Skip to content

Commit c8745c3

Browse files
committed
text files - don't auto adjust encoding if mode explicitly set
1 parent 6dde517 commit c8745c3

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

src/vs/workbench/common/editor/textEditorModel.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ export class BaseTextEditorModel extends EditorModel implements ITextEditorModel
118118
const lang = await this.languageDetectionService.detectLanguage(this.textEditorModelHandle);
119119
if (lang && !this.isDisposed()) {
120120
this.setLanguageIdInternal(lang);
121+
121122
const languageName = this.languageService.getLanguageName(lang);
122123
if (languageName) {
123124
this.accessibilityService.alert(localize('languageAutoDetected', "Language {0} was automatically detected and set as the language mode.", languageName));

src/vs/workbench/services/textfile/common/textFileEditorModel.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,6 +1004,10 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
10041004
//
10051005
// (see https://github.com/microsoft/vscode/issues/127936)
10061006

1007+
if (this.hasLanguageSetExplicitly) {
1008+
return; // return early when the language was changed by the user
1009+
}
1010+
10071011
if (!this.configurationService.inspect('files.encoding').overrideIdentifiers?.includes(e.newLanguage)) {
10081012
return; // only when there is a language specific override for the new language
10091013
}

0 commit comments

Comments
 (0)