Methods

1 files changed, 10 insertions, 14 deletions

diff --git a/tools/support/typst.tmLanguage.json b/tools/support/typst.tmLanguage.json
index ce683699..ef7806c8 100644
--- a/tools/support/typst.tmLanguage.json
+++ b/tools/support/typst.tmLanguage.json
@@ -124,7 +124,7 @@
         },
         {
           "name": "keyword.other.typst",
-          "match": "(#)(as|in|with|from)\\b",
+          "match": "(#)(as|in|from)\\b",
           "captures": { "1": { "name": "punctuation.definition.keyword.typst" } }
         },
         {
@@ -168,19 +168,19 @@
         {
           "comment": "Function name",
           "name": "entity.name.function.typst",
-          "match": "((#)[[:alpha:]_][[:alnum:]._-]*!?)(?=\\[|\\()",
+          "match": "((#)[[:alpha:]_][[:alnum:]_-]*!?)(?=\\[|\\()",
           "captures": { "2": { "name": "punctuation.definition.function.typst" } }
         },
         {
           "comment": "Function arguments",
-          "begin": "(?<=#[[:alpha:]_][[:alnum:]._-]*!?)\\(",
+          "begin": "(?<=#[[:alpha:]_][[:alnum:]_-]*!?)\\(",
           "end": "\\)",
           "captures": { "0": { "name": "punctuation.definition.group.typst" } },
           "patterns": [{ "include": "#arguments" }]
         },
         {
           "name": "variable.interpolated.typst",
-          "match": "(#)[[:alpha:]_][[:alnum:]._-]*",
+          "match": "(#)[[:alpha:]_][[:alnum:]_-]*",
           "captures": { "1": { "name": "punctuation.definition.variable.typst" } }
         }
       ]
@@ -216,7 +216,7 @@
         },
         {
           "name": "keyword.operator.arithmetic.typst",
-          "match": "\\+|\\*|/|(?<![[:alpha:]_][[:alnum:]._-]*)-(?![:alnum:]_-]*[[:alpha:]_])"
+          "match": "\\+|\\*|/|(?<![[:alpha:]_][[:alnum:]_-]*)-(?![:alnum:]_-]*[[:alpha:]_])"
         },
         {
           "name": "keyword.operator.word.typst",
@@ -224,7 +224,7 @@
         },
         {
           "name": "keyword.other.typst",
-          "match": "\\b(pub|let|set|show|wrap|as|in|with|from)\\b"
+          "match": "\\b(pub|let|set|show|wrap|as|in|from)\\b"
         },
         {
           "name": "keyword.control.conditional.typst",
@@ -246,18 +246,18 @@
         {
           "comment": "Function name",
           "name": "entity.name.function.typst",
-          "match": "\\b[[:alpha:]_][[:alnum:]._-]*!?(?=(\\[|\\()|\\s+\\bwith\\b)"
+          "match": "\\b[[:alpha:]_][[:alnum:]_-]*!?(?=\\[|\\()"
         },
         {
           "comment": "Function arguments",
-          "begin": "(?<=\\b[[:alpha:]_][[:alnum:]._-]*!?|\\bwith\\b\\s+)\\(",
+          "begin": "(?<=\\b[[:alpha:]_][[:alnum:]_-]*!?)\\(",
           "end": "\\)",
           "captures": { "0": { "name": "punctuation.definition.group.typst" } },
           "patterns": [{ "include": "#arguments" }]
         },
         {
           "name": "variable.other.typst",
-          "match": "\\b[[:alpha:]_][[:alnum:]._-]*\\b"
+          "match": "\\b[[:alpha:]_][[:alnum:]_-]*\\b"
         },
         {
           "name": "meta.group.typst",
@@ -307,10 +307,6 @@
           "match": "\\b(\\d*)?\\.?\\d+([eE][+-]?\\d+)?\\b"
         },
         {
-          "name": "constant.other.color.typst",
-          "match": "#[0-9a-zA-Z]+\\b"
-        },
-        {
           "name": "string.quoted.double.typst",
           "begin": "\"",
           "end": "\"",
@@ -326,7 +322,7 @@
       "patterns": [
         {
           "name": "variable.parameter.typst",
-          "match": "\\b[[:alpha:]_][[:alnum:]._-]*(?=:)"
+          "match": "\\b[[:alpha:]_][[:alnum:]_-]*(?=:)"
         },
         { "include": "#code" }
       ]