tm-grammars 1.4.4 → 1.4.6

package/README.md

@@ -56,7 +56,7 @@ import { grammars } from 'tm-grammars'
 | `cue` |  | [cue-sh/vscode-cue](https://github.com/cue-sh/vscode-cue/blob/0734615a2607fe03f5d6c1816f8f7435179659fc/syntaxes/cue.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/cue-sh/vscode-cue/master/LICENSE) |  | 15.93 kB |
 | `cypher` | `cql` | [adam-cowley/neo4j-vscode](https://github.com/adam-cowley/neo4j-vscode/blob/ad90d275ac76c740018e78f78722343f730270e0/cypher/cypher.tmLanguage) | [MIT](https://raw.githubusercontent.com/adam-cowley/neo4j-vscode/main/LICENSE) |  | 6.35 kB |
 | `d` |  | [Pure-D/code-d](https://github.com/Pure-D/code-d/blob/466ac04dcc1f6d3fea50ef5ae7a920a121efd09c/syntaxes/d.json) | [MIT](https://raw.githubusercontent.com/Pure-D/code-d/master/LICENSE.md) |  | 40.24 kB |
-| `dart` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/3c86ede5f554f6e196c832394e126b291a1de606/extensions/dart/syntaxes/dart.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  | 6.71 kB |
+| `dart` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/e9a8b6add5329f8124f23ff7143d95c22ce39f76/extensions/dart/syntaxes/dart.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  | 6.78 kB |
 | `dax` |  | [huyza/dax-language](https://github.com/huyza/dax-language/blob/7fd39aa84552617daa258189b2550dcdbd14149a/syntaxes/dax.grammer.json) |  |  | 5.37 kB |
 | `diff` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/4549bd26c7b799284e0ebd8dc1e0310e6a8707a1/extensions/diff/syntaxes/diff.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  | 2.45 kB |
 | `docker` | `dockerfile` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/8fdf170a0850c1cc027382f31650aaf300d3ae2a/extensions/docker/syntaxes/docker.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  | 1.51 kB |
@@ -79,7 +79,7 @@ import { grammars } from 'tm-grammars'
 | `glimmer-ts` | `gts` | [lifeart/vsc-ember-syntax](https://github.com/lifeart/vsc-ember-syntax/blob/312fb20cc04374eb8768369ebccabd12143edbe4/syntaxes/source.gts.json) | [MIT](https://raw.githubusercontent.com/lifeart/vsc-ember-syntax/master/LICENSE) | `typescript` `css` `javascript` `html` | 19.08 kB |
 | `glsl` |  | [polym0rph/GLSL.tmbundle](https://github.com/polym0rph/GLSL.tmbundle/blob/6998d3bbd204e26746a5ca580cda4c650b9057b1/Syntaxes/GLSL.tmLanguage) |  | `c` | 3.69 kB |
 | `gnuplot` |  | [MarioSchwalbe/vscode-gnuplot](https://github.com/MarioSchwalbe/vscode-gnuplot/blob/c62c1a61c9b6b4658b43d76c397dc2ad43523b6a/syntaxes/gnuplot.tmLanguage) | [GPL-3.0](https://raw.githubusercontent.com/MarioSchwalbe/vscode-gnuplot/master/LICENSE) |  | 16.46 kB |
-| `go` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/fc771c597f7e15500921e7965f999338f2dccbd1/extensions/go/syntaxes/go.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  | 42.51 kB |
+| `go` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/e9a8b6add5329f8124f23ff7143d95c22ce39f76/extensions/go/syntaxes/go.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  | 43.26 kB |
 | `graphql` | `gql` | [prisma-labs/vscode-graphql](https://github.com/prisma-labs/vscode-graphql/blob/4569aef2364b42b6acd8188e4a6ca9b0ba3c6a1d/grammars/graphql.json) | [MIT](https://raw.githubusercontent.com/graphql/vscode-graphql/master/LICENSE) | `javascript` `typescript` `jsx` `tsx` | 17.11 kB |
 | `groovy` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/8fdf170a0850c1cc027382f31650aaf300d3ae2a/extensions/groovy/syntaxes/groovy.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  | 18.63 kB |
 | `hack` |  | [slackhq/vscode-hack](https://github.com/slackhq/vscode-hack/blob/b997653188b127a7261b0d26e7808217f3eb47bb/syntaxes/hack.json) | [MIT](https://raw.githubusercontent.com/slackhq/vscode-hack/master/LICENSE.md) | `html` `sql` | 80.66 kB |

package/grammars/dart.json

@@ -272,7 +272,7 @@
           "name": "keyword.control.catch-exception.dart"
         },
         {
-          "match": "(?<!\\$)\\b(break|case|continue|default|do|else|for|if|in|return|switch|while|when)\\b(?!\\$)",
+          "match": "(?<!\\$)\\b(break|case|continue|default|do|else|for|if|in|switch|while|when)\\b(?!\\$)",
           "name": "keyword.control.dart"
         },
         {
@@ -288,7 +288,11 @@
           "name": "keyword.control.new.dart"
         },
         {
-          "match": "(?<!\\$)\\b(abstract|sealed|base|interface|class|enum|extends|extension type|extension|external|factory|implements|get(?!\\()|mixin|native|operator|set(?!\\()|typedef|with|covariant)\\b(?!\\$)",
+          "match": "(?<!\\$)\\b(return)\\b(?!\\$)",
+          "name": "keyword.control.return.dart"
+        },
+        {
+          "match": "(?<!\\$)\\b(abstract|sealed|base|interface|class|enum|extends|extension type|extension|external|factory|implements|get(?![(<])|mixin|native|operator|set(?![(<])|typedef|with|covariant)\\b(?!\\$)",
           "name": "keyword.declaration.dart"
         },
         {

package/grammars/go.json

@@ -30,7 +30,7 @@
         }
       },
       "comment": "After control variables, to not highlight as a struct/interface (before formatting with gofmt)",
-      "match": "(?:(?<=\\brange\\b|\\bswitch\\b|\\;|\\bif\\b|\\bfor\\b|\\<|\\>|\\<\\=|\\>\\=|\\=\\=|\\!\\=|\\w(?:\\+|/|\\-|\\*|\\%)|\\w(?:\\+|/|\\-|\\*|\\%)\\=|\\|\\||\\&\\&)(?:\\s*)([[:alnum:]\\-\\_\\!\\.\\[\\]\\<\\>\\=\\*/\\+\\%\\:]+)(?:\\s*)(?=\\{))"
+      "match": "(?:(?<=\\brange\\b|\\bswitch\\b|\\;|\\bif\\b|\\bfor\\b|\\<|\\>|\\<\\=|\\>\\=|\\=\\=|\\!\\=|\\w(?:\\+|/|\\-|\\*|\\%)|\\w(?:\\+|/|\\-|\\*|\\%)\\=|\\|\\||\\&\\&)(?:\\s*)((?![\\[\\]]+)[[:alnum:]\\-\\_\\!\\.\\[\\]\\<\\>\\=\\*/\\+\\%\\:]+)(?:\\s*)(?=\\{))"
     },
     "brackets": {
       "patterns": [
@@ -173,7 +173,7 @@
             }
           },
           "comment": "make keyword",
-          "match": "(?:(\\bmake\\b)(?:(\\()((?:(?:(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+(?:\\([^\\)]+\\))?)?(?:[\\w\\.\\*\\[\\]\\{\\}]+)?(?:\\[(?:[^\\]]+)?\\])?(?:[\\w\\.\\*\\[\\]\\{\\}]+)?)?((?:\\,\\s*(?:[\\w\\.\\(\\)]+)?)+)?(\\))))"
+          "match": "(?:(\\bmake\\b)(?:(\\()((?:(?:(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+(?:\\([^\\)]+\\))?)?(?:[\\w\\.\\*\\[\\]\\{\\}]+)?(?:\\[(?:[^\\]]+)?\\])?(?:[\\w\\.\\*\\[\\]\\{\\}]+)?)?((?:\\,\\s*(?:[\\w\\.\\(\\)/\\+\\-\\<\\>\\&\\|\\%\\*]+)?)+)?(\\))))"
         }
       ]
     },
@@ -253,7 +253,7 @@
         }
       },
       "comment": "double parentheses types",
-      "match": "(?:(\\((?:[\\w\\.\\[\\]\\*\\&]+)\\))(?=\\())"
+      "match": "(?:(?<!\\w)(\\((?:[\\w\\.\\[\\]\\*\\&]+)\\))(?=\\())"
     },
     "function_declaration": {
       "begin": "(?:^(\\bfunc\\b)(?:\\s*(\\([^\\)]+\\)\\s*)?(?:(\\w+)(?=\\(|\\[))?))",
@@ -317,12 +317,7 @@
               "name": "entity.name.function.go"
             }
           ]
-        },
-        "patterns": [
-          {
-            "include": "#type-declarations"
-          }
-        ]
+        }
       },
       "comment": "Function declarations",
       "end": "(?:(?<=\\))\\s*((?:(?:(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?!(?:[\\[\\]\\*]+)?(?:\\bstruct\\b|\\binterface\\b))[\\w\\.\\-\\*\\[\\]]+)?\\s*(?=\\{))",
@@ -403,14 +398,14 @@
                   "include": "#parameter-variable-types"
                 },
                 {
-                  "match": "(?:\\w+)",
+                  "match": "\\w+",
                   "name": "entity.name.type.go"
                 }
               ]
             }
           },
           "comment": "single function as a type returned type(s) declaration",
-          "match": "(?:(?<=\\))\\s+((?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?[\\w\\*\\.\\[\\]\\<\\>\\-]+(?:\\s*)(?:\\/(?:\\/|\\*).*)?)$)"
+          "match": "(?:(?<=\\))(?:\\s*)((?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?[\\w\\*\\.\\[\\]\\<\\>\\-]+(?:\\s*)(?:\\/(?:\\/|\\*).*)?)$)"
         },
         {
           "include": "$self"
@@ -610,7 +605,7 @@
         }
       },
       "comment": "functions in-line with multi return types",
-      "match": "(?:(\\bfunc\\b)((?:\\((?:[^/]*)\\))(?:\\s+)(?:\\((?:[^/]*)\\)))(?:\\s+)(?=\\{))"
+      "match": "(?:(\\bfunc\\b)((?:\\((?:[^/]*?)\\))(?:\\s+)(?:\\((?:[^/]*?)\\)))(?:\\s+)(?=\\{))"
     },
     "generic_param_types": {
       "comment": "generic parameter variables and types",
@@ -905,6 +900,42 @@
             }
           },
           "patterns": [
+            {
+              "include": "#support_functions"
+            },
+            {
+              "include": "#type-declarations-without-brackets"
+            },
+            {
+              "begin": "(?:([\\w\\.\\*]+)?(\\[))",
+              "beginCaptures": {
+                "1": {
+                  "patterns": [
+                    {
+                      "include": "#type-declarations"
+                    },
+                    {
+                      "match": "(?:\\w+)",
+                      "name": "entity.name.type.go"
+                    }
+                  ]
+                },
+                "2": {
+                  "name": "punctuation.definition.begin.bracket.square.go"
+                }
+              },
+              "end": "\\]",
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.end.bracket.square.go"
+                }
+              },
+              "patterns": [
+                {
+                  "include": "#generic_param_types"
+                }
+              ]
+            },
             {
               "begin": "\\(",
               "beginCaptures": {
@@ -921,15 +952,9 @@
               "patterns": [
                 {
                   "include": "#function_param_types"
-                },
-                {
-                  "include": "$self"
                 }
               ]
             },
-            {
-              "include": "#support_functions"
-            },
             {
               "captures": {
                 "1": {
@@ -938,17 +963,14 @@
                       "include": "#type-declarations"
                     },
                     {
-                      "include": "#generic_types"
-                    },
-                    {
-                      "match": "(?:\\w+)",
+                      "match": "\\w+",
                       "name": "entity.name.type.go"
                     }
                   ]
                 }
               },
-              "comment": "single declaration | with or declarations",
-              "match": "((?:\\s+\\|)?(?:[\\w\\.\\[\\]\\*]+)(?:\\s+\\|)?)"
+              "comment": "other types",
+              "match": "([\\w\\.]+)"
             },
             {
               "include": "$self"
@@ -1478,7 +1500,7 @@
       "comment": "Note that the order here is very important!",
       "patterns": [
         {
-          "match": "((?:\\*|&)+)(?:(?!\\d)(?=(?:[\\w\\[\\]])|(?:\\<\\-)))",
+          "match": "((?:\\*|\\&)+)(?:(?!\\d)(?=(?:[\\w\\[\\]])|(?:\\<\\-)))",
           "name": "keyword.operator.address.go"
         },
         {
@@ -1575,16 +1597,9 @@
       ]
     },
     "other_variables": {
-      "match": "(?:\\w+)",
-      "name": "variable.other.go",
-      "patterns": [
-        {
-          "include": "#storage_types"
-        },
-        {
-          "include": "$self"
-        }
-      ]
+      "comment": "all other variables",
+      "match": "\\w+",
+      "name": "variable.other.go"
     },
     "package_name": {
       "patterns": [
@@ -2088,11 +2103,18 @@
     "struct_variable_types_fields_multi": {
       "patterns": [
         {
-          "begin": "(?:\\s*)?([\\s\\,\\w]+)(?:\\s+)(?:(?:[\\[\\]\\*])+)?(\\bstruct\\b)\\s*(\\{)",
+          "begin": "(?:(\\w+(?:\\,\\s*\\w+)*)(?:\\s+)(?:(?:[\\[\\]\\*])+)?(\\bstruct\\b)(?:\\s*)(\\{))",
           "beginCaptures": {
             "1": {
-              "match": "(?:\\w+)",
-              "name": "variable.other.property.go"
+              "patterns": [
+                {
+                  "include": "#type-declarations"
+                },
+                {
+                  "match": "\\w+",
+                  "name": "variable.other.property.go"
+                }
+              ]
             },
             "2": {
               "name": "keyword.struct.go"
@@ -2336,7 +2358,7 @@
         }
       },
       "comment": "Support Functions",
-      "match": "(?:(?:((?<=\\.)\\w+)|(\\w+))(\\[(?:(?:[\\w\\.\\*\\[\\]\\{\\}\"\\']+)(?:(?:\\,\\s*(?:[\\w\\.\\*\\[\\]\\{\\}]+))*))?\\])?(?=\\())"
+      "match": "(?:(?:((?<=\\.)\\b\\w+)|(\\b\\w+))(\\[(?:(?:[\\w\\.\\*\\[\\]\\{\\}\"\\']+)(?:(?:\\,\\s*(?:[\\w\\.\\*\\[\\]\\{\\}]+))*))?\\])?(?=\\())"
     },
     "switch_select_case_variables": {
       "captures": {
@@ -2351,6 +2373,9 @@
             {
               "include": "#support_functions"
             },
+            {
+              "include": "#variable_assignment"
+            },
             {
               "match": "\\w+",
               "name": "variable.other.go"
@@ -2358,7 +2383,7 @@
           ]
         }
       },
-      "comment": "variables after case control keyword in switch/select expression",
+      "comment": "variables after case control keyword in switch/select expression, to not scope them as property variables",
       "match": "(?:(?:^\\s*(\\bcase\\b))(?:\\s+)([\\s\\S]+(?:\\:)\\s*(?:/(?:/|\\*).*)?)$)"
     },
     "switch_types": {
@@ -2370,7 +2395,7 @@
               "include": "#operators"
             },
             {
-              "match": "(?:\\w+)",
+              "match": "\\w+",
               "name": "variable.other.assignment.go"
             }
           ]
@@ -2384,7 +2409,7 @@
               "include": "#type-declarations"
             },
             {
-              "match": "(?:\\w+)",
+              "match": "\\w+",
               "name": "variable.other.go"
             }
           ]
@@ -2407,6 +2432,7 @@
           "name": "punctuation.definition.begin.bracket.curly.go"
         }
       },
+      "comment": "switch type assertions, only highlights types after case keyword",
       "end": "(?:\\})",
       "endCaptures": {
         "0": {
@@ -2414,9 +2440,6 @@
         }
       },
       "patterns": [
-        {
-          "include": "#type-declarations"
-        },
         {
           "captures": {
             "1": {
@@ -2444,8 +2467,33 @@
               ]
             }
           },
+          "comment": "types after case keyword with single line",
           "match": "(?:^\\s*(\\bcase\\b))(?:\\s+)([\\w\\.\\,\\*\\=\\<\\>\\!\\s]+)(:)(\\s*/(?:/|\\*)\\s*.*)?$"
         },
+        {
+          "begin": "\\bcase\\b",
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.control.go"
+            }
+          },
+          "comment": "types after case keyword with multi lines",
+          "end": "\\:",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.other.colon.go"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#type-declarations"
+            },
+            {
+              "match": "\\w+",
+              "name": "entity.name.type.go"
+            }
+          ]
+        },
         {
           "include": "$self"
         }

package/index.js

@@ -535,18 +535,18 @@ export const grammars = [
     source: 'https://github.com/Pure-D/code-d/blob/466ac04dcc1f6d3fea50ef5ae7a920a121efd09c/syntaxes/d.json',
   },
   {
-    byteSize: 6866,
+    byteSize: 6940,
     categories: [
       'general',
     ],
     displayName: 'Dart',
-    lastUpdate: '2023-12-13T12:08:01Z',
+    lastUpdate: '2024-02-27T11:14:40Z',
     license: 'MIT',
     licenseUrl: 'https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt',
     name: 'dart',
     scopeName: 'source.dart',
-    sha: '3c86ede5f554f6e196c832394e126b291a1de606',
-    source: 'https://github.com/microsoft/vscode/blob/3c86ede5f554f6e196c832394e126b291a1de606/extensions/dart/syntaxes/dart.tmLanguage.json',
+    sha: 'e9a8b6add5329f8124f23ff7143d95c22ce39f76',
+    source: 'https://github.com/microsoft/vscode/blob/e9a8b6add5329f8124f23ff7143d95c22ce39f76/extensions/dart/syntaxes/dart.tmLanguage.json',
   },
   {
     byteSize: 5498,
@@ -870,18 +870,18 @@ export const grammars = [
     source: 'https://github.com/MarioSchwalbe/vscode-gnuplot/blob/c62c1a61c9b6b4658b43d76c397dc2ad43523b6a/syntaxes/gnuplot.tmLanguage',
   },
   {
-    byteSize: 43529,
+    byteSize: 44298,
     categories: [
       'general',
     ],
     displayName: 'Go',
-    lastUpdate: '2024-02-07T13:33:31Z',
+    lastUpdate: '2024-02-27T11:14:40Z',
     license: 'MIT',
     licenseUrl: 'https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt',
     name: 'go',
     scopeName: 'source.go',
-    sha: 'fc771c597f7e15500921e7965f999338f2dccbd1',
-    source: 'https://github.com/microsoft/vscode/blob/fc771c597f7e15500921e7965f999338f2dccbd1/extensions/go/syntaxes/go.tmLanguage.json',
+    sha: 'e9a8b6add5329f8124f23ff7143d95c22ce39f76',
+    source: 'https://github.com/microsoft/vscode/blob/e9a8b6add5329f8124f23ff7143d95c22ce39f76/extensions/go/syntaxes/go.tmLanguage.json',
   },
   {
     aliases: [

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tm-grammars",
   "type": "module",
-  "version": "1.4.4",
+  "version": "1.4.6",
   "packageManager": "pnpm@8.15.1",
   "description": "Collecton of TextMate grammars in JSON",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",