@codingame/monaco-vscode-textmate-service-override 7.0.11 → 7.1.1

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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@codingame/monaco-vscode-textmate-service-override",
3
- "version": "7.0.11",
3
+ "version": "7.1.1",
4
4
  "keywords": [],
5
5
  "author": {
6
6
  "name": "CodinGame",
@@ -29,9 +29,9 @@
29
29
  }
30
30
  },
31
31
  "dependencies": {
32
- "vscode": "npm:@codingame/monaco-vscode-api@7.0.11",
32
+ "vscode": "npm:@codingame/monaco-vscode-api@7.1.1",
33
33
  "vscode-oniguruma": "1.7.0",
34
34
  "vscode-textmate": "9.0.0",
35
- "@codingame/monaco-vscode-files-service-override": "7.0.11"
35
+ "@codingame/monaco-vscode-files-service-override": "7.1.1"
36
36
  }
37
37
  }
@@ -1,6 +1,6 @@
1
1
  import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
2
2
  import './inspectEditorTokens.css.js';
3
- import { localizeWithPath } from 'vscode/vscode/vs/nls';
3
+ import { localize } from 'vscode/vscode/vs/nls';
4
4
  import { $ as $$1, clearNode, reset, append, isHTMLElement } from 'vscode/vscode/vs/base/browser/dom';
5
5
  import { CharCode } from 'vscode/vscode/vs/base/common/charCode';
6
6
  import { Color } from 'vscode/vscode/vs/base/common/color';
@@ -23,7 +23,6 @@ import { Schemas } from 'vscode/vscode/vs/base/common/network';
23
23
  import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
24
24
 
25
25
  var InspectEditorTokensController_1;
26
- const _moduleId = "vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens";
27
26
  const $ = $$1;
28
27
  let InspectEditorTokensController = class InspectEditorTokensController extends Disposable {
29
28
  static { InspectEditorTokensController_1 = this; }
@@ -96,7 +95,7 @@ class InspectEditorTokens extends EditorAction {
96
95
  constructor() {
97
96
  super({
98
97
  id: 'editor.action.inspectTMScopes',
99
- label: ( localizeWithPath(_moduleId, 0, "Developer: Inspect Editor Tokens and Scopes")),
98
+ label: ( localize(2805, "Developer: Inspect Editor Tokens and Scopes")),
100
99
  alias: 'Developer: Inspect Editor Tokens and Scopes',
101
100
  precondition: undefined
102
101
  });
@@ -162,7 +161,7 @@ class InspectEditorTokensWidget extends Disposable {
162
161
  const grammar = this._textMateService.createTokenizer(this._model.getLanguageId());
163
162
  const semanticTokens = this._computeSemanticTokens(position);
164
163
  clearNode(this._domNode);
165
- this._domNode.appendChild(document.createTextNode(( localizeWithPath(_moduleId, 1, "Loading..."))));
164
+ this._domNode.appendChild(document.createTextNode(( localize(2806, "Loading..."))));
166
165
  Promise.all([grammar, semanticTokens]).then(([grammar, semanticTokens]) => {
167
166
  if (this._isDisposed) {
168
167
  return;
@@ -16,7 +16,7 @@ import { StandardTokenType } from 'vscode/vscode/vs/editor/common/encodedTokenAt
16
16
  import { LazyTokenizationSupport, TokenizationRegistry } from 'vscode/vscode/vs/editor/common/languages';
17
17
  import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
18
18
  import { generateTokensCSSForColorMap } from 'vscode/vscode/vs/editor/common/languages/supports/tokenization';
19
- import { localizeWithPath } from 'vscode/vscode/vs/nls';
19
+ import { localize } from 'vscode/vscode/vs/nls';
20
20
  import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
21
21
  import { IExtensionResourceLoaderService } from 'vscode/vscode/vs/platform/extensionResourceLoader/common/extensionResourceLoader.service';
22
22
  import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
@@ -36,7 +36,6 @@ import * as vscodeTextmate from 'vscode-textmate';
36
36
  import * as vscodeOniguruma from 'vscode-oniguruma';
37
37
 
38
38
  var TextMateTokenizationFeature_1;
39
- const _moduleId = "vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl";
40
39
  let TextMateTokenizationFeature = class TextMateTokenizationFeature extends Disposable {
41
40
  static { TextMateTokenizationFeature_1 = this; }
42
41
  static { this.reportTokenizationTimeCounter = { sync: 0, async: 0 }; }
@@ -168,7 +167,7 @@ let TextMateTokenizationFeature = class TextMateTokenizationFeature extends Disp
168
167
  }
169
168
  startDebugMode(printFn, onStop) {
170
169
  if (this._debugMode) {
171
- this._notificationService.error(( localizeWithPath(_moduleId, 0, "Already Logging.")));
170
+ this._notificationService.error(( localize(2770, "Already Logging.")));
172
171
  return;
173
172
  }
174
173
  this._debugModePrintFunc = printFn;
@@ -176,19 +175,15 @@ let TextMateTokenizationFeature = class TextMateTokenizationFeature extends Disp
176
175
  if (this._debugMode) {
177
176
  this._progressService.withProgress({
178
177
  location: ProgressLocation.Notification,
179
- buttons: [( localizeWithPath(_moduleId, 1, "Stop"))]
178
+ buttons: [( localize(2771, "Stop"))]
180
179
  }, (progress) => {
181
180
  progress.report({
182
- message: ( localizeWithPath(
183
- _moduleId,
184
- 2,
185
- "Preparing to log TM Grammar parsing. Press Stop when finished."
186
- ))
181
+ message: ( localize(2772, "Preparing to log TM Grammar parsing. Press Stop when finished."))
187
182
  });
188
183
  return this._getVSCodeOniguruma().then((vscodeOniguruma) => {
189
184
  vscodeOniguruma.setDefaultDebugCall(true);
190
185
  progress.report({
191
- message: ( localizeWithPath(_moduleId, 3, "Now logging TM Grammar parsing. Press Stop when finished."))
186
+ message: ( localize(2773, "Now logging TM Grammar parsing. Press Stop when finished."))
192
187
  });
193
188
  return (
194
189
  (new Promise((resolve, reject) => { }))
@@ -396,9 +391,8 @@ function equalsTokenRules(a, b) {
396
391
  }
397
392
  function validateGrammarExtensionPoint(extensionLocation, syntax, collector, _languageService) {
398
393
  if (syntax.language && ((typeof syntax.language !== 'string') || !_languageService.isRegisteredLanguageId(syntax.language))) {
399
- collector.error(( localizeWithPath(
400
- _moduleId,
401
- 4,
394
+ collector.error(( localize(
395
+ 2774,
402
396
  "Unknown language in `contributes.{0}.language`. Provided value: {1}",
403
397
  grammarsExtPoint.name,
404
398
  String(syntax.language)
@@ -406,9 +400,8 @@ function validateGrammarExtensionPoint(extensionLocation, syntax, collector, _la
406
400
  return false;
407
401
  }
408
402
  if (!syntax.scopeName || (typeof syntax.scopeName !== 'string')) {
409
- collector.error(( localizeWithPath(
410
- _moduleId,
411
- 5,
403
+ collector.error(( localize(
404
+ 2775,
412
405
  "Expected string in `contributes.{0}.scopeName`. Provided value: {1}",
413
406
  grammarsExtPoint.name,
414
407
  String(syntax.scopeName)
@@ -416,9 +409,8 @@ function validateGrammarExtensionPoint(extensionLocation, syntax, collector, _la
416
409
  return false;
417
410
  }
418
411
  if (!syntax.path || (typeof syntax.path !== 'string')) {
419
- collector.error(( localizeWithPath(
420
- _moduleId,
421
- 6,
412
+ collector.error(( localize(
413
+ 2776,
422
414
  "Expected string in `contributes.{0}.path`. Provided value: {1}",
423
415
  grammarsExtPoint.name,
424
416
  String(syntax.path)
@@ -426,9 +418,8 @@ function validateGrammarExtensionPoint(extensionLocation, syntax, collector, _la
426
418
  return false;
427
419
  }
428
420
  if (syntax.injectTo && (!Array.isArray(syntax.injectTo) || ( (syntax.injectTo.some(scope => typeof scope !== 'string'))))) {
429
- collector.error(( localizeWithPath(
430
- _moduleId,
431
- 7,
421
+ collector.error(( localize(
422
+ 2777,
432
423
  "Invalid value in `contributes.{0}.injectTo`. Must be an array of language scope names. Provided value: {1}",
433
424
  grammarsExtPoint.name,
434
425
  JSON.stringify(syntax.injectTo)
@@ -436,9 +427,8 @@ function validateGrammarExtensionPoint(extensionLocation, syntax, collector, _la
436
427
  return false;
437
428
  }
438
429
  if (syntax.embeddedLanguages && !isObject(syntax.embeddedLanguages)) {
439
- collector.error(( localizeWithPath(
440
- _moduleId,
441
- 8,
430
+ collector.error(( localize(
431
+ 2778,
442
432
  "Invalid value in `contributes.{0}.embeddedLanguages`. Must be an object map from scope name to language. Provided value: {1}",
443
433
  grammarsExtPoint.name,
444
434
  JSON.stringify(syntax.embeddedLanguages)
@@ -446,9 +436,8 @@ function validateGrammarExtensionPoint(extensionLocation, syntax, collector, _la
446
436
  return false;
447
437
  }
448
438
  if (syntax.tokenTypes && !isObject(syntax.tokenTypes)) {
449
- collector.error(( localizeWithPath(
450
- _moduleId,
451
- 9,
439
+ collector.error(( localize(
440
+ 2779,
452
441
  "Invalid value in `contributes.{0}.tokenTypes`. Must be an object map from scope name to token type. Provided value: {1}",
453
442
  grammarsExtPoint.name,
454
443
  JSON.stringify(syntax.tokenTypes)
@@ -457,9 +446,8 @@ function validateGrammarExtensionPoint(extensionLocation, syntax, collector, _la
457
446
  }
458
447
  const grammarLocation = joinPath(extensionLocation, syntax.path);
459
448
  if (!isEqualOrParent(grammarLocation, extensionLocation)) {
460
- collector.warn(( localizeWithPath(
461
- _moduleId,
462
- 10,
449
+ collector.warn(( localize(
450
+ 2780,
463
451
  "Expected `contributes.{0}.path` ({1}) to be included inside extension's folder ({2}). This might make the extension non-portable.",
464
452
  grammarsExtPoint.name,
465
453
  grammarLocation.path,
@@ -1,43 +1,34 @@
1
1
  import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
2
- import { localizeWithPath } from 'vscode/vscode/vs/nls';
2
+ import { localize } from 'vscode/vscode/vs/nls';
3
3
  import { ExtensionsRegistry } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
4
4
  import { getTokenClassificationRegistry, typeAndModifierIdPattern } from 'vscode/vscode/vs/platform/theme/common/tokenClassificationRegistry';
5
5
  import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
6
6
  import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
7
7
 
8
- const _moduleId = "vs/workbench/services/themes/common/tokenClassificationExtensionPoint";
9
8
  const tokenClassificationRegistry = getTokenClassificationRegistry();
10
9
  const tokenTypeExtPoint = ExtensionsRegistry.registerExtensionPoint({
11
10
  extensionPoint: 'semanticTokenTypes',
12
11
  jsonSchema: {
13
- description: ( localizeWithPath(_moduleId, 0, 'Contributes semantic token types.')),
12
+ description: ( localize(2781, 'Contributes semantic token types.')),
14
13
  type: 'array',
15
14
  items: {
16
15
  type: 'object',
17
16
  properties: {
18
17
  id: {
19
18
  type: 'string',
20
- description: ( localizeWithPath(_moduleId, 1, 'The identifier of the semantic token type')),
19
+ description: ( localize(2782, 'The identifier of the semantic token type')),
21
20
  pattern: typeAndModifierIdPattern,
22
- patternErrorMessage: ( localizeWithPath(
23
- _moduleId,
24
- 2,
25
- 'Identifiers should be in the form letterOrDigit[_-letterOrDigit]*'
26
- )),
21
+ patternErrorMessage: ( localize(2783, 'Identifiers should be in the form letterOrDigit[_-letterOrDigit]*')),
27
22
  },
28
23
  superType: {
29
24
  type: 'string',
30
- description: ( localizeWithPath(_moduleId, 3, 'The super type of the semantic token type')),
25
+ description: ( localize(2784, 'The super type of the semantic token type')),
31
26
  pattern: typeAndModifierIdPattern,
32
- patternErrorMessage: ( localizeWithPath(
33
- _moduleId,
34
- 4,
35
- 'Super types should be in the form letterOrDigit[_-letterOrDigit]*'
36
- )),
27
+ patternErrorMessage: ( localize(2785, 'Super types should be in the form letterOrDigit[_-letterOrDigit]*')),
37
28
  },
38
29
  description: {
39
30
  type: 'string',
40
- description: ( localizeWithPath(_moduleId, 5, 'The description of the semantic token type')),
31
+ description: ( localize(2786, 'The description of the semantic token type')),
41
32
  }
42
33
  }
43
34
  }
@@ -46,24 +37,20 @@ const tokenTypeExtPoint = ExtensionsRegistry.registerExtensionPoint({
46
37
  const tokenModifierExtPoint = ExtensionsRegistry.registerExtensionPoint({
47
38
  extensionPoint: 'semanticTokenModifiers',
48
39
  jsonSchema: {
49
- description: ( localizeWithPath(_moduleId, 6, 'Contributes semantic token modifiers.')),
40
+ description: ( localize(2787, 'Contributes semantic token modifiers.')),
50
41
  type: 'array',
51
42
  items: {
52
43
  type: 'object',
53
44
  properties: {
54
45
  id: {
55
46
  type: 'string',
56
- description: ( localizeWithPath(_moduleId, 7, 'The identifier of the semantic token modifier')),
47
+ description: ( localize(2788, 'The identifier of the semantic token modifier')),
57
48
  pattern: typeAndModifierIdPattern,
58
- patternErrorMessage: ( localizeWithPath(
59
- _moduleId,
60
- 8,
61
- 'Identifiers should be in the form letterOrDigit[_-letterOrDigit]*'
62
- ))
49
+ patternErrorMessage: ( localize(2789, 'Identifiers should be in the form letterOrDigit[_-letterOrDigit]*'))
63
50
  },
64
51
  description: {
65
52
  type: 'string',
66
- description: ( localizeWithPath(_moduleId, 9, 'The description of the semantic token modifier'))
53
+ description: ( localize(2790, 'The description of the semantic token modifier'))
67
54
  }
68
55
  }
69
56
  }
@@ -72,19 +59,18 @@ const tokenModifierExtPoint = ExtensionsRegistry.registerExtensionPoint({
72
59
  const tokenStyleDefaultsExtPoint = ExtensionsRegistry.registerExtensionPoint({
73
60
  extensionPoint: 'semanticTokenScopes',
74
61
  jsonSchema: {
75
- description: ( localizeWithPath(_moduleId, 10, 'Contributes semantic token scope maps.')),
62
+ description: ( localize(2791, 'Contributes semantic token scope maps.')),
76
63
  type: 'array',
77
64
  items: {
78
65
  type: 'object',
79
66
  properties: {
80
67
  language: {
81
- description: ( localizeWithPath(_moduleId, 11, 'Lists the languge for which the defaults are.')),
68
+ description: ( localize(2792, 'Lists the languge for which the defaults are.')),
82
69
  type: 'string'
83
70
  },
84
71
  scopes: {
85
- description: ( localizeWithPath(
86
- _moduleId,
87
- 12,
72
+ description: ( localize(
73
+ 2793,
88
74
  'Maps a semantic token (described by semantic token selector) to one or more textMate scopes used to represent that token.'
89
75
  )),
90
76
  type: 'object',
@@ -103,18 +89,16 @@ class TokenClassificationExtensionPoints {
103
89
  constructor() {
104
90
  function validateTypeOrModifier(contribution, extensionPoint, collector) {
105
91
  if (typeof contribution.id !== 'string' || contribution.id.length === 0) {
106
- collector.error(( localizeWithPath(
107
- _moduleId,
108
- 13,
92
+ collector.error(( localize(
93
+ 2794,
109
94
  "'configuration.{0}.id' must be defined and can not be empty",
110
95
  extensionPoint
111
96
  )));
112
97
  return false;
113
98
  }
114
99
  if (!contribution.id.match(typeAndModifierIdPattern)) {
115
- collector.error(( localizeWithPath(
116
- _moduleId,
117
- 14,
100
+ collector.error(( localize(
101
+ 2795,
118
102
  "'configuration.{0}.id' must follow the pattern letterOrDigit[-_letterOrDigit]*",
119
103
  extensionPoint
120
104
  )));
@@ -122,18 +106,16 @@ class TokenClassificationExtensionPoints {
122
106
  }
123
107
  const superType = contribution.superType;
124
108
  if (superType && !superType.match(typeAndModifierIdPattern)) {
125
- collector.error(( localizeWithPath(
126
- _moduleId,
127
- 15,
109
+ collector.error(( localize(
110
+ 2796,
128
111
  "'configuration.{0}.superType' must follow the pattern letterOrDigit[-_letterOrDigit]*",
129
112
  extensionPoint
130
113
  )));
131
114
  return false;
132
115
  }
133
116
  if (typeof contribution.description !== 'string' || contribution.id.length === 0) {
134
- collector.error(( localizeWithPath(
135
- _moduleId,
136
- 16,
117
+ collector.error(( localize(
118
+ 2797,
137
119
  "'configuration.{0}.description' must be defined and can not be empty",
138
120
  extensionPoint
139
121
  )));
@@ -146,7 +128,7 @@ class TokenClassificationExtensionPoints {
146
128
  const extensionValue = extension.value;
147
129
  const collector = extension.collector;
148
130
  if (!extensionValue || !Array.isArray(extensionValue)) {
149
- collector.error(( localizeWithPath(_moduleId, 17, "'configuration.semanticTokenType' must be an array")));
131
+ collector.error(( localize(2798, "'configuration.semanticTokenType' must be an array")));
150
132
  return;
151
133
  }
152
134
  for (const contribution of extensionValue) {
@@ -167,7 +149,7 @@ class TokenClassificationExtensionPoints {
167
149
  const extensionValue = extension.value;
168
150
  const collector = extension.collector;
169
151
  if (!extensionValue || !Array.isArray(extensionValue)) {
170
- collector.error(( localizeWithPath(_moduleId, 18, "'configuration.semanticTokenModifier' must be an array")));
152
+ collector.error(( localize(2799, "'configuration.semanticTokenModifier' must be an array")));
171
153
  return;
172
154
  }
173
155
  for (const contribution of extensionValue) {
@@ -188,22 +170,17 @@ class TokenClassificationExtensionPoints {
188
170
  const extensionValue = extension.value;
189
171
  const collector = extension.collector;
190
172
  if (!extensionValue || !Array.isArray(extensionValue)) {
191
- collector.error(( localizeWithPath(_moduleId, 19, "'configuration.semanticTokenScopes' must be an array")));
173
+ collector.error(( localize(2800, "'configuration.semanticTokenScopes' must be an array")));
192
174
  return;
193
175
  }
194
176
  for (const contribution of extensionValue) {
195
177
  if (contribution.language && typeof contribution.language !== 'string') {
196
- collector.error(( localizeWithPath(
197
- _moduleId,
198
- 20,
199
- "'configuration.semanticTokenScopes.language' must be a string"
200
- )));
178
+ collector.error(( localize(2801, "'configuration.semanticTokenScopes.language' must be a string")));
201
179
  continue;
202
180
  }
203
181
  if (!contribution.scopes || typeof contribution.scopes !== 'object') {
204
- collector.error(( localizeWithPath(
205
- _moduleId,
206
- 21,
182
+ collector.error(( localize(
183
+ 2802,
207
184
  "'configuration.semanticTokenScopes.scopes' must be defined as an object"
208
185
  )));
209
186
  continue;
@@ -211,9 +188,8 @@ class TokenClassificationExtensionPoints {
211
188
  for (const selectorString in contribution.scopes) {
212
189
  const tmScopes = contribution.scopes[selectorString];
213
190
  if (!Array.isArray(tmScopes) || ( (tmScopes.some(l => typeof l !== 'string')))) {
214
- collector.error(( localizeWithPath(
215
- _moduleId,
216
- 22,
191
+ collector.error(( localize(
192
+ 2803,
217
193
  "'configuration.semanticTokenScopes.scopes' values must be an array of strings"
218
194
  )));
219
195
  continue;
@@ -223,9 +199,8 @@ class TokenClassificationExtensionPoints {
223
199
  tokenClassificationRegistry.registerTokenStyleDefault(selector, { scopesToProbe: ( (tmScopes.map(s => s.split(' ')))) });
224
200
  }
225
201
  catch (e) {
226
- collector.error(( localizeWithPath(
227
- _moduleId,
228
- 23,
202
+ collector.error(( localize(
203
+ 2804,
229
204
  "configuration.semanticTokenScopes.scopes': Problems parsing selector {0}.",
230
205
  selectorString
231
206
  )));