Migrate to jline3

.vscode/launch.json

@@ -38,7 +38,7 @@
             "request": "launch",
             "mainClass": "org.rascalmpl.shell.RascalShell",
             "projectName": "rascal",
-            "cwd" : "${workspaceFolder}/../rascal-tutor",
+            "cwd": "${workspaceFolder}/../rascal-tutor",
             "vmArgs": "-Xss80m -Xmx2g -ea"
         },
         {
@@ -47,7 +47,7 @@
             "request": "attach",
             "projectName": "rascal",
             "hostName": "localhost",
-            "port": 9001
+            "port": 9213
         },
         {
             "type": "java",

pom.xml

@@ -33,6 +33,7 @@
         <rascal.test.memory>2</rascal.test.memory>
         <maven.compiler.release>11</maven.compiler.release>
         <rascal-maven.version>0.28.4</rascal-maven.version>
+        <jline.version>3.27.0</jline.version>
     </properties>
 
     <licenses>
@@ -332,10 +333,6 @@
                                         <exclude>org.fusesource.jansi.internal.*</exclude>
                                     </excludes>
                                 </relocation>
-                                <relocation>
-                                    <pattern>jline</pattern>
-                                    <shadedPattern>org.rascalmpl.jline</shadedPattern>
-                                </relocation>
                             </relocations>
                             <filters>
                                 <filter>
@@ -464,10 +461,35 @@
             <artifactId>gson</artifactId>
             <version>2.10.1</version>
         </dependency>
-        <dependency>
-            <groupId>jline</groupId>
-            <artifactId>jline</artifactId>
-            <version>2.14.6</version>
+        <dependency> <!-- line reader/completion/history support -->
+            <groupId>org.jline</groupId>
+            <artifactId>jline-reader</artifactId>
+            <version>${jline.version}</version>
+        </dependency>
+        <dependency> <!-- terminal API -->
+            <groupId>org.jline</groupId>
+            <artifactId>jline-terminal</artifactId>
+            <version>${jline.version}</version>
+        </dependency>
+        <dependency> <!-- interaction with native APIs for console features, after jdk22 we can switch to FFM -->
+            <groupId>org.jline</groupId> 
+            <artifactId>jline-terminal-jni</artifactId>
+            <version>${jline.version}</version>
+        </dependency>
+        <dependency> <!-- styling api -->
+            <groupId>org.jline</groupId> 
+            <artifactId>jline-style</artifactId>
+            <version>${jline.version}</version>
+        </dependency>
+        <dependency> <!-- command registyr and extra features -->
+            <groupId>org.jline</groupId>
+            <artifactId>jline-console</artifactId>
+            <version>${jline.version}</version>
+        </dependency>
+        <dependency>  <!-- raw ansi commands -->
+            <groupId>org.jline</groupId>
+            <artifactId>jansi-core</artifactId>
+            <version>${jline.version}</version>
         </dependency>
         <dependency>
             <groupId>org.yaml</groupId>

src/org/rascalmpl/debug/IRascalMonitor.java

@@ -12,21 +12,18 @@
 *******************************************************************************/
 package org.rascalmpl.debug;
 
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintStream;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
+
+import org.jline.terminal.Terminal;
 import org.rascalmpl.interpreter.BatchProgressMonitor;
 import org.rascalmpl.interpreter.NullRascalMonitor;
 import org.rascalmpl.repl.TerminalProgressBarMonitor;
 
 import io.usethesource.vallang.ISourceLocation;
-import jline.Terminal;
-import jline.TerminalFactory;
 
 public interface IRascalMonitor {
 	/**
@@ -158,8 +155,8 @@ default void jobStep(String name, String message) {
 	 * and otherwise default to a dumn terminal console progress logger.
 	 * @return
 	 */
-	public static IRascalMonitor buildConsoleMonitor(InputStream in, OutputStream out) {
-		return buildConsoleMonitor(in, out, inBatchMode());
+	public static IRascalMonitor buildConsoleMonitor(Terminal term) {
+		return buildConsoleMonitor(term, inBatchMode());
 	}
 
 	public static boolean inBatchMode() {
@@ -168,12 +165,11 @@ public static boolean inBatchMode() {
 			;
 	}
 
-	public static IRascalMonitor buildConsoleMonitor(InputStream in, OutputStream out, boolean batchMode) {
-		Terminal terminal = TerminalFactory.get();
+	public static IRascalMonitor buildConsoleMonitor(Terminal terminal, boolean batchMode) {
 
-		return !batchMode && terminal.isAnsiSupported()
-			? new TerminalProgressBarMonitor(out, in, terminal)
-			: new BatchProgressMonitor(new PrintStream(out))
+		return !batchMode && TerminalProgressBarMonitor.shouldWorkIn(terminal)
+			? new TerminalProgressBarMonitor(terminal)
+			: new BatchProgressMonitor(terminal.writer())
 		;
 	}
 

src/org/rascalmpl/ideservices/BasicIDEServices.java

@@ -20,6 +20,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
+import org.jline.terminal.Terminal;
 import org.rascalmpl.debug.IRascalMonitor;
 import org.rascalmpl.uri.URIResolverRegistry;
 import org.rascalmpl.uri.URIUtil;
@@ -34,16 +35,24 @@
 public class BasicIDEServices implements IDEServices {
   private final IRascalMonitor monitor;
   private final PrintWriter stderr;
+  private final Terminal terminal;
 
-  public BasicIDEServices(PrintWriter stderr, IRascalMonitor monitor){
+  public BasicIDEServices(PrintWriter stderr, IRascalMonitor monitor, Terminal terminal){
     this.stderr = stderr;
     this.monitor = monitor;
+    this.terminal = terminal;
   }
 
   @Override
   public PrintWriter stderr() {
     return stderr;
   }
+
+  @Override
+  public Terminal activeTerminal() {
+    return terminal;
+  }
+
 
   public void browse(ISourceLocation loc, String title, int viewColumn){
       browse(loc.getURI(), title, viewColumn);

src/org/rascalmpl/ideservices/IDEServices.java

@@ -15,6 +15,7 @@
 import java.io.PrintWriter;
 import java.net.URI;
 
+import org.jline.terminal.Terminal;
 import org.rascalmpl.debug.IRascalMonitor;
 import org.rascalmpl.uri.LogicalMapResolver;
 import org.rascalmpl.uri.URIResolverRegistry;
@@ -73,6 +74,16 @@ default void unregisterLanguage(IConstructor language) {
     throw new UnsupportedOperationException("registerLanguage is not implemented in this environment.");
   }
 
+  /**
+   * Get access to the current terminal.  <br>
+   * used for features such as clearing the terminal, and starting a nested REPL. <br>
+   * Can return null if there is no active terminal.
+   * @return a terminal if there is one, null otherwise.
+   */
+  default Terminal activeTerminal() {
+    return null;
+  }
+
   /**
    * Asks the IDE to apply document edits as defined in the standard library module
    * analysis::diff::edits::TextEdits, according to the semantics defined in

src/org/rascalmpl/interpreter/BatchProgressMonitor.java

@@ -24,11 +24,15 @@ public class BatchProgressMonitor implements IRascalMonitor {
 	PrintWriter out;
 
 	public BatchProgressMonitor() {
-		this.out = new PrintWriter(System.err);
+		this(new PrintWriter(System.err, true));
 	}
 
 	public BatchProgressMonitor(PrintStream out) {
-		this.out = new PrintWriter(out);
+		this(new PrintWriter(out));
+	}
+
+	public BatchProgressMonitor(PrintWriter out) {
+		this.out = out;
 	}
 
 	@Override

src/org/rascalmpl/interpreter/DefaultTestResultListener.java

@@ -15,7 +15,7 @@
 
 import java.io.PrintWriter;
 
-import org.rascalmpl.repl.ReplTextWriter;
+import org.rascalmpl.repl.streams.ReplTextWriter;
 
 import io.usethesource.vallang.ISourceLocation;