[remote cli] difftool on newly created files cancels the diff and com…

…pletely closes the workspace. Fixes #135634
microsoft · Oct 22, 2021 · 60057f9 · 60057f9
1 parent e2e6a28
commit 60057f9
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/vs/server/remoteCli.ts b/src/vs/server/remoteCli.ts
@@ -379,9 +379,11 @@ function translatePath(input: string, mapFileUri: (input: string) => string, fol
 
 		if (stat.isFile()) {
 			fileURIS.push(mappedUri);
-		} else {
+		} else if (stat.isDirectory()) {
 			folderURIS.push(mappedUri);
 		}
+		// handle paths like /dev/null that external tools (e.g. git difftool) pass to us
+		fileURIS.push(mappedUri);
 	} catch (e) {
 		if (e.code === 'ENOENT') {
 			fileURIS.push(mappedUri);