--diff does not work with WSL. Fixes microsoft#83473

aeschli · aeschli · commit 6c0fe8cb04ff · 2019-10-28T22:53:06.000+01:00
diff --git a/src/vs/code/node/paths.ts b/src/vs/code/node/paths.ts
@@ -25,9 +25,6 @@ export function validatePaths(args: ParsedArgs): ParsedArgs {
 		args._ = paths;
 	}
 
-	// Update environment
-	args.diff = args.diff && args._.length === 2;
-
 	return args;
 }
 
diff --git a/src/vs/platform/windows/electron-main/windowsMainService.ts b/src/vs/platform/windows/electron-main/windowsMainService.ts
@@ -496,7 +496,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 
 		// Remember in recent document list (unless this opens for extension development)
 		// Also do not add paths when files are opened for diffing, only if opened individually
-		if (!usedWindows.some(window => window.isExtensionDevelopmentHost) && !openConfig.diffMode && !openConfig.noRecentEntry) {
+		if (!usedWindows.some(window => window.isExtensionDevelopmentHost) && !(fileInputs?.filesToDiff) && !openConfig.noRecentEntry) {
 			const recents: IRecent[] = [];
 			for (let pathToOpen of pathsToOpen) {
 				if (pathToOpen.workspace) {

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,6 @@ export function validatePaths(args: ParsedArgs): ParsedArgs {`
`25`	`25`	`args._ = paths;`
`26`	`26`	`}`
`27`	`27`
`28`		`- // Update environment`
`29`		`- args.diff = args.diff && args._.length === 2;`
`30`		`-`
`31`	`28`	`return args;`
`32`	`29`	`}`
`33`	`30`