Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 19:44:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove ILanguageService.validateLanguageId

Browse Source
This commit is contained in:
Alex Dima
2021-12-28 13:37:22 +01:00
parent 4b8ccc0dbe
commit b487b2ccc3
11 changed files with 32 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/vs/workbench/services/textMate/browser/abstractTextMateService.ts
View File

@@ -103,9 +103,8 @@ export abstract class AbstractTextMateService extends Disposable implements ITex
// never hurts to be too careful
continue;
}
const validLanguageId = this._languageService.validateLanguageId(language);
if (validLanguageId) {
embeddedLanguages[scope] = this._languageService.languageIdCodec.encodeLanguageId(validLanguageId);
if (this._languageService.isRegisteredLanguageId(language)) {
embeddedLanguages[scope] = this._languageService.languageIdCodec.encodeLanguageId(language);
}
}
}
@@ -130,8 +129,8 @@ export abstract class AbstractTextMateService extends Disposable implements ITex
}
let validLanguageId: string | null = null;
if (grammar.language) {
validLanguageId = this._languageService.validateLanguageId(grammar.language);
if (grammar.language && this._languageService.isRegisteredLanguageId(grammar.language)) {
validLanguageId = grammar.language;
}
this._grammarDefinitions.push({
@@ -258,7 +257,7 @@ export abstract class AbstractTextMateService extends Disposable implements ITex
private _createFactory(languageId: string): ITokenizationSupportFactory {
return {
createTokenizationSupport: async (): Promise<ITokenizationSupport | null> => {
if (!this._languageService.validateLanguageId(languageId)) {
if (!this._languageService.isRegisteredLanguageId(languageId)) {
return null;
}
if (!this._canCreateGrammarFactory()) {
@@ -375,7 +374,7 @@ export abstract class AbstractTextMateService extends Disposable implements ITex
}
public async createGrammar(languageId: string): Promise<IGrammar | null> {
if (!this._languageService.validateLanguageId(languageId)) {
if (!this._languageService.isRegisteredLanguageId(languageId)) {
return null;
}
const grammarFactory = await this._getOrCreateGrammarFactory();