Skip to content

Commit 309d15c

Browse files
committed
Use file/folder open commands for all operating systems
Mac was using its own thing. - Fixes #535 - Fixes #501
1 parent 95006a4 commit 309d15c

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

scripts/vscode.patch

+7-1
Original file line numberDiff line numberDiff line change
@@ -885,13 +885,19 @@ index 48ef482..dc47f81 100644
885885
- 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)"),
886886
+ 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)"),
887887
diff --git a/src/vs/workbench/electron-browser/main.contribution.ts b/src/vs/workbench/electron-browser/main.contribution.ts
888-
index 71bc992..97cbb71 100644
888+
index 71bc992..111ce51 100644
889889
--- a/src/vs/workbench/electron-browser/main.contribution.ts
890890
+++ b/src/vs/workbench/electron-browser/main.contribution.ts
891891
@@ -13 +13,2 @@ import { KeyMod, KeyChord, KeyCode } from 'vs/base/common/keyCodes';
892892
-import { isWindows, isLinux, isMacintosh } from 'vs/base/common/platform';
893893
+import { isNative, isWeb } from 'vs/base/common/platform';
894894
+import { isMacintosh, isWindows, isLinux } from 'vs/base/browser/browser';
895+
@@ -37 +38 @@ import { LogStorageAction } from 'vs/platform/storage/node/storageService';
896+
- if (isMacintosh) {
897+
+ if (isNative && isMacintosh) {
898+
@@ -225 +226 @@ import { LogStorageAction } from 'vs/platform/storage/node/storageService';
899+
- if (isMacintosh) {
900+
+ if (isNative && isMacintosh) {
895901
@@ -306 +307 @@ import { LogStorageAction } from 'vs/platform/storage/node/storageService';
896902
- when: IsMacContext.toNegated()
897903
+ // when: IsMacContext.toNegated()

0 commit comments

Comments
 (0)