@codingame/monaco-vscode-textmate-service-override 14.0.5 → 15.0.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.
- package/index.js +1 -1
- package/package.json +10 -10
- package/vscode/src/vs/workbench/services/textMate/browser/backgroundTokenization/textMateWorkerTokenizerController.js +3 -6
- package/vscode/src/vs/workbench/services/textMate/browser/backgroundTokenization/threadedBackgroundTokenizerFactory.d.ts +1 -1
- package/vscode/src/vs/workbench/services/textMate/browser/backgroundTokenization/threadedBackgroundTokenizerFactory.js +1 -1
- package/vscode/src/vs/workbench/services/textMate/browser/backgroundTokenization/worker/textMateWorkerTokenizer.js +3 -8
- package/vscode/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.d.ts +2 -2
- package/vscode/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.js +22 -24
- package/vscode/src/vs/workbench/services/textMate/browser/tokenizationSupport/tokenizationSupportWithLineLimit.js +1 -5
- package/vscode/src/vs/workbench/services/themes/common/tokenClassificationExtensionPoint.js +25 -25
package/index.js
CHANGED
|
@@ -9,7 +9,7 @@ import { ILifecycleService } from '@codingame/monaco-vscode-api/vscode/vs/workbe
|
|
|
9
9
|
import getServiceOverride$1 from '@codingame/monaco-vscode-files-service-override';
|
|
10
10
|
import { registerServiceInitializeParticipant } from '@codingame/monaco-vscode-api/lifecycle';
|
|
11
11
|
import './vscode/src/vs/workbench/services/themes/common/tokenClassificationExtensionPoint.js';
|
|
12
|
-
import '@codingame/monaco-vscode-
|
|
12
|
+
import '@codingame/monaco-vscode-7ba0af96-90c2-5e11-ad7f-befdbbf246c8-common/vscode/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens';
|
|
13
13
|
|
|
14
14
|
registerServiceInitializeParticipant(async (accessor) => {
|
|
15
15
|
void accessor
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-textmate-service-override",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "15.0.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "VSCode public API plugged on the monaco editor - textmate service-override",
|
|
6
6
|
"keywords": [],
|
|
@@ -15,11 +15,11 @@
|
|
|
15
15
|
},
|
|
16
16
|
"type": "module",
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@codingame/monaco-vscode-33833ac7-3af3-5e9d-8fb9-11838d852c59-common": "
|
|
19
|
-
"@codingame/monaco-vscode-695440c8-a687-5594-b476-bbc7b36bafe9-common": "
|
|
20
|
-
"@codingame/monaco-vscode-
|
|
21
|
-
"@codingame/monaco-vscode-api": "
|
|
22
|
-
"@codingame/monaco-vscode-files-service-override": "
|
|
18
|
+
"@codingame/monaco-vscode-33833ac7-3af3-5e9d-8fb9-11838d852c59-common": "15.0.0",
|
|
19
|
+
"@codingame/monaco-vscode-695440c8-a687-5594-b476-bbc7b36bafe9-common": "15.0.0",
|
|
20
|
+
"@codingame/monaco-vscode-7ba0af96-90c2-5e11-ad7f-befdbbf246c8-common": "15.0.0",
|
|
21
|
+
"@codingame/monaco-vscode-api": "15.0.0",
|
|
22
|
+
"@codingame/monaco-vscode-files-service-override": "15.0.0",
|
|
23
23
|
"vscode-oniguruma": "1.7.0",
|
|
24
24
|
"vscode-textmate": "9.2.0"
|
|
25
25
|
},
|
|
@@ -31,15 +31,15 @@
|
|
|
31
31
|
"default": "./index.js"
|
|
32
32
|
},
|
|
33
33
|
"./vscode/*": {
|
|
34
|
-
"
|
|
35
|
-
"
|
|
34
|
+
"types": "./vscode/src/*.d.ts",
|
|
35
|
+
"default": "./vscode/src/*.js"
|
|
36
36
|
},
|
|
37
37
|
"./worker": {
|
|
38
38
|
"default": "./worker.js"
|
|
39
39
|
},
|
|
40
40
|
"./*": {
|
|
41
|
-
"
|
|
42
|
-
"
|
|
41
|
+
"types": "./*.d.ts",
|
|
42
|
+
"default": "./*.js"
|
|
43
43
|
}
|
|
44
44
|
},
|
|
45
45
|
"typesVersions": {
|
|
@@ -1,11 +1,6 @@
|
|
|
1
1
|
|
|
2
2
|
import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
|
|
3
|
-
import '@codingame/monaco-vscode-api/vscode/vs/base/common/
|
|
4
|
-
import '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
|
|
5
|
-
import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
|
|
6
|
-
import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
|
|
7
|
-
import '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
|
|
8
|
-
import { keepObserved } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
|
|
3
|
+
import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
|
|
9
4
|
import { countEOL } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/eolCounter';
|
|
10
5
|
import { LineRange } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/lineRange';
|
|
11
6
|
import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
|
|
@@ -13,6 +8,8 @@ import { TokenizationStateStore } from '@codingame/monaco-vscode-api/vscode/vs/e
|
|
|
13
8
|
import { ContiguousMultilineTokensBuilder } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/tokens/contiguousMultilineTokensBuilder';
|
|
14
9
|
import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
|
|
15
10
|
import { MonotonousIndexTransformer, ArrayEdit, SingleArrayEdit } from '../arrayOperation.js';
|
|
11
|
+
import { keepObserved } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
|
|
12
|
+
import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
|
|
16
13
|
|
|
17
14
|
class TextMateWorkerTokenizerController extends Disposable {
|
|
18
15
|
static { this._id = 0; }
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
|
|
2
2
|
import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
|
|
3
3
|
import { IBackgroundTokenizationStore, IBackgroundTokenizer } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages";
|
|
4
|
-
import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language";
|
|
4
|
+
import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
|
|
5
5
|
import { ITextModel } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/model";
|
|
6
6
|
import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
|
|
7
7
|
import { IExtensionResourceLoaderService } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensionResourceLoader/common/extensionResourceLoader.service";
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
|
|
3
3
|
import { DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
|
|
4
4
|
import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
|
|
5
|
-
import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language';
|
|
5
|
+
import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
|
|
6
6
|
import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
|
|
7
7
|
import { IExtensionResourceLoaderService } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionResourceLoader/common/extensionResourceLoader.service';
|
|
8
8
|
import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
|
|
@@ -1,13 +1,6 @@
|
|
|
1
1
|
|
|
2
2
|
import { RunOnceScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
|
|
3
|
-
import
|
|
4
|
-
import '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
|
|
5
|
-
import '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
|
|
6
|
-
import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
|
|
7
|
-
import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
|
|
8
|
-
import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
|
|
9
|
-
import '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
|
|
10
|
-
import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
|
|
3
|
+
import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
|
|
11
4
|
import { setTimeout0 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
|
|
12
5
|
import { LineRange } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/lineRange';
|
|
13
6
|
import { MirrorTextModel } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model/mirrorTextModel';
|
|
@@ -16,6 +9,8 @@ import { ContiguousMultilineTokensBuilder } from '@codingame/monaco-vscode-api/v
|
|
|
16
9
|
import { LineTokens } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/tokens/lineTokens';
|
|
17
10
|
import { TextMateTokenizationSupport } from '../../tokenizationSupport/textMateTokenizationSupport.js';
|
|
18
11
|
import { TokenizationSupportWithLineLimit } from '../../tokenizationSupport/tokenizationSupportWithLineLimit.js';
|
|
12
|
+
import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
|
|
13
|
+
import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
|
|
19
14
|
|
|
20
15
|
class TextMateWorkerTokenizer extends MirrorTextModel {
|
|
21
16
|
constructor(uri, lines, eol, versionId, _host, _languageId, _encodedLanguageId, maxTokenizationLineLength) {
|
package/vscode/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
|
|
2
|
-
import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language";
|
|
2
|
+
import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
|
|
3
3
|
import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
|
|
4
4
|
import { IExtensionResourceLoaderService } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensionResourceLoader/common/extensionResourceLoader.service";
|
|
5
5
|
import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
|
|
@@ -9,7 +9,7 @@ import { IProgressService } from "@codingame/monaco-vscode-api/vscode/vs/platfor
|
|
|
9
9
|
import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
|
|
10
10
|
import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
|
|
11
11
|
import { ITextMateTokenizationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/textMate/browser/textMateTokenizationFeature.service";
|
|
12
|
-
import { IWorkbenchThemeService } from "@codingame/monaco-vscode-
|
|
12
|
+
import { IWorkbenchThemeService } from "@codingame/monaco-vscode-7ba0af96-90c2-5e11-ad7f-befdbbf246c8-common/vscode/vs/workbench/services/themes/common/workbenchThemeService.service";
|
|
13
13
|
import type { IGrammar } from "vscode-textmate";
|
|
14
14
|
export declare class TextMateTokenizationFeature extends Disposable implements ITextMateTokenizationService {
|
|
15
15
|
private readonly _languageService;
|
package/vscode/src/vs/workbench/services/textMate/browser/textMateTokenizationFeatureImpl.js
CHANGED
|
@@ -6,17 +6,13 @@ import { Color } from '@codingame/monaco-vscode-api/vscode/vs/base/common/color'
|
|
|
6
6
|
import { onUnexpectedError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
|
|
7
7
|
import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
|
|
8
8
|
import { FileAccess, nodeModulesPath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
|
|
9
|
-
import '@codingame/monaco-vscode-api/vscode/vs/base/common/
|
|
10
|
-
import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
|
|
11
|
-
import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
|
|
12
|
-
import '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
|
|
13
|
-
import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
|
|
9
|
+
import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
|
|
14
10
|
import { isWeb } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
|
|
15
11
|
import { joinPath, isEqualOrParent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
|
|
16
12
|
import { isObject } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
|
|
17
13
|
import { StandardTokenType } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/encodedTokenAttributes';
|
|
18
14
|
import { LazyTokenizationSupport, TokenizationRegistry } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
|
|
19
|
-
import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language';
|
|
15
|
+
import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
|
|
20
16
|
import { generateTokensCSSForColorMap } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/supports/tokenization';
|
|
21
17
|
import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
|
|
22
18
|
import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
|
|
@@ -33,7 +29,8 @@ import { TokenizationSupportWithLineLimit } from './tokenizationSupport/tokeniza
|
|
|
33
29
|
import { ThreadedBackgroundTokenizerFactory } from './backgroundTokenization/threadedBackgroundTokenizerFactory.js';
|
|
34
30
|
import { TMGrammarFactory, missingTMGrammarErrorMessage } from '../common/TMGrammarFactory.js';
|
|
35
31
|
import { grammarsExtPoint } from '@codingame/monaco-vscode-33833ac7-3af3-5e9d-8fb9-11838d852c59-common/vscode/vs/workbench/services/textMate/common/TMGrammars';
|
|
36
|
-
import { IWorkbenchThemeService } from '@codingame/monaco-vscode-
|
|
32
|
+
import { IWorkbenchThemeService } from '@codingame/monaco-vscode-7ba0af96-90c2-5e11-ad7f-befdbbf246c8-common/vscode/vs/workbench/services/themes/common/workbenchThemeService.service';
|
|
33
|
+
import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
|
|
37
34
|
|
|
38
35
|
var TextMateTokenizationFeature_1;
|
|
39
36
|
let TextMateTokenizationFeature = class TextMateTokenizationFeature extends Disposable {
|
|
@@ -57,7 +54,7 @@ let TextMateTokenizationFeature = class TextMateTokenizationFeature extends Disp
|
|
|
57
54
|
this._debugModePrintFunc = () => { };
|
|
58
55
|
this._grammarDefinitions = null;
|
|
59
56
|
this._grammarFactory = null;
|
|
60
|
-
this._tokenizersRegistrations = ( new DisposableStore());
|
|
57
|
+
this._tokenizersRegistrations = this._register(( new DisposableStore()));
|
|
61
58
|
this._currentTheme = null;
|
|
62
59
|
this._currentTokenColorMap = null;
|
|
63
60
|
this._threadedBackgroundTokenizerFactory = this._instantiationService.createInstance(ThreadedBackgroundTokenizerFactory, (timeMs, languageId, sourceExtensionId, lineLength, isRandomSample) => this._reportTokenizationTime(timeMs, languageId, sourceExtensionId, lineLength, true, isRandomSample), () => this.getAsyncTokenizationEnabled());
|
|
@@ -167,7 +164,7 @@ let TextMateTokenizationFeature = class TextMateTokenizationFeature extends Disp
|
|
|
167
164
|
}
|
|
168
165
|
startDebugMode(printFn, onStop) {
|
|
169
166
|
if (this._debugMode) {
|
|
170
|
-
this._notificationService.error(( localize(
|
|
167
|
+
this._notificationService.error(( localize(12090, "Already Logging.")));
|
|
171
168
|
return;
|
|
172
169
|
}
|
|
173
170
|
this._debugModePrintFunc = printFn;
|
|
@@ -175,15 +172,15 @@ let TextMateTokenizationFeature = class TextMateTokenizationFeature extends Disp
|
|
|
175
172
|
if (this._debugMode) {
|
|
176
173
|
this._progressService.withProgress({
|
|
177
174
|
location: ProgressLocation.Notification,
|
|
178
|
-
buttons: [( localize(
|
|
175
|
+
buttons: [( localize(12091, "Stop"))]
|
|
179
176
|
}, (progress) => {
|
|
180
177
|
progress.report({
|
|
181
|
-
message: ( localize(
|
|
178
|
+
message: ( localize(12092, "Preparing to log TM Grammar parsing. Press Stop when finished."))
|
|
182
179
|
});
|
|
183
180
|
return this._getVSCodeOniguruma().then((vscodeOniguruma) => {
|
|
184
181
|
vscodeOniguruma.setDefaultDebugCall(true);
|
|
185
182
|
progress.report({
|
|
186
|
-
message: ( localize(
|
|
183
|
+
message: ( localize(12093, "Now logging TM Grammar parsing. Press Stop when finished."))
|
|
187
184
|
});
|
|
188
185
|
return ( new Promise((resolve, reject) => { }));
|
|
189
186
|
});
|
|
@@ -238,7 +235,8 @@ let TextMateTokenizationFeature = class TextMateTokenizationFeature extends Disp
|
|
|
238
235
|
return null;
|
|
239
236
|
}
|
|
240
237
|
const maxTokenizationLineLength = observableConfigValue('editor.maxTokenizationLineLength', languageId, -1, this._configurationService);
|
|
241
|
-
const
|
|
238
|
+
const store = ( new DisposableStore());
|
|
239
|
+
const tokenization = store.add(( new TextMateTokenizationSupport(
|
|
242
240
|
r.grammar,
|
|
243
241
|
r.initialState,
|
|
244
242
|
r.containsEmbeddedLanguages,
|
|
@@ -248,15 +246,15 @@ let TextMateTokenizationFeature = class TextMateTokenizationFeature extends Disp
|
|
|
248
246
|
this._reportTokenizationTime(timeMs, languageId, r.sourceExtensionId, lineLength, false, isRandomSample);
|
|
249
247
|
},
|
|
250
248
|
true
|
|
251
|
-
));
|
|
252
|
-
|
|
249
|
+
)));
|
|
250
|
+
store.add(tokenization.onDidEncounterLanguage((encodedLanguageId) => {
|
|
253
251
|
if (!this._encounteredLanguages[encodedLanguageId]) {
|
|
254
252
|
const languageId = this._languageService.languageIdCodec.decodeLanguageId(encodedLanguageId);
|
|
255
253
|
this._encounteredLanguages[encodedLanguageId] = true;
|
|
256
254
|
this._languageService.requestBasicLanguageFeatures(languageId);
|
|
257
255
|
}
|
|
258
|
-
});
|
|
259
|
-
return ( new TokenizationSupportWithLineLimit(encodedLanguageId, tokenization,
|
|
256
|
+
}));
|
|
257
|
+
return ( new TokenizationSupportWithLineLimit(encodedLanguageId, tokenization, store, maxTokenizationLineLength));
|
|
260
258
|
}
|
|
261
259
|
catch (err) {
|
|
262
260
|
if (err.message && err.message === missingTMGrammarErrorMessage) {
|
|
@@ -386,7 +384,7 @@ function equalsTokenRules(a, b) {
|
|
|
386
384
|
function validateGrammarExtensionPoint(extensionLocation, syntax, collector, _languageService) {
|
|
387
385
|
if (syntax.language && ((typeof syntax.language !== 'string') || !_languageService.isRegisteredLanguageId(syntax.language))) {
|
|
388
386
|
collector.error(( localize(
|
|
389
|
-
|
|
387
|
+
12094,
|
|
390
388
|
"Unknown language in `contributes.{0}.language`. Provided value: {1}",
|
|
391
389
|
grammarsExtPoint.name,
|
|
392
390
|
String(syntax.language)
|
|
@@ -395,7 +393,7 @@ function validateGrammarExtensionPoint(extensionLocation, syntax, collector, _la
|
|
|
395
393
|
}
|
|
396
394
|
if (!syntax.scopeName || (typeof syntax.scopeName !== 'string')) {
|
|
397
395
|
collector.error(( localize(
|
|
398
|
-
|
|
396
|
+
12095,
|
|
399
397
|
"Expected string in `contributes.{0}.scopeName`. Provided value: {1}",
|
|
400
398
|
grammarsExtPoint.name,
|
|
401
399
|
String(syntax.scopeName)
|
|
@@ -404,7 +402,7 @@ function validateGrammarExtensionPoint(extensionLocation, syntax, collector, _la
|
|
|
404
402
|
}
|
|
405
403
|
if (!syntax.path || (typeof syntax.path !== 'string')) {
|
|
406
404
|
collector.error(( localize(
|
|
407
|
-
|
|
405
|
+
12096,
|
|
408
406
|
"Expected string in `contributes.{0}.path`. Provided value: {1}",
|
|
409
407
|
grammarsExtPoint.name,
|
|
410
408
|
String(syntax.path)
|
|
@@ -413,7 +411,7 @@ function validateGrammarExtensionPoint(extensionLocation, syntax, collector, _la
|
|
|
413
411
|
}
|
|
414
412
|
if (syntax.injectTo && (!Array.isArray(syntax.injectTo) || ( syntax.injectTo.some(scope => typeof scope !== 'string')))) {
|
|
415
413
|
collector.error(( localize(
|
|
416
|
-
|
|
414
|
+
12097,
|
|
417
415
|
"Invalid value in `contributes.{0}.injectTo`. Must be an array of language scope names. Provided value: {1}",
|
|
418
416
|
grammarsExtPoint.name,
|
|
419
417
|
JSON.stringify(syntax.injectTo)
|
|
@@ -422,7 +420,7 @@ function validateGrammarExtensionPoint(extensionLocation, syntax, collector, _la
|
|
|
422
420
|
}
|
|
423
421
|
if (syntax.embeddedLanguages && !isObject(syntax.embeddedLanguages)) {
|
|
424
422
|
collector.error(( localize(
|
|
425
|
-
|
|
423
|
+
12098,
|
|
426
424
|
"Invalid value in `contributes.{0}.embeddedLanguages`. Must be an object map from scope name to language. Provided value: {1}",
|
|
427
425
|
grammarsExtPoint.name,
|
|
428
426
|
JSON.stringify(syntax.embeddedLanguages)
|
|
@@ -431,7 +429,7 @@ function validateGrammarExtensionPoint(extensionLocation, syntax, collector, _la
|
|
|
431
429
|
}
|
|
432
430
|
if (syntax.tokenTypes && !isObject(syntax.tokenTypes)) {
|
|
433
431
|
collector.error(( localize(
|
|
434
|
-
|
|
432
|
+
12099,
|
|
435
433
|
"Invalid value in `contributes.{0}.tokenTypes`. Must be an object map from scope name to token type. Provided value: {1}",
|
|
436
434
|
grammarsExtPoint.name,
|
|
437
435
|
JSON.stringify(syntax.tokenTypes)
|
|
@@ -441,7 +439,7 @@ function validateGrammarExtensionPoint(extensionLocation, syntax, collector, _la
|
|
|
441
439
|
const grammarLocation = joinPath(extensionLocation, syntax.path);
|
|
442
440
|
if (!isEqualOrParent(grammarLocation, extensionLocation)) {
|
|
443
441
|
collector.warn(( localize(
|
|
444
|
-
|
|
442
|
+
12100,
|
|
445
443
|
"Expected `contributes.{0}.path` ({1}) to be included inside extension's folder ({2}). This might make the extension non-portable.",
|
|
446
444
|
grammarsExtPoint.name,
|
|
447
445
|
grammarLocation.path,
|
|
@@ -1,11 +1,7 @@
|
|
|
1
1
|
|
|
2
2
|
import { nullTokenizeEncoded } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/nullTokenize';
|
|
3
3
|
import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
|
|
4
|
-
import '@codingame/monaco-vscode-api/vscode/vs/base/common/
|
|
5
|
-
import '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
|
|
6
|
-
import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
|
|
7
|
-
import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
|
|
8
|
-
import '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
|
|
4
|
+
import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
|
|
9
5
|
import { keepObserved } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
|
|
10
6
|
|
|
11
7
|
class TokenizationSupportWithLineLimit extends Disposable {
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
|
|
3
3
|
import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
|
|
4
4
|
import { ExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
|
|
5
|
-
import { getTokenClassificationRegistry, typeAndModifierIdPattern } from '@codingame/monaco-vscode-
|
|
5
|
+
import { getTokenClassificationRegistry, typeAndModifierIdPattern } from '@codingame/monaco-vscode-7ba0af96-90c2-5e11-ad7f-befdbbf246c8-common/vscode/vs/platform/theme/common/tokenClassificationRegistry';
|
|
6
6
|
import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
|
|
7
7
|
import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
|
|
8
8
|
|
|
@@ -10,26 +10,26 @@ const tokenClassificationRegistry = getTokenClassificationRegistry();
|
|
|
10
10
|
const tokenTypeExtPoint = ExtensionsRegistry.registerExtensionPoint({
|
|
11
11
|
extensionPoint: 'semanticTokenTypes',
|
|
12
12
|
jsonSchema: {
|
|
13
|
-
description: ( localize(
|
|
13
|
+
description: ( localize(12297, 'Contributes semantic token types.')),
|
|
14
14
|
type: 'array',
|
|
15
15
|
items: {
|
|
16
16
|
type: 'object',
|
|
17
17
|
properties: {
|
|
18
18
|
id: {
|
|
19
19
|
type: 'string',
|
|
20
|
-
description: ( localize(
|
|
20
|
+
description: ( localize(12298, 'The identifier of the semantic token type')),
|
|
21
21
|
pattern: typeAndModifierIdPattern,
|
|
22
|
-
patternErrorMessage: ( localize(
|
|
22
|
+
patternErrorMessage: ( localize(12299, 'Identifiers should be in the form letterOrDigit[_-letterOrDigit]*')),
|
|
23
23
|
},
|
|
24
24
|
superType: {
|
|
25
25
|
type: 'string',
|
|
26
|
-
description: ( localize(
|
|
26
|
+
description: ( localize(12300, 'The super type of the semantic token type')),
|
|
27
27
|
pattern: typeAndModifierIdPattern,
|
|
28
|
-
patternErrorMessage: ( localize(
|
|
28
|
+
patternErrorMessage: ( localize(12301, 'Super types should be in the form letterOrDigit[_-letterOrDigit]*')),
|
|
29
29
|
},
|
|
30
30
|
description: {
|
|
31
31
|
type: 'string',
|
|
32
|
-
description: ( localize(
|
|
32
|
+
description: ( localize(12302, 'The description of the semantic token type')),
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
35
|
}
|
|
@@ -38,20 +38,20 @@ const tokenTypeExtPoint = ExtensionsRegistry.registerExtensionPoint({
|
|
|
38
38
|
const tokenModifierExtPoint = ExtensionsRegistry.registerExtensionPoint({
|
|
39
39
|
extensionPoint: 'semanticTokenModifiers',
|
|
40
40
|
jsonSchema: {
|
|
41
|
-
description: ( localize(
|
|
41
|
+
description: ( localize(12303, 'Contributes semantic token modifiers.')),
|
|
42
42
|
type: 'array',
|
|
43
43
|
items: {
|
|
44
44
|
type: 'object',
|
|
45
45
|
properties: {
|
|
46
46
|
id: {
|
|
47
47
|
type: 'string',
|
|
48
|
-
description: ( localize(
|
|
48
|
+
description: ( localize(12304, 'The identifier of the semantic token modifier')),
|
|
49
49
|
pattern: typeAndModifierIdPattern,
|
|
50
|
-
patternErrorMessage: ( localize(
|
|
50
|
+
patternErrorMessage: ( localize(12305, 'Identifiers should be in the form letterOrDigit[_-letterOrDigit]*'))
|
|
51
51
|
},
|
|
52
52
|
description: {
|
|
53
53
|
type: 'string',
|
|
54
|
-
description: ( localize(
|
|
54
|
+
description: ( localize(12306, 'The description of the semantic token modifier'))
|
|
55
55
|
}
|
|
56
56
|
}
|
|
57
57
|
}
|
|
@@ -60,18 +60,18 @@ const tokenModifierExtPoint = ExtensionsRegistry.registerExtensionPoint({
|
|
|
60
60
|
const tokenStyleDefaultsExtPoint = ExtensionsRegistry.registerExtensionPoint({
|
|
61
61
|
extensionPoint: 'semanticTokenScopes',
|
|
62
62
|
jsonSchema: {
|
|
63
|
-
description: ( localize(
|
|
63
|
+
description: ( localize(12307, 'Contributes semantic token scope maps.')),
|
|
64
64
|
type: 'array',
|
|
65
65
|
items: {
|
|
66
66
|
type: 'object',
|
|
67
67
|
properties: {
|
|
68
68
|
language: {
|
|
69
|
-
description: ( localize(
|
|
69
|
+
description: ( localize(12308, 'Lists the languge for which the defaults are.')),
|
|
70
70
|
type: 'string'
|
|
71
71
|
},
|
|
72
72
|
scopes: {
|
|
73
73
|
description: ( localize(
|
|
74
|
-
|
|
74
|
+
12309,
|
|
75
75
|
'Maps a semantic token (described by semantic token selector) to one or more textMate scopes used to represent that token.'
|
|
76
76
|
)),
|
|
77
77
|
type: 'object',
|
|
@@ -91,7 +91,7 @@ class TokenClassificationExtensionPoints {
|
|
|
91
91
|
function validateTypeOrModifier(contribution, extensionPoint, collector) {
|
|
92
92
|
if (typeof contribution.id !== 'string' || contribution.id.length === 0) {
|
|
93
93
|
collector.error(( localize(
|
|
94
|
-
|
|
94
|
+
12310,
|
|
95
95
|
"'configuration.{0}.id' must be defined and can not be empty",
|
|
96
96
|
extensionPoint
|
|
97
97
|
)));
|
|
@@ -99,7 +99,7 @@ class TokenClassificationExtensionPoints {
|
|
|
99
99
|
}
|
|
100
100
|
if (!contribution.id.match(typeAndModifierIdPattern)) {
|
|
101
101
|
collector.error(( localize(
|
|
102
|
-
|
|
102
|
+
12311,
|
|
103
103
|
"'configuration.{0}.id' must follow the pattern letterOrDigit[-_letterOrDigit]*",
|
|
104
104
|
extensionPoint
|
|
105
105
|
)));
|
|
@@ -108,7 +108,7 @@ class TokenClassificationExtensionPoints {
|
|
|
108
108
|
const superType = contribution.superType;
|
|
109
109
|
if (superType && !superType.match(typeAndModifierIdPattern)) {
|
|
110
110
|
collector.error(( localize(
|
|
111
|
-
|
|
111
|
+
12312,
|
|
112
112
|
"'configuration.{0}.superType' must follow the pattern letterOrDigit[-_letterOrDigit]*",
|
|
113
113
|
extensionPoint
|
|
114
114
|
)));
|
|
@@ -116,7 +116,7 @@ class TokenClassificationExtensionPoints {
|
|
|
116
116
|
}
|
|
117
117
|
if (typeof contribution.description !== 'string' || contribution.id.length === 0) {
|
|
118
118
|
collector.error(( localize(
|
|
119
|
-
|
|
119
|
+
12313,
|
|
120
120
|
"'configuration.{0}.description' must be defined and can not be empty",
|
|
121
121
|
extensionPoint
|
|
122
122
|
)));
|
|
@@ -129,7 +129,7 @@ class TokenClassificationExtensionPoints {
|
|
|
129
129
|
const extensionValue = extension.value;
|
|
130
130
|
const collector = extension.collector;
|
|
131
131
|
if (!extensionValue || !Array.isArray(extensionValue)) {
|
|
132
|
-
collector.error(( localize(
|
|
132
|
+
collector.error(( localize(12314, "'configuration.semanticTokenType' must be an array")));
|
|
133
133
|
return;
|
|
134
134
|
}
|
|
135
135
|
for (const contribution of extensionValue) {
|
|
@@ -150,7 +150,7 @@ class TokenClassificationExtensionPoints {
|
|
|
150
150
|
const extensionValue = extension.value;
|
|
151
151
|
const collector = extension.collector;
|
|
152
152
|
if (!extensionValue || !Array.isArray(extensionValue)) {
|
|
153
|
-
collector.error(( localize(
|
|
153
|
+
collector.error(( localize(12315, "'configuration.semanticTokenModifier' must be an array")));
|
|
154
154
|
return;
|
|
155
155
|
}
|
|
156
156
|
for (const contribution of extensionValue) {
|
|
@@ -171,17 +171,17 @@ class TokenClassificationExtensionPoints {
|
|
|
171
171
|
const extensionValue = extension.value;
|
|
172
172
|
const collector = extension.collector;
|
|
173
173
|
if (!extensionValue || !Array.isArray(extensionValue)) {
|
|
174
|
-
collector.error(( localize(
|
|
174
|
+
collector.error(( localize(12316, "'configuration.semanticTokenScopes' must be an array")));
|
|
175
175
|
return;
|
|
176
176
|
}
|
|
177
177
|
for (const contribution of extensionValue) {
|
|
178
178
|
if (contribution.language && typeof contribution.language !== 'string') {
|
|
179
|
-
collector.error(( localize(
|
|
179
|
+
collector.error(( localize(12317, "'configuration.semanticTokenScopes.language' must be a string")));
|
|
180
180
|
continue;
|
|
181
181
|
}
|
|
182
182
|
if (!contribution.scopes || typeof contribution.scopes !== 'object') {
|
|
183
183
|
collector.error(( localize(
|
|
184
|
-
|
|
184
|
+
12318,
|
|
185
185
|
"'configuration.semanticTokenScopes.scopes' must be defined as an object"
|
|
186
186
|
)));
|
|
187
187
|
continue;
|
|
@@ -190,7 +190,7 @@ class TokenClassificationExtensionPoints {
|
|
|
190
190
|
const tmScopes = contribution.scopes[selectorString];
|
|
191
191
|
if (!Array.isArray(tmScopes) || ( tmScopes.some(l => typeof l !== 'string'))) {
|
|
192
192
|
collector.error(( localize(
|
|
193
|
-
|
|
193
|
+
12319,
|
|
194
194
|
"'configuration.semanticTokenScopes.scopes' values must be an array of strings"
|
|
195
195
|
)));
|
|
196
196
|
continue;
|
|
@@ -201,7 +201,7 @@ class TokenClassificationExtensionPoints {
|
|
|
201
201
|
}
|
|
202
202
|
catch (e) {
|
|
203
203
|
collector.error(( localize(
|
|
204
|
-
|
|
204
|
+
12320,
|
|
205
205
|
"configuration.semanticTokenScopes.scopes': Problems parsing selector {0}.",
|
|
206
206
|
selectorString
|
|
207
207
|
)));
|