@codingame/monaco-editor-wrapper 3.5.3 → 3.6.0

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 (68) hide show
  1. package/dist/COBOL.tmLanguage.js +22 -6
  2. package/dist/JavaScript.tmLanguage.js +2 -2
  3. package/dist/JavaScriptReact.tmLanguage.js +2 -2
  4. package/dist/TypeScript.tmLanguage.js +2 -2
  5. package/dist/TypeScriptReact.tmLanguage.js +2 -2
  6. package/dist/_monaco-editor_commonjs-external.js +8 -1
  7. package/dist/angular.js +6 -0
  8. package/dist/buildignore.r.js +5 -0
  9. package/dist/{COBOL.js → cobol.js} +2 -2
  10. package/dist/cobol2.js +71 -47
  11. package/dist/cpp.tmLanguage.js +808 -4380
  12. package/dist/cpptools.js +1896 -1867
  13. package/dist/css.tmLanguage.js +1 -1
  14. package/dist/d.js +3 -0
  15. package/dist/d3.js +369 -288
  16. package/dist/dart.js +37 -24
  17. package/dist/dart3.js +46 -6
  18. package/dist/features/extensionConfigurations.js +2 -1
  19. package/dist/features/jsonContribution.d.ts +1 -1
  20. package/dist/features/typescriptContribution.js +1 -1
  21. package/dist/go.mod.js +8 -0
  22. package/dist/go.mod.tmGrammar.js +182 -0
  23. package/dist/go.sum.tmGrammar.js +55 -0
  24. package/dist/go.work.js +8 -0
  25. package/dist/govulncheck.tmGrammar.js +138 -0
  26. package/dist/html.tmLanguage.js +4 -4
  27. package/dist/index2.js +89 -18
  28. package/dist/java2.js +80 -2
  29. package/dist/javascript.js +1 -1
  30. package/dist/javascriptreact.js +1 -1
  31. package/dist/lua.tmLanguage.js +104 -7
  32. package/dist/lua2.js +98 -26
  33. package/dist/main.js +144 -29
  34. package/dist/markdown-vue.js +1 -1
  35. package/dist/namespace.r.js +88 -0
  36. package/dist/ocaml3.js +8 -1
  37. package/dist/rbuildignore.js +39 -0
  38. package/dist/rnamespace.js +283 -0
  39. package/dist/scalameta.js +12 -5
  40. package/dist/shell-unix-bash.tmLanguage.js +1193 -528
  41. package/dist/solargraph.js +2 -2
  42. package/dist/sql.tmLanguage.js +134 -46
  43. package/dist/svelte.js +3 -1
  44. package/dist/svelte.svelte-vscode.js +11 -14
  45. package/dist/svlangserver.js +2 -2
  46. package/dist/tcl.tmlanguage.yaml.js +1 -1
  47. package/dist/theme-defaults~dark_plus_experimental.js +146 -0
  48. package/dist/theme-defaults~dark_vs.js +6 -2
  49. package/dist/theme-defaults~light_plus_experimental.js +159 -0
  50. package/dist/theme-defaults~light_vs.js +4 -2
  51. package/dist/tools/EditorOpenHandlerRegistry.d.ts +1 -1
  52. package/dist/typescript-language-features.js +48 -45
  53. package/dist/typescript.js +1 -1
  54. package/dist/typescriptreact.js +1 -1
  55. package/dist/volar-vue.js +51 -18
  56. package/dist/vscode-R.js +12 -1
  57. package/dist/vscode-go-go.js +276 -0
  58. package/dist/vscode-go.js +1604 -0
  59. package/dist/vscode-python.js +14 -9
  60. package/dist/vue-directives.js +1 -1
  61. package/dist/vue-interpolations.js +1 -1
  62. package/dist/vue-sfc-style-variable-injection.js +1 -1
  63. package/dist/vue.tmLanguage.js +44 -12
  64. package/dist/worker.d.ts +1 -1
  65. package/package.json +29 -29
  66. package/stats.html +2462 -329
  67. package/dist/COBOL Copybook.js +0 -6
  68. package/dist/cobol-snippets.js +0 -5
@@ -0,0 +1,138 @@
1
+ var scopeName = "govulncheck";
2
+ var patterns = [
3
+ {
4
+ include: "#log"
5
+ },
6
+ {
7
+ include: "#info"
8
+ },
9
+ {
10
+ include: "#affecting"
11
+ },
12
+ {
13
+ include: "#unaffecting"
14
+ },
15
+ {
16
+ include: "#callstack"
17
+ },
18
+ {
19
+ include: "#callstacklong"
20
+ },
21
+ {
22
+ include: "#frame"
23
+ },
24
+ {
25
+ include: "#framePosition"
26
+ }
27
+ ];
28
+ var repository = {
29
+ log: {
30
+ comment: "log",
31
+ match: "^\\d{2}:\\d{2}:\\d{2} \\S.*$",
32
+ name: "comment.govulncheck"
33
+ },
34
+ info: {
35
+ comment: "info",
36
+ match: "^# .*",
37
+ name: "comment.govulncheck"
38
+ },
39
+ affecting: {
40
+ comment: "vulnerability heading",
41
+ match: "^(⚠) (\\S+) \\((https://[^)]+)\\)",
42
+ name: "markup.heading.1.govulncheck",
43
+ captures: {
44
+ "1": {
45
+ name: "token.error-token.severity.govulncheck"
46
+ },
47
+ "2": {
48
+ name: "token.error-token.vulnid.govulncheck"
49
+ },
50
+ "3": {
51
+ name: "entity.link.govulncheck"
52
+ }
53
+ }
54
+ },
55
+ unaffecting: {
56
+ comment: "vulnerability heading",
57
+ match: "^(ⓘ) (\\S+) \\((https://[^)]+)\\)",
58
+ captures: {
59
+ "1": {
60
+ name: "token.info-token.severity.govulncheck"
61
+ },
62
+ "2": {
63
+ name: "token.info-token.vulnid.govulncheck"
64
+ },
65
+ "3": {
66
+ name: "entity.link.govulncheck"
67
+ }
68
+ }
69
+ },
70
+ callstacklong: {
71
+ comment: "callstack",
72
+ match: "^\\- (\\S+) (\\S+) calls ([^,]+), which eventually calls (\\S+)",
73
+ name: "markup.list.unnumbered.callstack.summary.govulncheck",
74
+ captures: {
75
+ "1": {
76
+ name: "markup.link.callstack.position.govulncheck"
77
+ },
78
+ "2": {
79
+ name: "markup.italic.raw.callstack.symbol.govulncheck"
80
+ },
81
+ "3": {
82
+ name: "markup.italic.callstack.symbol.govulncheck"
83
+ },
84
+ "4": {
85
+ name: "markup.italic.callstack.symbol.govulncheck"
86
+ }
87
+ }
88
+ },
89
+ callstack: {
90
+ comment: "callstack",
91
+ match: "^\\- (\\S+) (\\S+) calls ([^,]+)$",
92
+ name: "markup.list.unnumbered.callstack.summary.govulncheck",
93
+ captures: {
94
+ "1": {
95
+ name: "markup.link.callstack.position.govulncheck"
96
+ },
97
+ "2": {
98
+ name: "markup.italic.raw.callstack.symbol.govulncheck"
99
+ },
100
+ "3": {
101
+ name: "markup.italic.callstack.symbol.govulncheck"
102
+ }
103
+ }
104
+ },
105
+ frame: {
106
+ comment: "frame",
107
+ match: "^\\t(\\S+)",
108
+ name: "markup.list.unnumbered.fram.govulncheck",
109
+ captures: {
110
+ "1": {
111
+ name: "markup.italic.raw.callstack.symbol.govulncheck"
112
+ }
113
+ }
114
+ },
115
+ framePosition: {
116
+ comment: "frame position info",
117
+ match: "^\\t\\t(\\([^)]+\\))",
118
+ name: "markup.list.unnumbered.frame.govulncheck",
119
+ captures: {
120
+ "1": {
121
+ name: "comment.govulncheck"
122
+ }
123
+ }
124
+ }
125
+ };
126
+ var information_for_contributors = [
127
+ "This file has been converted from https://github.com/golang/vscode-go/blob/master/",
128
+ "If you want to provide a fix or improvement, please create a pull request against the original repository.",
129
+ "Once accepted there, we are happy to receive an update request."
130
+ ];
131
+ var govulncheck_tmGrammar = {
132
+ scopeName: scopeName,
133
+ patterns: patterns,
134
+ repository: repository,
135
+ information_for_contributors: information_for_contributors
136
+ };
137
+
138
+ export { govulncheck_tmGrammar as default, information_for_contributors, patterns, repository, scopeName };
@@ -107,7 +107,7 @@ var repository = {
107
107
  name: "punctuation.definition.string.end.html"
108
108
  },
109
109
  "1": {
110
- name: "source.css-ignored-vscode"
110
+ name: "source.css"
111
111
  }
112
112
  },
113
113
  name: "string.quoted.double.html",
@@ -131,7 +131,7 @@ var repository = {
131
131
  name: "punctuation.definition.string.end.html"
132
132
  },
133
133
  "1": {
134
- name: "source.css-ignored-vscode"
134
+ name: "source.css"
135
135
  }
136
136
  },
137
137
  name: "string.quoted.single.html",
@@ -206,7 +206,7 @@ var repository = {
206
206
  name: "punctuation.definition.string.end.html"
207
207
  },
208
208
  "1": {
209
- name: "source.js-ignored-vscode"
209
+ name: "source.js"
210
210
  }
211
211
  },
212
212
  name: "string.quoted.double.html",
@@ -264,7 +264,7 @@ var repository = {
264
264
  name: "punctuation.definition.string.end.html"
265
265
  },
266
266
  "1": {
267
- name: "source.js-ignored-vscode"
267
+ name: "source.js"
268
268
  }
269
269
  },
270
270
  name: "string.quoted.single.html",
package/dist/index2.js CHANGED
@@ -23,6 +23,7 @@ function _objectSpread2(target) {
23
23
  return target;
24
24
  }
25
25
  function _defineProperty(obj, key, value) {
26
+ key = _toPropertyKey(key);
26
27
  if (key in obj) {
27
28
  Object.defineProperty(obj, key, {
28
29
  value: value,
@@ -35,17 +36,52 @@ function _defineProperty(obj, key, value) {
35
36
  }
36
37
  return obj;
37
38
  }
39
+ function _toPrimitive(input, hint) {
40
+ if (typeof input !== "object" || input === null) return input;
41
+ var prim = input[Symbol.toPrimitive];
42
+ if (prim !== undefined) {
43
+ var res = prim.call(input, hint || "default");
44
+ if (typeof res !== "object") return res;
45
+ throw new TypeError("@@toPrimitive must return a primitive value.");
46
+ }
47
+ return (hint === "string" ? String : Number)(input);
48
+ }
49
+ function _toPropertyKey(arg) {
50
+ var key = _toPrimitive(arg, "string");
51
+ return typeof key === "symbol" ? key : String(key);
52
+ }
38
53
 
39
54
  var configurationDefaults = {
55
+ "[clojure]": {
56
+ "diffEditor.ignoreTrimWhitespace": false
57
+ },
58
+ "[coffeescript]": {
59
+ "diffEditor.ignoreTrimWhitespace": false
60
+ },
61
+ "[csharp]": {
62
+ "editor.maxTokenizationLineLength": 2500
63
+ },
64
+ "[fsharp]": {
65
+ "diffEditor.ignoreTrimWhitespace": false
66
+ },
40
67
  "[go]": {
41
- "editor.insertSpaces": false
68
+ "editor.insertSpaces": false,
69
+ "editor.formatOnSave": true,
70
+ "editor.codeActionsOnSave": {
71
+ "source.organizeImports": true
72
+ },
73
+ "editor.suggest.snippetsPreventQuickSuggestions": false
42
74
  },
43
75
  "[javascript]": {
44
76
  "editor.maxTokenizationLineLength": 2500
45
77
  },
46
78
  "[markdown]": {
47
79
  "editor.unicodeHighlight.ambiguousCharacters": false,
48
- "editor.unicodeHighlight.invisibleCharacters": false
80
+ "editor.unicodeHighlight.invisibleCharacters": false,
81
+ "diffEditor.ignoreTrimWhitespace": false
82
+ },
83
+ "[python]": {
84
+ "diffEditor.ignoreTrimWhitespace": false
49
85
  },
50
86
  "[shellscript]": {
51
87
  "files.eol": "\n"
@@ -53,7 +89,8 @@ var configurationDefaults = {
53
89
  "[yaml]": {
54
90
  "editor.insertSpaces": true,
55
91
  "editor.tabSize": 2,
56
- "editor.autoIndent": "advanced"
92
+ "editor.autoIndent": "advanced",
93
+ "diffEditor.ignoreTrimWhitespace": false
57
94
  },
58
95
  "[dockercompose]": {
59
96
  "editor.insertSpaces": true,
@@ -100,23 +137,15 @@ var configurationDefaults = {
100
137
  "editor.formatOnPaste": true,
101
138
  "editor.formatOnType": true
102
139
  },
103
- "[COBOL]": {
104
- "editor.renderIndentGuides": false,
105
- "editor.rulers": [
106
- 7,
107
- 11,
108
- 72,
109
- 80
110
- ]
111
- },
112
- "[COBOL Copybook]": {
140
+ "[cobol]": {
113
141
  "editor.renderIndentGuides": false,
114
142
  "editor.rulers": [
115
143
  7,
116
144
  11,
117
145
  72,
118
146
  80
119
- ]
147
+ ],
148
+ "editor.wordSeparators": "!\"#$%&'()*+,./:;<=>?@[\\]^`{|}~"
120
149
  },
121
150
  "[java]": {
122
151
  "editor.suggest.snippetsPreventQuickSuggestions": false
@@ -126,7 +155,8 @@ var configurationDefaults = {
126
155
  comments: "inline",
127
156
  other: "on",
128
157
  strings: "on"
129
- }
158
+ },
159
+ "editor.semanticHighlighting.enabled": true
130
160
  },
131
161
  "[cpp]": {
132
162
  "editor.wordBasedSuggestions": false,
@@ -237,6 +267,14 @@ var semanticTokenTypes = [
237
267
  superType: "string",
238
268
  description: "Style for C++ user-defined literal strings."
239
269
  },
270
+ {
271
+ id: "razorComponentElement",
272
+ description: "A Razor component element"
273
+ },
274
+ {
275
+ id: "razorComponentAttribute",
276
+ description: "A Razor component attribute"
277
+ },
240
278
  {
241
279
  id: "razorTagHelperElement",
242
280
  description: "A Razor TagHelper Element"
@@ -670,6 +708,9 @@ var semanticTokenScopes = [
670
708
  "type.modification": [
671
709
  "storage.type.generic.lua"
672
710
  ],
711
+ "type.readonly": [
712
+ "storage.type.self.lua"
713
+ ],
673
714
  typeParameter: [
674
715
  "string.tag.lua"
675
716
  ],
@@ -688,11 +729,11 @@ var semanticTokenScopes = [
688
729
  "variable.definition": [
689
730
  "variable.language.self.lua"
690
731
  ],
732
+ "variable.global": [
733
+ "variable.global.lua"
734
+ ],
691
735
  "variable.readonly": [
692
736
  "variable.other.constant.lua"
693
- ],
694
- "variable.static": [
695
- "variable.global.lua"
696
737
  ]
697
738
  }
698
739
  },
@@ -1053,6 +1094,12 @@ var semanticTokenScopes = [
1053
1094
  {
1054
1095
  language: "aspnetcorerazor",
1055
1096
  scopes: {
1097
+ razorComponentElement: [
1098
+ "entity.name.class.element.component"
1099
+ ],
1100
+ razorComponentAttribute: [
1101
+ "entity.name.class.attribute.component"
1102
+ ],
1056
1103
  razorTagHelperElement: [
1057
1104
  "entity.name.class.element.taghelper"
1058
1105
  ],
@@ -1209,6 +1256,30 @@ var semanticTokenScopes = [
1209
1256
  "string.regexp.other-escape.cs"
1210
1257
  ]
1211
1258
  }
1259
+ },
1260
+ {
1261
+ language: "vue",
1262
+ scopes: {
1263
+ component: [
1264
+ "support.class.component.vue"
1265
+ ]
1266
+ }
1267
+ },
1268
+ {
1269
+ language: "markdown",
1270
+ scopes: {
1271
+ component: [
1272
+ "support.class.component.vue"
1273
+ ]
1274
+ }
1275
+ },
1276
+ {
1277
+ language: "html",
1278
+ scopes: {
1279
+ component: [
1280
+ "support.class.component.vue"
1281
+ ]
1282
+ }
1212
1283
  }
1213
1284
  ];
1214
1285
  var semanticTokenModifiers = [
package/dist/java2.js CHANGED
@@ -88,6 +88,12 @@ var java = [
88
88
  "description": "Enable/disable the Maven offline mode.",
89
89
  "scope": 3
90
90
  },
91
+ "java.import.maven.disableTestClasspathFlag": {
92
+ "type": "boolean",
93
+ "default": false,
94
+ "description": "Enable/disable test classpath segregation. When enabled, this permits the usage of test resources within a Maven project as dependencies within the compile scope of other projects.",
95
+ "scope": 3
96
+ },
91
97
  "java.import.gradle.enabled": {
92
98
  "type": "boolean",
93
99
  "default": true,
@@ -142,6 +148,12 @@ var java = [
142
148
  "description": "Setting for GRADLE_USER_HOME.",
143
149
  "scope": 3
144
150
  },
151
+ "java.import.gradle.annotationProcessing.enabled": {
152
+ "type": "boolean",
153
+ "default": true,
154
+ "description": "Enable/disable the annotation processing on Gradle projects and delegate Annotation Processing to JDT APT. Only works for Gradle 5.2 or higher.",
155
+ "scope": 3
156
+ },
145
157
  "java.maven.downloadSources": {
146
158
  "type": "boolean",
147
159
  "default": false,
@@ -381,6 +393,22 @@ var java = [
381
393
  "markdownDescription": "Enable/disable postfix completion support. `#editor.snippetSuggestions#` can be used to customize how postfix snippets are sorted.",
382
394
  "scope": 3
383
395
  },
396
+ "java.completion.matchCase": {
397
+ "type": "string",
398
+ "enum": [
399
+ "auto",
400
+ "firstLetter",
401
+ "off"
402
+ ],
403
+ "enumDescriptions": [
404
+ "Only match case for the first letter when using Visual Studio Code - Insiders.",
405
+ "Match case for the first letter when doing completion.",
406
+ "Do not match case when doing completion."
407
+ ],
408
+ "default": "auto",
409
+ "markdownDescription": "Specify whether to match case for code completion.",
410
+ "scope": 3
411
+ },
384
412
  "java.foldingRange.enabled": {
385
413
  "type": "boolean",
386
414
  "default": true,
@@ -790,7 +818,7 @@ var java = [
790
818
  "org.eclipse.jdt.annotation.NonNull",
791
819
  "org.springframework.lang.NonNull"
792
820
  ],
793
- "markdownDescription": "Specify the Nonnull annotation types to be used for null analysis. If more than one annotation is specified, then the topmost annotation will be used first if it exists in your project dependencies.",
821
+ "markdownDescription": "Specify the Nonnull annotation types to be used for null analysis. If more than one annotation is specified, then the topmost annotation will be used first if it exists in project dependencies. This setting will be ignored if `java.compile.nullAnalysis.mode` is set to `disabled`",
794
822
  "scope": 3
795
823
  },
796
824
  "java.compile.nullAnalysis.nullable": {
@@ -800,7 +828,57 @@ var java = [
800
828
  "org.eclipse.jdt.annotation.Nullable",
801
829
  "org.springframework.lang.Nullable"
802
830
  ],
803
- "markdownDescription": "Specify the Nullable annotation types to be used for null analysis. If more than one annotation is specified, then the topmost annotation will be used first if it exists in your project dependencies.",
831
+ "markdownDescription": "Specify the Nullable annotation types to be used for null analysis. If more than one annotation is specified, then the topmost annotation will be used first if it exists in project dependencies. This setting will be ignored if `java.compile.nullAnalysis.mode` is set to `disabled`",
832
+ "scope": 3
833
+ },
834
+ "java.compile.nullAnalysis.mode": {
835
+ "type": "string",
836
+ "enum": [
837
+ "disabled",
838
+ "interactive",
839
+ "automatic"
840
+ ],
841
+ "default": "interactive",
842
+ "markdownDescription": "Specify how to enable the annotation-based null analysis.",
843
+ "scope": 3
844
+ },
845
+ "java.cleanup.actionsOnSave": {
846
+ "type": "array",
847
+ "markdownDescription": "The list of clean ups to be run on the current document when it's saved. Clean ups can automatically fix code style or programming mistakes. Click [HERE](command:_java.learnMoreAboutCleanUps) to learn more about what each clean up does.",
848
+ "items": {
849
+ "type": "string",
850
+ "enum": [
851
+ "qualifyMembers",
852
+ "qualifyStaticMembers",
853
+ "addOverride",
854
+ "addDeprecated",
855
+ "stringConcatToTextBlock",
856
+ "invertEquals",
857
+ "addFinalModifier",
858
+ "instanceofPatternMatch",
859
+ "lambdaExpression",
860
+ "switchExpression",
861
+ "tryWithResource"
862
+ ]
863
+ },
864
+ "default": [],
865
+ "scope": 3
866
+ },
867
+ "java.sharedIndexes.enabled": {
868
+ "type": "string",
869
+ "enum": [
870
+ "auto",
871
+ "on",
872
+ "off"
873
+ ],
874
+ "default": "auto",
875
+ "markdownDescription": "[Experimental] Specify whether to share indexes between different workspaces. When set to `auto`, shared indexes will be enabled in Visual Studio Code - Insiders.",
876
+ "scope": 3
877
+ },
878
+ "java.sharedIndexes.location": {
879
+ "type": "string",
880
+ "markdownDescription": "Specifies a common index location for all workspaces. See default values as follows:\n \nWindows: First use `\"$APPDATA\\\\.jdt\\\\index\"`, or `\"~\\\\.jdt\\\\index\"` if it does not exist\n \nmacOS: `\"~/Library/Caches/.jdt/index\"`\n \nLinux: First use `\"$XDG_CACHE_HOME/.jdt/index\"`, or `\"~/.cache/.jdt/index\"` if it does not exist",
881
+ "default": "",
804
882
  "scope": 3
805
883
  }
806
884
  }
@@ -105,7 +105,7 @@ var folding = {
105
105
  }
106
106
  };
107
107
  var wordPattern = {
108
- pattern: "(-?\\d*\\.\\d\\w*)|([^\\`\\~\\!\\%\\^\\&\\*\\(\\)\\-\\=\\+\\[\\{\\]\\}\\\\\\|\\;\\:\\'\\\"\\,\\.\\<\\>/\\?\\s]+)"
108
+ pattern: "(-?\\d*\\.\\d\\w*)|([^\\`\\~\\@\\!\\%\\^\\&\\*\\(\\)\\-\\=\\+\\[\\{\\]\\}\\\\\\|\\;\\:\\'\\\"\\,\\.\\<\\>/\\?\\s]+)"
109
109
  };
110
110
  var indentationRules = {
111
111
  decreaseIndentPattern: {
@@ -105,7 +105,7 @@ var folding = {
105
105
  }
106
106
  };
107
107
  var wordPattern = {
108
- pattern: "(-?\\d*\\.\\d\\w*)|([^\\`\\~\\!\\%\\^\\&\\*\\(\\)\\-\\=\\+\\[\\{\\]\\}\\\\\\|\\;\\:\\'\\\"\\,\\.\\<\\>/\\?\\s]+)"
108
+ pattern: "(-?\\d*\\.\\d\\w*)|([^\\`\\~\\@\\!\\%\\^\\&\\*\\(\\)\\-\\=\\+\\[\\{\\]\\}\\\\\\|\\;\\:\\'\\\"\\,\\.\\<\\>/\\?\\s]+)"
109
109
  };
110
110
  var indentationRules = {
111
111
  decreaseIndentPattern: {
@@ -3,7 +3,7 @@ var information_for_contributors = [
3
3
  "If you want to provide a fix or improvement, please create a pull request against the original repository.",
4
4
  "Once accepted there, we are happy to receive an update request."
5
5
  ];
6
- var version = "https://github.com/sumneko/lua.tmbundle/commit/bc74f9230c3f07c0ecc1bc1727ad98d9e70aff5b";
6
+ var version = "https://github.com/sumneko/lua.tmbundle/commit/57be7c5cf8fa173f5f39806822725e503932ab45";
7
7
  var name = "Lua";
8
8
  var scopeName = "source.lua";
9
9
  var patterns = [
@@ -186,13 +186,17 @@ var patterns = [
186
186
  name: "entity.name.class.lua"
187
187
  },
188
188
  {
189
- match: "(?<=[^.]\\.|:)\\b([a-zA-Z_][a-zA-Z0-9_]*)",
189
+ match: "(?<=[^.]\\.|:)\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b(?!\\s*=\\s*\\b(function)\\b)",
190
190
  name: "entity.other.attribute.lua"
191
191
  },
192
192
  {
193
- match: "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b",
193
+ match: "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b(?!\\s*=\\s*\\b(function)\\b)",
194
194
  name: "variable.other.lua"
195
195
  },
196
+ {
197
+ match: "\\b([a-zA-Z_][a-zA-Z0-9_]*)\\b(?=\\s*=\\s*\\b(function)\\b)",
198
+ name: "entity.name.function.lua"
199
+ },
196
200
  {
197
201
  match: "\\+|-|%|#|\\*|\\/|\\^|==?|~=|!=|<=?|>=?|(?<!\\.)\\.{2}(?!\\.)",
198
202
  name: "keyword.operator.lua"
@@ -433,6 +437,26 @@ var repository = {
433
437
  }
434
438
  ]
435
439
  },
440
+ {
441
+ begin: "(?<=---\\s*)@enum",
442
+ beginCaptures: {
443
+ "0": {
444
+ name: "storage.type.annotation.lua"
445
+ }
446
+ },
447
+ end: "(?=[\\n@#])",
448
+ patterns: [
449
+ {
450
+ begin: "\\b([a-zA-Z_\\*][a-zA-Z0-9_\\.\\*\\-]*)",
451
+ beginCaptures: {
452
+ "0": {
453
+ name: "variable.lua"
454
+ }
455
+ },
456
+ end: "(?=\\n)"
457
+ }
458
+ ]
459
+ },
436
460
  {
437
461
  begin: "(?<=---\\s*)@type",
438
462
  beginCaptures: {
@@ -463,10 +487,56 @@ var repository = {
463
487
  name: "variable.lua"
464
488
  }
465
489
  },
490
+ end: "(?=[\\n#])",
491
+ patterns: [
492
+ {
493
+ include: "#luadoc.type"
494
+ }
495
+ ]
496
+ }
497
+ ]
498
+ },
499
+ {
500
+ begin: "(?<=---\\s*)(@operator)\\s*(\\b[a-z]+)?",
501
+ beginCaptures: {
502
+ "1": {
503
+ name: "storage.type.annotation.lua"
504
+ },
505
+ "2": {
506
+ name: "support.function.library.lua"
507
+ }
508
+ },
509
+ end: "(?=[\\n@#])",
510
+ patterns: [
511
+ {
512
+ include: "#luadoc.type"
513
+ }
514
+ ]
515
+ },
516
+ {
517
+ begin: "(?<=---\\s*)@cast",
518
+ beginCaptures: {
519
+ "0": {
520
+ name: "storage.type.annotation.lua"
521
+ }
522
+ },
523
+ end: "(?=[\\n@#])",
524
+ patterns: [
525
+ {
526
+ begin: "\\b([a-zA-Z_\\*][a-zA-Z0-9_\\.\\*\\-]*)",
527
+ beginCaptures: {
528
+ "0": {
529
+ name: "variable.other.lua"
530
+ }
531
+ },
466
532
  end: "(?=\\n)",
467
533
  patterns: [
468
534
  {
469
535
  include: "#luadoc.type"
536
+ },
537
+ {
538
+ match: "([+-|])",
539
+ name: "keyword.operator.lua"
470
540
  }
471
541
  ]
472
542
  }
@@ -491,7 +561,7 @@ var repository = {
491
561
  name: "keyword.operator.lua"
492
562
  }
493
563
  },
494
- end: "(?=\\n)",
564
+ end: "(?=[\\n#])",
495
565
  patterns: [
496
566
  {
497
567
  include: "#luadoc.type"
@@ -537,7 +607,7 @@ var repository = {
537
607
  name: "keyword.operator.lua"
538
608
  }
539
609
  },
540
- end: "(?=\\n)",
610
+ end: "(?=[\\n#])",
541
611
  patterns: [
542
612
  {
543
613
  include: "#string"
@@ -633,6 +703,33 @@ var repository = {
633
703
  },
634
704
  end: "(?=[\\n@#])"
635
705
  },
706
+ {
707
+ begin: "(?<=---\\s*)@private",
708
+ beginCaptures: {
709
+ "0": {
710
+ name: "storage.type.annotation.lua"
711
+ }
712
+ },
713
+ end: "(?=[\\n@#])"
714
+ },
715
+ {
716
+ begin: "(?<=---\\s*)@protected",
717
+ beginCaptures: {
718
+ "0": {
719
+ name: "storage.type.annotation.lua"
720
+ }
721
+ },
722
+ end: "(?=[\\n@#])"
723
+ },
724
+ {
725
+ begin: "(?<=---\\s*)@package",
726
+ beginCaptures: {
727
+ "0": {
728
+ name: "storage.type.annotation.lua"
729
+ }
730
+ },
731
+ end: "(?=[\\n@#])"
732
+ },
636
733
  {
637
734
  begin: "(?<=---\\s*)@version",
638
735
  beginCaptures: {
@@ -747,7 +844,7 @@ var repository = {
747
844
  name: "keyword.control.lua"
748
845
  }
749
846
  },
750
- end: "(?=\\s)",
847
+ end: "(?=[\\s#])",
751
848
  patterns: [
752
849
  {
753
850
  match: "[\\(\\),:\\?][ \\t]*",
@@ -779,7 +876,7 @@ var repository = {
779
876
  },
780
877
  {
781
878
  begin: "(?=[a-zA-Z_\\.\\*\"'\\[])",
782
- end: "(?=[\\s\\)\\,\\?\\:\\}\\|])",
879
+ end: "(?=[\\s\\)\\,\\?\\:\\}\\|#])",
783
880
  patterns: [
784
881
  {
785
882
  match: "([a-zA-Z0-9_\\.\\*\\[\\]\\<\\>\\,\\-]+)(?<!,)[ \\t]*",