JEP442 support

jline · Aug 1, 2023 · 61c6f78 · 61c6f78
1 parent 981a1f9
commit 61c6f78
Show file tree

Hide file tree

Showing 28 changed files with 2,988 additions and 2 deletions.
diff --git a/jline/pom.xml b/jline/pom.xml
@@ -320,6 +320,9 @@
                                 <include>**/TTop.java</include>
                                 <include>**/ConsoleEngineImpl.java</include>
                             </includes>
+                            <excludes>
+                                <exclude>**/jep434/*.java</exclude>
+                            </excludes>
                             <compilerArgs>
                                 <arg>-Xlint:all,-options</arg>
                                 <arg>-Werror</arg>
@@ -335,6 +338,7 @@
                             <excludes>
                                 <exclude>**/TTop.java</exclude>
                                 <exclude>**/ConsoleEngineImpl.java</exclude>
+                                <exclude>**/jep434/*.java</exclude>
                             </excludes>
                             <compilerArgs>
                                 <arg>-Xlint:all,-options</arg>
@@ -344,6 +348,22 @@
                             </compilerArgs>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>jdk20</id>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                        <configuration>
+                            <includes>
+                                <include>**/jep434/*.java</include>
+                            </includes>
+                            <release>21</release>
+                            <compilerArgs>
+                                <arg>-Xlint:all,-options</arg>
+                                <arg>--enable-preview</arg>
+                            </compilerArgs>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>

diff --git a/reader/pom.xml b/reader/pom.xml
@@ -24,6 +24,7 @@
 
     <properties>
         <automatic.module.name>org.jline.reader</automatic.module.name>
+        <surefire.argLine>--add-opens java.base/java.io=ALL-UNNAMED --enable-preview</surefire.argLine>
     </properties>
 
     <dependencies>

diff --git a/reader/src/main/java/org/jline/reader/impl/LineReaderImpl.java b/reader/src/main/java/org/jline/reader/impl/LineReaderImpl.java
@@ -232,7 +232,7 @@ protected enum BellType {
 
     protected KillRing killRing = new KillRing();
 
-    protected UndoTree<Buffer> undo = new UndoTree<>(this::setBuffer);
+    protected UndoTree<Buffer> undo;
     protected boolean isUndo;
 
     /**
@@ -291,6 +291,7 @@ public LineReaderImpl(Terminal terminal, String appName) throws IOException {
         this(terminal, appName, null);
     }
 
+    @SuppressWarnings("this-escape")
     public LineReaderImpl(Terminal terminal, String appName, Map<String, Object> variables) {
         Objects.requireNonNull(terminal, "terminal can not be null");
         this.terminal = terminal;
@@ -309,6 +310,7 @@ public LineReaderImpl(Terminal terminal, String appName, Map<String, Object> var
             this.alternateOut = Curses.tputs(terminal.getStringCapability(Capability.exit_alt_charset_mode));
         }
 
+        undo = new UndoTree<>(this::setBuffer);
         builtinWidgets = builtinWidgets();
         widgets = new HashMap<>(builtinWidgets);
         bindingReader = new BindingReader(terminal.reader());

diff --git a/reader/src/main/java/org/jline/reader/impl/UndoTree.java b/reader/src/main/java/org/jline/reader/impl/UndoTree.java
@@ -20,6 +20,7 @@ public class UndoTree<T> {
     private final Node parent;
     private Node current;
 
+    @SuppressWarnings("this-escape")
     public UndoTree(Consumer<T> s) {
         state = s;
         parent = new Node(null);

diff --git a/reader/src/main/java/org/jline/reader/impl/history/DefaultHistory.java b/reader/src/main/java/org/jline/reader/impl/history/DefaultHistory.java
@@ -43,6 +43,7 @@ public class DefaultHistory implements History {
 
     public DefaultHistory() {}
 
+    @SuppressWarnings("this-escape")
     public DefaultHistory(LineReader reader) {
         attach(reader);
     }

diff --git a/terminal/pom.xml b/terminal/pom.xml
@@ -47,6 +47,41 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.10.1</version>
+                <executions>
+                    <execution>
+                        <id>default-compile</id>
+                        <configuration>
+                            <excludes>
+                                <exclude>**/jep442/*.java</exclude>
+                            </excludes>
+                            <compilerArgs>
+                                <arg>-Xlint:all,-options</arg>
+                                <arg>-Werror</arg>
+                            </compilerArgs>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>jdk21</id>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                        <configuration>
+                            <includes>
+                                <include>**/jep442/*.java</include>
+                            </includes>
+                            <release>21</release>
+                            <compilerArgs>
+                                <arg>-Xlint:all,-options</arg>
+                                <arg>--enable-preview</arg>
+                            </compilerArgs>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>

diff --git a/terminal/src/main/java/org/jline/terminal/Attributes.java b/terminal/src/main/java/org/jline/terminal/Attributes.java
@@ -137,6 +137,7 @@ public enum LocalFlag {
 
     public Attributes() {}
 
+    @SuppressWarnings("this-escape")
     public Attributes(Attributes attr) {
         copy(attr);
     }

diff --git a/terminal/src/main/java/org/jline/terminal/Size.java b/terminal/src/main/java/org/jline/terminal/Size.java
@@ -15,6 +15,7 @@ public class Size {
 
     public Size() {}
 
+    @SuppressWarnings("this-escape")
     public Size(int columns, int rows) {
         this();
         setColumns(columns);

diff --git a/terminal/src/main/java/org/jline/terminal/TerminalBuilder.java b/terminal/src/main/java/org/jline/terminal/TerminalBuilder.java
@@ -54,6 +54,7 @@ public final class TerminalBuilder {
     public static final String PROP_JNA = "org.jline.terminal.jna";
     public static final String PROP_JANSI = "org.jline.terminal.jansi";
     public static final String PROP_EXEC = "org.jline.terminal.exec";
+    public static final String PROP_JEP434 = "org.jline.terminal.jep434";
     public static final String PROP_DUMB = "org.jline.terminal.dumb";
     public static final String PROP_DUMB_COLOR = "org.jline.terminal.dumb.color";
     public static final String PROP_OUTPUT = "org.jline.terminal.output";
@@ -129,6 +130,7 @@ public static TerminalBuilder builder() {
     private Boolean jna;
     private Boolean jansi;
     private Boolean exec;
+    private Boolean jep434;
     private Boolean dumb;
     private Boolean color;
     private Attributes attributes;
@@ -184,6 +186,11 @@ public TerminalBuilder exec(boolean exec) {
         return this;
     }
 
+    public TerminalBuilder jep434(boolean jep434) {
+        this.jep434 = jep434;
+        return this;
+    }
+
     public TerminalBuilder dumb(boolean dumb) {
         this.dumb = dumb;
         return this;
@@ -368,12 +375,25 @@ private Terminal doBuild() throws IOException {
         if (exec == null) {
             exec = getBoolean(PROP_EXEC, true);
         }
+        Boolean jep434 = this.jep434;
+        if (jep434 == null) {
+            jep434 = getBoolean(PROP_JEP434, true);
+        }
         Boolean dumb = this.dumb;
         if (dumb == null) {
             dumb = getBoolean(PROP_DUMB, null);
         }
         IllegalStateException exception = new IllegalStateException("Unable to create a terminal");
         List<TerminalProvider> providers = new ArrayList<>();
+        if (jep434) {
+            try {
+                TerminalProvider provider = TerminalProvider.load("jep434");
+                providers.add(provider);
+            } catch (Throwable t) {
+                Log.debug("Unable to load JEP434 support: ", t);
+                exception.addSuppressed(t);
+            }
+        }
         if (jna) {
             try {
                 TerminalProvider provider = TerminalProvider.load("jna");

diff --git a/terminal/src/main/java/org/jline/terminal/impl/AbstractTerminal.java b/terminal/src/main/java/org/jline/terminal/impl/AbstractTerminal.java
@@ -44,19 +44,21 @@ public abstract class AbstractTerminal implements Terminal {
     protected final Set<Capability> bools = new HashSet<>();
     protected final Map<Capability, Integer> ints = new HashMap<>();
     protected final Map<Capability, String> strings = new HashMap<>();
-    protected final ColorPalette palette = new ColorPalette(this);
+    protected final ColorPalette palette;
     protected Status status;
     protected Runnable onClose;
 
     public AbstractTerminal(String name, String type) throws IOException {
         this(name, type, null, SignalHandler.SIG_DFL);
     }
 
+    @SuppressWarnings("this-escape")
     public AbstractTerminal(String name, String type, Charset encoding, SignalHandler signalHandler)
             throws IOException {
         this.name = name;
         this.type = type != null ? type : "ansi";
         this.encoding = encoding != null ? encoding : Charset.defaultCharset();
+        this.palette = new ColorPalette(this);
         for (Signal signal : Signal.values()) {
             handlers.put(signal, signalHandler);
         }

diff --git a/terminal/src/main/java/org/jline/terminal/impl/AbstractWindowsTerminal.java b/terminal/src/main/java/org/jline/terminal/impl/AbstractWindowsTerminal.java
@@ -82,6 +82,7 @@ public abstract class AbstractWindowsTerminal<Console> extends AbstractTerminal
     protected boolean focusTracking = false;
     private volatile boolean closing;
 
+    @SuppressWarnings("this-escape")
     public AbstractWindowsTerminal(
             Writer writer,
             String name,

diff --git a/terminal/src/main/java/org/jline/terminal/impl/Diag.java b/terminal/src/main/java/org/jline/terminal/impl/Diag.java
@@ -50,6 +50,17 @@ static void diag(PrintStream out) {
         out.println("IS_OSX =     " + OSUtils.IS_OSX);
         out.println();
 
+        // Jep434
+        out.println("Jep434 Support");
+        out.println("=================");
+        try {
+            TerminalProvider provider = TerminalProvider.load("jep434");
+            testProvider(out, provider);
+        } catch (Throwable t) {
+            out.println("Jep434 support not available: " + t);
+        }
+        out.println();
+
         out.println("JnaSupport");
         out.println("=================");
         try {

diff --git a/terminal/src/main/java/org/jline/terminal/impl/DumbTerminal.java b/terminal/src/main/java/org/jline/terminal/impl/DumbTerminal.java
@@ -40,6 +40,7 @@ public DumbTerminal(String name, String type, InputStream in, OutputStream out,
         this(name, type, in, out, encoding, SignalHandler.SIG_DFL);
     }
 
+    @SuppressWarnings("this-escape")
     public DumbTerminal(
             String name, String type, InputStream in, OutputStream out, Charset encoding, SignalHandler signalHandler)
             throws IOException {

diff --git a/terminal/src/main/java/org/jline/terminal/impl/ExternalTerminal.java b/terminal/src/main/java/org/jline/terminal/impl/ExternalTerminal.java
@@ -67,6 +67,7 @@ public ExternalTerminal(
         this(name, type, masterInput, masterOutput, encoding, signalHandler, paused, null, null);
     }
 
+    @SuppressWarnings("this-escape")
     public ExternalTerminal(
             String name,
             String type,

diff --git a/terminal/src/main/java/org/jline/terminal/impl/LineDisciplineTerminal.java b/terminal/src/main/java/org/jline/terminal/impl/LineDisciplineTerminal.java
@@ -91,6 +91,7 @@ public LineDisciplineTerminal(String name, String type, OutputStream masterOutpu
         this(name, type, masterOutput, encoding, SignalHandler.SIG_DFL);
     }
 
+    @SuppressWarnings("this-escape")
     public LineDisciplineTerminal(
             String name, String type, OutputStream masterOutput, Charset encoding, SignalHandler signalHandler)
             throws IOException {

diff --git a/terminal/src/main/java/org/jline/terminal/impl/PosixPtyTerminal.java b/terminal/src/main/java/org/jline/terminal/impl/PosixPtyTerminal.java
@@ -55,6 +55,7 @@ public PosixPtyTerminal(
         this(name, type, pty, in, out, encoding, signalHandler, false);
     }
 
+    @SuppressWarnings("this-escape")
     public PosixPtyTerminal(
             String name,
             String type,

diff --git a/terminal/src/main/java/org/jline/terminal/impl/PosixSysTerminal.java b/terminal/src/main/java/org/jline/terminal/impl/PosixSysTerminal.java
@@ -34,6 +34,7 @@ public class PosixSysTerminal extends AbstractPosixTerminal {
     protected final Map<Signal, Object> nativeHandlers = new HashMap<>();
     protected final Task closer;
 
+    @SuppressWarnings("this-escape")
     public PosixSysTerminal(
             String name, String type, Pty pty, Charset encoding, boolean nativeSignals, SignalHandler signalHandler)
             throws IOException {