Syntax error highlight

jline · Oct 25, 2019 · 3911e26 · 3911e26
1 parent bbdfc0e
commit 3911e26
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 1 deletion.
diff --git a/builtins/src/main/java/org/jline/builtins/Widgets.java b/builtins/src/main/java/org/jline/builtins/Widgets.java
@@ -18,6 +18,7 @@
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.function.Function;
+import java.util.regex.Pattern;
 
 import org.jline.keymap.KeyMap;
 import org.jline.reader.Binding;
@@ -34,7 +35,7 @@
 import org.jline.utils.Status;
 
 /**
- * Brackets/quotes autopairing and command autosuggestion widgets for jline applications. 
+ * Brackets/quotes autopairing and command autosuggestion widgets for jline applications.
  *
  * @author <a href="mailto:matti.rintanikkola@gmail.com">Matti Rinta-Nikkola</a>
  */
@@ -155,6 +156,10 @@ public void setTailTip(String tailTip) {
         reader.setTailTip(tailTip);
     }
 
+    public void setErrorPattern(Pattern errorPattern) {
+        reader.getHighlighter().setErrorPattern(errorPattern);
+    }
+
     public void clearTailTip() {
         reader.setTailTip("");
     }
@@ -725,6 +730,7 @@ public boolean tailtipAcceptLine() {
                 setSuggestionType(SuggestionType.COMPLETER);
             }
             clearDescription();
+            setErrorPattern(null);
             cmdDescs.clearTemporaryDescs();
             return clearTailTip(LineReader.ACCEPT_LINE);
         }
@@ -766,6 +772,7 @@ private boolean doTailTip(String widget) {
                     doCommandTailTip(widget, cmdDesc, args);
                 } else {
                     doDescription(cmdDesc.getMainDescription(descriptionSize));
+                    setErrorPattern(cmdDesc.getErrorPattern());
                 }
             } else {
                 Pair<String,Boolean> cmdkey = cmdDescs.evaluateCommandLine(buffer.toString(), buffer.cursor());
@@ -775,6 +782,7 @@ private boolean doTailTip(String widget) {
                     resetTailTip();
                 } else if (!cmdkey.getV()) {
                     doDescription(cmdDesc.getMainDescription(descriptionSize));
+                    setErrorPattern(cmdDesc.getErrorPattern());
                 }
             }
             return true;
@@ -1112,6 +1120,11 @@ public static class CmdDesc {
         private List<AttributedString> mainDesc;
         private List<ArgDesc> argsDesc;
         private TreeMap<String,List<AttributedString>> optsDesc;
+        private Pattern errorPattern;
+
+        public CmdDesc() {
+
+        }
 
         public CmdDesc(List<ArgDesc> argsDesc) {
             this(new ArrayList<>(), argsDesc, new HashMap<>());
@@ -1132,6 +1145,19 @@ public CmdDesc(List<AttributedString> mainDesc, List<ArgDesc> argsDesc, Map<Stri
             }
         }
 
+        public CmdDesc mainDesc(List<AttributedString> mainDesc) {
+            this.mainDesc = new ArrayList<>(mainDesc);
+            return this;
+        }
+
+        public void setErrorPattern(Pattern errorPattern) {
+            this.errorPattern = errorPattern;
+        }
+
+        public Pattern getErrorPattern() {
+            return errorPattern;
+        }
+
         public List<ArgDesc> getArgsDesc() {
             return argsDesc;
         }

diff --git a/reader/src/main/java/org/jline/reader/Highlighter.java b/reader/src/main/java/org/jline/reader/Highlighter.java
@@ -8,9 +8,12 @@
  */
 package org.jline.reader;
 
+import java.util.regex.Pattern;
+
 import org.jline.utils.AttributedString;
 
 public interface Highlighter {
 
     AttributedString highlight(LineReader reader, String buffer);
+    public void setErrorPattern(Pattern errorPattern);
 }
diff --git a/reader/src/main/java/org/jline/reader/impl/DefaultHighlighter.java b/reader/src/main/java/org/jline/reader/impl/DefaultHighlighter.java
@@ -8,6 +8,8 @@
  */
 package org.jline.reader.impl;
 
+import java.util.regex.Pattern;
+
 import org.jline.reader.LineReader;
 import org.jline.reader.LineReader.RegionType;
 import org.jline.reader.Highlighter;
@@ -17,6 +19,12 @@
 import org.jline.utils.WCWidth;
 
 public class DefaultHighlighter implements Highlighter {
+    private Pattern errorPattern;
+
+    @Override
+    public void setErrorPattern(Pattern errorPattern) {
+        this.errorPattern = errorPattern;
+    }
 
     @Override
     public AttributedString highlight(LineReader reader, String buffer) {
@@ -78,6 +86,9 @@ public AttributedString highlight(LineReader reader, String buffer) {
                 sb.style(AttributedStyle::inverseOff);
             }
         }
+        if (errorPattern != null) {
+            sb.styleMatches(errorPattern, AttributedStyle.INVERSE);
+        }
         return sb.toAttributedString();
     }