[SQLLINE-318] Correct highlighting and line continuation for '/*/'

julianhyde · Jul 10, 2019 · a672fdf · a672fdf
1 parent 104abc8
commit a672fdf
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/src/main/java/sqlline/SqlLineHighlighter.java b/src/main/java/sqlline/SqlLineHighlighter.java
@@ -464,7 +464,8 @@ int handleComments(String line, BitSet commentBitSet,
     if (startingPoint + 1 < line.length()
         && ch == '/'
         && line.charAt(startingPoint + 1) == '*') {
-      int end = line.indexOf("*/", startingPoint);
+      int end = startingPoint + 2 < line.length()
+          ? line.indexOf("*/", startingPoint + 2) : -1;
       end = end == -1 ? line.length() - 1 : end + 1;
       commentBitSet.set(startingPoint, end + 1);
       startingPoint = end;

diff --git a/src/main/java/sqlline/SqlLineParser.java b/src/main/java/sqlline/SqlLineParser.java
@@ -173,7 +173,8 @@ public ParsedLine parse(final String line, final int cursor,
                 rawWordLength, rawWordStart, i);
             rawWordStart = i + 1;
           } else if (multiLineCommentStart >= 0) {
-            if (currentChar == '/' && line.charAt(i - 1) == '*') {
+            if (i - multiLineCommentStart > 2
+                && currentChar == '/' && line.charAt(i - 1) == '*') {
               // End the block; arg could be empty, but that's fine
               words.add(flush(current));
               multiLineCommentStart = -1;

diff --git a/src/test/java/sqlline/SqlLineHighlighterLowLevelTest.java b/src/test/java/sqlline/SqlLineHighlighterLowLevelTest.java
@@ -166,6 +166,7 @@ public void testLowLevelHandleComments() {
         "--select",
         "/* \"''\"",
         "/*",
+        "/*/ should be a comment",
         "--",
         "/* kh\n'asd'ad*/",
         "/*\"-- \"values*/"

diff --git a/src/test/java/sqlline/SqlLineHighlighterTest.java b/src/test/java/sqlline/SqlLineHighlighterTest.java
@@ -152,6 +152,7 @@ public void testCommentedStrings() {
         "--select",
         "/* \"''\"",
         "/*",
+        "/*/ should be a comment",
         "--",
         "--\n/*",
         "/* kh\n'asd'ad*/",

diff --git a/src/test/java/sqlline/SqlLineParserTest.java b/src/test/java/sqlline/SqlLineParserTest.java
@@ -56,6 +56,7 @@ public class SqlLineParserTest {
       "select 1 --; --;",
       "select /*--\n\n--\n--;",
       "select /* \n ;",
+      "select /*/;",
       "select --\n/*\n--\n--;",
       "select ' ''\n '' '\n /* ;",
       "select ` ``\n `` `\n /* ;",
@@ -182,7 +183,7 @@ public void testSqlLineParserForWrongLinesWithEmptyPrompt() {
     for (String line : WRONG_LINES) {
       try {
         parser.parse(line, line.length(), acceptLine);
-        fail("Missing closing quote or semicolon for line " + line);
+        fail("Missing closing comment, quote or semicolon for line " + line);
       } catch (EOFError eofError) {
         //ok
       }