tm-grammars 1.18.7 → 1.18.9

package/README.md

@@ -20,7 +20,7 @@ import { grammars } from 'tm-grammars'
 ## Grammars
 | Name | Alias | Source | License | Deps On | File Size |
 | ---- | ----- | ------ | ------- | ------- | --------- |
-| `abap` |  | [pvl/abap.tmbundle](https://github.com/pvl/abap.tmbundle/blob/a9b2efff4f4afa469d984353384f09e4ebd24055/Syntaxes/ABAP.tmLanguage) |  |  | 15.19 kB |
+| `abap` |  | [pvl/abap.tmbundle](https://github.com/pvl/abap.tmbundle/blob/ae37b62b547c4af5fb925cd97feaaeab69603ca2/Syntaxes/ABAP.tmLanguage) |  |  | 15.22 kB |
 | `actionscript-3` |  | [BowlerHatLLC/vscode-as3mxml](https://github.com/BowlerHatLLC/vscode-as3mxml/blob/77075cd9a439ecd87815cecb1f1c2bb1ff44a2e5/distribution/src/assembly/syntaxes/AS3.tmLanguage) | [Apache-2.0](https://raw.githubusercontent.com/BowlerHatLLC/vscode-as3mxml/main/LICENSE) |  | 13.64 kB |
 | `ada` |  | [AdaCore/ada_language_server](https://github.com/AdaCore/ada_language_server/blob/75c0d0c22b3f3dbf559946331c7aca6fc5b84065/integration/vscode/ada/advanced/ada.tmLanguage.json) | [GPL-3.0](https://raw.githubusercontent.com/AdaCore/ada_language_server/master/LICENSE) |  | 45.71 kB |
 | `angular-html` |  | [onivim/vscode-exthost](https://github.com/onivim/vscode-exthost/blob/cfc2a2212de9ea10943af58ebd1817a5ad196463/extensions/html/syntaxes/html-derivative.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/onivim/vscode-exthost/master/LICENSE.txt) | `html` `angular-expression` `angular-let-declaration` `angular-template` `angular-template-blocks` | 772.00 B |
@@ -91,7 +91,7 @@ import { grammars } from 'tm-grammars'
 | `glimmer-ts` | `gts` | [lifeart/vsc-ember-syntax](https://github.com/lifeart/vsc-ember-syntax/blob/76fce7b360ce09a78789e7d5217b8955d1a5d95f/syntaxes/source.gts.json) | [MIT](https://raw.githubusercontent.com/lifeart/vsc-ember-syntax/master/LICENSE) | `typescript` `css` `javascript` `html` | 19.04 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) |  | 13.83 kB |
-| `go` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/e67b1982e1ab318288b8196ad503273dcb168049/extensions/go/syntaxes/go.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  | 44.65 kB |
+| `go` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/0561ca03c895239131a526d8731da0e53027167c/extensions/go/syntaxes/go.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  | 45.72 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.10 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.52 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.38 kB |
@@ -142,7 +142,7 @@ import { grammars } from 'tm-grammars'
 | `mojo` |  | [modularml/mojo-syntax](https://github.com/modularml/mojo-syntax/blob/46eccdaeda2b1587e9b82808cdb35670f359d16d/syntaxes/mojo.syntax.json) | [MIT](https://raw.githubusercontent.com/modularml/mojo-syntax/main/LICENSE) |  | 68.68 kB |
 | `move` |  | [damirka/move-syntax](https://github.com/damirka/move-syntax/blob/4b04e9d614901097ffc0663fef40bd3e5d87779e/syntaxes/move.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/damirka/move-syntax/main/LICENSE) |  | 19.27 kB |
 | `narrat` | `nar` | [liana-p/narrat-syntax-highlighting-vscode](https://github.com/liana-p/narrat-syntax-highlighting-vscode/blob/00d4b410338fc50ca0ce77a1f7e873c1fb66d376/syntaxes/narrat.tmLanguage.yaml) | [MIT](https://raw.githubusercontent.com/liana-p/narrat-syntax-highlighting-vscode/main/LICENSE) |  | 3.39 kB |
-| `nextflow` | `nf` | [nextflow-io/vscode-language-nextflow](https://github.com/nextflow-io/vscode-language-nextflow/blob/7eeb9be8d01556b7c51c59307275c2f720f2ddf4/syntaxes/nextflow.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/nextflow-io/vscode-language-nextflow/master/LICENSE.md) |  | 4.40 kB |
+| `nextflow` | `nf` | [nextflow-io/vscode-language-nextflow](https://github.com/nextflow-io/vscode-language-nextflow/blob/9f77dfa030f7d6d057cc8745f8b8bcf366548048/syntaxes/nextflow.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/nextflow-io/vscode-language-nextflow/master/LICENSE.md) |  | 3.67 kB |
 | `nginx` |  | [hangxingliu/vscode-nginx-conf-hint](https://github.com/hangxingliu/vscode-nginx-conf-hint/blob/49159c02fd09dce264ded7802c9499a0f09646f5/src/syntax/nginx.tmLanguage) | [GPL-3.0](https://raw.githubusercontent.com/hangxingliu/vscode-nginx-conf-hint/main/LICENSE) | `lua` | 34.10 kB |
 | `nim` |  | [pragmagic/vscode-nim](https://github.com/pragmagic/vscode-nim/blob/0272a0544ddf147fde98f8a8f2b624b7dcb19eb3/syntaxes/nim.json) | [NOASSERTION](https://raw.githubusercontent.com/pragmagic/vscode-nim/master/LICENSE) | `c` `html` `xml` `javascript` `css` `glsl` `markdown` | 21.79 kB |
 | `nix` |  | [nix-community/vscode-nix-ide](https://github.com/nix-community/vscode-nix-ide/blob/cd420d0bcea26cf1cf650f47c738bd1b6658a80c/syntaxes/nix.YAML-tmLanguage) | [MIT](https://raw.githubusercontent.com/nix-community/vscode-nix-ide/main/LICENSE) |  | 14.22 kB |

package/grammars/abap.json

@@ -252,7 +252,7 @@
   ],
   "repository": {
     "abap_constants": {
-      "match": "(?i)(?<=\\s)(initial|null|space|abap_true|abap_false|abap_undefined|table_line|%_final|%_hints|%_predefined|col_background|col_group|col_heading|col_key|col_negative|col_normal|col_positive|col_total|adabas|as400|db2|db6|hdb|oracle|sybase|mssqlnt|pos_low|pos_high)(?=\\s|\\.|,)",
+      "match": "(?i)(?<=\\s)(initial|null|@?space|@?abap_true|@?abap_false|@?abap_undefined|table_line|%_final|%_hints|%_predefined|col_background|col_group|col_heading|col_key|col_negative|col_normal|col_positive|col_total|adabas|as400|db2|db6|hdb|oracle|sybase|mssqlnt|pos_low|pos_high)(?=\\s|\\.|,)",
       "name": "constant.language.abap"
     },
     "abaptypes": {
@@ -318,7 +318,7 @@
       "name": "keyword.control.simple.abap"
     },
     "main_keywords": {
-      "match": "(?i)(?<=^|\\s)(abap-source|abstract|accept|accepting|access|according|action|activation|actual|add|add-corresponding|adjacent|alias|aliases|align|all|allocate|alpha|amdp|analysis|analyzer|append|appending|application|archive|area|arithmetic|as|ascending|assert|assign|assigned|assigning|association|asynchronous|at|attributes|authority|authority-check|authorization|auto|back|background|backward|badi|base|before|begin|behavior|between|binary|bit|blank|blanks|block|blocks|bound|boundaries|bounds|boxed|break|break-point|buffer|by|bypassing|byte|byte-order|call|calling|cast|casting|cds|center|centered|change|changing|channels|char-to-hex|character|check|checkbox|cid|circular|class|class-data|class-events|class-method|class-methods|class-pool|cleanup|clear|client|clients|clock|clone|close|cnt|code|collect|color|column|comment|comments|commit|common|communication|comparing|component|components|compression|compute|concatenate|cond|condense|condition|connection|constant|constants|context|contexts|control|controls|conv|conversion|convert|copy|corresponding|count|country|cover|create|currency|current|cursor|customer-function|data|database|datainfo|dataset|date|daylight|ddl|deallocate|decimals|declarations|deep|default|deferred|define|delete|deleting|demand|descending|describe|destination|detail|determine|dialog|did|directory|discarding|display|display-mode|distance|distinct|divide|divide-corresponding|dummy|duplicate|duplicates|duration|during|dynpro|edit|editor-call|empty|enabled|enabling|encoding|end|end-enhancement-section|end-of-definition|end-of-page|end-of-selection|end-test-injection|end-test-seam|endenhancement|endexec|endfunction|endian|ending|endmodule|endprovide|endselect|endwith|engineering|enhancement|enhancement-point|enhancement-section|enhancements|entities|entity|entries|entry|enum|environment|equiv|errors|escape|escaping|event|events|exact|except|exception|exception-table|exceptions|excluding|exec|execute|exists|exit|exit-command|expanding|explicit|exponent|export|exporting|extended|extension|extract|fail|failed|features|fetch|field|field-groups|field-symbols|fields|file|fill|filter|filters|final|find|first|first-line|fixed-point|flush|following|for|format|forward|found|frame|frames|free|from|full|function|function-pool|generate|get|giving|graph|group|groups|handle|handler|hashed|having|header|headers|heading|help-id|help-request|hide|hint|hold|hotspot|icon|id|identification|identifier|ignore|ignoring|immediately|implemented|implicit|import|importing|in|inactive|incl|include|includes|increment|index|index-line|indicators|infotypes|inheriting|init|initial|initialization|inner|input|insert|instance|instances|intensified|interface|interface-pool|interfaces|internal|intervals|into|inverse|inverted-date|is|iso|job|join|keep|keeping|kernel|key|keys|keywords|kind|language|last|late|layout|leading|leave|left|left-justified|leftplus|leftspace|legacy|length|let|level|levels|like|line|line-count|line-selection|line-size|linefeed|lines|link|list|list-processing|listbox|load|load-of-program|local|locale|lock|locks|log-point|logical|lower|mapped|mapping|margin|mark|mask|match|matchcode|maximum|members|memory|mesh|message|message-id|messages|messaging|method|methods|mode|modif|modifier|modify|module|move|move-corresponding|multiply|multiply-corresponding|name|nametab|native|nested|nesting|new|new-line|new-page|new-section|next|no|no-display|no-extension|no-gap|no-gaps|no-grouping|no-heading|no-scrolling|no-sign|no-title|no-zero|nodes|non-unicode|non-unique|number|object|objects|objmgr|obligatory|occurence|occurences|occurrence|occurrences|occurs|of|offset|on|only|open|optional|option|options|order|others|out|outer|output|output-length|overflow|overlay|pack|package|pad|padding|page|parameter|parameter-table|parameters|part|partially|pcre|perform|performing|permissions|pf-status|places|pool|position|pragmas|preceeding|precompiled|preferred|preserving|primary|print|print-control|private|privileged|procedure|program|property|protected|provide|push|pushbutton|put|query|queue-only|queueonly|quickinfo|radiobutton|raising|range|ranges|read|read-only|receive|received|receiving|redefinition|reduce|ref|reference|refresh|regex|reject|renaming|replace|replacement|replacing|report|reported|request|requested|required|reserve|reset|resolution|respecting|response|restore|result|results|resumable|resume|retry|return|returning|right|right-justified|rightplus|rightspace|rollback|rows|rp-provide-from-last|run|sap|sap-spool|save|saving|scale_preserving|scale_preserving_scientific|scan|scientific|scientific_with_leading_zero|screen|scroll|scroll-boundary|scrolling|search|seconds|section|select|select-options|selection|selection-screen|selection-set|selection-sets|selection-table|selections|send|separate|separated|session|set|shared|shift|shortdump|shortdump-id|sign|sign_as_postfix|simple|simulation|single|size|skip|skipping|smart|some|sort|sortable|sorted|source|specified|split|spool|spots|sql|stable|stamp|standard|start-of-selection|starting|state|statement|statements|static|statics|statusinfo|step|step-loop|stop|structure|structures|style|subkey|submatches|submit|subroutine|subscreen|substring|subtract|subtract-corresponding|suffix|sum|summary|supplied|supply|suppress|switch|symbol|syntax-check|syntax-trace|system-call|system-exceptions|tab|tabbed|table|tables|tableview|tabstrip|target|task|tasks|test|test-injection|test-seam|testing|text|textpool|then|throw|time|times|timestamp|timezone|title|titlebar|to|tokens|top-lines|top-of-page|trace-file|trace-table|trailing|transaction|transfer|transformation|translate|transporting|trmac|truncate|truncation|type|type-pool|type-pools|types|uline|unassign|unbounded|under|unicode|union|unique|unit|unix|unpack|until|unwind|up|update|upper|user|user-command|using|utf-8|uuid|valid|validate|value|value-request|values|vary|varying|version|via|visible|wait|when|where|width|window|windows|with|with-heading|with-title|without|word|work|workspace|write|xml|xsd|yes|zero|zone)(?=\\s|\\.|:|,)",
+      "match": "(?i)(?<=^|\\s)(abap-source|abstract|accept|accepting|access|according|action|activation|actual|add|add-corresponding|adjacent|after|alias|aliases|align|all|allocate|alpha|amdp|analysis|analyzer|append|appending|application|archive|area|arithmetic|as|ascending|assert|assign|assigned|assigning|association|asynchronous|at|attributes|authority|authority-check|authorization|auto|back|background|backward|badi|base|before|begin|behavior|between|binary|bit|blank|blanks|block|blocks|bound|boundaries|bounds|boxed|break|break-point|buffer|by|bypassing|byte|byte-order|call|calling|cast|casting|cds|center|centered|change|changing|channels|char-to-hex|character|check|checkbox|cid|circular|class|class-data|class-events|class-method|class-methods|class-pool|cleanup|clear|client|clients|clock|clone|close|cnt|code|collect|color|column|comment|comments|commit|common|communication|comparing|component|components|compression|compute|concatenate|cond|condense|condition|connection|constant|constants|context|contexts|control|controls|conv|conversion|convert|copy|corresponding|count|country|cover|create|currency|current|cursor|customer-function|data|database|datainfo|dataset|date|daylight|ddl|deallocate|decimals|declarations|deep|default|deferred|define|delete|deleting|demand|descending|describe|destination|detail|determine|dialog|did|directory|discarding|display|display-mode|distance|distinct|divide|divide-corresponding|dummy|duplicate|duplicates|duration|during|dynpro|edit|editor-call|empty|enabled|enabling|encoding|end|end-enhancement-section|end-of-definition|end-of-page|end-of-selection|end-test-injection|end-test-seam|endenhancement|endexec|endfunction|endian|ending|endmodule|endprovide|endselect|endwith|engineering|enhancement|enhancement-point|enhancement-section|enhancements|entities|entity|entries|entry|enum|environment|equiv|errors|escape|escaping|event|events|exact|except|exception|exception-table|exceptions|excluding|exec|execute|exists|exit|exit-command|expanding|explicit|exponent|export|exporting|extended|extension|extract|fail|failed|features|fetch|field|field-groups|field-symbols|fields|file|fill|filter|filters|final|find|first|first-line|fixed-point|flush|following|for|format|forward|found|frame|frames|free|from|full|function|function-pool|generate|get|giving|graph|group|groups|handle|handler|hashed|having|header|headers|heading|help-id|help-request|hide|hint|hold|hotspot|icon|id|identification|identifier|ignore|ignoring|immediately|implemented|implicit|import|importing|in|inactive|incl|include|includes|including|increment|index|index-line|indicators|infotypes|inheriting|init|initial|initialization|inner|input|insert|instance|instances|intensified|interface|interface-pool|interfaces|internal|intervals|into|inverse|inverted-date|is|iso|job|join|keep|keeping|kernel|key|keys|keywords|kind|language|last|late|layout|leading|leave|left|left-justified|leftplus|leftspace|legacy|length|let|level|levels|like|line|line-count|line-selection|line-size|linefeed|lines|link|list|list-processing|listbox|load|load-of-program|local|locale|lock|locks|log-point|logical|lower|mapped|mapping|margin|mark|mask|match|matchcode|maximum|members|memory|mesh|message|message-id|messages|messaging|method|methods|mode|modif|modifier|modify|module|move|move-corresponding|multiply|multiply-corresponding|name|nametab|native|nested|nesting|new|new-line|new-page|new-section|next|no|no-display|no-extension|no-gap|no-gaps|no-grouping|no-heading|no-scrolling|no-sign|no-title|no-zero|nodes|non-unicode|non-unique|number|object|objects|objmgr|obligatory|occurence|occurences|occurrence|occurrences|occurs|of|offset|on|only|open|optional|option|options|order|others|out|outer|output|output-length|overflow|overlay|pack|package|pad|padding|page|parameter|parameter-table|parameters|part|partially|pcre|perform|performing|permissions|pf-status|places|pool|position|pragmas|preceding|precompiled|preferred|preserving|primary|print|print-control|private|privileged|procedure|process|program|property|protected|provide|push|pushbutton|put|query|queue-only|queueonly|quickinfo|radiobutton|raising|range|ranges|read|read-only|receive|received|receiving|redefinition|reduce|ref|reference|refresh|regex|reject|renaming|replace|replacement|replacing|report|reported|request|requested|required|reserve|reset|resolution|respecting|response|restore|result|results|resumable|resume|retry|return|returning|right|right-justified|rightplus|rightspace|rollback|rows|rp-provide-from-last|run|sap|sap-spool|save|saving|scale_preserving|scale_preserving_scientific|scan|scientific|scientific_with_leading_zero|screen|scroll|scroll-boundary|scrolling|search|seconds|section|select|select-options|selection|selection-screen|selection-set|selection-sets|selection-table|selections|send|separate|separated|session|set|shared|shift|shortdump|shortdump-id|sign|sign_as_postfix|simple|simulation|single|size|skip|skipping|smart|some|sort|sortable|sorted|source|specified|split|spool|spots|sql|stable|stamp|standard|start-of-selection|starting|state|statement|statements|static|statics|statusinfo|step|step-loop|stop|structure|structures|style|subkey|submatches|submit|subroutine|subscreen|substring|subtract|subtract-corresponding|suffix|sum|summary|supplied|supply|suppress|switch|symbol|syntax-check|syntax-trace|system-call|system-exceptions|tab|tabbed|table|tables|tableview|tabstrip|target|task|tasks|test|test-injection|test-seam|testing|text|textpool|then|throw|time|times|timestamp|timezone|title|titlebar|to|tokens|top-lines|top-of-page|trace-file|trace-table|trailing|transaction|transfer|transformation|translate|transporting|trmac|truncate|truncation|type|type-pool|type-pools|types|uline|unassign|unbounded|under|unicode|union|unique|unit|unix|unpack|until|unwind|up|update|upper|user|user-command|using|utf-8|uuid|valid|validate|value|value-request|values|vary|varying|version|via|visible|wait|when|where|width|window|windows|with|with-heading|with-title|without|word|work|workspace|write|xml|xsd|yes|zero|zone)(?=\\s|\\.|:|,)",
       "name": "keyword.control.simple.abap"
     },
     "operators": {

package/grammars/go.json

@@ -526,7 +526,53 @@
           "match": "(?:((?:(?:\\b\\w+\\,\\s*)+)?\\b\\w+)(?:\\s+)((?:(?:\\s*(?:[\\*\\[\\]]+)?(?:<-\\s*)?\\bchan\\b(?:\\s*<-)?\\s*)+)?(?:(?:(?:[\\w\\[\\]\\.\\*]+)?(?:(?:\\bfunc\\b\\((?:[^)]+)?\\))(?:(?:\\s*(?:[\\*\\[\\]]+)?(?:<-\\s*)?\\bchan\\b(?:\\s*<-)?\\s*)+)?(?:\\s*))+(?:(?:(?:[\\w\\*\\.\\[\\]]+)|(?:\\((?:[^)]+)?\\))))?)|(?:(?:[\\[\\]\\*]+)?[\\w\\*\\.]+(?:\\[(?:[^\\]]+)\\])?(?:[\\w\\.\\*]+)?)+)))"
         },
         {
-          "include": "#parameter-variable-types"
+          "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": {
+            "0": {
+              "name": "punctuation.definition.begin.bracket.round.go"
+            }
+          },
+          "end": "\\)",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.end.bracket.round.go"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#function_param_types"
+            }
+          ]
         },
         {
           "captures": {
@@ -735,7 +781,53 @@
           "match": "(?:((?:(?:\\b\\w+\\,\\s*)+)?\\b\\w+)(?:\\s+)((?:(?:\\s*(?:[\\*\\[\\]]+)?(?:<-\\s*)?\\bchan\\b(?:\\s*<-)?\\s*)+)?(?:(?:(?:[\\w\\[\\]\\.\\*]+)?(?:(?:\\bfunc\\b\\((?:[^)]+)?\\))(?:(?:\\s*(?:[\\*\\[\\]]+)?(?:<-\\s*)?\\bchan\\b(?:\\s*<-)?\\s*)+)?(?:\\s*))+(?:(?:(?:[\\w\\*\\.]+)|(?:\\((?:[^)]+)?\\))))?)|(?:(?:(?:[\\w\\*\\.\\~]+)|(?:\\[(?:(?:[\\w\\.\\*]+)?(?:\\[(?:[^\\]]+)?\\])?(?:\\,\\s+)?)+\\]))(?:[\\w\\.\\*]+)?)+)))"
         },
         {
-          "include": "#parameter-variable-types"
+          "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": {
+            "0": {
+              "name": "punctuation.definition.begin.bracket.round.go"
+            }
+          },
+          "end": "\\)",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.definition.end.bracket.round.go"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#function_param_types"
+            }
+          ]
         },
         {
           "captures": {

package/grammars/nextflow.json

@@ -3,153 +3,230 @@
   "name": "nextflow",
   "patterns": [
     {
-      "include": "#nfl-rules"
+      "include": "#nextflow"
     }
   ],
   "repository": {
-    "implicit-variables": {
-      "patterns": [
-        {
-          "match": "(?<=[^\\.\\w]|^)(params|nextflow|workflow|launchDir|moduleDir|projectDir|workDir)\\b",
-          "name": "variable.language.nextflow"
+    "enum-def": {
+      "begin": "^\\s*(enum)\\s+(\\w+)\\s*{",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.nextflow"
+        },
+        "2": {
+          "name": "storage.type.groovy"
         }
-      ]
-    },
-    "include-statement": {
+      },
+      "end": "}",
       "patterns": [
         {
-          "match": "^\\b(include)\\b",
-          "name": "keyword.nextflow"
+          "include": "source.nextflow-groovy#comments"
         },
         {
-          "match": "\\b(from)\\b",
-          "name": "keyword.nextflow"
+          "include": "#enum-values"
         }
       ]
     },
-    "nfl-rules": {
+    "enum-values": {
       "patterns": [
         {
-          "include": "#process-def"
-        },
-        {
-          "include": "#workflow-def"
-        },
-        {
-          "include": "#code-block"
-        },
-        {
-          "include": "#include-statement"
-        },
-        {
-          "include": "#implicit-variables"
-        },
-        {
-          "begin": "(\\w*\\()",
+          "begin": "(?<=;|^)\\s*\\b([A-Z0-9_]+)(?=\\s*(?:,|}|\\(|$))",
           "beginCaptures": {
             "1": {
-              "patterns": [
-                {
-                  "include": "source.nextflow-groovy"
-                }
-              ]
+              "name": "constant.enum.name.groovy"
             }
           },
-          "comment": "method call and parens",
-          "end": "\\)",
+          "end": ",|(?=})|^(?!\\s*\\w+\\s*(?:,|$))",
           "patterns": [
             {
-              "include": "#nfl-rules"
-            }
-          ]
-        },
-        {
-          "begin": "{",
-          "comment": "braces",
-          "end": "}",
-          "patterns": [
-            {
-              "include": "#nfl-rules"
+              "begin": "\\(",
+              "end": "\\)",
+              "name": "meta.enum.value.groovy",
+              "patterns": [
+                {
+                  "match": ",",
+                  "name": "punctuation.definition.seperator.parameter.groovy"
+                },
+                {
+                  "include": "#groovy-code"
+                }
+              ]
             }
           ]
-        },
-        {
-          "include": "source.nextflow-groovy"
         }
       ]
     },
-    "process-body": {
+    "function-body": {
       "patterns": [
         {
-          "match": "(?:accelerator|afterScript|beforeScript|cache|cpus|conda|container|containerOptions|clusterOptions|debug|disk|echo|errorStrategy|executor|ext|label|machineType|maxErrors|maxForks|maxRetries|memory|module|penv|pod|publishDir|queue|resourceLabels|scratch|stageInMode|stageOutMode|storeDir|tag|time)\\b",
-          "name": "entity.name.function.nextflow"
-        },
-        {
-          "match": "(?:input|output|when|script|shell|exec):",
-          "name": "constant.block.nextflow"
+          "match": "\\s"
         },
         {
-          "match": "\\b(tuple|set|path|file|val|stdout)(\\(|\\s)",
-          "name": "entity.name.function.nextflow"
-        },
-        {
-          "include": "#implicit-variables"
+          "begin": "(?=(?:\\w|<)[^(]*\\s+(?:[\\w$]|<)+\\s*\\()",
+          "end": "(?=[\\w$]+\\s*\\()",
+          "name": "meta.method.return-type.java",
+          "patterns": [
+            {
+              "include": "source.nextflow-groovy#types"
+            }
+          ]
         },
         {
-          "begin": "(\\w*\\()",
+          "begin": "([\\w$]+)\\s*\\(",
           "beginCaptures": {
             "1": {
+              "name": "entity.name.function.java"
+            }
+          },
+          "end": "\\)",
+          "name": "meta.definition.method.signature.java",
+          "patterns": [
+            {
+              "begin": "(?=[^)])",
+              "end": "(?=\\))",
+              "name": "meta.method.parameters.groovy",
               "patterns": [
                 {
-                  "include": "source.nextflow-groovy"
+                  "begin": "(?=[^,)])",
+                  "end": "(?=,|\\))",
+                  "name": "meta.method.parameter.groovy",
+                  "patterns": [
+                    {
+                      "match": ",",
+                      "name": "punctuation.definition.separator.groovy"
+                    },
+                    {
+                      "begin": "=",
+                      "beginCaptures": {
+                        "0": {
+                          "name": "keyword.operator.assignment.groovy"
+                        }
+                      },
+                      "end": "(?=,|\\))",
+                      "name": "meta.parameter.default.groovy",
+                      "patterns": [
+                        {
+                          "include": "source.nextflow-groovy#groovy-code"
+                        }
+                      ]
+                    },
+                    {
+                      "include": "source.nextflow-groovy#parameters"
+                    }
+                  ]
                 }
               ]
             }
-          },
-          "comment": "method call and parens",
-          "end": "\\)",
+          ]
+        },
+        {
+          "begin": "(?=<)",
+          "end": "(?=\\s)",
+          "name": "meta.method.paramerised-type.groovy",
           "patterns": [
             {
-              "include": "#process-body"
+              "begin": "<",
+              "end": ">",
+              "name": "storage.type.parameters.groovy",
+              "patterns": [
+                {
+                  "include": "source.nextflow-groovy#types"
+                },
+                {
+                  "match": ",",
+                  "name": "punctuation.definition.seperator.groovy"
+                }
+              ]
             }
           ]
         },
         {
           "begin": "{",
-          "comment": "braces",
-          "end": "}",
+          "end": "(?=})",
+          "name": "meta.method.body.java",
           "patterns": [
             {
-              "include": "#process-body"
+              "include": "source.nextflow-groovy#groovy-code"
             }
           ]
+        }
+      ]
+    },
+    "function-def": {
+      "applyEndPatternLast": 1,
+      "begin": "(?:(?<=;|^|{)(?=\\s*(?:(?:def)|(?:(?:(?:boolean|byte|char|short|int|float|long|double)|(?:@?(?:[a-zA-Z]\\w*\\.)*[A-Z]+\\w*))[\\[\\]]*(?:<.*>)?)n)\\s+([^=]+\\s+)?\\w+\\s*\\())",
+      "end": "}|(?=[^{])",
+      "name": "meta.definition.method.groovy",
+      "patterns": [
+        {
+          "include": "#function-body"
+        }
+      ]
+    },
+    "include-statement": {
+      "patterns": [
+        {
+          "match": "^\\b(include)\\b",
+          "name": "keyword.nextflow"
         },
         {
-          "include": "source.nextflow-groovy#comments"
+          "match": "\\b(from)\\b",
+          "name": "keyword.nextflow"
+        }
+      ]
+    },
+    "nextflow": {
+      "patterns": [
+        {
+          "include": "#enum-def"
         },
         {
-          "include": "source.nextflow-groovy#support-functions"
+          "include": "#function-def"
         },
         {
-          "include": "source.nextflow-groovy#keyword"
+          "include": "#process-def"
         },
         {
-          "include": "source.nextflow-groovy#values"
+          "include": "#workflow-def"
         },
         {
-          "include": "source.nextflow-groovy#anonymous-classes-and-new"
+          "include": "#output-def"
         },
         {
-          "include": "source.nextflow-groovy#types"
+          "include": "#include-statement"
         },
         {
-          "include": "source.nextflow-groovy#parens"
+          "include": "source.nextflow-groovy"
+        }
+      ]
+    },
+    "output-def": {
+      "begin": "^\\s*(output)\\s*{",
+      "beginCaptures": {
+        "1": {
+          "name": "keyword.nextflow"
+        }
+      },
+      "end": "}",
+      "name": "output.nextflow",
+      "patterns": [
+        {
+          "include": "source.nextflow-groovy#groovy"
+        }
+      ]
+    },
+    "process-body": {
+      "patterns": [
+        {
+          "match": "(?:input|output|when|script|shell|exec):",
+          "name": "constant.block.nextflow"
         },
         {
-          "include": "source.nextflow-groovy#closures"
+          "match": "\\b(tuple|path|file|val|stdin|stdout)(\\(|\\s)",
+          "name": "entity.name.function.nextflow"
         },
         {
-          "include": "source.nextflow-groovy#braces"
+          "include": "source.nextflow-groovy#groovy"
         }
       ]
     },
@@ -173,105 +250,12 @@
     },
     "workflow-body": {
       "patterns": [
-        {
-          "include": "#implicit-variables"
-        },
         {
           "match": "(?:take|main|emit):",
           "name": "constant.block.nextflow"
         },
         {
-          "match": "(?<=[\\s\\.])(branch|buffer|close|collate|collect|collectFile|combine|concat|count|countBy|cross|distinct|dump|filter|first|flatMap|flatten|groupTuple|ifEmpty|join|last|map|max|merge|min|mix|multiMap|randomSample|reduce|set|splitCsv|splitFasta|splitFastq|splitText|sum|take|tap|toInteger|toList|toSortedList|transpose|unique|until|view)(?=[{(\\s])",
-          "name": "entity.name.function.nextflow"
-        },
-        {
-          "captures": {
-            "1": {
-              "name": "keyword.nextflow"
-            },
-            "2": {
-              "name": "entity.name.function.nextflow"
-            }
-          },
-          "comment": "Channel factory single line",
-          "match": "\\b((?:C|c)hannel\\.)((fromList|fromPath|fromFilePairs|fromSRA|from|of|empty|value|watchPath)\\W)?"
-        },
-        {
-          "begin": "\\b((?:C|c)hannel)\\s*$",
-          "beginCaptures": {
-            "1": {
-              "name": "keyword.nextflow"
-            }
-          },
-          "comment": "Channel factory multi-line",
-          "end": "(^\\s*)(?:(\\.)(fromList|fromPath|fromFilePairs|fromSRA|from|of|empty|value|watchPath)\\W)?",
-          "endCaptures": {
-            "1": {
-              "name": "keyword.nextflow"
-            },
-            "2": {
-              "name": "keyword.nextflow"
-            },
-            "3": {
-              "name": "entity.name.function.nextflow"
-            }
-          }
-        },
-        {
-          "begin": "(\\w*\\()",
-          "beginCaptures": {
-            "1": {
-              "patterns": [
-                {
-                  "include": "source.nextflow-groovy"
-                }
-              ]
-            }
-          },
-          "comment": "method call and parens",
-          "end": "\\)",
-          "patterns": [
-            {
-              "include": "#workflow-body"
-            }
-          ]
-        },
-        {
-          "begin": "{",
-          "comment": "braces",
-          "end": "}",
-          "patterns": [
-            {
-              "include": "#workflow-body"
-            }
-          ]
-        },
-        {
-          "include": "source.nextflow-groovy#comments"
-        },
-        {
-          "include": "source.nextflow-groovy#support-functions"
-        },
-        {
-          "include": "source.nextflow-groovy#keyword"
-        },
-        {
-          "include": "source.nextflow-groovy#values"
-        },
-        {
-          "include": "source.nextflow-groovy#anonymous-classes-and-new"
-        },
-        {
-          "include": "source.nextflow-groovy#types"
-        },
-        {
-          "include": "source.nextflow-groovy#parens"
-        },
-        {
-          "include": "source.nextflow-groovy#closures"
-        },
-        {
-          "include": "source.nextflow-groovy#braces"
+          "include": "source.nextflow-groovy#groovy"
         }
       ]
     },

package/index.js

@@ -5,14 +5,14 @@
 
 export const grammars = [
   {
-    byteSize: 15553,
+    byteSize: 15584,
     displayName: 'ABAP',
-    hash: '3eE0JzViWX',
-    lastUpdate: '2023-07-29T13:25:39Z',
+    hash: 'm8nOHIPzTv',
+    lastUpdate: '2024-10-30T07:20:22Z',
     name: 'abap',
     scopeName: 'source.abap',
-    sha: 'a9b2efff4f4afa469d984353384f09e4ebd24055',
-    source: 'https://github.com/pvl/abap.tmbundle/blob/a9b2efff4f4afa469d984353384f09e4ebd24055/Syntaxes/ABAP.tmLanguage',
+    sha: 'ae37b62b547c4af5fb925cd97feaaeab69603ca2',
+    source: 'https://github.com/pvl/abap.tmbundle/blob/ae37b62b547c4af5fb925cd97feaaeab69603ca2/Syntaxes/ABAP.tmLanguage',
   },
   {
     byteSize: 13967,
@@ -1158,19 +1158,19 @@ export const grammars = [
     source: 'https://github.com/MarioSchwalbe/vscode-gnuplot/blob/c62c1a61c9b6b4658b43d76c397dc2ad43523b6a/syntaxes/gnuplot.tmLanguage',
   },
   {
-    byteSize: 45723,
+    byteSize: 46815,
     categories: [
       'general',
     ],
     displayName: 'Go',
-    hash: 'IfBCdLT6ko',
-    lastUpdate: '2024-09-27T08:27:11Z',
+    hash: 'dKNuePcwNy',
+    lastUpdate: '2024-10-28T14:54:18Z',
     license: 'MIT',
     licenseUrl: 'https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt',
     name: 'go',
     scopeName: 'source.go',
-    sha: 'e67b1982e1ab318288b8196ad503273dcb168049',
-    source: 'https://github.com/microsoft/vscode/blob/e67b1982e1ab318288b8196ad503273dcb168049/extensions/go/syntaxes/go.tmLanguage.json',
+    sha: '0561ca03c895239131a526d8731da0e53027167c',
+    source: 'https://github.com/microsoft/vscode/blob/0561ca03c895239131a526d8731da0e53027167c/extensions/go/syntaxes/go.tmLanguage.json',
   },
   {
     aliases: [
@@ -2137,16 +2137,16 @@ export const grammars = [
     aliases: [
       'nf',
     ],
-    byteSize: 4505,
+    byteSize: 3763,
     displayName: 'Nextflow',
-    hash: 'f3qRVKpJGi',
-    lastUpdate: '2022-11-22T13:08:54Z',
+    hash: 'mOLjIBx8gF',
+    lastUpdate: '2024-10-28T03:30:14Z',
     license: 'MIT',
     licenseUrl: 'https://raw.githubusercontent.com/nextflow-io/vscode-language-nextflow/master/LICENSE.md',
     name: 'nextflow',
     scopeName: 'source.nextflow',
-    sha: '7eeb9be8d01556b7c51c59307275c2f720f2ddf4',
-    source: 'https://github.com/nextflow-io/vscode-language-nextflow/blob/7eeb9be8d01556b7c51c59307275c2f720f2ddf4/syntaxes/nextflow.tmLanguage.json',
+    sha: '9f77dfa030f7d6d057cc8745f8b8bcf366548048',
+    source: 'https://github.com/nextflow-io/vscode-language-nextflow/blob/9f77dfa030f7d6d057cc8745f8b8bcf366548048/syntaxes/nextflow.tmLanguage.json',
   },
   {
     byteSize: 34919,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tm-grammars",
   "type": "module",
-  "version": "1.18.7",
+  "version": "1.18.9",
   "description": "Collecton of TextMate grammars in JSON",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",