Merge pull request #102 from kdbinsidebrains/101-is-there-a-way-to-di…

…sable-syntax-highlighting-for-mode-such-as-x 5.8.3: Mode parsing fixed
kdbinsidebrains · Jul 28, 2024 · 22a1502 · 22a1502
2 parents fc94aa8 + 567c1c0
commit 22a1502
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # KdbInsideBrains Changelog
 
+## [5.8.3]
+
+### Fixed
+
+- Issues 101: mode highlighting is used for a variable at the end of line sometimes
+
 ## [5.8.2]
 
 ### Fixed

diff --git a/src/main/resources/org/kdb/inside/brains/q.flex b/src/main/resources/org/kdb/inside/brains/q.flex
@@ -2,13 +2,12 @@ package org.kdb.inside.brains;
 
 import com.intellij.psi.tree.IElementType;
 
-import java.util.Deque;
 import java.util.ArrayDeque;
-
-import static org.kdb.inside.brains.psi.QTypes.*;
+import java.util.Deque;
 
 import static com.intellij.psi.TokenType.BAD_CHARACTER;
 import static com.intellij.psi.TokenType.WHITE_SPACE;
+import static org.kdb.inside.brains.psi.QTypes.*;
 
 %%
 
@@ -318,7 +317,7 @@ Vector={BooleanList}|{ByteList}|{IntegerList}|{FloatList}|
   ^{CommandName}/{NewLine}                   { return COMMAND_SYSTEM; }
   ^{CommandName}/{WhiteSpace}                { return COMMAND_SYSTEM; }
 
-  ^{ModePrefix}                              { return MODE_PATTERN; }
+  ^{ModePrefix}                              { if (zzCurrentPos == 0 || zzBuffer.charAt(zzCurrentPos - 1) == '\n') {return MODE_PATTERN; } else {yypushback(1); return VARIABLE_PATTERN;} }
 
   {TypeCast}                                 { return TYPE_CAST_PATTERN; }
 

diff --git a/version.properties b/version.properties
@@ -1 +1 @@
-pluginVersion=5.8.2
+pluginVersion=5.8.3