diff options
Diffstat (limited to 'src/vs/workbench/services/textfile/common')
| -rw-r--r-- | src/vs/workbench/services/textfile/common/textFileEditorModel.ts | 9 | ||||
| -rw-r--r-- | src/vs/workbench/services/textfile/common/textfiles.ts | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts index 6672a7126d3..6dc44f932c3 100644 --- a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts +++ b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts @@ -197,8 +197,8 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil this.modelService.setMode(this.textEditorModel, languageSelection); } - override setLanguageId(languageId: string): void { - super.setLanguageId(languageId); + override setLanguageId(languageId: string, source?: string): void { + super.setLanguageId(languageId, source); this.preferredLanguageId = languageId; } @@ -556,15 +556,16 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil } } - private installModelListeners(model: ITextModel): void { + protected override installModelListeners(model: ITextModel): void { // See https://github.com/microsoft/vscode/issues/30189 // This code has been extracted to a different method because it caused a memory leak // where `value` was captured in the content change listener closure scope. - // Listen to text model events this._register(model.onDidChangeContent(e => this.onModelContentChanged(model, e.isUndoing || e.isRedoing))); this._register(model.onDidChangeLanguage(() => this.onMaybeShouldChangeEncoding())); // detect possible encoding change via language specific settings + + super.installModelListeners(model); } private onModelContentChanged(model: ITextModel, isUndoingOrRedoing: boolean): void { diff --git a/src/vs/workbench/services/textfile/common/textfiles.ts b/src/vs/workbench/services/textfile/common/textfiles.ts index 8cb717b2fca..e961ed75e2f 100644 --- a/src/vs/workbench/services/textfile/common/textfiles.ts +++ b/src/vs/workbench/services/textfile/common/textfiles.ts @@ -468,7 +468,7 @@ export interface ILanguageSupport { /** * Sets the language id of the object. */ - setLanguageId(languageId: string, setExplicitly?: boolean): void; + setLanguageId(languageId: string, source?: string): void; } export interface ITextFileEditorModelSaveEvent extends IWorkingCopySaveEvent { |