Skip to content

Commit d209aa2

Browse files
alexdimaalexdima
committed
Rename modeId -> languageId 
1 parent 621f3bc commit d209aa2

34 files changed

+147
-147
lines changed

‎src/vs/base/browser/markdownRenderer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export interface MarkedOptions extends marked.MarkedOptions {
3030
}
3131

3232
export interface MarkdownRenderOptions extends FormattedTextRenderOptions {
33-
codeBlockRenderer?: (modeId: string, value: string) => Promise<HTMLElement>;
33+
codeBlockRenderer?: (languageId: string, value: string) => Promise<HTMLElement>;
3434
asyncRenderCallback?: () => void;
3535
baseUrl?: URI;
3636
}

‎src/vs/editor/browser/core/markdownRenderer.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,17 @@ export class MarkdownRenderer {
7272
// In markdown,
7373
// it is possible that we stumble upon language aliases (e.g.js instead of javascript)
7474
// it is possible no alias is given in which case we fall back to the current editor lang
75-
let modeId: string | undefined | null;
75+
let languageId: string | undefined | null;
7676
if (languageAlias) {
77-
modeId = this._modeService.getModeIdForLanguageName(languageAlias);
77+
languageId = this._modeService.getModeIdForLanguageName(languageAlias);
7878
} else if (this._options.editor) {
79-
modeId = this._options.editor.getModel()?.getLanguageId();
79+
languageId = this._options.editor.getModel()?.getLanguageId();
8080
}
81-
if (!modeId) {
82-
modeId = 'plaintext';
81+
if (!languageId) {
82+
languageId = 'plaintext';
8383
}
84-
this._modeService.triggerMode(modeId);
85-
const tokenization = await TokenizationRegistry.getPromise(modeId) ?? undefined;
84+
this._modeService.triggerMode(languageId);
85+
const tokenization = await TokenizationRegistry.getPromise(languageId) ?? undefined;
8686

8787
const element = document.createElement('span');
8888

‎src/vs/editor/common/modes/nullMode.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ export const NULL_STATE: IState = new NullStateImpl();
2121

2222
export const NULL_MODE_ID = 'vs.editor.nullMode';
2323

24-
export function nullTokenize(modeId: string, buffer: string, state: IState, deltaOffset: number): TokenizationResult {
25-
return new TokenizationResult([new Token(deltaOffset, '', modeId)], state);
24+
export function nullTokenize(languageId: string, buffer: string, state: IState, deltaOffset: number): TokenizationResult {
25+
return new TokenizationResult([new Token(deltaOffset, '', languageId)], state);
2626
}
2727

2828
export function nullTokenize2(languageId: LanguageId, buffer: string, state: IState | null, deltaOffset: number): TokenizationResult2 {

‎src/vs/editor/common/services/languagesRegistry.ts

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -274,11 +274,11 @@ export class LanguagesRegistry extends Disposable {
274274
return Object.keys(this._nameMap);
275275
}
276276

277-
public getLanguageName(modeId: string): string | null {
278-
if (!hasOwnProperty.call(this._languages, modeId)) {
277+
public getLanguageName(languageId: string): string | null {
278+
if (!hasOwnProperty.call(this._languages, languageId)) {
279279
return null;
280280
}
281-
return this._languages[modeId].name;
281+
return this._languages[languageId].name;
282282
}
283283

284284
public getModeIdForLanguageNameLowercase(languageNameLower: string): string | null {
@@ -288,18 +288,18 @@ export class LanguagesRegistry extends Disposable {
288288
return this._lowercaseNameMap[languageNameLower];
289289
}
290290

291-
public getConfigurationFiles(modeId: string): URI[] {
292-
if (!hasOwnProperty.call(this._languages, modeId)) {
291+
public getConfigurationFiles(languageId: string): URI[] {
292+
if (!hasOwnProperty.call(this._languages, languageId)) {
293293
return [];
294294
}
295-
return this._languages[modeId].configurationFiles || [];
295+
return this._languages[languageId].configurationFiles || [];
296296
}
297297

298-
public getMimeForMode(modeId: string): string | null {
299-
if (!hasOwnProperty.call(this._languages, modeId)) {
298+
public getMimeForMode(languageId: string): string | null {
299+
if (!hasOwnProperty.call(this._languages, languageId)) {
300300
return null;
301301
}
302-
const language = this._languages[modeId];
302+
const language = this._languages[languageId];
303303
return (language.mimetypes[0] || null);
304304
}
305305

@@ -318,22 +318,22 @@ export class LanguagesRegistry extends Disposable {
318318
}
319319
return mimeTypeOrId;
320320
}).
321-
filter((modeId) => {
322-
return hasOwnProperty.call(this._languages, modeId);
321+
filter((languageId) => {
322+
return hasOwnProperty.call(this._languages, languageId);
323323
})
324324
);
325325
}
326326

327-
public validateLanguageId(modeId: string | null): string | null {
328-
if (!modeId || modeId === NULL_MODE_ID) {
327+
public validateLanguageId(languageId: string | null): string | null {
328+
if (!languageId || languageId === NULL_MODE_ID) {
329329
return NULL_MODE_ID;
330330
}
331331

332-
if (!hasOwnProperty.call(this._languages, modeId)) {
332+
if (!hasOwnProperty.call(this._languages, languageId)) {
333333
return null;
334334
}
335335

336-
return modeId;
336+
return languageId;
337337
}
338338

339339
public getModeIdFromLanguageName(languageName: string): string | null {

‎src/vs/editor/common/services/modeService.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ export interface IModeService {
4040
getRegisteredLanguageNames(): string[];
4141
getExtensions(alias: string): string[];
4242
getFilenames(alias: string): string[];
43-
getMimeForMode(modeId: string): string | null;
44-
getLanguageName(modeId: string): string | null;
43+
getMimeForMode(languageId: string): string | null;
44+
getLanguageName(languageId: string): string | null;
4545
getModeIdForLanguageName(alias: string): string | null;
4646
getModeIdByFilepathOrFirstLine(resource: URI, firstLine?: string): string | null;
4747
getModeId(commaSeparatedMimetypesOrCommaSeparatedIds: string): string | null;
48-
validateLanguageId(modeId: string): string | null;
49-
getConfigurationFiles(modeId: string): URI[];
48+
validateLanguageId(languageId: string): string | null;
49+
getConfigurationFiles(languageId: string): URI[];
5050

5151
// --- instantiation
5252
create(commaSeparatedMimetypesOrCommaSeparatedIds: string | undefined): ILanguageSelection;

‎src/vs/editor/common/services/modeServiceImpl.ts

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,12 @@ export class ModeServiceImpl extends Disposable implements IModeService {
9696
return this._registry.getFilenames(alias);
9797
}
9898

99-
public getMimeForMode(modeId: string): string | null {
100-
return this._registry.getMimeForMode(modeId);
99+
public getMimeForMode(languageId: string): string | null {
100+
return this._registry.getMimeForMode(languageId);
101101
}
102102

103-
public getLanguageName(modeId: string): string | null {
104-
return this._registry.getLanguageName(modeId);
103+
public getLanguageName(languageId: string): string | null {
104+
return this._registry.getLanguageName(languageId);
105105
}
106106

107107
public getModeIdForLanguageName(alias: string): string | null {
@@ -118,59 +118,59 @@ export class ModeServiceImpl extends Disposable implements IModeService {
118118
return firstOrDefault(modeIds, null);
119119
}
120120

121-
public validateLanguageId(modeId: string | null): string | null {
122-
return this._registry.validateLanguageId(modeId);
121+
public validateLanguageId(languageId: string | null): string | null {
122+
return this._registry.validateLanguageId(languageId);
123123
}
124124

125-
public getConfigurationFiles(modeId: string): URI[] {
126-
return this._registry.getConfigurationFiles(modeId);
125+
public getConfigurationFiles(languageId: string): URI[] {
126+
return this._registry.getConfigurationFiles(languageId);
127127
}
128128

129129
// --- instantiation
130130

131131
public create(commaSeparatedMimetypesOrCommaSeparatedIds: string | undefined): ILanguageSelection {
132132
return new LanguageSelection(this.onLanguagesMaybeChanged, () => {
133-
const modeId = this.getModeId(commaSeparatedMimetypesOrCommaSeparatedIds);
134-
return this._createModeAndGetLanguageIdentifier(modeId);
133+
const languageId = this.getModeId(commaSeparatedMimetypesOrCommaSeparatedIds);
134+
return this._createModeAndGetLanguageIdentifier(languageId);
135135
});
136136
}
137137

138138
public createByLanguageName(languageName: string): ILanguageSelection {
139139
return new LanguageSelection(this.onLanguagesMaybeChanged, () => {
140-
const modeId = this._getModeIdByLanguageName(languageName);
141-
return this._createModeAndGetLanguageIdentifier(modeId);
140+
const languageId = this._getModeIdByLanguageName(languageName);
141+
return this._createModeAndGetLanguageIdentifier(languageId);
142142
});
143143
}
144144

145145
public createByFilepathOrFirstLine(resource: URI | null, firstLine?: string): ILanguageSelection {
146146
return new LanguageSelection(this.onLanguagesMaybeChanged, () => {
147-
const modeId = this.getModeIdByFilepathOrFirstLine(resource, firstLine);
148-
return this._createModeAndGetLanguageIdentifier(modeId);
147+
const languageId = this.getModeIdByFilepathOrFirstLine(resource, firstLine);
148+
return this._createModeAndGetLanguageIdentifier(languageId);
149149
});
150150
}
151151

152-
private _createModeAndGetLanguageIdentifier(modeId: string | null): string {
152+
private _createModeAndGetLanguageIdentifier(languageId: string | null): string {
153153
// Fall back to plain text if no mode was found
154-
const languageId = this.validateLanguageId(modeId || 'plaintext') || NULL_MODE_ID;
155-
this._getOrCreateMode(languageId);
156-
return languageId;
154+
const validLanguageId = this.validateLanguageId(languageId || 'plaintext') || NULL_MODE_ID;
155+
this._getOrCreateMode(validLanguageId);
156+
return validLanguageId;
157157
}
158158

159159
public triggerMode(commaSeparatedMimetypesOrCommaSeparatedIds: string): void {
160-
const modeId = this.getModeId(commaSeparatedMimetypesOrCommaSeparatedIds);
160+
const languageId = this.getModeId(commaSeparatedMimetypesOrCommaSeparatedIds);
161161
// Fall back to plain text if no mode was found
162-
this._getOrCreateMode(modeId || 'plaintext');
162+
this._getOrCreateMode(languageId || 'plaintext');
163163
}
164164

165165
private _getModeIdByLanguageName(languageName: string): string | null {
166166
return this._registry.getModeIdFromLanguageName(languageName);
167167
}
168168

169-
private _getOrCreateMode(modeId: string): void {
170-
if (!this._encounteredLanguages.has(modeId)) {
171-
this._encounteredLanguages.add(modeId);
172-
const languageId = this.validateLanguageId(modeId) || NULL_MODE_ID;
173-
this._onDidEncounterLanguage.fire(languageId);
169+
private _getOrCreateMode(languageId: string): void {
170+
if (!this._encounteredLanguages.has(languageId)) {
171+
this._encounteredLanguages.add(languageId);
172+
const validLanguageId = this.validateLanguageId(languageId) || NULL_MODE_ID;
173+
this._onDidEncounterLanguage.fire(validLanguageId);
174174
}
175175
}
176176
}

‎src/vs/editor/contrib/gotoSymbol/link/goToDefinitionAtPosition.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,10 @@ export class GotoDefinitionAtPositionEditorContribution implements IEditorContri
203203
wordRange = new Range(position.lineNumber, word.startColumn, position.lineNumber, word.endColumn);
204204
}
205205

206-
const modeId = this.modeService.getModeIdByFilepathOrFirstLine(textEditorModel.uri);
206+
const languageId = this.modeService.getModeIdByFilepathOrFirstLine(textEditorModel.uri);
207207
this.addDecoration(
208208
wordRange,
209-
new MarkdownString().appendCodeblock(modeId ? modeId : '', previewValue)
209+
new MarkdownString().appendCodeblock(languageId ? languageId : '', previewValue)
210210
);
211211
ref.dispose();
212212
});

0 commit comments

Comments
 (0)