polish

src/vs/workbench/browser/parts/titlebar/menubarControl.ts

@@ -350,12 +350,13 @@ export class MenubarControl extends Disposable {
 		return label;
 	}
 
-	private createOpenRecentMenuAction(recent: IRecent, isFile: boolean): IAction & { uri: URI } {
+	private createOpenRecentMenuAction(recent: IRecent): IAction & { uri: URI } {
 
 		let label: string;
 		let uri: URI;
 		let commandId: string;
 		let typeHint: URIType | undefined;
+		let forceOpenWorkspaceAsFile = false;
 
 		if (isRecentFolder(recent)) {
 			uri = recent.folderUri;
@@ -372,6 +373,7 @@ export class MenubarControl extends Disposable {
 			label = recent.label || this.labelService.getUriLabel(uri);
 			commandId = 'openRecentFile';
 			typeHint = 'file';
+			forceOpenWorkspaceAsFile = true;
 		}
 
 		const ret: IAction = new Action(commandId, unmnemonicLabel(label), undefined, undefined, (event) => {
@@ -379,7 +381,7 @@ export class MenubarControl extends Disposable {
 
 			return this.windowService.openWindow([{ uri, typeHint }], {
 				forceNewWindow: openInNewWindow,
-				forceOpenWorkspaceAsFile: isFile
+				forceOpenWorkspaceAsFile
 			});
 		});
 
@@ -398,7 +400,7 @@ export class MenubarControl extends Disposable {
 
 		if (workspaces.length > 0) {
 			for (let i = 0; i < MenubarControl.MAX_MENU_RECENT_ENTRIES && i < workspaces.length; i++) {
-				result.push(this.createOpenRecentMenuAction(workspaces[i], false));
+				result.push(this.createOpenRecentMenuAction(workspaces[i]));
 			}
 
 			result.push(new Separator());
@@ -406,7 +408,7 @@ export class MenubarControl extends Disposable {
 
 		if (files.length > 0) {
 			for (let i = 0; i < MenubarControl.MAX_MENU_RECENT_ENTRIES && i < files.length; i++) {
-				result.push(this.createOpenRecentMenuAction(files[i], true));
+				result.push(this.createOpenRecentMenuAction(files[i]));
 			}
 
 			result.push(new Separator());

src/vs/workbench/electron-browser/actions/windowActions.ts

@@ -7,7 +7,7 @@ import 'vs/css!./media/actions';
 
 import { URI } from 'vs/base/common/uri';
 import { Action } from 'vs/base/common/actions';
-import { IWindowService, IWindowsService } from 'vs/platform/windows/common/windows';
+import { IWindowService, IWindowsService, IURIToOpen } from 'vs/platform/windows/common/windows';
 import * as nls from 'vs/nls';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { isMacintosh } from 'vs/base/common/platform';
@@ -339,38 +339,32 @@ export abstract class BaseOpenRecentAction extends Action {
 	private openRecent(recentWorkspaces: Array<IRecentWorkspace | IRecentFolder>, recentFiles: IRecentFile[]): void {
 
 		const toPick = (recent: IRecent, labelService: ILabelService, buttons: IQuickInputButton[] | undefined) => {
-			let resource: URI | undefined;
+			let uriToOpen: IURIToOpen | undefined;
 			let fullLabel: string | undefined;
 			let fileKind: FileKind | undefined;
 			if (isRecentFolder(recent)) {
-				resource = recent.folderUri;
+				uriToOpen = { uri: recent.folderUri, typeHint: 'folder' };
 				fullLabel = recent.label || labelService.getWorkspaceLabel(recent.folderUri, { verbose: true });
 				fileKind = FileKind.FOLDER;
 			} else if (isRecentWorkspace(recent)) {
-				resource = recent.workspace.configPath;
+				uriToOpen = { uri: recent.workspace.configPath, typeHint: 'file' };
 				fullLabel = recent.label || labelService.getWorkspaceLabel(recent.workspace, { verbose: true });
 				fileKind = FileKind.ROOT_FOLDER;
 			} else {
-				resource = recent.fileUri;
+				uriToOpen = { uri: recent.fileUri, typeHint: 'file' };
 				fullLabel = recent.label || labelService.getUriLabel(recent.fileUri);
 				fileKind = FileKind.FILE;
 			}
 			const { name, parentPath } = splitName(fullLabel);
 			return {
-				iconClasses: getIconClasses(this.modelService, this.modeService, resource, fileKind),
+				iconClasses: getIconClasses(this.modelService, this.modeService, uriToOpen.uri, fileKind),
 				label: name,
 				description: parentPath,
 				buttons,
-				resource,
+				uriToOpen,
 				fileKind,
 			};
 		};
-
-		const runPick = (uri: URI, isFile: boolean, keyMods: IKeyMods) => {
-			const forceNewWindow = keyMods.ctrlCmd;
-			return this.windowService.openWindow([{ uri, typeHint: isFile ? 'file' : 'folder' }], { forceNewWindow, forceOpenWorkspaceAsFile: isFile });
-		};
-
 		const workspacePicks = recentWorkspaces.map(workspace => toPick(workspace, this.labelService, !this.isQuickNavigate() ? [this.removeFromRecentlyOpened] : undefined));
 		const filePicks = recentFiles.map(p => toPick(p, this.labelService, !this.isQuickNavigate() ? [this.removeFromRecentlyOpened] : undefined));
 
@@ -390,11 +384,13 @@ export abstract class BaseOpenRecentAction extends Action {
 			onKeyMods: mods => keyMods = mods,
 			quickNavigate: this.isQuickNavigate() ? { keybindings: this.keybindingService.lookupKeybindings(this.id) } : undefined,
 			onDidTriggerItemButton: context => {
-				this.windowsService.removeFromRecentlyOpened([context.item.resource]).then(() => context.removeItem());
+				this.windowsService.removeFromRecentlyOpened([context.item.uriToOpen.uri]).then(() => context.removeItem());
 			}
 		}).then((pick): Promise<void> | void => {
 			if (pick) {
-				return runPick(pick.resource, pick.fileKind === FileKind.FILE, keyMods);
+				const forceNewWindow = keyMods.ctrlCmd;
+				const forceOpenWorkspaceAsFile = pick.fileKind === FileKind.FILE;
+				return this.windowService.openWindow([pick.uriToOpen], { forceNewWindow, forceOpenWorkspaceAsFile });
 			}
 		});
 	}