SystemHighlighter refresh() refresh also external syntaxHighlighters

jline · Dec 18, 2021 · 51c0399 · 51c0399
1 parent 652d7a1
commit 51c0399
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/console/src/main/java/org/jline/console/impl/SystemHighlighter.java b/console/src/main/java/org/jline/console/impl/SystemHighlighter.java
@@ -25,6 +25,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.*;
+import java.util.function.Supplier;
 
 import static org.jline.builtins.Styles.NANORC_THEME;
 import static org.jline.builtins.SyntaxHighlighter.REGEX_TOKEN_NAME;
@@ -45,6 +46,7 @@ public class SystemHighlighter extends DefaultHighlighter {
     protected final Map<String, FileHighlightCommand> fileHighlight = new HashMap<>();
     protected final Map<String,SyntaxHighlighter> specificHighlighter = new HashMap<>();
     protected int  commandIndex;
+    private final List<Supplier<Boolean>> externalHighlightersRefresh = new ArrayList<>();
 
     public SystemHighlighter(SyntaxHighlighter commandHighlighter, SyntaxHighlighter argsHighlighter
             , SyntaxHighlighter langHighlighter) {
@@ -94,12 +96,19 @@ public void refresh(LineReader lineReader) {
                 for (String key : readerColors.keySet()) {
                     lineReader.setVariable(key, styleCompiler.getStyle(key));
                 }
+                for (Supplier<Boolean> refresh : externalHighlightersRefresh) {
+                    refresh.get();
+                }
             } catch (IOException e) {
                 Log.warn(e.getMessage());
             }
         }
     }
 
+    public void addExternalHighlighterRefresh(Supplier<Boolean> refresh) {
+        externalHighlightersRefresh.add(refresh);
+    }
+
     private Path compareThemes(SyntaxHighlighter highlighter, Path currentTheme) {
         Path out;
         if (currentTheme != null) {

diff --git a/demo/src/main/java/org/jline/demo/Repl.java b/demo/src/main/java/org/jline/demo/Repl.java
@@ -300,6 +300,8 @@ public static void main(String[] args) {
             }
             highlighter.addFileHighlight("nano", "less", "slurp");
             highlighter.addFileHighlight("groovy", "classloader", Arrays.asList("-a", "--add"));
+            highlighter.addExternalHighlighterRefresh(printer::refresh);
+            highlighter.addExternalHighlighterRefresh(scriptEngine::refresh);
             //
             // LineReader
             //