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

Remove model.getModeId()

Browse Source
This commit is contained in:
Alex Dima
2017-01-05 14:56:14 +01:00
parent bb49af3316
commit badd8d1877
19 changed files with 21 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/browser/labels.ts
View File

@@ -215,7 +215,7 @@ function getConfiguredLangId(modelService: IModelService, resource: uri): string
if (resource) {
const model = modelService.getModel(resource);
if (model) {
const modeId = model.getModeId();
const modeId = model.getLanguageIdentifier().language;
if (modeId && modeId !== PLAINTEXT_MODE_ID) {
configuredLangId = modeId; // only take if the mode is specific (aka no just plain text)
}

4
src/vs/workbench/browser/parts/editor/editorStatus.ts
View File

@@ -526,7 +526,7 @@ export class EditorStatus implements IStatusbarItem {
const textModel = getTextModel(editorWidget);
if (textModel) {
// Compute mode
const modeId = textModel.getModeId();
const modeId = textModel.getLanguageIdentifier().language;
info = { mode: this.modeService.getLanguageName(modeId) };
}
}
@@ -736,7 +736,7 @@ export class ChangeModeAction extends Action {
// Compute mode
let currentModeId: string;
if (textModel) {
const modeId = textModel.getModeId();
const modeId = textModel.getLanguageIdentifier().language;
currentModeId = this.modeService.getLanguageName(modeId);
}