Multi root workspaces: UNC paths get written as URI and not path. Fixes microsoft#70453

aeschli · aeschli · commit 1615a36eb451 · 2019-03-14T15:43:27.000+01:00
diff --git a/src/vs/base/common/resources.ts b/src/vs/base/common/resources.ts
@@ -218,14 +218,15 @@ export function relativePath(from: URI, to: URI): string | undefined {
  * Resolves a absolute or relative path against a base URI.
  */
 export function resolvePath(base: URI, path: string): URI {
-	let resolvedPath: string;
 	if (base.scheme === Schemas.file) {
-		resolvedPath = URI.file(paths.resolve(originalFSPath(base), path)).path;
-	} else {
-		resolvedPath = paths.posix.resolve(base.path, path);
+		const newURI = URI.file(paths.resolve(originalFSPath(base), path));
+		return base.with({
+			authority: newURI.authority,
+			path: newURI.path
+		});
 	}
 	return base.with({
-		path: resolvedPath
+		path: paths.posix.resolve(base.path, path)
 	});
 }
 
diff --git a/src/vs/base/test/common/resources.test.ts b/src/vs/base/test/common/resources.test.ts
@@ -296,6 +296,9 @@ suite('Resources', () => {
 
 			assertResolve(URI.file('\\\\server\\share\\some\\'), 'b1\\file.js', URI.file('\\\\server\\share\\some\\b1\\file.js'));
 			assertResolve(URI.file('\\\\server\\share\\some\\'), '\\file.js', URI.file('\\\\server\\share\\file.js'));
+
+			assertResolve(URI.file('c:\\'), '\\\\server\\share\\some\\', URI.file('\\\\server\\share\\some'));
+			assertResolve(URI.file('\\\\server\\share\\some\\'), 'c:\\', URI.file('c:\\'));
 		} else {
 			assertResolve(URI.file('/foo/bar'), 'file.js', URI.file('/foo/bar/file.js'));
 			assertResolve(URI.file('/foo/bar'), './file.js', URI.file('/foo/bar/file.js'));
diff --git a/src/vs/platform/workspaces/common/workspaces.ts b/src/vs/platform/workspaces/common/workspaces.ts
@@ -173,7 +173,7 @@ const SLASH = '/';
  */
 export function getStoredWorkspaceFolder(folderURI: URI, folderName: string | undefined, targetConfigFolderURI: URI, useSlashForPath = !isWindows): IStoredWorkspaceFolder {
 
-	if (folderURI.scheme !== targetConfigFolderURI.scheme || !isEqualAuthority(folderURI.authority, targetConfigFolderURI.authority)) {
+	if (folderURI.scheme !== targetConfigFolderURI.scheme) {
 		return { name: folderName, uri: folderURI.toString(true) };
 	}
 
@@ -200,6 +200,9 @@ export function getStoredWorkspaceFolder(folderURI: URI, folderName: string | un
 				}
 			}
 		} else {
+			if (!isEqualAuthority(folderURI.authority, targetConfigFolderURI.authority)) {
+				return { name: folderName, uri: folderURI.toString(true) };
+			}
 			folderPath = folderURI.path;
 		}
 	}
diff --git a/src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts b/src/vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts
@@ -316,6 +316,31 @@ suite('WorkspacesMainService', () => {
 		});
 	});
 
+	test('rewriteWorkspaceFileForNewLocation (unc paths)', () => {
+		if (!isWindows) {
+			return Promise.resolve();
+		}
+
+		const workspaceLocation = path.join(os.tmpdir(), 'wsloc');
+		const folder1Location = 'x:\\foo';
+		const folder2Location = '\\\\server\\share2\\some\\path';
+		const folder3Location = path.join(os.tmpdir(), 'wsloc', 'inner', 'more');
+
+		return createWorkspace([folder1Location, folder2Location, folder3Location]).then(workspace => {
+			const workspaceConfigPath = URI.file(path.join(workspaceLocation, `myworkspace.${Date.now()}.${WORKSPACE_EXTENSION}`));
+			let origContent = fs.readFileSync(workspace.configPath.fsPath).toString();
+
+			const newContent = rewriteWorkspaceFileForNewLocation(origContent, workspace.configPath, workspaceConfigPath);
+
+			const ws = JSON.parse(newContent) as IStoredWorkspace;
+			assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[0]).path, folder1Location);
+			assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[1]).path, folder2Location);
+			assertPathEquals((<IRawFileWorkspaceFolder>ws.folders[2]).path, 'inner\\more');
+
+			service.deleteUntitledWorkspaceSync(workspace);
+		});
+	});
+
 	test('deleteUntitledWorkspaceSync (untitled)', () => {
 		return createWorkspace([process.cwd(), os.tmpdir()]).then(workspace => {
 			assert.ok(fs.existsSync(workspace.configPath.fsPath));

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ const SLASH = '/';`
`173`	`173`	`*/`
`174`	`174`	`export function getStoredWorkspaceFolder(folderURI: URI, folderName: string \| undefined, targetConfigFolderURI: URI, useSlashForPath = !isWindows): IStoredWorkspaceFolder {`
`175`	`175`
`176`		`- if (folderURI.scheme !== targetConfigFolderURI.scheme \|\| !isEqualAuthority(folderURI.authority, targetConfigFolderURI.authority)) {`
	`176`	`+ if (folderURI.scheme !== targetConfigFolderURI.scheme) {`
`177`	`177`	`return { name: folderName, uri: folderURI.toString(true) };`
`178`	`178`	`}`
`179`	`179`
`@@ -200,6 +200,9 @@ export function getStoredWorkspaceFolder(folderURI: URI, folderName: string \| un`
`200`	`200`	`}`
`201`	`201`	`}`
`202`	`202`	`} else {`
	`203`	`+ if (!isEqualAuthority(folderURI.authority, targetConfigFolderURI.authority)) {`
	`204`	`+ return { name: folderName, uri: folderURI.toString(true) };`
	`205`	`+ }`
`203`	`206`	`folderPath = folderURI.path;`
`204`	`207`	`}`
`205`	`208`	`}`