Simplify end patterns further

effekt-lang · Jul 20, 2024 · 7dc2c36 · 7dc2c36
1 parent 1df2a1b
commit 7dc2c36
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/syntaxes/effekt.tmLanguage.json b/syntaxes/effekt.tmLanguage.json
@@ -37,7 +37,7 @@
     "definitions": {
       "patterns": [{
           "begin": "\\s*(extern)\\s+((?:(?:\\{[^\\}]*\\}|[a-zA-Z][a-z-A-Z0-9_$]*)\\s+)?)\\s*(def)\\s+([a-zA-Z][a-z-A-Z0-9_$]*)\\b",
-          "end": "(?:(?=\\n)|(?=\\b(?:(?!=>)[^=]>\\b)|(?:(?!>)\\=)))",
+          "end": "(?=\\n)|(?<=\\S)\\s*(?==(?!>))",
           "captures": {
             "1": { "name": "keyword.declaration.type" },
             "2": { "patterns": [{ "include": "#capabilities" }] },
@@ -47,7 +47,7 @@
           "patterns": [{ "include": "#parameters" }]
         }, {
           "begin": "\\s*(def)\\s+([a-zA-Z][a-z-A-Z0-9_$]*)\\b",
-          "end": "(?:(?=\\n)|(?=\\b(?:(?!=>)[^=]>\\b)|(?:(?!>)\\=)))",
+          "end": "(?=\\n)|(?<=\\S)\\s*(?==(?!>))",
           "captures": {
             "1": { "name": "keyword.declaration.function" },
             "2": { "name": "entity.name.function" }
@@ -65,7 +65,7 @@
             "1": { "name": "keyword.declaration.var" },
             "2": { "name": "variable" }
           },
-          "end": "(?:(?=\\n)|(?=\\b(?:(?!=>)[^=]>\\b)|(?:(?!>)\\=)))",
+          "end": "(?:;|(?=\\n)|(?<=\\S)\\s*(?==(?!>)))",
           "patterns": [{
             "match": "\\s+(in)\\s+([a-zA-Z][a-z-A-Z0-9_$]*)\\b",
             "captures": {