change active-editor to ${activeEditorLanguage} (for microsoft#78903)

Benjamin Pasero · Benjamin Pasero · commit c4192e9bd3f8 · 2020-01-06T15:25:29.000+01:00
diff --git a/extensions/configuration-editing/src/settingsDocumentHelper.ts b/extensions/configuration-editing/src/settingsDocumentHelper.ts
@@ -36,8 +36,8 @@ export class SettingsDocument {
 		if (location.path[0] === 'files.defaultLanguage') {
 			return this.provideLanguageCompletionItems(location, range).then(items => {
 
-				// Add special item 'active-editor'
-				return [this.newSimpleCompletionItem(JSON.stringify('active-editor'), range, localize('activeEditor', "Use the language mode of the currently active text editor if any")), ...items];
+				// Add special item '${activeEditorLanguage}'
+				return [this.newSimpleCompletionItem(JSON.stringify('${activeEditorLanguage}'), range, localize('activeEditor', "Use the language of the currently active text editor if any")), ...items];
 			});
 		}
 
diff --git a/src/vs/workbench/common/editor/untitledTextEditorInput.ts b/src/vs/workbench/common/editor/untitledTextEditorInput.ts
@@ -232,8 +232,8 @@ export class UntitledTextEditorInput extends TextEditorInput implements IEncodin
 
 	setMode(mode: string): void {
 		let actualMode: string | undefined = undefined;
-		if (mode === 'active-editor') {
-			// support the special 'active-editor' mode by
+		if (mode === '${activeEditorLanguage}') {
+			// support the special '${activeEditorLanguage}' mode by
 			// looking up the language mode from the currently
 			// active text editor if any
 			actualMode = this.editorService.activeTextEditorMode;
diff --git a/src/vs/workbench/contrib/files/browser/files.contribution.ts b/src/vs/workbench/contrib/files/browser/files.contribution.ts
@@ -314,7 +314,7 @@ configurationRegistry.registerConfiguration({
 		'files.hotExit': hotExitConfiguration,
 		'files.defaultLanguage': {
 			'type': 'string',
-			'description': nls.localize('defaultLanguage', "The default language mode that is assigned to new files. If configured to `active-editor`, will use the language mode of the currently active text editor if any.")
+			'description': nls.localize('defaultLanguage', "The default language mode that is assigned to new files. If configured to `${activeEditorLanguage}`, will use the language mode of the currently active text editor if any.")
 		},
 		'files.maxMemoryForLargeFilesMB': {
 			'type': 'number',
diff --git a/src/vs/workbench/test/common/editor/untitledTextEditor.test.ts b/src/vs/workbench/test/common/editor/untitledTextEditor.test.ts
@@ -236,9 +236,9 @@ suite('Workbench untitled text editors', () => {
 		input.dispose();
 	});
 
-	test('Untitled created with files.defaultLanguage setting (active-editor)', () => {
+	test('Untitled created with files.defaultLanguage setting (${activeEditorLanguage})', () => {
 		const config = accessor.testConfigurationService;
-		config.setUserConfiguration('files', { 'defaultLanguage': 'active-editor' });
+		config.setUserConfiguration('files', { 'defaultLanguage': '${activeEditorLanguage}' });
 
 		accessor.editorService.activeTextEditorMode = 'typescript';
 

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@ export class SettingsDocument {`
`36`	`36`	`if (location.path[0] === 'files.defaultLanguage') {`
`37`	`37`	`return this.provideLanguageCompletionItems(location, range).then(items => {`
`38`	`38`
`39`		`- // Add special item 'active-editor'`
`40`		`- return [this.newSimpleCompletionItem(JSON.stringify('active-editor'), range, localize('activeEditor', "Use the language mode of the currently active text editor if any")), ...items];`
	`39`	`+ // Add special item '${activeEditorLanguage}'`
	`40`	`+ return [this.newSimpleCompletionItem(JSON.stringify('${activeEditorLanguage}'), range, localize('activeEditor', "Use the language of the currently active text editor if any")), ...items];`
`41`	`41`	`});`
`42`	`42`	`}`
`43`	`43`