bug detecting workspaceIndentifiers to revive

aeschli · aeschli · commit b39ed1fbce7f · 2019-01-27T23:20:02.000+01:00
diff --git a/src/vs/platform/windows/node/windowsIpc.ts b/src/vs/platform/windows/node/windowsIpc.ts
@@ -6,7 +6,7 @@
 import { Event } from 'vs/base/common/event';
 import { IChannel, IServerChannel } from 'vs/base/parts/ipc/node/ipc';
 import { IWindowsService, INativeOpenDialogOptions, IEnterWorkspaceResult, CrashReporterStartOptions, IMessageBoxResult, MessageBoxOptions, SaveDialogOptions, OpenDialogOptions, IDevToolsOptions, INewWindowOptions } from 'vs/platform/windows/common/windows';
-import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isWorkspaceIdentifier, reviveWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
+import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, reviveWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
 import { IRecentlyOpened } from 'vs/platform/history/common/history';
 import { ISerializableCommandAction } from 'vs/platform/actions/common/actions';
 import { URI } from 'vs/base/common/uri';
@@ -63,7 +63,7 @@ export class WindowsChannel implements IServerChannel {
 			case 'removeFromRecentlyOpened': {
 				let paths: Array<IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier | URI | string> = arg;
 				if (Array.isArray(paths)) {
-					paths = paths.map(path => isWorkspaceIdentifier(path) ? reviveWorkspaceIdentifier(path) : typeof path === 'string' ? path : URI.revive(path));
+					paths = paths.map(path => isChanneledWorkspaceIdentifier(path) ? reviveWorkspaceIdentifier(path) : typeof path === 'string' ? path : URI.revive(path));
 				}
 				return this.service.removeFromRecentlyOpened(paths);
 			}
@@ -193,7 +193,7 @@ export class WindowsChannelClient implements IWindowsService {
 	getRecentlyOpened(windowId: number): Promise<IRecentlyOpened> {
 		return this.channel.call('getRecentlyOpened', windowId)
 			.then((recentlyOpened: IRecentlyOpened) => {
-				recentlyOpened.workspaces = recentlyOpened.workspaces.map(workspace => isWorkspaceIdentifier(workspace) ? reviveWorkspaceIdentifier(workspace) : URI.revive(workspace));
+				recentlyOpened.workspaces = recentlyOpened.workspaces.map(workspace => isChanneledWorkspaceIdentifier(workspace) ? reviveWorkspaceIdentifier(workspace) : URI.revive(workspace));
 				recentlyOpened.files = recentlyOpened.files.map(URI.revive);
 				return recentlyOpened;
 			});
@@ -337,3 +337,7 @@ export class WindowsChannelClient implements IWindowsService {
 		return Promise.resolve(this.channel.call('resolveProxy', [windowId, url]));
 	}
 }
+
+function isChanneledWorkspaceIdentifier(obj: any): obj is IWorkspaceIdentifier {
+	return obj && obj['configPath'];
+}
diff --git a/src/vs/platform/workspaces/common/workspaces.ts b/src/vs/platform/workspaces/common/workspaces.ts
@@ -26,7 +26,7 @@ export interface IWorkspaceIdentifier {
 	configPath: URI;
 }
 
-export function reviveWorkspaceIdentifier(workspace: { id: string, configPath: UriComponents; }) {
+export function reviveWorkspaceIdentifier(workspace: { id: string, configPath: UriComponents; }): IWorkspaceIdentifier {
 	return { id: workspace.id, configPath: URI.revive(workspace.configPath) };
 }
 
diff --git a/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts b/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts
@@ -1245,11 +1245,6 @@ suite('WorkspaceConfigurationService-Multiroot', () => {
 	});
 });
 
-
-export function createWorkspaceIdentifier(path: URI) {
-
-}
-
 function getWorkspaceId(configPath: URI): string {
 	let workspaceConfigPath = configPath.scheme === Schemas.file ? fsPath(configPath) : configPath.toString();
 	if (!isLinux) {

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ export interface IWorkspaceIdentifier {`
`26`	`26`	`configPath: URI;`
`27`	`27`	`}`
`28`	`28`
`29`		`-export function reviveWorkspaceIdentifier(workspace: { id: string, configPath: UriComponents; }) {`
	`29`	`+export function reviveWorkspaceIdentifier(workspace: { id: string, configPath: UriComponents; }): IWorkspaceIdentifier {`
`30`	`30`	`return { id: workspace.id, configPath: URI.revive(workspace.configPath) };`
`31`	`31`	`}`
`32`	`32`