From 6c0fe8cb04ff9acdbabe9ac83ee7b7c39bb4f049 Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Mon, 28 Oct 2019 22:52:54 +0100 Subject: [PATCH] --diff does not work with WSL. Fixes #83473 --- src/vs/code/node/paths.ts | 3 --- src/vs/platform/windows/electron-main/windowsMainService.ts | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/vs/code/node/paths.ts b/src/vs/code/node/paths.ts index fb191e7fe08..f605a4526f3 100644 --- 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 index f7b92e721b0..d0b62c048bd 100644 --- 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) {