diff --git a/scripts/vscode.patch b/scripts/vscode.patch index 0db5ae50..41f69c2b 100644 --- a/scripts/vscode.patch +++ b/scripts/vscode.patch @@ -752,11 +752,14 @@ index 1f8088e..f5b0551 100644 - included: platform.isMacintosh + included: platform.isNative && platform.isMacintosh diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts -index 24ba122..fca7faf 100644 +index 24ba122..3ab8804 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts @@ -12,0 +13 @@ import * as nls from 'vs/nls'; +import * as browser from 'vs/base/browser/browser'; +@@ -185 +186 @@ configurationRegistry.registerConfiguration({ +- default: 'auto', ++ default: browser.isSafari ? 'dom' : 'auto', @@ -196 +197 @@ configurationRegistry.registerConfiguration({ - default: platform.isMacintosh ? 'selectWord' : platform.isWindows ? 'copyPaste' : 'default', + default: browser.isMacintosh ? 'selectWord' : browser.isWindows ? 'copyPaste' : 'default', @@ -885,7 +888,7 @@ 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..111ce51 100644 +index 71bc992..2692f39 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';