nano editor fails to highlight block comments, fixes #753

jline · Nov 27, 2021 · 844ce0b · 844ce0b
1 parent f759ea6
commit 844ce0b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/builtins/src/main/java/org/jline/builtins/Less.java b/builtins/src/main/java/org/jline/builtins/Less.java
@@ -1307,7 +1307,12 @@ synchronized boolean display(boolean oneScreen, Integer curPos) throws IOExcepti
         Pattern dpCompiled = getPattern(true);
         boolean fitOnOneScreen = false;
         boolean eof = false;
-        syntaxHighlighter.reset();
+        if (highlight) {
+            syntaxHighlighter.reset();
+            for (int i = Math.max(0, inputLine - height); i < inputLine; i++) {
+                syntaxHighlighter.highlight(getLine(i));
+            }
+        }
         for (int terminalLine = 0; terminalLine < height - 1; terminalLine++) {
             if (curLine == null) {
                 Pair<Integer, AttributedString> nextLine = nextLine2display(inputLine, dpCompiled);

diff --git a/builtins/src/main/java/org/jline/builtins/Nano.java b/builtins/src/main/java/org/jline/builtins/Nano.java
@@ -861,7 +861,12 @@ List<AttributedString> getDisplayedLines(int nbLines) {
             int curLine = firstLineToDisplay;
             int curOffset = offsetInLineToDisplay;
             int prevLine = -1;
-            syntaxHighlighter.reset();
+            if (highlight) {
+                syntaxHighlighter.reset();
+                for (int i = Math.max(0, curLine - nbLines); i < curLine; i++) {
+                    syntaxHighlighter.highlight(getLine(i));
+                }
+            }
             for (int terminalLine = 0; terminalLine < nbLines; terminalLine++) {
                 AttributedStringBuilder line = new AttributedStringBuilder().tabs(tabs);
                 if (printLineNumbers && curLine < lines.size()) {