untitled - ignore default language when associated path

Benjamin Pasero · Benjamin Pasero · commit 921657de1b7c · 2017-03-27T16:18:01.000-07:00
diff --git a/src/vs/workbench/services/untitled/common/untitledEditorService.ts b/src/vs/workbench/services/untitled/common/untitledEditorService.ts
@@ -188,9 +188,12 @@ export class UntitledEditorService implements IUntitledEditorService {
 			} while (Object.keys(UntitledEditorService.CACHE).indexOf(resource.toString()) >= 0);
 		}
 
-		const configuration = this.configurationService.getConfiguration<IFilesConfiguration>();
-		if (!modeId && configuration.files && configuration.files.defaultLanguage) {
-			modeId = configuration.files.defaultLanguage;
+		// Look up default language from settings if any
+		if (!modeId && !hasAssociatedFilePath) {
+			const configuration = this.configurationService.getConfiguration<IFilesConfiguration>();
+			if (configuration.files && configuration.files.defaultLanguage) {
+				modeId = configuration.files.defaultLanguage;
+			}
 		}
 
 		const input = this.instantiationService.createInstance(UntitledEditorInput, resource, hasAssociatedFilePath, modeId, initialValue);

Original file line number	Diff line number	Diff line change
`@@ -188,9 +188,12 @@ export class UntitledEditorService implements IUntitledEditorService {`
`188`	`188`	`} while (Object.keys(UntitledEditorService.CACHE).indexOf(resource.toString()) >= 0);`
`189`	`189`	`}`
`190`	`190`
`191`		`- const configuration = this.configurationService.getConfiguration<IFilesConfiguration>();`
`192`		`- if (!modeId && configuration.files && configuration.files.defaultLanguage) {`
`193`		`- modeId = configuration.files.defaultLanguage;`
	`191`	`+ // Look up default language from settings if any`
	`192`	`+ if (!modeId && !hasAssociatedFilePath) {`
	`193`	`+ const configuration = this.configurationService.getConfiguration<IFilesConfiguration>();`
	`194`	`+ if (configuration.files && configuration.files.defaultLanguage) {`
	`195`	`+ modeId = configuration.files.defaultLanguage;`
	`196`	`+ }`
`194`	`197`	`}`
`195`	`198`
`196`	`199`	`const input = this.instantiationService.createInstance(UntitledEditorInput, resource, hasAssociatedFilePath, modeId, initialValue);`