fix broken workspace commands

src/vs/workbench/browser/actions/workspaceCommands.ts

@@ -144,13 +144,13 @@ CommandsRegistry.registerCommand({
 CommandsRegistry.registerCommand({
 	id: ADD_ROOT_FOLDER_COMMAND_ID,
 	handler: (accessor) => {
+		const viewletService = accessor.get(IViewletService);
+		const workspaceEditingService = accessor.get(IWorkspaceEditingService);
 		return pickFolders(mnemonicButtonLabel(nls.localize({ key: 'add', comment: ['&& denotes a mnemonic'] }, "&&Add")), nls.localize('addFolderToWorkspaceTitle', "Add Folder to Workspace"),
 			accessor.get(IWindowService), accessor.get(IWorkspaceContextService), accessor.get(IHistoryService)).then(folders => {
 				if (!folders || !folders.length) {
 					return null;
 				}
-				const viewletService = accessor.get(IViewletService);
-				const workspaceEditingService = accessor.get(IWorkspaceEditingService);
 
 				// Add and show Files Explorer viewlet
 				return workspaceEditingService.addFolders(folders.map(folder => ({ uri: URI.file(folder) }))).then(() => viewletService.openViewlet(viewletService.getDefaultViewletId(), true));

src/vs/workbench/parts/preferences/browser/preferencesActions.ts

@@ -150,7 +150,7 @@ export class OpenFolderSettingsAction extends Action {
 		return this.commandService.executeCommand<IWorkspaceFolder>(PICK_WORKSPACE_FOLDER_COMMAND_ID)
 			.then(workspaceFolder => {
 				if (workspaceFolder) {
-					return this.commandService.executeCommand(OPEN_FOLDER_SETTINGS_COMMAND, workspaceFolder);
+					return this.commandService.executeCommand(OPEN_FOLDER_SETTINGS_COMMAND, workspaceFolder.uri);
 				}
 				return null;
 			});

src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts

@@ -263,7 +263,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(PreferencesContribution, LifecyclePhase.Starting);
 
-CommandsRegistry.registerCommand(OPEN_FOLDER_SETTINGS_COMMAND, function (accessor: ServicesAccessor, args?: IWorkspaceFolder) {
+CommandsRegistry.registerCommand(OPEN_FOLDER_SETTINGS_COMMAND, function (accessor: ServicesAccessor, resource: URI) {
 	const preferencesService = accessor.get(IPreferencesService);
-	return preferencesService.openFolderSettings(args.uri);
-});
\ No newline at end of file
+	return preferencesService.openFolderSettings(resource);
+});