Jline3 and other console improvements #935
Conversation
Fixes bug with returnable statements not using the parsed command Adds support for multiple classes Adds ability to reference last returned output with the "last" variable (must be cast to type)
| @NonNls private static String CONSOLE_DATE = "HH:mm:ss"; | ||
| @NonNls private static String FILE_DATE = "yyyy/MM/dd HH:mm:ss"; | ||
| @NonNls private static String CONSOLE_PROMPT = ">"; | ||
| @NonNls private static String CONSOLE_PROMPT = "> "; // TODO: fix prompt |
There was a problem hiding this comment.
What's the problem here? Document in detail or link a bug.
| addReplacement(ChatColor.RESET, "\u001B[39;0m"); // NON-NLS | ||
| } | ||
|
|
||
| private static void addReplacement(ChatColor formatting, String ansi) { |
There was a problem hiding this comment.
Make Ansi @NonNls, and then the // NON-NLS comments probably won't be needed.
| this.level = level; | ||
| } | ||
| if (record.getThrown() != null) { | ||
| // StringWriter's close() is trivial |
There was a problem hiding this comment.
Use try-with-resources anyway, for future-proofing. It's probably equally concise.
| for (ChatColor color : colors) { | ||
| if (this.color && replacements.containsKey(color)) { | ||
| string = string.replaceAll("(?i)" + color, replacements.get(color)); | ||
| } else { |
There was a problem hiding this comment.
Just use the ternary operator here.
| } | ||
| candidates.addAll(completions); | ||
| completions = server.getScheduler().syncIfNeeded(() -> server.getCommandMap() | ||
| .tabComplete(sender, line.line())); |
There was a problem hiding this comment.
Keep the lambda on one line.
| if (task.call()) { | ||
| try { | ||
| Object returned = MethodInvocationUtils | ||
| .invokeStaticMethod(getCompiledClass("REPLShell"), "run", |
There was a problem hiding this comment.
Move the methods of MethodInvocationUtils to this class, unless and until another class uses them.
| + '"')); // NON-NLS | ||
| if (command.startsWith("$")) { // NON-NLS | ||
| server.getScheduler().runTask(null, | ||
| new EvalTask(command.substring(1), command.startsWith("$$"))); |
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
| @@ -0,0 +1,14 @@ | |||
| package net.glowstone.i18n; | |||
There was a problem hiding this comment.
Why not just add these methods to LoggableLocalizedString instead?
| import java.util.logging.Level; | ||
| import javax.tools.FileObject; | ||
| import javax.tools.ForwardingJavaFileManager; | ||
| import javax.tools.JavaCompiler; |
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
| } | ||
| } | ||
|
|
||
| public class ClassDataOutputStream extends OutputStream { |
There was a problem hiding this comment.
What does this do differently than the underlying ByteArrayOutputStream? If this can't simply be replaced by a BAOS, document why not, and can we use a FilterOutputStream instead?
Restores compatibility with mastercoms' commits.
|
@mastercoms asked me to commit the changes I could. I've done that; the REPL implementation is now on branch |
|
Why is this stalled? |
|
Unfortunately, we encountered regressions in the terminal on Windows. I haven't tested the latest version to see if it was fixed. |
This moves Glowstone to jline3. It comes with a better formatted console, compatibility improvements and more.
In addition to jline3, there are also new console manager tasks in addition to the already present command task: evaluation tasks and console tasks.
EvalTasks parse Java code from the console andConsoleTasks add new ways to customize the console through binds (not implemented), settings, keymaps and widgets.Co-authored-by: Pr0methean 4961925+Pr0methean@users.noreply.github.com