tm-grammars 1.6.4 → 1.6.5

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 (9) hide show
  1. package/README.md +7 -7
  2. package/grammars/go.json +196 -92
  3. package/grammars/julia.json +5 -5
  4. package/grammars/latex.json +1006 -231
  5. package/grammars/rust.json +1 -1
  6. package/grammars/shellscript.json +581 -551
  7. package/grammars/tex.json +74 -30
  8. package/index.js +34 -33
  9. package/package.json +1 -1
package/README.md CHANGED
@@ -37,7 +37,7 @@ import { grammars } from 'tm-grammars'
37
37
  | `bat` | `batch` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/df15c8e832a341633acd2e9bb26e1b275d09cfe0/extensions/bat/syntaxes/batchfile.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | | 12.38 kB |
38
38
  | `beancount` | | [Lencerf/vscode-beancount](https://github.com/Lencerf/vscode-beancount/blob/ffc762e047bb09ed5d16508b302aef16a6057139/syntaxes/beancount.tmLanguage) | [MIT](https://raw.githubusercontent.com/Lencerf/vscode-beancount/master/LICENSE) | | 10.19 kB |
39
39
  | `berry` | `be` | [berry-lang/berry](https://github.com/berry-lang/berry/blob/a0f5c044a3b593deaf87292ca6f04c2343e53dc8/tools/plugins/vscode/skiars.berry-1.1.0/syntaxes/berry.json) | [MIT](https://raw.githubusercontent.com/berry-lang/berry/master/LICENSE) | | 2.12 kB |
40
- | `bibtex` | | [microsoft/vscode](https://github.com/microsoft/vscode/blob/6021e0179514df6de02f91174ff7f9c5f6c87fd1/extensions/latex/syntaxes/Bibtex.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | | 4.68 kB |
40
+ | `bibtex` | | [microsoft/vscode](https://github.com/microsoft/vscode/blob/b557947e50a068bdcc927ffd31ee555dbb232558/extensions/latex/syntaxes/Bibtex.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | | 4.68 kB |
41
41
  | `bicep` | | [Azure/bicep](https://github.com/Azure/bicep/blob/c87233025b216156dcbbe3b34930e41a5ecb6199/src/textmate/bicep.tmlanguage) | [MIT](https://raw.githubusercontent.com/Azure/bicep/main/LICENSE) | | 3.95 kB |
42
42
  | `blade` | | [spatie/shiki-php](https://github.com/spatie/shiki-php/blob/e985c3ab6b13252ad4521b7edb8ff91a9da3dd46/languages/blade.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/spatie/shiki-php/main/LICENSE.md) | `html` `xml` `sql` `javascript` `json` `css` | 101.01 kB |
43
43
  | `c` | | [microsoft/vscode](https://github.com/microsoft/vscode/blob/bd1abe08c38bb5deccf65610f8f3c03d2338d20d/extensions/cpp/syntaxes/c.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | | 69.70 kB |
@@ -80,7 +80,7 @@ import { grammars } from 'tm-grammars'
80
80
  | `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.08 kB |
81
81
  | `glsl` | | [polym0rph/GLSL.tmbundle](https://github.com/polym0rph/GLSL.tmbundle/blob/6998d3bbd204e26746a5ca580cda4c650b9057b1/Syntaxes/GLSL.tmLanguage) | | `c` | 3.69 kB |
82
82
  | `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 |
83
- | `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 |
83
+ | `go` | | [microsoft/vscode](https://github.com/microsoft/vscode/blob/b557947e50a068bdcc927ffd31ee555dbb232558/extensions/go/syntaxes/go.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | | 45.14 kB |
84
84
  | `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 |
85
85
  | `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 |
86
86
  | `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 |
@@ -106,10 +106,10 @@ import { grammars } from 'tm-grammars'
106
106
  | `jsonnet` | | [heptio/vscode-jsonnet](https://github.com/heptio/vscode-jsonnet/blob/39088f9cde9f483c8e0efeb67a3fd561cd873aad/syntaxes/jsonnet.tmLanguage.json) | [Apache-2.0](https://raw.githubusercontent.com/heptio/vscode-jsonnet/master/LICENSE) | | 3.32 kB |
107
107
  | `jssm` | `fsl` | [StoneCypher/sublime-jssm](https://github.com/StoneCypher/sublime-jssm/blob/2be02a59d284229bbbfb3dc6c2bdcec9b2c263ef/jssm.tmLanguage) | [MIT](https://raw.githubusercontent.com/StoneCypher/sublime-jssm/master/LICENSE) | | 2.79 kB |
108
108
  | `jsx` | | [microsoft/vscode](https://github.com/microsoft/vscode/blob/35d97bc7e439fce0f50f42074041ab2d8571b20a/extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | | 173.35 kB |
109
- | `julia` | `jl` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/35d97bc7e439fce0f50f42074041ab2d8571b20a/extensions/julia/syntaxes/julia.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | `cpp` `python` `javascript` `r` `sql` | 30.82 kB |
109
+ | `julia` | `jl` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/b557947e50a068bdcc927ffd31ee555dbb232558/extensions/julia/syntaxes/julia.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | `cpp` `python` `javascript` `r` `sql` | 32.83 kB |
110
110
  | `kotlin` | `kt` `kts` | [fwcd/vscode-kotlin](https://github.com/fwcd/vscode-kotlin/blob/bb71d917dd97b756d45f2594346efe3d70a15060/syntaxes/kotlin.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/fwcd/vscode-kotlin/main/LICENSE) | | 8.22 kB |
111
111
  | `kusto` | `kql` | [rosshamish/kuskus](https://github.com/rosshamish/kuskus/blob/638b8a9249c2c423bc263726661cde534b25adc7/kusto-syntax-highlighting/syntaxes/kusto.tmLanguage.json) | | | 19.23 kB |
112
- | `latex` | | [microsoft/vscode](https://github.com/microsoft/vscode/blob/35d97bc7e439fce0f50f42074041ab2d8571b20a/extensions/latex/syntaxes/LaTeX.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | `tex` `css` `haskell` `html` `xml` `java` `lua` `julia` `ruby` `javascript` `typescript` `python` `yaml` `rust` `scala` `gnuplot` | 40.02 kB |
112
+ | `latex` | | [microsoft/vscode](https://github.com/microsoft/vscode/blob/b557947e50a068bdcc927ffd31ee555dbb232558/extensions/latex/syntaxes/LaTeX.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | `tex` `shellscript` `css` `gnuplot` `haskell` `html` `java` `julia` `javascript` `lua` `python` `ruby` `rust` `typescript` `xml` `yaml` `scala` | 53.26 kB |
113
113
  | `less` | | [microsoft/vscode](https://github.com/microsoft/vscode/blob/b0d60e8e2e90bc9d7913611c176d14b8eb91b532/extensions/less/syntaxes/less.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | | 79.56 kB |
114
114
  | `liquid` | | [Shopify/liquid-tm-grammar](https://github.com/Shopify/liquid-tm-grammar/blob/909aab5b1d8be374585bd02ef46e0e38d65f2f89/grammars/liquid.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/Shopify/liquid-tm-grammar/main/LICENSE.md) | `html` `css` `json` `javascript` | 15.31 kB |
115
115
  | `lisp` | | [mattn/vscode-lisp](https://github.com/mattn/vscode-lisp/blob/c3672d9a1877d15a2472a3e58c96c123c44f1473/syntaxes/Lisp.tmLanguage) | [MIT](https://raw.githubusercontent.com/mattn/vscode-lisp/master/LICENSE) | | 13.46 kB |
@@ -155,14 +155,14 @@ import { grammars } from 'tm-grammars'
155
155
  | `riscv` | | [zhuanhao-wu/vscode-riscv-support](https://github.com/zhuanhao-wu/vscode-riscv-support/blob/2736b60e45ff2ef738d784055e136cf38d6290cd/syntaxes/riscv.tmLanguage) | [MIT](https://raw.githubusercontent.com/zhuanhao-wu/vscode-riscv-support/master/LICENSE) | | 7.04 kB |
156
156
  | `rst` | | [microsoft/vscode](https://github.com/microsoft/vscode/blob/48e93f756b764991ede33ad09781a863aca6907a/extensions/restructuredtext/syntaxes/rst.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | `html-derivative` `cpp` `python` `javascript` `shellscript` `yaml` `cmake` `ruby` | 9.03 kB |
157
157
  | `ruby` | `rb` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/17e7a257ffc86a48318cefd8f3b904dc546a4314/extensions/ruby/syntaxes/ruby.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | `html` `xml` `sql` `css` `c` `javascript` `shellscript` `lua` | 36.11 kB |
158
- | `rust` | `rs` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/35d97bc7e439fce0f50f42074041ab2d8571b20a/extensions/rust/syntaxes/rust.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | | 16.77 kB |
158
+ | `rust` | `rs` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/b557947e50a068bdcc927ffd31ee555dbb232558/extensions/rust/syntaxes/rust.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | | 16.77 kB |
159
159
  | `sas` | | [rpardee/sas](https://github.com/rpardee/sas/blob/49f6e733c6c0b918a2a825ca2f63dba704f3e8c0/syntaxes/sas.tmLanguage) | [MIT](https://raw.githubusercontent.com/rpardee/sas/master/LICENSE) | `sql` | 9.31 kB |
160
160
  | `sass` | | [TheRealSyler/vscode-sass-indented](https://github.com/TheRealSyler/vscode-sass-indented/blob/7b0bd6bbbb768c0cf21b2aa0899cb872ee42fd50/syntaxes/sass.tmLanguage.json) | [NOASSERTION](https://raw.githubusercontent.com/TheRealSyler/vscode-sass-indented/master/LICENSE) | | 8.84 kB |
161
161
  | `scala` | | [scala/vscode-scala-syntax](https://github.com/scala/vscode-scala-syntax/blob/1addd66a1bcb65510348ee6dddb5acfcf51f4fba/syntaxes/Scala.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/scala/vscode-scala-syntax/main/LICENSE.md) | | 26.85 kB |
162
162
  | `scheme` | | [sjhuangx/vscode-scheme](https://github.com/sjhuangx/vscode-scheme/blob/4e21683666e1e2edfa21d040ecd427f628e7b5ff/syntaxes/scheme.tmLanguage) | [MIT](https://raw.githubusercontent.com/sjhuangx/vscode-scheme/master/LICENSE.md) | | 8.35 kB |
163
163
  | `scss` | | [microsoft/vscode](https://github.com/microsoft/vscode/blob/cf8d61ebd2f022f4ce8280171f0360d1fe0a206d/extensions/scss/syntaxes/scss.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | `css` | 26.21 kB |
164
164
  | `shaderlab` | `shader` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/8fdf170a0850c1cc027382f31650aaf300d3ae2a/extensions/shaderlab/syntaxes/shaderlab.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | `hlsl` | 5.83 kB |
165
- | `shellscript` | `bash` `sh` `shell` `zsh` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/6285faddc6bbce7e605c04f8ab4364fdc6aa2f04/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | | 38.67 kB |
165
+ | `shellscript` | `bash` `sh` `shell` `zsh` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/b557947e50a068bdcc927ffd31ee555dbb232558/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | | 38.97 kB |
166
166
  | `shellsession` | `console` | [hronro/sublime-linguist-syntax](https://github.com/hronro/sublime-linguist-syntax/blob/9c84f1d69dbe89bc23292f129cf2d408a9c7afe1/syntaxes/ShellSession.tmLanguage) | [MIT](https://raw.githubusercontent.com/hronro/sublime-linguist-syntax/master/LICENSE) | `shellscript` | 567.00 B |
167
167
  | `smalltalk` | | [leocamello/vscode-smalltalk](https://github.com/leocamello/vscode-smalltalk/blob/bc888519a21740b4dbd4edcf2f884c61855dc58b/syntaxes/smalltalk.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/leocamello/vscode-smalltalk/master/LICENSE) | | 3.91 kB |
168
168
  | `solidity` | | [juanfranblanco/vscode-solidity](https://github.com/juanfranblanco/vscode-solidity/blob/75531be0beda99b7293d778eb0b1c63f70d8ac59/syntaxes/solidity.json) | [MIT](https://raw.githubusercontent.com/juanfranblanco/vscode-solidity/master/License.txt) | | 15.15 kB |
@@ -178,7 +178,7 @@ import { grammars } from 'tm-grammars'
178
178
  | `tasl` | | [underlay/vscode-tasl](https://github.com/underlay/vscode-tasl/blob/dde4b7c0b762c2e667584095362dd49ebfacece7/syntaxes/tasl.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/underlay/vscode-tasl/main/LICENSE) | | 3.21 kB |
179
179
  | `tcl` | | [sleutho/tcl](https://github.com/sleutho/tcl/blob/f18820ad14678bc033f0a35524820c90fe50f18b/syntaxes/tcl.tmLanguage) | | | 4.66 kB |
180
180
  | `terraform` | `tf` `tfvars` | [hashicorp/syntax](https://github.com/hashicorp/syntax/blob/c693badea4d460d1c05b8d2ab0c88bad143da3f1/syntaxes/terraform.tmGrammar.json) | [MPL-2.0](https://raw.githubusercontent.com/hashicorp/syntax/main/LICENSE) | | 12.58 kB |
181
- | `tex` | | [microsoft/vscode](https://github.com/microsoft/vscode/blob/3c86ede5f554f6e196c832394e126b291a1de606/extensions/latex/syntaxes/TeX.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | `r` | 7.85 kB |
181
+ | `tex` | | [microsoft/vscode](https://github.com/microsoft/vscode/blob/b557947e50a068bdcc927ffd31ee555dbb232558/extensions/latex/syntaxes/TeX.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | `r` | 8.35 kB |
182
182
  | `toml` | | [textmate/toml.tmbundle](https://github.com/textmate/toml.tmbundle/blob/e82b64c1e86396220786846201e9aa3f0a2d9ca2/Syntaxes/TOML.tmLanguage) | | | 6.26 kB |
183
183
  | `tsv` | | [mechatroner/vscode_rainbow_csv](https://github.com/mechatroner/vscode_rainbow_csv/blob/00d4c947f1bbe6a4a73599bd97fb31bdfbe262f3/syntaxes/tsv.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/mechatroner/vscode_rainbow_csv/master/LICENSE) | | 633.00 B |
184
184
  | `tsx` | | [microsoft/vscode](https://github.com/microsoft/vscode/blob/35d97bc7e439fce0f50f42074041ab2d8571b20a/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | | 171.16 kB |
package/grammars/go.json CHANGED
@@ -418,6 +418,9 @@
418
418
  {
419
419
  "include": "#struct_variables_types"
420
420
  },
421
+ {
422
+ "include": "#interface_variables_types"
423
+ },
421
424
  {
422
425
  "include": "#type-declarations-without-brackets"
423
426
  },
@@ -435,8 +438,8 @@
435
438
  ]
436
439
  }
437
440
  },
438
- "comment": "struct type declaration",
439
- "match": "((?:(?:\\b\\w+\\,\\s*)+)?\\b\\w+)\\s+(?=(?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:[\\[\\]\\*]+)?\\bstruct\\b\\s*\\{)"
441
+ "comment": "struct/interface type declaration",
442
+ "match": "((?:(?:\\b\\w+\\,\\s*)+)?\\b\\w+)\\s+(?=(?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:[\\[\\]\\*]+)?\\b(?:struct|interface)\\b\\s*\\{)"
440
443
  },
441
444
  {
442
445
  "captures": {
@@ -610,9 +613,32 @@
610
613
  "generic_param_types": {
611
614
  "comment": "generic parameter variables and types",
612
615
  "patterns": [
616
+ {
617
+ "include": "#struct_variables_types"
618
+ },
619
+ {
620
+ "include": "#interface_variables_types"
621
+ },
613
622
  {
614
623
  "include": "#type-declarations-without-brackets"
615
624
  },
625
+ {
626
+ "captures": {
627
+ "1": {
628
+ "patterns": [
629
+ {
630
+ "include": "#type-declarations"
631
+ },
632
+ {
633
+ "match": "\\w+",
634
+ "name": "variable.parameter.go"
635
+ }
636
+ ]
637
+ }
638
+ },
639
+ "comment": "struct/interface type declaration",
640
+ "match": "((?:(?:\\b\\w+\\,\\s*)+)?\\b\\w+)\\s+(?=(?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:[\\[\\]\\*]+)?\\b(?:struct|interface)\\b\\s*\\{)"
641
+ },
616
642
  {
617
643
  "captures": {
618
644
  "1": {
@@ -881,101 +907,105 @@
881
907
  ]
882
908
  },
883
909
  "interface_variables_types": {
910
+ "begin": "(\\binterface\\b)\\s*(\\{)",
911
+ "beginCaptures": {
912
+ "1": {
913
+ "name": "keyword.interface.go"
914
+ },
915
+ "2": {
916
+ "name": "punctuation.definition.begin.bracket.curly.go"
917
+ }
918
+ },
919
+ "comment": "interface variable types",
920
+ "end": "\\}",
921
+ "endCaptures": {
922
+ "0": {
923
+ "name": "punctuation.definition.end.bracket.curly.go"
924
+ }
925
+ },
884
926
  "patterns": [
885
927
  {
886
- "begin": "(\\binterface\\b)\\s*(\\{)",
928
+ "include": "#interface_variables_types_field"
929
+ },
930
+ {
931
+ "include": "$self"
932
+ }
933
+ ]
934
+ },
935
+ "interface_variables_types_field": {
936
+ "comment": "interface variable type fields",
937
+ "patterns": [
938
+ {
939
+ "include": "#support_functions"
940
+ },
941
+ {
942
+ "include": "#type-declarations-without-brackets"
943
+ },
944
+ {
945
+ "begin": "(?:([\\w\\.\\*]+)?(\\[))",
887
946
  "beginCaptures": {
888
947
  "1": {
889
- "name": "keyword.interface.go"
948
+ "patterns": [
949
+ {
950
+ "include": "#type-declarations"
951
+ },
952
+ {
953
+ "match": "(?:\\w+)",
954
+ "name": "entity.name.type.go"
955
+ }
956
+ ]
890
957
  },
891
958
  "2": {
892
- "name": "punctuation.definition.begin.bracket.curly.go"
959
+ "name": "punctuation.definition.begin.bracket.square.go"
893
960
  }
894
961
  },
895
- "comment": "interface variable types",
896
- "end": "\\}",
962
+ "end": "\\]",
897
963
  "endCaptures": {
898
964
  "0": {
899
- "name": "punctuation.definition.end.bracket.curly.go"
965
+ "name": "punctuation.definition.end.bracket.square.go"
900
966
  }
901
967
  },
902
968
  "patterns": [
903
969
  {
904
- "include": "#support_functions"
905
- },
906
- {
907
- "include": "#type-declarations-without-brackets"
908
- },
970
+ "include": "#generic_param_types"
971
+ }
972
+ ]
973
+ },
974
+ {
975
+ "begin": "\\(",
976
+ "beginCaptures": {
977
+ "0": {
978
+ "name": "punctuation.definition.begin.bracket.round.go"
979
+ }
980
+ },
981
+ "end": "\\)",
982
+ "endCaptures": {
983
+ "0": {
984
+ "name": "punctuation.definition.end.bracket.round.go"
985
+ }
986
+ },
987
+ "patterns": [
909
988
  {
910
- "begin": "(?:([\\w\\.\\*]+)?(\\[))",
911
- "beginCaptures": {
912
- "1": {
913
- "patterns": [
914
- {
915
- "include": "#type-declarations"
916
- },
917
- {
918
- "match": "(?:\\w+)",
919
- "name": "entity.name.type.go"
920
- }
921
- ]
922
- },
923
- "2": {
924
- "name": "punctuation.definition.begin.bracket.square.go"
925
- }
926
- },
927
- "end": "\\]",
928
- "endCaptures": {
929
- "0": {
930
- "name": "punctuation.definition.end.bracket.square.go"
931
- }
932
- },
989
+ "include": "#function_param_types"
990
+ }
991
+ ]
992
+ },
993
+ {
994
+ "captures": {
995
+ "1": {
933
996
  "patterns": [
934
997
  {
935
- "include": "#generic_param_types"
936
- }
937
- ]
938
- },
939
- {
940
- "begin": "\\(",
941
- "beginCaptures": {
942
- "0": {
943
- "name": "punctuation.definition.begin.bracket.round.go"
944
- }
945
- },
946
- "end": "\\)",
947
- "endCaptures": {
948
- "0": {
949
- "name": "punctuation.definition.end.bracket.round.go"
950
- }
951
- },
952
- "patterns": [
998
+ "include": "#type-declarations"
999
+ },
953
1000
  {
954
- "include": "#function_param_types"
1001
+ "match": "\\w+",
1002
+ "name": "entity.name.type.go"
955
1003
  }
956
1004
  ]
957
- },
958
- {
959
- "captures": {
960
- "1": {
961
- "patterns": [
962
- {
963
- "include": "#type-declarations"
964
- },
965
- {
966
- "match": "\\w+",
967
- "name": "entity.name.type.go"
968
- }
969
- ]
970
- }
971
- },
972
- "comment": "other types",
973
- "match": "([\\w\\.]+)"
974
- },
975
- {
976
- "include": "$self"
977
1005
  }
978
- ]
1006
+ },
1007
+ "comment": "other types",
1008
+ "match": "([\\w\\.]+)"
979
1009
  }
980
1010
  ]
981
1011
  },
@@ -1057,7 +1087,7 @@
1057
1087
  }
1058
1088
  },
1059
1089
  "comment": "map types",
1060
- "end": "(?:(\\])((?:(?:(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?!(?:[\\[\\]\\*]+)?\\b(?:func|struct|map)\\b)[\\w\\.\\[\\]\\*]+)?)",
1090
+ "end": "(?:(\\])((?:(?:(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?!(?:[\\[\\]\\*]+)?\\b(?:func|struct|map)\\b)(?:[\\*\\[\\]]+)?(?:[\\w\\.]+))?)",
1061
1091
  "endCaptures": {
1062
1092
  "1": {
1063
1093
  "name": "punctuation.definition.end.bracket.square.go"
@@ -1087,7 +1117,7 @@
1087
1117
  "include": "#type-declarations-without-brackets"
1088
1118
  },
1089
1119
  {
1090
- "include": "#generic_types"
1120
+ "include": "#parameter-variable-types"
1091
1121
  },
1092
1122
  {
1093
1123
  "include": "#functions"
@@ -1872,7 +1902,7 @@
1872
1902
  }
1873
1903
  },
1874
1904
  "comment": "single type declaration",
1875
- "match": "(?:(?:^\\s*)(\\btype\\b)(?:\\s*)([\\w\\.\\*]+)(?:\\s+)(?!(?:[\\[\\]\\*]+)?\\b(?:struct|interface)\\b)([\\s\\S]+))"
1905
+ "match": "(?:(?:^\\s*)(\\btype\\b)(?:\\s*)([\\w\\.\\*]+)(?:\\s+)(?!(?:\\=\\s*)?(?:[\\[\\]\\*]+)?\\b(?:struct|interface)\\b)([\\s\\S]+))"
1876
1906
  },
1877
1907
  {
1878
1908
  "begin": "(?:(?:^|\\s+)(\\btype\\b)(?:\\s*)([\\w\\.\\*]+)(?=\\[))",
@@ -2101,9 +2131,10 @@
2101
2131
  "match": "(?:(?:^\\s*)(\\btype\\b)(?:\\s*)([\\w\\.]+))"
2102
2132
  },
2103
2133
  "struct_variable_types_fields_multi": {
2134
+ "comment": "struct variable and type fields with multi lines",
2104
2135
  "patterns": [
2105
2136
  {
2106
- "begin": "(?:(\\w+(?:\\,\\s*\\w+)*)(?:\\s+)(?:(?:[\\[\\]\\*])+)?(\\bstruct\\b)(?:\\s*)(\\{))",
2137
+ "begin": "(?:((?:\\w+(?:\\,\\s*\\w+)*)(?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:\\s+)(?:[\\[\\]\\*]+)?)(\\bstruct\\b)(?:\\s*)(\\{))",
2107
2138
  "beginCaptures": {
2108
2139
  "1": {
2109
2140
  "patterns": [
@@ -2123,7 +2154,7 @@
2123
2154
  "name": "punctuation.definition.begin.bracket.curly.go"
2124
2155
  }
2125
2156
  },
2126
- "comment": "Struct variable for struct in struct types",
2157
+ "comment": "struct in struct types",
2127
2158
  "end": "\\}",
2128
2159
  "endCaptures": {
2129
2160
  "0": {
@@ -2138,22 +2169,29 @@
2138
2169
  "include": "$self"
2139
2170
  }
2140
2171
  ]
2141
- }
2142
- ]
2143
- },
2144
- "struct_variables_types": {
2145
- "patterns": [
2172
+ },
2146
2173
  {
2147
- "begin": "(\\bstruct\\b)\\s*(\\{)",
2174
+ "begin": "(?:((?:\\w+(?:\\,\\s*\\w+)*)(?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:\\s+)(?:[\\[\\]\\*]+)?)(\\binterface\\b)(?:\\s*)(\\{))",
2148
2175
  "beginCaptures": {
2149
2176
  "1": {
2150
- "name": "keyword.struct.go"
2177
+ "patterns": [
2178
+ {
2179
+ "include": "#type-declarations"
2180
+ },
2181
+ {
2182
+ "match": "\\w+",
2183
+ "name": "variable.other.property.go"
2184
+ }
2185
+ ]
2151
2186
  },
2152
2187
  "2": {
2188
+ "name": "keyword.interface.go"
2189
+ },
2190
+ "3": {
2153
2191
  "name": "punctuation.definition.begin.bracket.curly.go"
2154
2192
  }
2155
2193
  },
2156
- "comment": "Struct variable type",
2194
+ "comment": "interface in struct types",
2157
2195
  "end": "\\}",
2158
2196
  "endCaptures": {
2159
2197
  "0": {
@@ -2162,12 +2200,78 @@
2162
2200
  },
2163
2201
  "patterns": [
2164
2202
  {
2165
- "include": "#struct_variables_types_fields"
2203
+ "include": "#interface_variables_types_field"
2204
+ },
2205
+ {
2206
+ "include": "$self"
2207
+ }
2208
+ ]
2209
+ },
2210
+ {
2211
+ "begin": "(?:((?:\\w+(?:\\,\\s*\\w+)*)(?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:\\s+)(?:[\\[\\]\\*]+)?)(\\bfunc\\b)(?:\\s*)(\\())",
2212
+ "beginCaptures": {
2213
+ "1": {
2214
+ "patterns": [
2215
+ {
2216
+ "include": "#type-declarations"
2217
+ },
2218
+ {
2219
+ "match": "\\w+",
2220
+ "name": "variable.other.property.go"
2221
+ }
2222
+ ]
2223
+ },
2224
+ "2": {
2225
+ "name": "keyword.function.go"
2226
+ },
2227
+ "3": {
2228
+ "name": "punctuation.definition.begin.bracket.round.go"
2229
+ }
2230
+ },
2231
+ "comment": "function in struct types",
2232
+ "end": "\\)",
2233
+ "endCaptures": {
2234
+ "0": {
2235
+ "name": "punctuation.definition.end.bracket.round.go"
2236
+ }
2237
+ },
2238
+ "patterns": [
2239
+ {
2240
+ "include": "#function_param_types"
2166
2241
  },
2167
2242
  {
2168
2243
  "include": "$self"
2169
2244
  }
2170
2245
  ]
2246
+ },
2247
+ {
2248
+ "include": "#parameter-variable-types"
2249
+ }
2250
+ ]
2251
+ },
2252
+ "struct_variables_types": {
2253
+ "begin": "(\\bstruct\\b)\\s*(\\{)",
2254
+ "beginCaptures": {
2255
+ "1": {
2256
+ "name": "keyword.struct.go"
2257
+ },
2258
+ "2": {
2259
+ "name": "punctuation.definition.begin.bracket.curly.go"
2260
+ }
2261
+ },
2262
+ "comment": "Struct variable type",
2263
+ "end": "\\}",
2264
+ "endCaptures": {
2265
+ "0": {
2266
+ "name": "punctuation.definition.end.bracket.curly.go"
2267
+ }
2268
+ },
2269
+ "patterns": [
2270
+ {
2271
+ "include": "#struct_variables_types_fields"
2272
+ },
2273
+ {
2274
+ "include": "$self"
2171
2275
  }
2172
2276
  ]
2173
2277
  },
@@ -2251,13 +2355,13 @@
2251
2355
  ]
2252
2356
  }
2253
2357
  },
2254
- "match": "(?:((?:(?:\\w+\\,\\s*)+)?(?:\\w+\\s+))?((?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:[\\w\\.\\*\\[\\]]+)(?:\\;)?))"
2358
+ "match": "(?:((?:(?:\\w+\\,\\s*)+)?(?:\\w+\\s+))?((?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:[\\S]+)(?:\\;)?))"
2255
2359
  }
2256
2360
  ]
2257
2361
  }
2258
2362
  },
2259
2363
  "comment": "one line with semicolon(;) without formatting gofmt - single type | property variables and types",
2260
- "match": "(?:(?<=\\{)((?:\\s*(?:(?:(?:\\w+\\,\\s*)+)?(?:\\w+\\s+))?(?:(?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:[\\w\\.\\*\\[\\]\\(\\)\\{\\}]+)(?:\\;)?))+)\\s*(?=\\}))"
2364
+ "match": "(?:(?<=\\{)((?:\\s*(?:(?:(?:\\w+\\,\\s*)+)?(?:\\w+\\s+))?(?:(?:(?:\\s*(?:[\\*\\[\\]]+)?(?:\\<\\-\\s*)?\\bchan\\b(?:\\s*\\<\\-)?\\s*)+)?(?:[\\S]+)(?:\\;)?))+)\\s*(?=\\}))"
2261
2365
  },
2262
2366
  {
2263
2367
  "captures": {
package/grammars/julia.json CHANGED
@@ -335,7 +335,7 @@
335
335
  "operator": {
336
336
  "patterns": [
337
337
  {
338
- "match": "(?:->|<-|-->|=>)",
338
+ "match": "\\.?(?:<-->|->|-->|<--|←|→|↔|↚|↛|↞|↠|↢|↣|↦|↤|↮|⇎|⇍|⇏|⇐|⇒|⇔|⇴|⇶|⇷|⇸|⇹|⇺|⇻|⇼|⇽|⇾|⇿|⟵|⟶|⟷|⟹|⟺|⟻|⟼|⟽|⟾|⟿|⤀|⤁|⤂|⤃|⤄|⤅|⤆|⤇|⤌|⤍|⤎|⤏|⤐|⤑|⤔|⤕|⤖|⤗|⤘|⤝|⤞|⤟|⤠|⥄|⥅|⥆|⥇|⥈|⥊|⥋|⥎|⥐|⥒|⥓|⥖|⥗|⥚|⥛|⥞|⥟|⥢|⥤|⥦|⥧|⥨|⥩|⥪|⥫|⥬|⥭|⥰|⧴|⬱|⬰|⬲|⬳|⬴|⬵|⬶|⬷|⬸|⬹|⬺|⬻|⬼|⬽|⬾|⬿|⭀|⭁|⭂|⭃|⥷|⭄|⥺|⭇|⭈|⭉|⭊|⭋|⭌|￩|￫|⇜|⇝|↜|↝|↩|↪|↫|↬|↼|↽|⇀|⇁|⇄|⇆|⇇|⇉|⇋|⇌|⇚|⇛|⇠|⇢|↷|↶|↺|↻|=>)",
339
339
  "name": "keyword.operator.arrow.julia"
340
340
  },
341
341
  {
@@ -361,7 +361,7 @@
361
361
  "match": "(?:\\s*(::|>:|<:)\\s*((?:(?:Union)?\\([^)]*\\)|[[:alpha:]_$∇][[:word:]⁺-ₜ!′\\.]*(?:(?:{(?:[^{}]|{(?:[^{}]|{[^{}]*})*})*})|(?:\".+?(?<!\\\\)\"))?)))(?:\\.\\.\\.)?((?:\\.)?'*)"
362
362
  },
363
363
  {
364
- "match": "(?:===|∈|\\.∈|∉|\\.∉|∋|\\.∋|∌|\\.∌|≈|\\.≈|≉|\\.≉|≠|\\.≠|≡|\\.≡|≢|\\.≢|⊆|\\.⊆|⊇|\\.⊇|⊈|\\.⊈|⊉|\\.⊉|⊊|\\.⊊|⊋|\\.⊋|\\.==|!==|!=|\\.>=|\\.>|\\.<=|\\.<|\\.≤|\\.≥|==|\\.!=|\\.=|\\.!|<:|>:|:>|(?<!>)>=|(?<!<)<=|>|<|≥|≤)",
364
+ "match": "(\\.?((?<!<)<=|(?<!>)>=|>|<|≥|≤|===|==|≡|!=|≠|!==|≢|∈|∉|∋|∌|⊆|⊈|⊂|⊄|⊊|∝|∊|∍|∥|∦|∷|∺|∻|∽|∾|≁|≃|≂|≄|≅|≆|≇|≈|≉|≊|≋|≌|≍|≎|≐|≑|≒|≓|≖|≗|≘|≙|≚|≛|≜|≝|≞|≟|≣|≦|≧|≨|≩|≪|≫|≬|≭|≮|≯|≰|≱|≲|≳|≴|≵|≶|≷|≸|≹|≺|≻|≼|≽|≾|≿|⊀|⊁|⊃|⊅|⊇|⊉|⊋|⊏|⊐|⊑|⊒|⊜|⊩|⊬|⊮|⊰|⊱|⊲|⊳|⊴|⊵|⊶|⊷|⋍|⋐|⋑|⋕|⋖|⋗|⋘|⋙|⋚|⋛|⋜|⋝|⋞|⋟|⋠|⋡|⋢|⋣|⋤|⋥|⋦|⋧|⋨|⋩|⋪|⋫|⋬|⋭|⋲|⋳|⋴|⋵|⋶|⋷|⋸|⋹|⋺|⋻|⋼|⋽|⋾|⋿|⟈|⟉|⟒|⦷|⧀|⧁|⧡|⧣|⧤|⧥|⩦|⩧|⩪|⩫|⩬|⩭|⩮|⩯|⩰|⩱|⩲|⩳|⩵|⩶|⩷|⩸|⩹|⩺|⩻|⩼|⩽|⩾|⩿|⪀|⪁|⪂|⪃|⪄|⪅|⪆|⪇|⪈|⪉|⪊|⪋|⪌|⪍|⪎|⪏|⪐|⪑|⪒|⪓|⪔|⪕|⪖|⪗|⪘|⪙|⪚|⪛|⪜|⪝|⪞|⪟|⪠|⪡|⪢|⪣|⪤|⪥|⪦|⪧|⪨|⪩|⪪|⪫|⪬|⪭|⪮|⪯|⪰|⪱|⪲|⪳|⪴|⪵|⪶|⪷|⪸|⪹|⪺|⪻|⪼|⪽|⪾|⪿|⫀|⫁|⫂|⫃|⫄|⫅|⫆|⫇|⫈|⫉|⫊|⫋|⫌|⫍|⫎|⫏|⫐|⫑|⫒|⫓|⫔|⫕|⫖|⫗|⫘|⫙|⫷|⫸|⫹|⫺|⊢|⊣|⟂|⫪|⫫|<:|>:))",
365
365
  "name": "keyword.operator.relation.julia"
366
366
  },
367
367
  {
@@ -385,11 +385,11 @@
385
385
  "name": "keyword.operator.applies.julia"
386
386
  },
387
387
  {
388
- "match": "(?:\\||\\.\\||\\&|\\.\\&|~|\\.~|⊻|\\.⊻)",
388
+ "match": "(?:\\||\\.\\||\\&|\\.\\&|~|¬|\\.~|⊻|\\.⊻)",
389
389
  "name": "keyword.operator.bitwise.julia"
390
390
  },
391
391
  {
392
- "match": "(?:\\+\\+|--|\\+|\\.\\+|-|\\.\\-|\\*|\\.\\*|//(?!=)|\\.//(?!=)|/|\\./|%|\\.%|\\\\|\\.\\\\|\\^|\\.\\^|÷|\\.÷|⋅|\\.⋅|∩|\\.∩|∪|\\.∪|×|√|∛)",
392
+ "match": "\\.?(?:\\+\\+|\\-\\-|\\+|\\-|−|¦|\\||⊕|⊖|⊞|⊟|∪|∨|⊔|±|∓|∔|∸|≏|⊎|⊻|⊽|⋎|⋓|⟇|⧺|⧻|⨈|⨢|⨣|⨤|⨥|⨦|⨧|⨨|⨩|⨪|⨫|⨬|⨭|⨮|⨹|⨺|⩁|⩂|⩅|⩊|⩌|⩏|⩐|⩒|⩔|⩖|⩗|⩛|⩝|⩡|⩢|⩣|\\*|//?|⌿|÷|%|&|·|·|⋅|∘|×|\\\\|∩|∧|⊗|⊘|⊙|⊚|⊛|⊠|⊡|⊓|∗|∙|∤|⅋|≀|⊼|⋄|⋆|⋇|⋉|⋊|⋋|⋌|⋏|⋒|⟑|⦸|⦼|⦾|⦿|⧶|⧷|⨇|⨰|⨱|⨲|⨳|⨴|⨵|⨶|⨷|⨸|⨻|⨼|⨽|⩀|⩃|⩄|⩋|⩍|⩎|⩑|⩓|⩕|⩘|⩚|⩜|⩞|⩟|⩠|⫛|⊍|▷|⨝|⟕|⟖|⟗|⨟|\\^|↑|↓|⇵|⟰|⟱|⤈|⤉|⤊|⤋|⤒|⤓|⥉|⥌|⥍|⥏|⥑|⥔|⥕|⥘|⥙|⥜|⥝|⥠|⥡|⥣|⥥|⥮|⥯|￪|￬|√|∛|∜|⋆|±|∓)",
393
393
  "name": "keyword.operator.arithmetic.julia"
394
394
  },
395
395
  {
@@ -405,7 +405,7 @@
405
405
  "name": "keyword.operator.relation.in.julia"
406
406
  },
407
407
  {
408
- "match": "(?:\\.(?=(?:@|_|\\p{L}))|\\.\\.+)",
408
+ "match": "(?:\\.(?=(?:@|_|\\p{L}))|\\.\\.+|…|⁝|⋮|⋱|⋰|⋯)",
409
409
  "name": "keyword.operator.dots.julia"
410
410
  },
411
411
  {