Syntax highlighting 0.0.2 - variables and function names. (eth-sri#246)

Co-authored-by: TomExMachina <[email protected]>
reuank · Oct 20, 2023 · 2ff5a5b · 2ff5a5b
1 parent bdcbcf1
commit 2ff5a5b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/src/lmql/ui/vscode/package.json b/src/lmql/ui/vscode/package.json
@@ -3,7 +3,7 @@
   "displayName": "Language Model Query Language (LMQL) Syntax Highlighting",
   "description": "Syntax highlighting for .lmql and Python files with embedded LMQL.",
   "publisher": "lmql-team",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "engines": {
     "vscode": "^1.76.0"
   },

diff --git a/src/lmql/ui/vscode/syntaxes/lmql.qstring.json b/src/lmql/ui/vscode/syntaxes/lmql.qstring.json
@@ -9,18 +9,31 @@
             "patterns": [
                 {
                     "include": "source.python#expression"
+                },
+                {
+                    "match": "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b(?=\\])",
+                    "name": "entity.name.function.lmql"
                 }
             ]
         },
         {
             "begin": "\\{",
             "end": "\\}",
-            "contentName": "keyword.control.lmql",
+            "name": "keyword.control.lmql",
             "patterns": [
                 {
                     "include": "source.python#f-expression"
+                },
+                {
+                    "match": "\\{",
+                    "name": "punctuation.section.block.begin.lmql"
+                },
+                {
+                    "match": "\\}",
+                    "name": "punctuation.section.block.end.lmql"
                 }
             ]
         }
     ]
-}
+}
+
diff --git a/src/lmql/ui/vscode/syntaxes/lmql.tmLanguage.json b/src/lmql/ui/vscode/syntaxes/lmql.tmLanguage.json
@@ -8,6 +8,9 @@
 		{
 			"include": "#keywords"
 		},
+		{
+			"include": "#template_variables"
+		},
 		{
 			"include": "source.python#statement"
 		},
@@ -17,12 +20,10 @@
 	],
 	"repository": {
 		"keywords": {
-			"patterns": [
-				{
-					"name": "keyword.control.lmql",
-					"match": "\\b(BEAM|beam|ARGMAX|argmax|SAMPLE|incontext|BEST_K|best_k|BEAM_VAR|beam_var|VAR|var|sample|FROM|from|WHERE|where|DISTRIBUTION|distribution)\\b"
-				}
-			]
+			"patterns": [{
+				"name": "keyword.control.lmql",
+				"match": "\\b(BEAM|beam|ARGMAX|argmax|SAMPLE|BEST_K|best_k|BEAM_VAR|beam_var|VAR|var|sample|FROM|from|WHERE|where|DISTRIBUTION|distribution)\\b"
+			}]
 		}
 	},
 	"scopeName": "source.lmql"