Remove duplicate (case sensitive) recent workspace/folder names on the welcome screen (fix #111954)

src/vs/platform/workspaces/electron-main/workspacesHistoryMainService.ts

@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as nls from 'vs/nls';
-import * as arrays from 'vs/base/common/arrays';
+import { localize } from 'vs/nls';
+import { coalesce } from 'vs/base/common/arrays';
 import { IStateService } from 'vs/platform/state/node/state';
 import { app, JumpListCategory } from 'electron';
 import { ILogService } from 'vs/platform/log/common/log';
@@ -14,7 +14,7 @@ import { isWindows, isMacintosh } from 'vs/base/common/platform';
 import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, IRecentlyOpened, isRecentWorkspace, isRecentFolder, IRecent, isRecentFile, IRecentFolder, IRecentWorkspace, IRecentFile, toStoreData, restoreRecentlyOpened, RecentlyOpenedStorageData, WORKSPACE_EXTENSION } from 'vs/platform/workspaces/common/workspaces';
 import { IWorkspacesMainService } from 'vs/platform/workspaces/electron-main/workspacesMainService';
 import { ThrottledDelayer } from 'vs/base/common/async';
-import { isEqual, dirname, originalFSPath, basename, extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
+import { dirname, originalFSPath, basename, extUriBiasedIgnorePathCase } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
 import { Schemas } from 'vs/base/common/network';
 import { IEnvironmentMainService } from 'vs/platform/environment/electron-main/environmentMainService';
@@ -57,10 +57,10 @@ export class WorkspacesHistoryMainService extends Disposable implements IWorkspa
 
 	declare readonly _serviceBrand: undefined;
 
-	private readonly _onRecentlyOpenedChange = new Emitter<void>();
+	private readonly _onRecentlyOpenedChange = this._register(new Emitter<void>());
 	readonly onRecentlyOpenedChange: CommonEvent<void> = this._onRecentlyOpenedChange.event;
 
-	private macOSRecentDocumentsUpdater = this._register(new ThrottledDelayer<void>(800));
+	private readonly macOSRecentDocumentsUpdater = this._register(new ThrottledDelayer<void>(800));
 
 	constructor(
 		@IStateService private readonly stateService: IStateService,
@@ -89,40 +89,40 @@ export class WorkspacesHistoryMainService extends Disposable implements IWorkspa
 		}
 
 		this.updateWindowsJumpList();
-		this.onRecentlyOpenedChange(() => this.updateWindowsJumpList());
+		this._register(this.onRecentlyOpenedChange(() => this.updateWindowsJumpList()));
 	}
 
-	addRecentlyOpened(newlyAdded: IRecent[]): void {
+	addRecentlyOpened(recentToAdd: IRecent[]): void {
 		const workspaces: Array<IRecentFolder | IRecentWorkspace> = [];
 		const files: IRecentFile[] = [];
 
-		for (let curr of newlyAdded) {
+		for (let recent of recentToAdd) {
 
 			// Workspace
-			if (isRecentWorkspace(curr)) {
-				if (!this.workspacesMainService.isUntitledWorkspace(curr.workspace) && indexOfWorkspace(workspaces, curr.workspace) === -1) {
-					workspaces.push(curr);
+			if (isRecentWorkspace(recent)) {
+				if (!this.workspacesMainService.isUntitledWorkspace(recent.workspace) && indexOfWorkspace(workspaces, recent.workspace) === -1) {
+					workspaces.push(recent);
 				}
 			}
 
 			// Folder
-			else if (isRecentFolder(curr)) {
-				if (indexOfFolder(workspaces, curr.folderUri) === -1) {
-					workspaces.push(curr);
+			else if (isRecentFolder(recent)) {
+				if (indexOfFolder(workspaces, recent.folderUri) === -1) {
+					workspaces.push(recent);
 				}
 			}
 
 			// File
 			else {
-				const alreadyExistsInHistory = indexOfFile(files, curr.fileUri) >= 0;
-				const shouldBeFiltered = curr.fileUri.scheme === Schemas.file && WorkspacesHistoryMainService.COMMON_FILES_FILTER.indexOf(basename(curr.fileUri)) >= 0;
+				const alreadyExistsInHistory = indexOfFile(files, recent.fileUri) >= 0;
+				const shouldBeFiltered = recent.fileUri.scheme === Schemas.file && WorkspacesHistoryMainService.COMMON_FILES_FILTER.indexOf(basename(recent.fileUri)) >= 0;
 
 				if (!alreadyExistsInHistory && !shouldBeFiltered) {
-					files.push(curr);
+					files.push(recent);
 
 					// Add to recent documents (Windows only, macOS later)
-					if (isWindows && curr.fileUri.scheme === Schemas.file) {
-						app.addRecentDocument(curr.fileUri.fsPath);
+					if (isWindows && recent.fileUri.scheme === Schemas.file) {
+						app.addRecentDocument(recent.fileUri.fsPath);
 					}
 				}
 			}
@@ -147,14 +147,15 @@ export class WorkspacesHistoryMainService extends Disposable implements IWorkspa
 		}
 	}
 
-	removeRecentlyOpened(toRemove: URI[]): void {
+	removeRecentlyOpened(recentToRemove: URI[]): void {
 		const keep = (recent: IRecent) => {
 			const uri = location(recent);
-			for (const resource of toRemove) {
-				if (isEqual(resource, uri)) {
+			for (const resourceToRemove of recentToRemove) {
+				if (extUriBiasedIgnorePathCase.isEqual(resourceToRemove, uri)) {
 					return false;
 				}
 			}
+
 			return true;
 		};
 
@@ -319,8 +320,8 @@ export class WorkspacesHistoryMainService extends Disposable implements IWorkspa
 			items: [
 				{
 					type: 'task',
-					title: nls.localize('newWindow', "New Window"),
-					description: nls.localize('newWindowDesc', "Opens a new window"),
+					title: localize('newWindow', "New Window"),
+					description: localize('newWindowDesc', "Opens a new window"),
 					program: process.execPath,
 					args: '-n', // force new window
 					iconPath: process.execPath,
@@ -351,18 +352,18 @@ export class WorkspacesHistoryMainService extends Disposable implements IWorkspa
 			// Add entries
 			jumpList.push({
 				type: 'custom',
-				name: nls.localize('recentFolders', "Recent Workspaces"),
-				items: arrays.coalesce(this.getRecentlyOpened().workspaces.slice(0, 7 /* limit number of entries here */).map(recent => {
+				name: localize('recentFolders', "Recent Workspaces"),
+				items: coalesce(this.getRecentlyOpened().workspaces.slice(0, 7 /* limit number of entries here */).map(recent => {
 					const workspace = isRecentWorkspace(recent) ? recent.workspace : recent.folderUri;
 					const title = recent.label ? splitName(recent.label).name : this.getSimpleWorkspaceLabel(workspace, this.environmentService.untitledWorkspacesHome);
 
 					let description;
 					let args;
 					if (isSingleFolderWorkspaceIdentifier(workspace)) {
-						description = nls.localize('folderDesc', "{0} {1}", getBaseLabel(workspace), getPathLabel(dirname(workspace), this.environmentService));
+						description = localize('folderDesc', "{0} {1}", getBaseLabel(workspace), getPathLabel(dirname(workspace), this.environmentService));
 						args = `--folder-uri "${workspace.toString()}"`;
 					} else {
-						description = nls.localize('workspaceDesc', "{0} {1}", getBaseLabel(workspace.configPath), getPathLabel(dirname(workspace.configPath), this.environmentService));
+						description = localize('workspaceDesc', "{0} {1}", getBaseLabel(workspace.configPath), getPathLabel(dirname(workspace.configPath), this.environmentService));
 						args = `--file-uri "${workspace.configPath.toString()}"`;
 					}
 
@@ -398,7 +399,7 @@ export class WorkspacesHistoryMainService extends Disposable implements IWorkspa
 
 		// Workspace: Untitled
 		if (extUriBiasedIgnorePathCase.isEqualOrParent(workspace.configPath, workspaceHome)) {
-			return nls.localize('untitledWorkspace', "Untitled (Workspace)");
+			return localize('untitledWorkspace', "Untitled (Workspace)");
 		}
 
 		let filename = basename(workspace.configPath);
@@ -406,7 +407,7 @@ export class WorkspacesHistoryMainService extends Disposable implements IWorkspa
 			filename = filename.substr(0, filename.length - WORKSPACE_EXTENSION.length - 1);
 		}
 
-		return nls.localize('workspaceName', "{0} (Workspace)", filename);
+		return localize('workspaceName', "{0} (Workspace)", filename);
 	}
 }
 
@@ -427,9 +428,9 @@ function indexOfWorkspace(arr: IRecent[], candidate: IWorkspaceIdentifier): numb
 }
 
 function indexOfFolder(arr: IRecent[], candidate: ISingleFolderWorkspaceIdentifier): number {
-	return arr.findIndex(folder => isRecentFolder(folder) && isEqual(folder.folderUri, candidate));
+	return arr.findIndex(folder => isRecentFolder(folder) && extUriBiasedIgnorePathCase.isEqual(folder.folderUri, candidate));
 }
 
 function indexOfFile(arr: IRecentFile[], candidate: URI): number {
-	return arr.findIndex(file => isEqual(file.fileUri, candidate));
+	return arr.findIndex(file => extUriBiasedIgnorePathCase.isEqual(file.fileUri, candidate));
 }