Merge pull request #1913 from puneetdixit200/fix-set-prefix-highlighting

Fix highlighting for set-prefixed identifiers

Author: rolandwalker

changelog.md

@@ -4,6 +4,7 @@ Upcoming (TBD)
 Bug Fixes
 ---------
 * Keep completion-menu Escape cancellation eager only in Vi mode so Emacs Alt-key bindings keep working while completions are open.
+* Keep identifiers that start with `set` highlighted as names.
 
 
 Internal

mycli/lexer.py

@@ -1,11 +1,17 @@
 from pygments.lexer import inherit
 from pygments.lexers.sql import MySqlLexer
-from pygments.token import Keyword
+from pygments.token import Keyword, Name
 
 
 class MyCliLexer(MySqlLexer):
     """Extends MySQL lexer to add keywords."""
 
     tokens = {
-        "root": [(r"\brepair\b", Keyword), (r"\boffset\b", Keyword), inherit],
+        "root": [
+            # TODO: Remove once Pygments is upgraded above v2.20.0.
+            (r"\bset[\w$]+\b", Name),
+            (r"\brepair\b", Keyword),
+            (r"\boffset\b", Keyword),
+            inherit,
+        ],
     }

test/pytests/test_lexer.py

@@ -0,0 +1,10 @@
+from pygments.token import Keyword, Name
+
+from mycli.lexer import MyCliLexer
+
+
+def test_mysql_lexer_keeps_identifiers_starting_with_set_together():
+    tokens = list(MyCliLexer().get_tokens("SELECT * FROM settings_123 WHERE id = 123;"))
+
+    assert (Name, "settings_123") in tokens
+    assert (Keyword, "set") not in tokens