💄

src/vs/platform/history/electron-main/historyMainService.ts

@@ -53,7 +53,7 @@ export class HistoryMainService implements IHistoryMainService {
 				mru.workspaces = arrays.distinct(mru.workspaces, workspace => this.isSingleFolderWorkspace(workspace) ? workspace : workspace.id);
 
 				// Add to recent documents unless the workspace is untitled (macOS only, Windows can show workspaces separately)
-				const isUntitledWorkspace = this.isWorkspace(workspace) && this.workspacesService.isUntitledWorkspace(workspace);
+				const isUntitledWorkspace = !this.isSingleFolderWorkspace(workspace) && this.workspacesService.isUntitledWorkspace(workspace);
 				if (isMacintosh && !isUntitledWorkspace) {
 					app.addRecentDocument(this.isSingleFolderWorkspace(workspace) ? workspace : workspace.configPath);
 				}
@@ -79,10 +79,6 @@ export class HistoryMainService implements IHistoryMainService {
 		}
 	}
 
-	private isWorkspace(obj: any): obj is IWorkspaceIdentifier {
-		return !!(obj as IWorkspaceIdentifier).id;
-	}
-
 	private isSingleFolderWorkspace(obj: any): obj is string {
 		return typeof obj === 'string';
 	}

src/vs/workbench/services/configuration/node/configuration.ts

@@ -32,8 +32,8 @@ import * as nls from 'vs/nls';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { ExtensionsRegistry, ExtensionMessageCollector } from 'vs/platform/extensions/common/extensionsRegistry';
 import { IConfigurationNode, IConfigurationRegistry, Extensions, editorConfigurationSchemaId, IDefaultConfigurationExtension, validateProperty, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
-
 import { createHash } from 'crypto';
+import { getWorkspaceLabel } from "vs/platform/workspaces/common/workspaces";
 
 interface IStat {
 	resource: URI;
@@ -327,7 +327,7 @@ export class WorkspaceServiceImpl extends WorkspaceService {
 	private workspaceConfiguration: WorkspaceConfiguration;
 	private cachedFolderConfigs: StrictResourceMap<FolderConfiguration<any>>;
 
-	constructor(private workspaceConfigPath: string, private folderPath: string, environmentService: IEnvironmentService, private workspaceSettingsRootFolder: string = WORKSPACE_CONFIG_FOLDER_DEFAULT_NAME) {
+	constructor(private workspaceConfigPath: string, private folderPath: string, private environmentService: IEnvironmentService, private workspaceSettingsRootFolder: string = WORKSPACE_CONFIG_FOLDER_DEFAULT_NAME) {
 		super();
 		this.baseConfigurationService = this._register(new GlobalConfigurationService(environmentService));
 	}
@@ -394,7 +394,8 @@ export class WorkspaceServiceImpl extends WorkspaceService {
 				if (!workspaceConfigurationModel.id || !workspaceConfigurationModel.folders.length) {
 					return TPromise.wrapError<void>(new Error('Invalid workspace configuraton file ' + this.workspaceConfigPath));
 				}
-				this.workspace = new Workspace(workspaceConfigurationModel.id, nls.localize('untitledWorkspace', "Untitled Workspace"), workspaceConfigurationModel.folders, this.workspaceConfiguration.workspaceConfigurationPath);
+				const workspaceName = getWorkspaceLabel(this.environmentService, { id: workspaceConfigurationModel.id, configPath: this.workspaceConfiguration.workspaceConfigurationPath.fsPath });
+				this.workspace = new Workspace(workspaceConfigurationModel.id, workspaceName, workspaceConfigurationModel.folders, this.workspaceConfiguration.workspaceConfigurationPath);
 				this.legacyWorkspace = new LegacyWorkspace(this.workspace.roots[0]);
 				this._register(this.workspaceConfiguration.onDidUpdateConfiguration(() => this.onWorkspaceConfigurationChanged()));
 				return null;