Improved highlighting for FScript

fastn-stack · Aug 2, 2023 · f7febe5 · f7febe5
1 parent 30646f6
commit f7febe5
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 5 deletions.
diff --git a/src/language-configuration.json b/src/language-configuration.json
@@ -3,7 +3,15 @@
         "lineComment": ";;",
     },
     "brackets": [],
-    "autoClosingPairs": [],
-    "surroundingPairs": [],
+    "autoClosingPairs": [
+        { "open": "{", "close": "}" },
+        { "open": "[", "close": "]" },
+        { "open": "(", "close": ")" }    
+    ],
+    "surroundingPairs": [
+        ["{", "}"],
+        ["[", "]"],
+        ["(", ")"]
+    ],
     "wordPattern": "(#|\\$|\\*\\$)?(\\w+[\\w\\.|\\-]*)(\\$)?"
 }
diff --git a/src/syntaxes/ftd.tmLanguage.json b/src/syntaxes/ftd.tmLanguage.json
@@ -58,13 +58,27 @@
       }
     },
     {
-      "name": "string.value.arithmetic.curly-braces.ftd",
+      "name": "string.operators.curly-braces.ftd",
       "begin": "{",
       "end": "}",
       "patterns": [
+        {
+          "name": "punctuation.definition.paran.open.ftd",
+          "match": "\\(",
+          "captures": {
+            "0": { "name": "support.type" }
+          }
+        },
+        {
+          "name": "punctuation.definition.paran.close.ftd",
+          "match": "\\)",
+          "captures": {
+            "0": { "name": "support.type" }
+          }
+        },
         {
           "name": "keyword.operator.ftd",
-          "match": "\\+|-|\\*|/|%|\\^|>=|<=|==|!=|>|<",
+          "match": "!|>=|<=|==|!=|>|<|&|&&|\\||\\|\\|",
           "captures": {
             "0": { "name": "keyword.operator" }
           }
@@ -78,7 +92,7 @@
       "patterns": [
         {
           "name": "keyword.operator.ftd",
-          "match": "\\+|-|\\*|/|%|\\^|>=|<=|==|!=|>|<",
+          "match": "\\+|-|\\*|/|%|\\^",
           "captures": {
             "0": { "name": "keyword.operator.ftd" }
           }