From d209aa2b02f6cc99f3c985b23c99eb2346f9dbdb Mon Sep 17 00:00:00 2001 From: Alexandru Dima Date: Fri, 22 Oct 2021 17:46:37 +0200 Subject: [PATCH] Rename `modeId` -> `languageId` --- src/vs/base/browser/markdownRenderer.ts | 2 +- .../editor/browser/core/markdownRenderer.ts | 14 ++-- src/vs/editor/common/modes/nullMode.ts | 4 +- .../common/services/languagesRegistry.ts | 30 ++++----- src/vs/editor/common/services/modeService.ts | 8 +-- .../editor/common/services/modeServiceImpl.ts | 50 +++++++------- .../link/goToDefinitionAtPosition.ts | 4 +- .../standalone/common/monarch/monarchLexer.ts | 66 +++++++++---------- .../browser/mainThreadDocumentsAndEditors.ts | 2 +- .../workbench/api/common/extHost.protocol.ts | 4 +- .../api/common/extHostDocumentData.ts | 10 +-- .../workbench/api/common/extHostDocuments.ts | 4 +- .../api/common/extHostDocumentsAndEditors.ts | 2 +- .../api/common/extHostInteractive.ts | 4 +- .../api/common/extHostNotebookDocument.ts | 2 +- .../browser/parts/editor/editorStatus.ts | 22 +++---- .../browser/breakpointEditorContribution.ts | 4 +- .../debug/browser/debugAdapterManager.ts | 6 +- .../browser/extensionsWorkbenchService.ts | 4 +- .../browser/markdownDocumentRenderer.ts | 8 +-- .../cellStatusBar/statusBarProviders.ts | 4 +- .../contrib/codeRenderer/codeRenderer.ts | 4 +- .../notebook/browser/notebook.contribution.ts | 4 +- .../preferences/browser/preferencesActions.ts | 6 +- .../browser/themes.test.contribution.ts | 4 +- .../languageDetectionWorkerServiceImpl.ts | 4 +- .../common/languageDetectionWorkerService.ts | 4 +- .../textMate/common/textMateService.ts | 2 +- .../browser/api/extHostApiCommands.test.ts | 2 +- .../test/browser/api/extHostBulkEdits.test.ts | 2 +- .../extHostDocumentSaveParticipant.test.ts | 2 +- .../api/extHostDocumentsAndEditors.test.ts | 2 +- .../api/extHostLanguageFeatures.test.ts | 2 +- .../test/browser/api/extHostNotebook.test.ts | 2 +- 34 files changed, 147 insertions(+), 147 deletions(-) diff --git a/src/vs/base/browser/markdownRenderer.ts b/src/vs/base/browser/markdownRenderer.ts index 7e5e0c5849f..70995984352 100644 --- a/src/vs/base/browser/markdownRenderer.ts +++ b/src/vs/base/browser/markdownRenderer.ts @@ -30,7 +30,7 @@ export interface MarkedOptions extends marked.MarkedOptions { } export interface MarkdownRenderOptions extends FormattedTextRenderOptions { - codeBlockRenderer?: (modeId: string, value: string) => Promise; + codeBlockRenderer?: (languageId: string, value: string) => Promise; asyncRenderCallback?: () => void; baseUrl?: URI; } diff --git a/src/vs/editor/browser/core/markdownRenderer.ts b/src/vs/editor/browser/core/markdownRenderer.ts index a47953eaa59..e3331caec67 100644 --- a/src/vs/editor/browser/core/markdownRenderer.ts +++ b/src/vs/editor/browser/core/markdownRenderer.ts @@ -72,17 +72,17 @@ export class MarkdownRenderer { // In markdown, // it is possible that we stumble upon language aliases (e.g.js instead of javascript) // it is possible no alias is given in which case we fall back to the current editor lang - let modeId: string | undefined | null; + let languageId: string | undefined | null; if (languageAlias) { - modeId = this._modeService.getModeIdForLanguageName(languageAlias); + languageId = this._modeService.getModeIdForLanguageName(languageAlias); } else if (this._options.editor) { - modeId = this._options.editor.getModel()?.getLanguageId(); + languageId = this._options.editor.getModel()?.getLanguageId(); } - if (!modeId) { - modeId = 'plaintext'; + if (!languageId) { + languageId = 'plaintext'; } - this._modeService.triggerMode(modeId); - const tokenization = await TokenizationRegistry.getPromise(modeId) ?? undefined; + this._modeService.triggerMode(languageId); + const tokenization = await TokenizationRegistry.getPromise(languageId) ?? undefined; const element = document.createElement('span'); diff --git a/src/vs/editor/common/modes/nullMode.ts b/src/vs/editor/common/modes/nullMode.ts index 2a90817f62b..e82fae45fa3 100644 --- a/src/vs/editor/common/modes/nullMode.ts +++ b/src/vs/editor/common/modes/nullMode.ts @@ -21,8 +21,8 @@ export const NULL_STATE: IState = new NullStateImpl(); export const NULL_MODE_ID = 'vs.editor.nullMode'; -export function nullTokenize(modeId: string, buffer: string, state: IState, deltaOffset: number): TokenizationResult { - return new TokenizationResult([new Token(deltaOffset, '', modeId)], state); +export function nullTokenize(languageId: string, buffer: string, state: IState, deltaOffset: number): TokenizationResult { + return new TokenizationResult([new Token(deltaOffset, '', languageId)], state); } export function nullTokenize2(languageId: LanguageId, buffer: string, state: IState | null, deltaOffset: number): TokenizationResult2 { diff --git a/src/vs/editor/common/services/languagesRegistry.ts b/src/vs/editor/common/services/languagesRegistry.ts index 54c2d463194..93bb212a89d 100644 --- a/src/vs/editor/common/services/languagesRegistry.ts +++ b/src/vs/editor/common/services/languagesRegistry.ts @@ -274,11 +274,11 @@ export class LanguagesRegistry extends Disposable { return Object.keys(this._nameMap); } - public getLanguageName(modeId: string): string | null { - if (!hasOwnProperty.call(this._languages, modeId)) { + public getLanguageName(languageId: string): string | null { + if (!hasOwnProperty.call(this._languages, languageId)) { return null; } - return this._languages[modeId].name; + return this._languages[languageId].name; } public getModeIdForLanguageNameLowercase(languageNameLower: string): string | null { @@ -288,18 +288,18 @@ export class LanguagesRegistry extends Disposable { return this._lowercaseNameMap[languageNameLower]; } - public getConfigurationFiles(modeId: string): URI[] { - if (!hasOwnProperty.call(this._languages, modeId)) { + public getConfigurationFiles(languageId: string): URI[] { + if (!hasOwnProperty.call(this._languages, languageId)) { return []; } - return this._languages[modeId].configurationFiles || []; + return this._languages[languageId].configurationFiles || []; } - public getMimeForMode(modeId: string): string | null { - if (!hasOwnProperty.call(this._languages, modeId)) { + public getMimeForMode(languageId: string): string | null { + if (!hasOwnProperty.call(this._languages, languageId)) { return null; } - const language = this._languages[modeId]; + const language = this._languages[languageId]; return (language.mimetypes[0] || null); } @@ -318,22 +318,22 @@ export class LanguagesRegistry extends Disposable { } return mimeTypeOrId; }). - filter((modeId) => { - return hasOwnProperty.call(this._languages, modeId); + filter((languageId) => { + return hasOwnProperty.call(this._languages, languageId); }) ); } - public validateLanguageId(modeId: string | null): string | null { - if (!modeId || modeId === NULL_MODE_ID) { + public validateLanguageId(languageId: string | null): string | null { + if (!languageId || languageId === NULL_MODE_ID) { return NULL_MODE_ID; } - if (!hasOwnProperty.call(this._languages, modeId)) { + if (!hasOwnProperty.call(this._languages, languageId)) { return null; } - return modeId; + return languageId; } public getModeIdFromLanguageName(languageName: string): string | null { diff --git a/src/vs/editor/common/services/modeService.ts b/src/vs/editor/common/services/modeService.ts index d4ae53ebc2a..44049ddc320 100644 --- a/src/vs/editor/common/services/modeService.ts +++ b/src/vs/editor/common/services/modeService.ts @@ -40,13 +40,13 @@ export interface IModeService { getRegisteredLanguageNames(): string[]; getExtensions(alias: string): string[]; getFilenames(alias: string): string[]; - getMimeForMode(modeId: string): string | null; - getLanguageName(modeId: string): string | null; + getMimeForMode(languageId: string): string | null; + getLanguageName(languageId: string): string | null; getModeIdForLanguageName(alias: string): string | null; getModeIdByFilepathOrFirstLine(resource: URI, firstLine?: string): string | null; getModeId(commaSeparatedMimetypesOrCommaSeparatedIds: string): string | null; - validateLanguageId(modeId: string): string | null; - getConfigurationFiles(modeId: string): URI[]; + validateLanguageId(languageId: string): string | null; + getConfigurationFiles(languageId: string): URI[]; // --- instantiation create(commaSeparatedMimetypesOrCommaSeparatedIds: string | undefined): ILanguageSelection; diff --git a/src/vs/editor/common/services/modeServiceImpl.ts b/src/vs/editor/common/services/modeServiceImpl.ts index 61c0b745d6d..a044d8c942d 100644 --- a/src/vs/editor/common/services/modeServiceImpl.ts +++ b/src/vs/editor/common/services/modeServiceImpl.ts @@ -96,12 +96,12 @@ export class ModeServiceImpl extends Disposable implements IModeService { return this._registry.getFilenames(alias); } - public getMimeForMode(modeId: string): string | null { - return this._registry.getMimeForMode(modeId); + public getMimeForMode(languageId: string): string | null { + return this._registry.getMimeForMode(languageId); } - public getLanguageName(modeId: string): string | null { - return this._registry.getLanguageName(modeId); + public getLanguageName(languageId: string): string | null { + return this._registry.getLanguageName(languageId); } public getModeIdForLanguageName(alias: string): string | null { @@ -118,59 +118,59 @@ export class ModeServiceImpl extends Disposable implements IModeService { return firstOrDefault(modeIds, null); } - public validateLanguageId(modeId: string | null): string | null { - return this._registry.validateLanguageId(modeId); + public validateLanguageId(languageId: string | null): string | null { + return this._registry.validateLanguageId(languageId); } - public getConfigurationFiles(modeId: string): URI[] { - return this._registry.getConfigurationFiles(modeId); + public getConfigurationFiles(languageId: string): URI[] { + return this._registry.getConfigurationFiles(languageId); } // --- instantiation public create(commaSeparatedMimetypesOrCommaSeparatedIds: string | undefined): ILanguageSelection { return new LanguageSelection(this.onLanguagesMaybeChanged, () => { - const modeId = this.getModeId(commaSeparatedMimetypesOrCommaSeparatedIds); - return this._createModeAndGetLanguageIdentifier(modeId); + const languageId = this.getModeId(commaSeparatedMimetypesOrCommaSeparatedIds); + return this._createModeAndGetLanguageIdentifier(languageId); }); } public createByLanguageName(languageName: string): ILanguageSelection { return new LanguageSelection(this.onLanguagesMaybeChanged, () => { - const modeId = this._getModeIdByLanguageName(languageName); - return this._createModeAndGetLanguageIdentifier(modeId); + const languageId = this._getModeIdByLanguageName(languageName); + return this._createModeAndGetLanguageIdentifier(languageId); }); } public createByFilepathOrFirstLine(resource: URI | null, firstLine?: string): ILanguageSelection { return new LanguageSelection(this.onLanguagesMaybeChanged, () => { - const modeId = this.getModeIdByFilepathOrFirstLine(resource, firstLine); - return this._createModeAndGetLanguageIdentifier(modeId); + const languageId = this.getModeIdByFilepathOrFirstLine(resource, firstLine); + return this._createModeAndGetLanguageIdentifier(languageId); }); } - private _createModeAndGetLanguageIdentifier(modeId: string | null): string { + private _createModeAndGetLanguageIdentifier(languageId: string | null): string { // Fall back to plain text if no mode was found - const languageId = this.validateLanguageId(modeId || 'plaintext') || NULL_MODE_ID; - this._getOrCreateMode(languageId); - return languageId; + const validLanguageId = this.validateLanguageId(languageId || 'plaintext') || NULL_MODE_ID; + this._getOrCreateMode(validLanguageId); + return validLanguageId; } public triggerMode(commaSeparatedMimetypesOrCommaSeparatedIds: string): void { - const modeId = this.getModeId(commaSeparatedMimetypesOrCommaSeparatedIds); + const languageId = this.getModeId(commaSeparatedMimetypesOrCommaSeparatedIds); // Fall back to plain text if no mode was found - this._getOrCreateMode(modeId || 'plaintext'); + this._getOrCreateMode(languageId || 'plaintext'); } private _getModeIdByLanguageName(languageName: string): string | null { return this._registry.getModeIdFromLanguageName(languageName); } - private _getOrCreateMode(modeId: string): void { - if (!this._encounteredLanguages.has(modeId)) { - this._encounteredLanguages.add(modeId); - const languageId = this.validateLanguageId(modeId) || NULL_MODE_ID; - this._onDidEncounterLanguage.fire(languageId); + private _getOrCreateMode(languageId: string): void { + if (!this._encounteredLanguages.has(languageId)) { + this._encounteredLanguages.add(languageId); + const validLanguageId = this.validateLanguageId(languageId) || NULL_MODE_ID; + this._onDidEncounterLanguage.fire(validLanguageId); } } } diff --git a/src/vs/editor/contrib/gotoSymbol/link/goToDefinitionAtPosition.ts b/src/vs/editor/contrib/gotoSymbol/link/goToDefinitionAtPosition.ts index 1a040b6e873..e7da40052c5 100644 --- a/src/vs/editor/contrib/gotoSymbol/link/goToDefinitionAtPosition.ts +++ b/src/vs/editor/contrib/gotoSymbol/link/goToDefinitionAtPosition.ts @@ -203,10 +203,10 @@ export class GotoDefinitionAtPositionEditorContribution implements IEditorContri wordRange = new Range(position.lineNumber, word.startColumn, position.lineNumber, word.endColumn); } - const modeId = this.modeService.getModeIdByFilepathOrFirstLine(textEditorModel.uri); + const languageId = this.modeService.getModeIdByFilepathOrFirstLine(textEditorModel.uri); this.addDecoration( wordRange, - new MarkdownString().appendCodeblock(modeId ? modeId : '', previewValue) + new MarkdownString().appendCodeblock(languageId ? languageId : '', previewValue) ); ref.dispose(); }); diff --git a/src/vs/editor/standalone/common/monarch/monarchLexer.ts b/src/vs/editor/standalone/common/monarch/monarchLexer.ts index 5cc9c7344d2..24bf8c77817 100644 --- a/src/vs/editor/standalone/common/monarch/monarchLexer.ts +++ b/src/vs/editor/standalone/common/monarch/monarchLexer.ts @@ -125,17 +125,17 @@ class MonarchStackElement { } class EmbeddedModeData { - public readonly modeId: string; + public readonly languageId: string; public readonly state: modes.IState; - constructor(modeId: string, state: modes.IState) { - this.modeId = modeId; + constructor(languageId: string, state: modes.IState) { + this.languageId = languageId; this.state = state; } public equals(other: EmbeddedModeData): boolean { return ( - this.modeId === other.modeId + this.languageId === other.languageId && this.state.equals(other.state) ); } @@ -146,7 +146,7 @@ class EmbeddedModeData { if (stateClone === this.state) { return this; } - return new EmbeddedModeData(this.modeId, this.state); + return new EmbeddedModeData(this.languageId, this.state); } } @@ -229,7 +229,7 @@ class MonarchLineState implements modes.IState { } interface IMonarchTokensCollector { - enterMode(startOffset: number, modeId: string): void; + enterMode(startOffset: number, languageId: string): void; emit(startOffset: number, type: string): void; nestedModeTokenize(embeddedModeLine: string, hasEOL: boolean, embeddedModeData: EmbeddedModeData, offsetDelta: number): modes.IState; } @@ -237,32 +237,32 @@ interface IMonarchTokensCollector { class MonarchClassicTokensCollector implements IMonarchTokensCollector { private _tokens: Token[]; - private _language: string | null; + private _languageId: string | null; private _lastTokenType: string | null; private _lastTokenLanguage: string | null; constructor() { this._tokens = []; - this._language = null; + this._languageId = null; this._lastTokenType = null; this._lastTokenLanguage = null; } - public enterMode(startOffset: number, modeId: string): void { - this._language = modeId; + public enterMode(startOffset: number, languageId: string): void { + this._languageId = languageId; } public emit(startOffset: number, type: string): void { - if (this._lastTokenType === type && this._lastTokenLanguage === this._language) { + if (this._lastTokenType === type && this._lastTokenLanguage === this._languageId) { return; } this._lastTokenType = type; - this._lastTokenLanguage = this._language; - this._tokens.push(new Token(startOffset, type, this._language!)); + this._lastTokenLanguage = this._languageId; + this._tokens.push(new Token(startOffset, type, this._languageId!)); } public nestedModeTokenize(embeddedModeLine: string, hasEOL: boolean, embeddedModeData: EmbeddedModeData, offsetDelta: number): modes.IState { - const nestedModeId = embeddedModeData.modeId; + const nestedModeId = embeddedModeData.languageId; const embeddedModeState = embeddedModeData.state; const nestedModeTokenizationSupport = modes.TokenizationRegistry.get(nestedModeId); @@ -276,7 +276,7 @@ class MonarchClassicTokensCollector implements IMonarchTokensCollector { this._tokens = this._tokens.concat(nestedResult.tokens); this._lastTokenType = null; this._lastTokenLanguage = null; - this._language = null; + this._languageId = null; return nestedResult.endState; } @@ -303,8 +303,8 @@ class MonarchModernTokensCollector implements IMonarchTokensCollector { this._lastTokenMetadata = 0; } - public enterMode(startOffset: number, modeId: string): void { - this._currentLanguageId = this._modeService.languageIdCodec.encodeLanguageId(modeId); + public enterMode(startOffset: number, languageId: string): void { + this._currentLanguageId = this._modeService.languageIdCodec.encodeLanguageId(languageId); } public emit(startOffset: number, type: string): void { @@ -346,7 +346,7 @@ class MonarchModernTokensCollector implements IMonarchTokensCollector { } public nestedModeTokenize(embeddedModeLine: string, hasEOL: boolean, embeddedModeData: EmbeddedModeData, offsetDelta: number): modes.IState { - const nestedModeId = embeddedModeData.modeId; + const nestedModeId = embeddedModeData.languageId; const embeddedModeState = embeddedModeData.state; const nestedModeTokenizationSupport = modes.TokenizationRegistry.get(nestedModeId); @@ -378,16 +378,16 @@ export class MonarchTokenizer implements modes.ITokenizationSupport { private readonly _modeService: IModeService; private readonly _standaloneThemeService: IStandaloneThemeService; - private readonly _modeId: string; + private readonly _languageId: string; private readonly _lexer: monarchCommon.ILexer; - private readonly _embeddedModes: { [modeId: string]: boolean; }; + private readonly _embeddedModes: { [languageId: string]: boolean; }; public embeddedLoaded: Promise; private readonly _tokenizationRegistryListener: IDisposable; - constructor(modeService: IModeService, standaloneThemeService: IStandaloneThemeService, modeId: string, lexer: monarchCommon.ILexer) { + constructor(modeService: IModeService, standaloneThemeService: IStandaloneThemeService, languageId: string, lexer: monarchCommon.ILexer) { this._modeService = modeService; this._standaloneThemeService = standaloneThemeService; - this._modeId = modeId; + this._languageId = languageId; this._lexer = lexer; this._embeddedModes = Object.create(null); this.embeddedLoaded = Promise.resolve(undefined); @@ -408,7 +408,7 @@ export class MonarchTokenizer implements modes.ITokenizationSupport { } if (isOneOfMyEmbeddedModes) { emitting = true; - modes.TokenizationRegistry.fire([this._modeId]); + modes.TokenizationRegistry.fire([this._languageId]); emitting = false; } }); @@ -525,7 +525,7 @@ export class MonarchTokenizer implements modes.ITokenizationSupport { if (popOffset === -1) { // tokenization will not leave nested mode let nestedEndState = tokensCollector.nestedModeTokenize(line, hasEOL, lineState.embeddedModeData!, offsetDelta); - return MonarchLineStateFactory.create(lineState.stack, new EmbeddedModeData(lineState.embeddedModeData!.modeId, nestedEndState)); + return MonarchLineStateFactory.create(lineState.stack, new EmbeddedModeData(lineState.embeddedModeData!.languageId, nestedEndState)); } let nestedModeLine = line.substring(0, popOffset); @@ -546,7 +546,7 @@ export class MonarchTokenizer implements modes.ITokenizationSupport { } private _myTokenize(lineWithoutLF: string, hasEOL: boolean, lineState: MonarchLineState, offsetDelta: number, tokensCollector: IMonarchTokensCollector): MonarchLineState { - tokensCollector.enterMode(offsetDelta, this._modeId); + tokensCollector.enterMode(offsetDelta, this._languageId); const lineWithoutLFLength = lineWithoutLF.length; const line = (hasEOL && this._lexer.includeLF ? lineWithoutLF + '\n' : lineWithoutLF); @@ -863,20 +863,20 @@ export class MonarchTokenizer implements modes.ITokenizationSupport { return null; } - if (mimetypeOrModeId === this._modeId) { + if (mimetypeOrModeId === this._languageId) { // embedding myself... return mimetypeOrModeId; } - let modeId = this._modeService.getModeId(mimetypeOrModeId); + const languageId = this._modeService.getModeId(mimetypeOrModeId); - if (modeId) { + if (languageId) { // Fire mode loading event - this._modeService.triggerMode(modeId); - this._embeddedModes[modeId] = true; + this._modeService.triggerMode(languageId); + this._embeddedModes[languageId] = true; } - return modeId; + return languageId; } } @@ -902,6 +902,6 @@ function findBracket(lexer: monarchCommon.ILexer, matched: string) { return null; } -export function createTokenizationSupport(modeService: IModeService, standaloneThemeService: IStandaloneThemeService, modeId: string, lexer: monarchCommon.ILexer): modes.ITokenizationSupport { - return new MonarchTokenizer(modeService, standaloneThemeService, modeId, lexer); +export function createTokenizationSupport(modeService: IModeService, standaloneThemeService: IStandaloneThemeService, languageId: string, lexer: monarchCommon.ILexer): modes.ITokenizationSupport { + return new MonarchTokenizer(modeService, standaloneThemeService, languageId, lexer); } diff --git a/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.ts b/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.ts index 8ba4d2ecbae..ace4005ae3a 100644 --- a/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.ts +++ b/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.ts @@ -397,7 +397,7 @@ export class MainThreadDocumentsAndEditors { versionId: model.getVersionId(), lines: model.getLinesContent(), EOL: model.getEOL(), - modeId: model.getLanguageId(), + languageId: model.getLanguageId(), isDirty: this._textFileService.isDirty(model.uri) }; } diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts index 4d54fa93446..4d16d0c94f3 100644 --- a/src/vs/workbench/api/common/extHost.protocol.ts +++ b/src/vs/workbench/api/common/extHost.protocol.ts @@ -1213,7 +1213,7 @@ export interface IModelAddedData { versionId: number; lines: string[]; EOL: string; - modeId: string; + languageId: string; isDirty: boolean; } export interface ExtHostDocumentsShape { @@ -2082,7 +2082,7 @@ export interface ExtHostNotebookKernelsShape { } export interface ExtHostInteractiveShape { - $willAddInteractiveDocument(uri: UriComponents, eol: string, modeId: string, notebookUri: UriComponents): void; + $willAddInteractiveDocument(uri: UriComponents, eol: string, languageId: string, notebookUri: UriComponents): void; $willRemoveInteractiveDocument(uri: UriComponents, notebookUri: UriComponents): void; } diff --git a/src/vs/workbench/api/common/extHostDocumentData.ts b/src/vs/workbench/api/common/extHostDocumentData.ts index 78e12d7a47c..6ef516c23a8 100644 --- a/src/vs/workbench/api/common/extHostDocumentData.ts +++ b/src/vs/workbench/api/common/extHostDocumentData.ts @@ -15,16 +15,16 @@ import type * as vscode from 'vscode'; import { equals } from 'vs/base/common/arrays'; const _modeId2WordDefinition = new Map(); -export function setWordDefinitionFor(modeId: string, wordDefinition: RegExp | undefined): void { +export function setWordDefinitionFor(languageId: string, wordDefinition: RegExp | undefined): void { if (!wordDefinition) { - _modeId2WordDefinition.delete(modeId); + _modeId2WordDefinition.delete(languageId); } else { - _modeId2WordDefinition.set(modeId, wordDefinition); + _modeId2WordDefinition.set(languageId, wordDefinition); } } -export function getWordDefinitionFor(modeId: string): RegExp | undefined { - return _modeId2WordDefinition.get(modeId); +export function getWordDefinitionFor(languageId: string): RegExp | undefined { + return _modeId2WordDefinition.get(languageId); } export class ExtHostDocumentData extends MirrorTextModel { diff --git a/src/vs/workbench/api/common/extHostDocuments.ts b/src/vs/workbench/api/common/extHostDocuments.ts index 4f131028566..b146bb1475a 100644 --- a/src/vs/workbench/api/common/extHostDocuments.ts +++ b/src/vs/workbench/api/common/extHostDocuments.ts @@ -170,7 +170,7 @@ export class ExtHostDocuments implements ExtHostDocumentsShape { })); } - public setWordDefinitionFor(modeId: string, wordDefinition: RegExp | undefined): void { - setWordDefinitionFor(modeId, wordDefinition); + public setWordDefinitionFor(languageId: string, wordDefinition: RegExp | undefined): void { + setWordDefinitionFor(languageId, wordDefinition); } } diff --git a/src/vs/workbench/api/common/extHostDocumentsAndEditors.ts b/src/vs/workbench/api/common/extHostDocumentsAndEditors.ts index bc5c7b3d19e..66f2d74c847 100644 --- a/src/vs/workbench/api/common/extHostDocumentsAndEditors.ts +++ b/src/vs/workbench/api/common/extHostDocumentsAndEditors.ts @@ -103,7 +103,7 @@ export class ExtHostDocumentsAndEditors implements ExtHostDocumentsAndEditorsSha data.lines, data.EOL, data.versionId, - data.modeId, + data.languageId, data.isDirty, data.notebook )); diff --git a/src/vs/workbench/api/common/extHostInteractive.ts b/src/vs/workbench/api/common/extHostInteractive.ts index 6d885208286..4d6628ac39b 100644 --- a/src/vs/workbench/api/common/extHostInteractive.ts +++ b/src/vs/workbench/api/common/extHostInteractive.ts @@ -38,12 +38,12 @@ export class ExtHostInteractive implements ExtHostInteractiveShape { this._commands.registerApiCommand(openApiCommand); } - $willAddInteractiveDocument(uri: UriComponents, eol: string, modeId: string, notebookUri: UriComponents) { + $willAddInteractiveDocument(uri: UriComponents, eol: string, languageId: string, notebookUri: UriComponents) { this._textDocumentsAndEditors.acceptDocumentsAndEditorsDelta({ addedDocuments: [{ EOL: eol, lines: [''], - modeId: modeId, + languageId: languageId, uri: uri, isDirty: false, versionId: 1, diff --git a/src/vs/workbench/api/common/extHostNotebookDocument.ts b/src/vs/workbench/api/common/extHostNotebookDocument.ts index 355ed5f5bf5..312296e7acc 100644 --- a/src/vs/workbench/api/common/extHostNotebookDocument.ts +++ b/src/vs/workbench/api/common/extHostNotebookDocument.ts @@ -36,7 +36,7 @@ export class ExtHostCell { return { EOL: cell.eol, lines: cell.source, - modeId: cell.language, + languageId: cell.language, uri: cell.uri, isDirty: false, versionId: 1, diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts index 645ed872af0..f079c6ce595 100644 --- a/src/vs/workbench/browser/parts/editor/editorStatus.ts +++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts @@ -738,8 +738,8 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution { if (editorWidget && editorInput && toEditorWithModeSupport(editorInput)) { const textModel = editorWidget.getModel(); if (textModel) { - const modeId = textModel.getLanguageId(); - info.mode = withNullAsUndefined(this.modeService.getLanguageName(modeId)); + const languageId = textModel.getLanguageId(); + info.mode = withNullAsUndefined(this.modeService.getLanguageName(languageId)); } } @@ -1120,19 +1120,19 @@ export class ChangeModeAction extends Action { const languages = this.modeService.getRegisteredLanguageNames(); const picks: QuickPickInput[] = languages.sort() .map(lang => { - const modeId = this.modeService.getModeIdForLanguageName(lang.toLowerCase()) || 'unknown'; + const languageId = this.modeService.getModeIdForLanguageName(lang.toLowerCase()) || 'unknown'; const extensions = this.modeService.getExtensions(lang).join(' '); let description: string; if (currentLanguageId === lang) { - description = localize('languageDescription', "({0}) - Configured Language", modeId); + description = localize('languageDescription', "({0}) - Configured Language", languageId); } else { - description = localize('languageDescriptionConfigured', "({0})", modeId); + description = localize('languageDescriptionConfigured', "({0})", languageId); } return { label: lang, meta: extensions, - iconClasses: getIconClassesForModeId(modeId), + iconClasses: getIconClassesForModeId(languageId), description }; }); @@ -1201,13 +1201,13 @@ export class ChangeModeAction extends Action { const resource = EditorResourceAccessor.getOriginalUri(activeEditor, { supportSideBySide: SideBySideEditor.PRIMARY }); if (resource) { // Detect languages since we are in an untitled file - let modeId: string | undefined = withNullAsUndefined(this.modeService.getModeIdByFilepathOrFirstLine(resource, textModel.getLineContent(1))); - if (!modeId) { + let languageId: string | undefined = withNullAsUndefined(this.modeService.getModeIdByFilepathOrFirstLine(resource, textModel.getLineContent(1))); + if (!languageId) { detectedLanguage = await this.languageDetectionService.detectLanguage(resource); - modeId = detectedLanguage; + languageId = detectedLanguage; } - if (modeId) { - languageSelection = this.modeService.create(modeId); + if (languageId) { + languageSelection = this.modeService.create(languageId); } } } diff --git a/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts b/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts index 1ba72644749..04317e2bc55 100644 --- a/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts +++ b/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts @@ -79,8 +79,8 @@ function getBreakpointDecorationOptions(model: ITextModel, breakpoint: IBreakpoi if (message) { if (breakpoint.condition || breakpoint.hitCondition) { - const modeId = model.getLanguageId(); - glyphMarginHoverMessage = new MarkdownString().appendCodeblock(modeId, message); + const languageId = model.getLanguageId(); + glyphMarginHoverMessage = new MarkdownString().appendCodeblock(languageId, message); } else { glyphMarginHoverMessage = new MarkdownString().appendText(message); } diff --git a/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts b/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts index dea12ea7425..107d8bbcf4e 100644 --- a/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts +++ b/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts @@ -258,8 +258,8 @@ export class AdapterManager extends Disposable implements IAdapterManager { } canSetBreakpointsIn(model: ITextModel): boolean { - const modeId = model.getLanguageId(); - if (!modeId || modeId === 'jsonc' || modeId === 'log') { + const languageId = model.getLanguageId(); + if (!languageId || languageId === 'jsonc' || languageId === 'log') { // do not allow breakpoints in our settings files and output return false; } @@ -267,7 +267,7 @@ export class AdapterManager extends Disposable implements IAdapterManager { return true; } - return this.breakpointModeIdsSet.has(modeId); + return this.breakpointModeIdsSet.has(languageId); } isDebuggerEnabled(dbg: Debugger): boolean { diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts index fae717b661c..931fac55c65 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts @@ -730,8 +730,8 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension const keywords = lookup[ext] || []; // Get mode name - const modeId = this.modeService.getModeIdByFilepathOrFirstLine(URI.file(`.${ext}`)); - const languageName = modeId && this.modeService.getLanguageName(modeId); + const languageId = this.modeService.getModeIdByFilepathOrFirstLine(URI.file(`.${ext}`)); + const languageName = languageId && this.modeService.getLanguageName(languageId); const languageTag = languageName ? ` tag:"${languageName}"` : ''; // Construct a rich query diff --git a/src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.ts b/src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.ts index d5513d54f9a..3c038ad0d63 100644 --- a/src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.ts +++ b/src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.ts @@ -206,10 +206,10 @@ export async function renderMarkdownDocument( } extensionService.whenInstalledExtensionsRegistered().then(async () => { let support: ITokenizationSupport | undefined; - const modeId = modeService.getModeIdForLanguageName(lang); - if (modeId) { - modeService.triggerMode(modeId); - support = await TokenizationRegistry.getPromise(modeId) ?? undefined; + const languageId = modeService.getModeIdForLanguageName(lang); + if (languageId) { + modeService.triggerMode(languageId); + support = await TokenizationRegistry.getPromise(languageId) ?? undefined; } callback(null, `${tokenizeToString(code, modeService.languageIdCodec, support)}`); }); diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/statusBarProviders.ts b/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/statusBarProviders.ts index c18498f3c6d..a59607ea955 100644 --- a/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/statusBarProviders.ts +++ b/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/statusBarProviders.ts @@ -33,10 +33,10 @@ class CellStatusBarLanguagePickerProvider implements INotebookCellStatusBarItemP return; } - const modeId = cell.cellKind === CellKind.Markup ? + const languageId = cell.cellKind === CellKind.Markup ? 'markdown' : (this._modeService.getModeIdForLanguageName(cell.language) || cell.language); - const text = this._modeService.getLanguageName(modeId) || this._modeService.getLanguageName('plaintext'); + const text = this._modeService.getLanguageName(languageId) || this._modeService.getLanguageName('plaintext'); const item = { text, command: CHANGE_CELL_LANGUAGE, diff --git a/src/vs/workbench/contrib/notebook/browser/contrib/codeRenderer/codeRenderer.ts b/src/vs/workbench/contrib/notebook/browser/contrib/codeRenderer/codeRenderer.ts index 275c718790f..1fa546d1e02 100644 --- a/src/vs/workbench/contrib/notebook/browser/contrib/codeRenderer/codeRenderer.ts +++ b/src/vs/workbench/contrib/notebook/browser/contrib/codeRenderer/codeRenderer.ts @@ -36,7 +36,7 @@ abstract class CodeRendererContrib extends Disposable implements IOutputTransfor abstract render(output: ICellOutputViewModel, item: IOutputItemDto, container: HTMLElement): IRenderOutput; - protected _render(output: ICellOutputViewModel, container: HTMLElement, value: string, modeId: string): IRenderOutput { + protected _render(output: ICellOutputViewModel, container: HTMLElement, value: string, languageId: string): IRenderOutput { const disposable = new DisposableStore(); const editor = this.instantiationService.createInstance(CodeEditorWidget, container, getOutputSimpleEditorOptions(), { isSimpleWidget: true, contributions: this.notebookEditor.creationOptions.cellEditorContributions }); @@ -60,7 +60,7 @@ abstract class CodeRendererContrib extends Disposable implements IOutputTransfor container.style.height = `${editorHeight + 8}px`; })); - const mode = this.modeService.create(modeId); + const mode = this.modeService.create(languageId); const textModel = this.modelService.createModel(value, mode, undefined, false); editor.setModel(textModel); diff --git a/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts b/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts index 3767452b411..f85268a5cea 100644 --- a/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts +++ b/src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts @@ -273,8 +273,8 @@ class CellContentProvider implements ITextModelContentProvider { return cell.textBuffer.getLineContent(1).substr(0, limit); } }; - const modeId = this._modeService.getModeIdForLanguageName(cell.language); - const languageSelection = modeId ? this._modeService.create(modeId) : (cell.cellKind === CellKind.Markup ? this._modeService.create('markdown') : this._modeService.createByFilepathOrFirstLine(resource, cell.textBuffer.getLineContent(1))); + const languageId = this._modeService.getModeIdForLanguageName(cell.language); + const languageSelection = languageId ? this._modeService.create(languageId) : (cell.cellKind === CellKind.Markup ? this._modeService.create('markdown') : this._modeService.createByFilepathOrFirstLine(resource, cell.textBuffer.getLineContent(1))); result = this._modelService.createModel( bufferFactory, languageSelection, diff --git a/src/vs/workbench/contrib/preferences/browser/preferencesActions.ts b/src/vs/workbench/contrib/preferences/browser/preferencesActions.ts index 292785a95c3..699d4847c9c 100644 --- a/src/vs/workbench/contrib/preferences/browser/preferencesActions.ts +++ b/src/vs/workbench/contrib/preferences/browser/preferencesActions.ts @@ -53,9 +53,9 @@ export class ConfigureLanguageBasedSettingsAction extends Action { await this.quickInputService.pick(picks, { placeHolder: nls.localize('pickLanguage', "Select Language") }) .then(pick => { if (pick) { - const modeId = this.modeService.getModeIdForLanguageName(pick.label.toLowerCase()); - if (typeof modeId === 'string') { - return this.preferencesService.openUserSettings({ jsonEditor: true, revealSetting: { key: `[${modeId}]`, edit: true } }); + const languageId = this.modeService.getModeIdForLanguageName(pick.label.toLowerCase()); + if (typeof languageId === 'string') { + return this.preferencesService.openUserSettings({ jsonEditor: true, revealSetting: { key: `[${languageId}]`, edit: true } }); } } return undefined; diff --git a/src/vs/workbench/contrib/themes/browser/themes.test.contribution.ts b/src/vs/workbench/contrib/themes/browser/themes.test.contribution.ts index d97e3c08705..fda191dc5b0 100644 --- a/src/vs/workbench/contrib/themes/browser/themes.test.contribution.ts +++ b/src/vs/workbench/contrib/themes/browser/themes.test.contribution.ts @@ -216,8 +216,8 @@ class Snapper { } public captureSyntaxTokens(fileName: string, content: string): Promise { - const modeId = this.modeService.getModeIdByFilepathOrFirstLine(URI.file(fileName)); - return this.textMateService.createGrammar(modeId!).then((grammar) => { + const languageId = this.modeService.getModeIdByFilepathOrFirstLine(URI.file(fileName)); + return this.textMateService.createGrammar(languageId!).then((grammar) => { if (!grammar) { return []; } diff --git a/src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.ts b/src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.ts index 1d094d8e929..0e1ccd7a277 100644 --- a/src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.ts +++ b/src/vs/workbench/services/languageDetection/browser/languageDetectionWorkerServiceImpl.ts @@ -51,8 +51,8 @@ export class LanguageDetectionService extends Disposable implements ILanguageDet : FileAccess.asBrowserUri(`${moduleLocation}/model/group1-shard1of1.bin`, require).toString(true)); } - public isEnabledForMode(modeId: string): boolean { - return !!modeId && this._configurationService.getValue(LanguageDetectionService.enablementSettingKey, { overrideIdentifier: modeId }); + public isEnabledForMode(languageId: string): boolean { + return !!languageId && this._configurationService.getValue(LanguageDetectionService.enablementSettingKey, { overrideIdentifier: languageId }); } private getModeId(language: string | undefined): string | undefined { diff --git a/src/vs/workbench/services/languageDetection/common/languageDetectionWorkerService.ts b/src/vs/workbench/services/languageDetection/common/languageDetectionWorkerService.ts index d1c9f5ece44..87803bfc726 100644 --- a/src/vs/workbench/services/languageDetection/common/languageDetectionWorkerService.ts +++ b/src/vs/workbench/services/languageDetection/common/languageDetectionWorkerService.ts @@ -12,10 +12,10 @@ export interface ILanguageDetectionService { readonly _serviceBrand: undefined; /** - * @param modeId The modeId to check if language detection is currently enabled. + * @param languageId The languageId to check if language detection is currently enabled. * @returns whether or not language detection is on for this language mode. */ - isEnabledForMode(modeId: string): boolean; + isEnabledForMode(languageId: string): boolean; /** * @param resource The resource to detect the language for. diff --git a/src/vs/workbench/services/textMate/common/textMateService.ts b/src/vs/workbench/services/textMate/common/textMateService.ts index 52980668c11..278efa9a571 100644 --- a/src/vs/workbench/services/textMate/common/textMateService.ts +++ b/src/vs/workbench/services/textMate/common/textMateService.ts @@ -13,7 +13,7 @@ export interface ITextMateService { onDidEncounterLanguage: Event; - createGrammar(modeId: string): Promise; + createGrammar(languageId: string): Promise; startDebugMode(printFn: (str: string) => void, onStop: () => void): void; } diff --git a/src/vs/workbench/test/browser/api/extHostApiCommands.test.ts b/src/vs/workbench/test/browser/api/extHostApiCommands.test.ts index fc8f97a3405..141d2420fa2 100644 --- a/src/vs/workbench/test/browser/api/extHostApiCommands.test.ts +++ b/src/vs/workbench/test/browser/api/extHostApiCommands.test.ts @@ -131,7 +131,7 @@ suite('ExtHostLanguageFeatureCommands', function () { addedDocuments: [{ isDirty: false, versionId: model.getVersionId(), - modeId: model.getLanguageId(), + languageId: model.getLanguageId(), uri: model.uri, lines: model.getValue().split(model.getEOL()), EOL: model.getEOL(), diff --git a/src/vs/workbench/test/browser/api/extHostBulkEdits.test.ts b/src/vs/workbench/test/browser/api/extHostBulkEdits.test.ts index a77e9d63c8d..23a895c6037 100644 --- a/src/vs/workbench/test/browser/api/extHostBulkEdits.test.ts +++ b/src/vs/workbench/test/browser/api/extHostBulkEdits.test.ts @@ -33,7 +33,7 @@ suite('ExtHostBulkEdits.applyWorkspaceEdit', () => { documentsAndEditors.$acceptDocumentsAndEditorsDelta({ addedDocuments: [{ isDirty: false, - modeId: 'foo', + languageId: 'foo', uri: resource, versionId: 1337, lines: ['foo'], diff --git a/src/vs/workbench/test/browser/api/extHostDocumentSaveParticipant.test.ts b/src/vs/workbench/test/browser/api/extHostDocumentSaveParticipant.test.ts index 03989a14fcd..68708e71ad1 100644 --- a/src/vs/workbench/test/browser/api/extHostDocumentSaveParticipant.test.ts +++ b/src/vs/workbench/test/browser/api/extHostDocumentSaveParticipant.test.ts @@ -41,7 +41,7 @@ suite('ExtHostDocumentSaveParticipant', () => { documentsAndEditors.$acceptDocumentsAndEditorsDelta({ addedDocuments: [{ isDirty: false, - modeId: 'foo', + languageId: 'foo', uri: resource, versionId: 1, lines: ['foo'], diff --git a/src/vs/workbench/test/browser/api/extHostDocumentsAndEditors.test.ts b/src/vs/workbench/test/browser/api/extHostDocumentsAndEditors.test.ts index 6456bae1d43..95248a34a40 100644 --- a/src/vs/workbench/test/browser/api/extHostDocumentsAndEditors.test.ts +++ b/src/vs/workbench/test/browser/api/extHostDocumentsAndEditors.test.ts @@ -23,7 +23,7 @@ suite('ExtHostDocumentsAndEditors', () => { addedDocuments: [{ EOL: '\n', isDirty: true, - modeId: 'fooLang', + languageId: 'fooLang', uri: URI.parse('foo:bar'), versionId: 1, lines: [ diff --git a/src/vs/workbench/test/browser/api/extHostLanguageFeatures.test.ts b/src/vs/workbench/test/browser/api/extHostLanguageFeatures.test.ts index 3949710bd5c..0871f46573c 100644 --- a/src/vs/workbench/test/browser/api/extHostLanguageFeatures.test.ts +++ b/src/vs/workbench/test/browser/api/extHostLanguageFeatures.test.ts @@ -92,7 +92,7 @@ suite('ExtHostLanguageFeatures', function () { addedDocuments: [{ isDirty: false, versionId: model.getVersionId(), - modeId: model.getLanguageId(), + languageId: model.getLanguageId(), uri: model.uri, lines: model.getValue().split(model.getEOL()), EOL: model.getEOL(), diff --git a/src/vs/workbench/test/browser/api/extHostNotebook.test.ts b/src/vs/workbench/test/browser/api/extHostNotebook.test.ts index e2cd5aa061a..f7bc550ce7a 100644 --- a/src/vs/workbench/test/browser/api/extHostNotebook.test.ts +++ b/src/vs/workbench/test/browser/api/extHostNotebook.test.ts @@ -211,7 +211,7 @@ suite('NotebookCell#Document', function () { EOL: '\n', isDirty: doc.isDirty, lines: doc.getText().split('\n'), - modeId: doc.languageId, + languageId: doc.languageId, uri: doc.uri, versionId: doc.version });