Unable to open workspace settings if "workbench.settings.openDefaultSettings": false (fixes microsoft#11888)

Benjamin Pasero · Benjamin Pasero · commit b3e928809eb6 · 2016-09-12T17:20:30.000+02:00
diff --git a/src/vs/workbench/browser/actions/openSettings.ts b/src/vs/workbench/browser/actions/openSettings.ts
@@ -110,10 +110,11 @@ export class BaseOpenSettingsAction extends BaseTwoEditorsAction {
 			return this.openTwoEditors(DefaultSettingsInput.getInstance(this.instantiationService, this.configurationService), settingsResource, emptySettingsContents);
 		}
 
-		return this.editorService.openEditor({
+		// Create as needed and open in editor
+		return this.createIfNotExists(settingsResource, emptySettingsContents).then(() => this.editorService.openEditor({
 			resource: settingsResource,
 			options: { pinned: true }
-		}).then(() => null);
+		}).then(() => null));
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -110,10 +110,11 @@ export class BaseOpenSettingsAction extends BaseTwoEditorsAction {`
`110`	`110`	`return this.openTwoEditors(DefaultSettingsInput.getInstance(this.instantiationService, this.configurationService), settingsResource, emptySettingsContents);`
`111`	`111`	`}`
`112`	`112`
`113`		`- return this.editorService.openEditor({`
	`113`	`+ // Create as needed and open in editor`
	`114`	`+ return this.createIfNotExists(settingsResource, emptySettingsContents).then(() => this.editorService.openEditor({`
`114`	`115`	`resource: settingsResource,`
`115`	`116`	`options: { pinned: true }`
`116`		`- }).then(() => null);`
	`117`	`+ }).then(() => null));`
`117`	`118`	`}`
`118`	`119`	`}`
`119`	`120`