List of recently opened sorts weird. Fixes microsoft#70222

aeschli · aeschli · commit 2275bfe42848 · 2019-03-14T17:08:41.000+01:00
diff --git a/src/vs/platform/history/electron-main/historyMainService.ts b/src/vs/platform/history/electron-main/historyMainService.ts
@@ -48,38 +48,44 @@ export class HistoryMainService implements IHistoryMainService {
 	}
 
 	addRecentlyOpened(newlyAdded: IRecent[]): void {
-		const mru = this.getRecentlyOpened();
+		const workspaces: Array<IRecentFolder | IRecentWorkspace> = [];
+		const files: IRecentFile[] = [];
 
 		for (let curr of newlyAdded) {
 			if (isRecentWorkspace(curr)) {
-				if (!this.workspacesMainService.isUntitledWorkspace(curr.workspace) && indexOfWorkspace(mru.workspaces, curr.workspace) === -1) {
-					mru.workspaces.unshift(curr);
+				if (!this.workspacesMainService.isUntitledWorkspace(curr.workspace) && indexOfWorkspace(workspaces, curr.workspace) === -1) {
+					workspaces.push(curr);
 				}
 			} else if (isRecentFolder(curr)) {
-				if (indexOfFolder(mru.workspaces, curr.folderUri) === -1) {
-					mru.workspaces.unshift(curr);
+				if (indexOfFolder(workspaces, curr.folderUri) === -1) {
+					workspaces.push(curr);
 				}
 			} else {
-				if (indexOfFile(mru.files, curr.fileUri) === -1) {
-					mru.files.unshift(curr);
+				if (indexOfFile(files, curr.fileUri) === -1) {
+					files.push(curr);
 					// Add to recent documents (Windows only, macOS later)
 					if (isWindows && curr.fileUri.scheme === Schemas.file) {
 						app.addRecentDocument(curr.fileUri.fsPath);
 					}
 				}
 			}
+		}
 
-			// Make sure its bounded
-			mru.workspaces = mru.workspaces.slice(0, HistoryMainService.MAX_TOTAL_RECENT_ENTRIES);
-			mru.files = mru.files.slice(0, HistoryMainService.MAX_TOTAL_RECENT_ENTRIES);
+		this.addEntriesFromStorage(workspaces, files);
 
-			this.saveRecentlyOpened(mru);
-			this._onRecentlyOpenedChange.fire();
+		if (workspaces.length > HistoryMainService.MAX_TOTAL_RECENT_ENTRIES) {
+			workspaces.length = HistoryMainService.MAX_TOTAL_RECENT_ENTRIES;
+		}
+		if (files.length > HistoryMainService.MAX_TOTAL_RECENT_ENTRIES) {
+			files.length = HistoryMainService.MAX_TOTAL_RECENT_ENTRIES;
+		}
 
-			// Schedule update to recent documents on macOS dock
-			if (isMacintosh) {
-				this.macOSRecentDocumentsUpdater.trigger(() => this.updateMacOSRecentDocuments());
-			}
+		this.saveRecentlyOpened({ workspaces, files });
+		this._onRecentlyOpenedChange.fire();
+
+		// Schedule update to recent documents on macOS dock
+		if (isMacintosh) {
+			this.macOSRecentDocumentsUpdater.trigger(() => this.updateMacOSRecentDocuments());
 		}
 	}
 
@@ -177,7 +183,12 @@ export class HistoryMainService implements IHistoryMainService {
 				}
 			}
 		}
+		this.addEntriesFromStorage(workspaces, files);
 
+		return { workspaces, files };
+	}
+
+	private addEntriesFromStorage(workspaces: Array<IRecentFolder | IRecentWorkspace>, files: IRecentFile[]) {
 		// Get from storage
 		let recents = this.getRecentlyOpenedFromStorage();
 		for (let recent of recents.workspaces) {
@@ -196,7 +207,6 @@ export class HistoryMainService implements IHistoryMainService {
 				files.push(recent);
 			}
 		}
-		return { workspaces, files };
 	}
 
 	private getRecentlyOpenedFromStorage(): IRecentlyOpened {

Original file line number	Diff line number	Diff line change
`@@ -48,38 +48,44 @@ export class HistoryMainService implements IHistoryMainService {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`addRecentlyOpened(newlyAdded: IRecent[]): void {`
`51`		`- const mru = this.getRecentlyOpened();`
	`51`	`+ const workspaces: Array<IRecentFolder \| IRecentWorkspace> = [];`
	`52`	`+ const files: IRecentFile[] = [];`
`52`	`53`
`53`	`54`	`for (let curr of newlyAdded) {`
`54`	`55`	`if (isRecentWorkspace(curr)) {`
`55`		`- if (!this.workspacesMainService.isUntitledWorkspace(curr.workspace) && indexOfWorkspace(mru.workspaces, curr.workspace) === -1) {`
`56`		`- mru.workspaces.unshift(curr);`
	`56`	`+ if (!this.workspacesMainService.isUntitledWorkspace(curr.workspace) && indexOfWorkspace(workspaces, curr.workspace) === -1) {`
	`57`	`+ workspaces.push(curr);`
`57`	`58`	`}`
`58`	`59`	`} else if (isRecentFolder(curr)) {`
`59`		`- if (indexOfFolder(mru.workspaces, curr.folderUri) === -1) {`
`60`		`- mru.workspaces.unshift(curr);`
	`60`	`+ if (indexOfFolder(workspaces, curr.folderUri) === -1) {`
	`61`	`+ workspaces.push(curr);`
`61`	`62`	`}`
`62`	`63`	`} else {`
`63`		`- if (indexOfFile(mru.files, curr.fileUri) === -1) {`
`64`		`- mru.files.unshift(curr);`
	`64`	`+ if (indexOfFile(files, curr.fileUri) === -1) {`
	`65`	`+ files.push(curr);`
`65`	`66`	`// Add to recent documents (Windows only, macOS later)`
`66`	`67`	`if (isWindows && curr.fileUri.scheme === Schemas.file) {`
`67`	`68`	`app.addRecentDocument(curr.fileUri.fsPath);`
`68`	`69`	`}`
`69`	`70`	`}`
`70`	`71`	`}`
	`72`	`+ }`
`71`	`73`
`72`		`- // Make sure its bounded`
`73`		`- mru.workspaces = mru.workspaces.slice(0, HistoryMainService.MAX_TOTAL_RECENT_ENTRIES);`
`74`		`- mru.files = mru.files.slice(0, HistoryMainService.MAX_TOTAL_RECENT_ENTRIES);`
	`74`	`+ this.addEntriesFromStorage(workspaces, files);`
`75`	`75`
`76`		`- this.saveRecentlyOpened(mru);`
`77`		`- this._onRecentlyOpenedChange.fire();`
	`76`	`+ if (workspaces.length > HistoryMainService.MAX_TOTAL_RECENT_ENTRIES) {`
	`77`	`+ workspaces.length = HistoryMainService.MAX_TOTAL_RECENT_ENTRIES;`
	`78`	`+ }`
	`79`	`+ if (files.length > HistoryMainService.MAX_TOTAL_RECENT_ENTRIES) {`
	`80`	`+ files.length = HistoryMainService.MAX_TOTAL_RECENT_ENTRIES;`
	`81`	`+ }`
`78`	`82`
`79`		`- // Schedule update to recent documents on macOS dock`
`80`		`- if (isMacintosh) {`
`81`		`- this.macOSRecentDocumentsUpdater.trigger(() => this.updateMacOSRecentDocuments());`
`82`		`- }`
	`83`	`+ this.saveRecentlyOpened({ workspaces, files });`
	`84`	`+ this._onRecentlyOpenedChange.fire();`
	`85`	`+`
	`86`	`+ // Schedule update to recent documents on macOS dock`
	`87`	`+ if (isMacintosh) {`
	`88`	`+ this.macOSRecentDocumentsUpdater.trigger(() => this.updateMacOSRecentDocuments());`
`83`	`89`	`}`
`84`	`90`	`}`
`85`	`91`
`@@ -177,7 +183,12 @@ export class HistoryMainService implements IHistoryMainService {`
`177`	`183`	`}`
`178`	`184`	`}`
`179`	`185`	`}`
	`186`	`+ this.addEntriesFromStorage(workspaces, files);`
`180`	`187`
	`188`	`+ return { workspaces, files };`
	`189`	`+ }`
	`190`	`+`
	`191`	`+ private addEntriesFromStorage(workspaces: Array<IRecentFolder \| IRecentWorkspace>, files: IRecentFile[]) {`
`181`	`192`	`// Get from storage`
`182`	`193`	`let recents = this.getRecentlyOpenedFromStorage();`
`183`	`194`	`for (let recent of recents.workspaces) {`
`@@ -196,7 +207,6 @@ export class HistoryMainService implements IHistoryMainService {`
`196`	`207`	`files.push(recent);`
`197`	`208`	`}`
`198`	`209`	`}`
`199`		`- return { workspaces, files };`
`200`	`210`	`}`
`201`	`211`
`202`	`212`	`private getRecentlyOpenedFromStorage(): IRecentlyOpened {`