npm - tm-grammars - Versions diffs - 1.1.3 → 1.1.4 - Mend

tm-grammars 1.1.3 → 1.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/README.md CHANGED Viewed

@@ -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/35d97bc7e439fce0f50f42074041ab2d8571b20a/extensions/go/syntaxes/go.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  | 41.19 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 |
 | `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/go.json CHANGED Viewed

@@ -8,33 +8,29 @@
   ],
   "repository": {
     "after_control_variables": {
-      "patterns": [
-        {
-          "captures": {
-            "1": {
-              "patterns": [
-                {
-                  "include": "#type-declarations-without-brackets"
-                },
-                {
-                  "match": "\\[",
-                  "name": "punctuation.definition.begin.bracket.square.go"
-                },
-                {
-                  "match": "\\]",
-                  "name": "punctuation.definition.end.bracket.square.go"
-                },
-                {
-                  "match": "(?:\\w+)",
-                  "name": "variable.other.go"
-                }
-              ]
+      "captures": {
+        "1": {
+          "patterns": [
+            {
+              "include": "#type-declarations-without-brackets"
+            },
+            {
+              "match": "\\[",
+              "name": "punctuation.definition.begin.bracket.square.go"
+            },
+            {
+              "match": "\\]",
+              "name": "punctuation.definition.end.bracket.square.go"
+            },
+            {
+              "match": "(?:\\w+)",
+              "name": "variable.other.go"
             }
-          },
-          "comment": "After control variables, to not highlight as a struct/interface",
-          "match": "(?:(?<=\\brange\\b|\\bswitch\\b|\\;|\\bif\\b|\\bfor\\b|\\<|\\>|\\<\\=|\\>\\=|\\=\\=|\\!\\=|\\w(?:\\+|/|\\-|\\*|\\%)|\\w(?:\\+|/|\\-|\\*|\\%)\\=|\\|\\||\\&\\&)(?:\\s*)([[:alnum:]\\-\\_\\!\\.\\[\\]\\<\\>\\=\\*/\\+\\%\\:]+)(?:\\s*)(?=\\{))"
+          ]
         }
-      ]
+      },
+      "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*)(?=\\{))"
     },
     "brackets": {
       "patterns": [
@@ -177,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\\.\\(\\)]+)?)+)?(\\))))"
         }
       ]
     },
@@ -614,7 +610,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",
@@ -1028,148 +1024,112 @@
       "match": "\\b(true|false|nil|iota)\\b",
       "name": "constant.language.go"
     },
-    "map_other_types": {
-      "patterns": [
-        {
-          "captures": {
-            "1": {
-              "name": "keyword.map.go"
-            },
-            "2": {
-              "patterns": [
-                {
-                  "include": "#type-declarations-without-brackets"
-                },
-                {
-                  "match": "\\[",
-                  "name": "punctuation.definition.begin.bracket.square.go"
-                },
-                {
-                  "match": "\\]",
-                  "name": "punctuation.definition.end.bracket.square.go"
-                },
-                {
-                  "match": "\\{",
-                  "name": "punctuation.definition.begin.bracket.curly.go"
-                },
-                {
-                  "match": "\\}",
-                  "name": "punctuation.definition.end.bracket.curly.go"
-                },
-                {
-                  "match": "\\(",
-                  "name": "punctuation.definition.begin.bracket.round.go"
-                },
-                {
-                  "match": "\\)",
-                  "name": "punctuation.definition.end.bracket.round.go"
-                },
-                {
-                  "match": "\\w+",
-                  "name": "entity.name.type.go"
-                }
-              ]
-            },
-            "3": {
-              "patterns": [
-                {
-                  "include": "#type-declarations"
-                },
-                {
-                  "match": "\\w+",
-                  "name": "entity.name.type.go"
-                }
-              ]
-            }
-          },
-          "comment": "Other map type names (struct/interface)",
-          "match": "(?:(\\bmap\\b)(\\[(?:.*)\\])?((?!\\bfunc\\b|\\bstruct\\b)[\\w\\.\\*]+)?)"
+    "map_types": {
+      "begin": "(?:(\\bmap\\b)(\\[))",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.map.go"
+        },
+        "2": {
+          "name": "punctuation.definition.begin.bracket.square.go"
         }
-      ]
-    },
-    "multi_types": {
-      "patterns": [
-        {
-          "begin": "(\\btype\\b)\\s*(\\()",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.type.go"
-            },
-            "2": {
-              "name": "punctuation.definition.begin.bracket.round.go"
-            }
-          },
-          "comment": "multi type declaration",
-          "end": "\\)",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.end.bracket.round.go"
-            }
-          },
+      },
+      "comment": "map types",
+      "end": "(?:(\\])((?:(?:(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?!(?:[\\[\\]\\*]+)?\\b(?:func|struct|map)\\b)[\\w\\.\\[\\]\\*]+)?)",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.end.bracket.square.go"
+        },
+        "2": {
           "patterns": [
             {
-              "include": "#struct_variables_types"
+              "include": "#type-declarations-without-brackets"
             },
             {
-              "include": "#type-declarations-without-brackets"
+              "match": "\\[",
+              "name": "punctuation.definition.begin.bracket.square.go"
             },
             {
-              "include": "#parameter-variable-types"
+              "match": "\\]",
+              "name": "punctuation.definition.end.bracket.square.go"
             },
             {
-              "match": "(?:\\w+)",
+              "match": "\\w+",
               "name": "entity.name.type.go"
             }
           ]
+        }
+      },
+      "patterns": [
+        {
+          "include": "#type-declarations-without-brackets"
         },
         {
-          "begin": "(?:(?:^|\\s+)(\\btype\\b)(?:\\s*)([\\w\\.\\*]+)(?=\\[))",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.type.go"
-            },
-            "2": {
-              "patterns": [
-                {
-                  "include": "#type-declarations-without-brackets"
-                },
-                {
-                  "match": "(?:\\w+)",
-                  "name": "entity.name.type.go"
-                }
-              ]
-            }
-          },
-          "comment": "single type declaration with multi-lines generics",
-          "end": "(?:(?<=\\])((?:\\s+)(?:(?:(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:(?!(?:[\\[\\]\\*]+)?(?:\\bstruct\\b|\\binterface\\b|\\bfunc\\b))[\\w\\.\\-\\*\\[\\]]+))?)",
-          "endCaptures": {
-            "1": {
-              "patterns": [
-                {
-                  "include": "#type-declarations-without-brackets"
-                },
-                {
-                  "match": "(?:\\w+)",
-                  "name": "entity.name.type.go"
-                }
-              ]
-            }
-          },
-          "patterns": [
-            {
-              "include": "#struct_variables_types"
-            },
-            {
-              "include": "#type-declarations-without-brackets"
-            },
-            {
-              "include": "#parameter-variable-types"
-            },
-            {
-              "match": "(?:\\w+)",
-              "name": "entity.name.type.go"
-            }
-          ]
+          "include": "#generic_types"
+        },
+        {
+          "include": "#functions"
+        },
+        {
+          "match": "\\[",
+          "name": "punctuation.definition.begin.bracket.square.go"
+        },
+        {
+          "match": "\\]",
+          "name": "punctuation.definition.end.bracket.square.go"
+        },
+        {
+          "match": "\\{",
+          "name": "punctuation.definition.begin.bracket.curly.go"
+        },
+        {
+          "match": "\\}",
+          "name": "punctuation.definition.end.bracket.curly.go"
+        },
+        {
+          "match": "\\(",
+          "name": "punctuation.definition.begin.bracket.round.go"
+        },
+        {
+          "match": "\\)",
+          "name": "punctuation.definition.end.bracket.round.go"
+        },
+        {
+          "match": "\\w+",
+          "name": "entity.name.type.go"
+        }
+      ]
+    },
+    "multi_types": {
+      "begin": "(\\btype\\b)\\s*(\\()",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.type.go"
+        },
+        "2": {
+          "name": "punctuation.definition.begin.bracket.round.go"
+        }
+      },
+      "comment": "multi type declaration",
+      "end": "\\)",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.end.bracket.round.go"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#struct_variables_types"
+        },
+        {
+          "include": "#type-declarations-without-brackets"
+        },
+        {
+          "include": "#parameter-variable-types"
+        },
+        {
+          "match": "(?:\\w+)",
+          "name": "entity.name.type.go"
         }
       ]
     },
@@ -1563,6 +1523,7 @@
       "comment": "struct and interface expression in-line (before curly bracket)",
       "patterns": [
         {
+          "comment": "after control variables must be added exactly here, do not move it! (changing may not affect tests, so be careful!)",
           "include": "#after_control_variables"
         },
         {
@@ -1853,38 +1814,12 @@
                   "include": "#type-declarations"
                 },
                 {
-                  "match": "(?:\\w+)",
+                  "match": "\\w+",
                   "name": "entity.name.type.go"
                 }
               ]
             },
             "3": {
-              "patterns": [
-                {
-                  "begin": "\\[",
-                  "beginCaptures": {
-                    "0": {
-                      "name": "punctuation.definition.begin.bracket.square.go"
-                    }
-                  },
-                  "end": "\\]",
-                  "endCaptures": {
-                    "0": {
-                      "name": "punctuation.definition.end.bracket.square.go"
-                    }
-                  },
-                  "patterns": [
-                    {
-                      "include": "#generic_param_types"
-                    },
-                    {
-                      "include": "$self"
-                    }
-                  ]
-                }
-              ]
-            },
-            "4": {
               "patterns": [
                 {
                   "begin": "\\(",
@@ -1915,14 +1850,95 @@
                   "include": "#generic_types"
                 },
                 {
-                  "match": "(?:\\w+)",
+                  "match": "\\w+",
                   "name": "entity.name.type.go"
                 }
               ]
             }
           },
           "comment": "single type declaration",
-          "match": "(?:(?:^|\\s+)(\\btype\\b)(?:\\s*)([\\w\\.\\*]+)(\\[(?:.*)\\])?(?:\\s+)((?!(?:[\\[\\]\\*]+)?(?:\\bstruct\\b|\\binterface\\b))([\\s\\S]+)))"
+          "match": "(?:(?:^\\s*)(\\btype\\b)(?:\\s*)([\\w\\.\\*]+)(?:\\s+)(?!(?:[\\[\\]\\*]+)?\\b(?:struct|interface)\\b)([\\s\\S]+))"
+        },
+        {
+          "begin": "(?:(?:^|\\s+)(\\btype\\b)(?:\\s*)([\\w\\.\\*]+)(?=\\[))",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.type.go"
+            },
+            "2": {
+              "patterns": [
+                {
+                  "include": "#type-declarations-without-brackets"
+                },
+                {
+                  "match": "\\w+",
+                  "name": "entity.name.type.go"
+                }
+              ]
+            }
+          },
+          "comment": "single type declaration with generics",
+          "end": "(?:(?<=\\])((?:\\s+)(?:(?:(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:(?!(?:[\\[\\]\\*]+)?(?:\\bstruct\\b|\\binterface\\b|\\bfunc\\b))[\\w\\.\\-\\*\\[\\]]+))?)",
+          "endCaptures": {
+            "1": {
+              "patterns": [
+                {
+                  "include": "#type-declarations-without-brackets"
+                },
+                {
+                  "match": "\\[",
+                  "name": "punctuation.definition.begin.bracket.square.go"
+                },
+                {
+                  "match": "\\]",
+                  "name": "punctuation.definition.end.bracket.square.go"
+                },
+                {
+                  "match": "\\w+",
+                  "name": "entity.name.type.go"
+                }
+              ]
+            }
+          },
+          "patterns": [
+            {
+              "include": "#struct_variables_types"
+            },
+            {
+              "include": "#type-declarations-without-brackets"
+            },
+            {
+              "include": "#parameter-variable-types"
+            },
+            {
+              "match": "\\[",
+              "name": "punctuation.definition.begin.bracket.square.go"
+            },
+            {
+              "match": "\\]",
+              "name": "punctuation.definition.end.bracket.square.go"
+            },
+            {
+              "match": "\\{",
+              "name": "punctuation.definition.begin.bracket.curly.go"
+            },
+            {
+              "match": "\\}",
+              "name": "punctuation.definition.end.bracket.curly.go"
+            },
+            {
+              "match": "\\(",
+              "name": "punctuation.definition.begin.bracket.round.go"
+            },
+            {
+              "match": "\\)",
+              "name": "punctuation.definition.end.bracket.round.go"
+            },
+            {
+              "match": "\\w+",
+              "name": "entity.name.type.go"
+            }
+          ]
         }
       ]
     },
@@ -2056,41 +2072,18 @@
         },
         "2": {
           "patterns": [
+            {
+              "include": "#type-declarations"
+            },
             {
               "match": "\\w+",
               "name": "entity.name.type.go"
             }
           ]
-        },
-        "3": {
-          "patterns": [
-            {
-              "begin": "\\[",
-              "beginCaptures": {
-                "0": {
-                  "name": "punctuation.definition.begin.bracket.square.go"
-                }
-              },
-              "end": "\\]",
-              "endCaptures": {
-                "0": {
-                  "name": "punctuation.definition.end.bracket.square.go"
-                }
-              },
-              "patterns": [
-                {
-                  "include": "#generic_param_types"
-                },
-                {
-                  "include": "$self"
-                }
-              ]
-            }
-          ]
         }
       },
-      "comment": "struct, interface type declarations",
-      "match": "(?:(?:^|\\s+)(\\btype\\b)(?:\\s+)([\\w\\.]+)(\\[(?:.*)\\])?)"
+      "comment": "struct, interface type declarations (related to: struct_variables_types, interface_variables_types)",
+      "match": "(?:(?:^\\s*)(\\btype\\b)(?:\\s*)([\\w\\.]+))"
     },
     "struct_variable_types_fields_multi": {
       "patterns": [
@@ -2328,14 +2321,22 @@
               "name": "punctuation.definition.end.bracket.square.go"
             },
             {
-              "match": "(?:\\w+)",
+              "match": "\\{",
+              "name": "punctuation.definition.begin.bracket.curly.go"
+            },
+            {
+              "match": "\\}",
+              "name": "punctuation.definition.end.bracket.curly.go"
+            },
+            {
+              "match": "\\w+",
               "name": "entity.name.type.go"
             }
           ]
         }
       },
       "comment": "Support Functions",
-      "match": "(?:(?:((?<=\\.)\\w+)|(\\w+))(\\[(?:.*)?\\])?(?=\\())"
+      "match": "(?:(?:((?<=\\.)\\w+)|(\\w+))(\\[(?:(?:[\\w\\.\\*\\[\\]\\{\\}\"\\']+)(?:(?:\\,\\s*(?:[\\w\\.\\*\\[\\]\\{\\}]+))*))?\\])?(?=\\())"
     },
     "switch_select_case_variables": {
       "captures": {
@@ -2483,7 +2484,7 @@
           "include": "#comments"
         },
         {
-          "include": "#map_other_types"
+          "include": "#map_types"
         },
         {
           "include": "#brackets"
@@ -2527,7 +2528,7 @@
           "include": "#comments"
         },
         {
-          "include": "#map_other_types"
+          "include": "#map_types"
         },
         {
           "include": "#delimiters"
@@ -2589,7 +2590,7 @@
                   "include": "#delimiters"
                 },
                 {
-                  "match": "(?:\\w+)",
+                  "match": "\\w+",
                   "name": "variable.other.assignment.go"
                 }
               ]
@@ -2597,20 +2598,36 @@
             "2": {
               "patterns": [
                 {
-                  "include": "#type-declarations"
+                  "include": "#type-declarations-without-brackets"
                 },
                 {
                   "include": "#generic_types"
                 },
                 {
-                  "match": "(?:\\w+)",
+                  "match": "\\(",
+                  "name": "punctuation.definition.begin.bracket.round.go"
+                },
+                {
+                  "match": "\\)",
+                  "name": "punctuation.definition.end.bracket.round.go"
+                },
+                {
+                  "match": "\\[",
+                  "name": "punctuation.definition.begin.bracket.square.go"
+                },
+                {
+                  "match": "\\]",
+                  "name": "punctuation.definition.end.bracket.square.go"
+                },
+                {
+                  "match": "\\w+",
                   "name": "entity.name.type.go"
                 }
               ]
             }
           },
           "comment": "var and const with single type assignment",
-          "match": "(?:(?<=\\bvar\\b|\\bconst\\b)(?:\\s*)([\\w\\.]+(?:(?:\\,\\s*[\\w\\.]+)+)?)(?:\\s*)(?:((?:(?:(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?!(?:(?:[\\[\\]\\*]+)?\\bstruct\\b\\s*\\{)|(?:(?:[\\[\\]\\*]+)?\\bfunc\\b))(?:(?:(?:[\\w\\.\\*]+)?(?:\\[(?:.*)\\])?(?:[\\w\\.\\*]+)?))?\\s*(?:\\=)?))?)"
+          "match": "(?:(?<=\\bvar\\b|\\bconst\\b)(?:\\s*)(\\b[\\w\\.]+(?:\\,\\s*[\\w\\.]+)*)(?:\\s*)((?:(?:(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+(?:\\([^\\)]+\\))?)?(?!(?:[\\[\\]\\*]+)?\\b(?:struct|func|map)\\b)(?:[\\w\\.\\[\\]\\*]+(?:\\,\\s*[\\w\\.\\[\\]\\*]+)*)?(?:\\s*)(?:\\=)?)?)"
         },
         {
           "begin": "(?:(?<=\\bvar\\b|\\bconst\\b)(?:\\s*)(\\())",
@@ -2635,7 +2652,7 @@
                       "include": "#delimiters"
                     },
                     {
-                      "match": "(?:\\w+)",
+                      "match": "\\w+",
                       "name": "variable.other.assignment.go"
                     }
                   ]
@@ -2643,19 +2660,35 @@
                 "2": {
                   "patterns": [
                     {
-                      "include": "#type-declarations"
+                      "include": "#type-declarations-without-brackets"
                     },
                     {
                       "include": "#generic_types"
                     },
                     {
-                      "match": "(?:\\w+)",
+                      "match": "\\(",
+                      "name": "punctuation.definition.begin.bracket.round.go"
+                    },
+                    {
+                      "match": "\\)",
+                      "name": "punctuation.definition.end.bracket.round.go"
+                    },
+                    {
+                      "match": "\\[",
+                      "name": "punctuation.definition.begin.bracket.square.go"
+                    },
+                    {
+                      "match": "\\]",
+                      "name": "punctuation.definition.end.bracket.square.go"
+                    },
+                    {
+                      "match": "\\w+",
                       "name": "entity.name.type.go"
                     }
                   ]
                 }
               },
-              "match": "(?:(?:^\\s+)([\\w\\.]+(?:(?:\\,\\s*[\\w\\.]+)+)?)(?:\\s*)((?:((?:(?:(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?!(?:(?:[\\[\\]\\*]+)?\\bstruct\\b\\s*\\{)|(?:(?:[\\[\\]\\*]+)?\\bfunc\\b))(?:(?:(?:[\\w\\.\\*]+)?(?:\\[(?:.*)\\])?(?:[\\w\\.\\*]+)?))?\\s*(?:\\=)?))?))"
+              "match": "(?:(?:^\\s*)(\\b[\\w\\.]+(?:\\,\\s*[\\w\\.]+)*)(?:\\s*)((?:(?:(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+(?:\\([^\\)]+\\))?)?(?!(?:[\\[\\]\\*]+)?\\b(?:struct|func|map)\\b)(?:[\\w\\.\\[\\]\\*]+(?:\\,\\s*[\\w\\.\\[\\]\\*]+)*)?(?:\\s*)(?:\\=)?)?)"
             },
             {
               "include": "$self"

package/index.js CHANGED Viewed

@@ -870,18 +870,18 @@ export const grammars = [
     source: 'https://github.com/MarioSchwalbe/vscode-gnuplot/blob/c62c1a61c9b6b4658b43d76c397dc2ad43523b6a/syntaxes/gnuplot.tmLanguage',
   },
   {
-    byteSize: 42183,
+    byteSize: 43529,
     categories: [
       'general',
     ],
     displayName: 'Go',
-    lastUpdate: '2024-01-26T12:06:22Z',
+    lastUpdate: '2024-02-07T13:33:31Z',
     license: 'MIT',
     licenseUrl: 'https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt',
     name: 'go',
     scopeName: 'source.go',
-    sha: '35d97bc7e439fce0f50f42074041ab2d8571b20a',
-    source: 'https://github.com/microsoft/vscode/blob/35d97bc7e439fce0f50f42074041ab2d8571b20a/extensions/go/syntaxes/go.tmLanguage.json',
+    sha: 'fc771c597f7e15500921e7965f999338f2dccbd1',
+    source: 'https://github.com/microsoft/vscode/blob/fc771c597f7e15500921e7965f999338f2dccbd1/extensions/go/syntaxes/go.tmLanguage.json',
   },
   {
     aliases: [

package/package.json CHANGED Viewed

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