From 309d15cefdb0feca559c508081acaeecb4440e63 Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 18 Apr 2019 10:48:54 -0500 Subject: [PATCH] Use file/folder open commands for all operating systems Mac was using its own thing. - Fixes #535 - Fixes #501 --- scripts/vscode.patch | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/vscode.patch b/scripts/vscode.patch index bc6cae6a2..0db5ae504 100644 --- a/scripts/vscode.patch +++ b/scripts/vscode.patch @@ -885,13 +885,19 @@ index 48ef482..dc47f81 100644 - placeHolder: isMacintosh ? nls.localize('openRecentPlaceHolderMac', "Select to open (hold Cmd-key to open in new window)") : nls.localize('openRecentPlaceHolder', "Select to open (hold Ctrl-key to open in new window)"), + placeHolder: browser.isMacintosh ? nls.localize('openRecentPlaceHolderMac', "Select to open (hold Cmd-key to open in new window)") : nls.localize('openRecentPlaceHolder', "Select to open (hold Ctrl-key to open in new window)"), diff --git a/src/vs/workbench/electron-browser/main.contribution.ts b/src/vs/workbench/electron-browser/main.contribution.ts -index 71bc992..97cbb71 100644 +index 71bc992..111ce51 100644 --- a/src/vs/workbench/electron-browser/main.contribution.ts +++ b/src/vs/workbench/electron-browser/main.contribution.ts @@ -13 +13,2 @@ import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes'; -import { isWindows, isLinux, isMacintosh } from 'vs/base/common/platform'; +import { isNative, isWeb } from 'vs/base/common/platform'; +import { isMacintosh, isWindows, isLinux } from 'vs/base/browser/browser'; +@@ -37 +38 @@ import { LogStorageAction } from 'vs/platform/storage/node/storageService'; +- if (isMacintosh) { ++ if (isNative && isMacintosh) { +@@ -225 +226 @@ import { LogStorageAction } from 'vs/platform/storage/node/storageService'; +- if (isMacintosh) { ++ if (isNative && isMacintosh) { @@ -306 +307 @@ import { LogStorageAction } from 'vs/platform/storage/node/storageService'; - when: IsMacContext.toNegated() + // when: IsMacContext.toNegated()