Fix #42766 - Don't throw on absent workspace settings

microsoft · Feb 1, 2018 · d272072 · d272072
1 parent d233df9
commit d272072
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts b/src/vs/workbench/parts/preferences/browser/preferencesEditor.ts
@@ -532,11 +532,15 @@ class PreferencesRenderersController extends Disposable {
 		});
 	}
 
-	private async getPreferencesEditorModel(target: SettingsTarget): TPromise<ISettingsEditorModel> {
+	private async getPreferencesEditorModel(target: SettingsTarget): TPromise<ISettingsEditorModel | null> {
 		const resource = target === ConfigurationTarget.USER ? this.preferencesService.userSettingsResource :
 			target === ConfigurationTarget.WORKSPACE ? this.preferencesService.workspaceSettingsResource :
 				target;
 
+		if (!resource) {
+			return null;
+		}
+
 		const targetKey = resource.toString();
 		if (!this._prefsModelsForSearch.has(targetKey)) {
 			try {