Fix #51668

src/vs/workbench/services/preferences/browser/preferencesService.ts

@@ -238,17 +238,20 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 
 	configureSettingsForLanguage(language: string): void {
 		this.openGlobalSettings()
-			.then(editor => {
+			.then(editor => this.createPreferencesEditorModel(this.userSettingsResource)
+				.then((settingsModel: IPreferencesEditorModel<ISetting>) => {
 					const codeEditor = getCodeEditor(editor.getControl());
 					if (codeEditor) {
-					this.getPosition(language, codeEditor)
+						this.getPosition(language, settingsModel, codeEditor)
 							.then(position => {
+								if (codeEditor) {
 									codeEditor.setPosition(position);
 									codeEditor.focus();
-						});
 								}
 							});
 					}
+				}));
+	}
 
 	private openOrSwitchSettings(configurationTarget: ConfigurationTarget, resource: URI, options?: IEditorOptions, group: IEditorGroup = this.editorGroupService.activeGroup): TPromise<IEditor> {
 		const editorInput = this.getActiveSettingsEditorInput(group);
@@ -456,9 +459,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 		];
 	}
 
-	private getPosition(language: string, codeEditor: ICodeEditor): TPromise<IPosition> {
-		return this.createPreferencesEditorModel(this.userSettingsResource)
-			.then((settingsModel: IPreferencesEditorModel<ISetting>) => {
+	private getPosition(language: string, settingsModel: IPreferencesEditorModel<ISetting>, codeEditor: ICodeEditor): TPromise<IPosition> {
 		const languageKey = `[${language}]`;
 		let setting = settingsModel.getPreference(languageKey);
 		const model = codeEditor.getModel();
@@ -475,9 +476,9 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 				}
 				const editOperation = EditOperation.insert(new Position(lastSetting.valueRange.endLineNumber, lastSetting.valueRange.endColumn), content);
 				model.pushEditOperations([], [editOperation], () => []);
-						return { lineNumber: lastSetting.valueRange.endLineNumber + 1, column: model.getLineMaxColumn(lastSetting.valueRange.endLineNumber + 1) };
+				return TPromise.as({ lineNumber: lastSetting.valueRange.endLineNumber + 1, column: model.getLineMaxColumn(lastSetting.valueRange.endLineNumber + 1) });
 			}
-					return { lineNumber: setting.valueRange.startLineNumber, column: setting.valueRange.startColumn + 1 };
+			return TPromise.as({ lineNumber: setting.valueRange.startLineNumber, column: setting.valueRange.startColumn + 1 });
 		}
 		return this.configurationService.updateValue(languageKey, {}, ConfigurationTarget.USER)
 			.then(() => {
@@ -489,7 +490,6 @@ export class PreferencesService extends Disposable implements IPreferencesServic
 				settingsModel.dispose();
 				return { lineNumber, column: model.getLineMaxColumn(lineNumber) };
 			});
-			});
 	}
 
 	private spaces(count: number, { tabSize, insertSpaces }: { tabSize: number; insertSpaces: boolean }): string {