fix: wrong next state in regex state

ajaxorg · Apr 25, 2023 · c5ed709 · c5ed709
1 parent 990745a
commit c5ed709
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/mode/_test/text_lucene.txt b/src/mode/_test/text_lucene.txt
@@ -55,3 +55,4 @@ esc\:aped
 esc\\aped
 esc\ aped:foo
 "foo\"bar"
+foo:/bar/
diff --git a/src/mode/_test/tokens_lucene.json b/src/mode/_test/tokens_lucene.json
@@ -327,6 +327,12 @@
 ],[
    "start",
   ["string","\"foo\\\"bar\""]
+],[
+   "start",
+  ["keyword","foo:"],
+  ["string.regexp.start","/"],
+  ["string.regexp","bar"],
+  ["string.regexp.end","/"]
 ],[
    "start"
 ]]
diff --git a/src/mode/lucene_highlight_rules.js b/src/mode/lucene_highlight_rules.js
@@ -73,7 +73,7 @@ var LuceneHighlightRules = function() {
                 // flag
                 token: "string.regexp.end",
                 regex: "/[sxngimy]*",
-                next: "no_regex"
+                next: "start"
             }, {
                 // invalid operators
                 token : "invalid",
@@ -96,7 +96,7 @@ var LuceneHighlightRules = function() {
             }, {
                 token: "empty",
                 regex: "$",
-                next: "no_regex"
+                next: "start"
             }, {
                 defaultToken: "string.regexp"
             }
@@ -115,9 +115,9 @@ var LuceneHighlightRules = function() {
             }, {
                 token: "empty",
                 regex: "$",
-                next: "no_regex"
+                next: "start"
             }, {
-                defaultToken: "string.regexp.charachterclass"
+                defaultToken: "string.regexp.characterclass"
             }
         ]
     };