From 8916cb9bb244e965c65853bf09c0607d31d3f94c Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Wed, 6 Mar 2019 11:10:23 -0800 Subject: [PATCH] Update to vscode 1.31.1 (#45) --- .travis.yml | 2 +- build/tasks.ts | 2 +- scripts/vscode.patch | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1844bb6..540780c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ before_install: script: - scripts/build.sh before_deploy: -- export TRAVIS_TAG="1.31.0-$TRAVIS_BUILD_NUMBER" +- export TRAVIS_TAG="1.31.1-$TRAVIS_BUILD_NUMBER" - echo "$TRAVIS_TAG" "$TRAVIS_COMMIT" - git config --local user.name "$USER_NAME" - git config --local user.email "$USER_EMAIL" diff --git a/build/tasks.ts b/build/tasks.ts index 761a397..431fe50 100644 --- a/build/tasks.ts +++ b/build/tasks.ts @@ -224,7 +224,7 @@ const ensureCloned = register("vscode:clone", async (runner) => { } runner.cwd = vscodePath; - const checkout = await runner.execute("git", ["checkout", "tags/1.31.0"]); + const checkout = await runner.execute("git", ["checkout", "tags/1.31.1"]); if (checkout.exitCode !== 0) { throw new Error(`Failed to checkout: ${checkout.stderr}`); } diff --git a/scripts/vscode.patch b/scripts/vscode.patch index 3ae8a25..3854de0 100644 --- a/scripts/vscode.patch +++ b/scripts/vscode.patch @@ -31,7 +31,7 @@ index 1922450144..9900776aa2 100644 -import { isMacintosh } from 'vs/base/common/platform'; +import { isMacintosh } from 'vs/base/browser/browser'; diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts -index 5386958054..5c936e0a1d 100644 +index e6b2e4e39b..06cdfe152f 100644 --- a/src/vs/base/browser/ui/list/listWidget.ts +++ b/src/vs/base/browser/ui/list/listWidget.ts @@ -13 +13 @@ import * as DOM from 'vs/base/browser/dom'; @@ -43,7 +43,7 @@ index 5386958054..5c936e0a1d 100644 @@ -479 +479 @@ export function isSelectionSingleChangeEvent(event: IListMouseEvent | IList - return platform.isMacintosh ? event.browserEvent.metaKey : event.browserEvent.ctrlKey; + return browser.isMacintosh ? event.browserEvent.metaKey : event.browserEvent.ctrlKey; -@@ -539 +539 @@ class MouseController implements IDisposable { +@@ -540 +540 @@ class MouseController implements IDisposable { - return platform.isMacintosh ? event.browserEvent.metaKey : event.browserEvent.ctrlKey; + return browser.isMacintosh ? event.browserEvent.metaKey : event.browserEvent.ctrlKey; diff --git a/src/vs/base/browser/ui/sash/sash.ts b/src/vs/base/browser/ui/sash/sash.ts @@ -91,7 +91,7 @@ index 01f59d40fa..453d5c4ed3 100644 -import { isMacintosh } from 'vs/base/common/platform'; +import { isMacintosh } from 'vs/base/browser/browser'; diff --git a/src/vs/base/browser/ui/tree/abstractTree.ts b/src/vs/base/browser/ui/tree/abstractTree.ts -index 742c6aa0d8..2791d0691e 100644 +index d9665944a1..80659bb5f0 100644 --- a/src/vs/base/browser/ui/tree/abstractTree.ts +++ b/src/vs/base/browser/ui/tree/abstractTree.ts @@ -24 +24 @@ import { disposableTimeout } from 'vs/base/common/async'; @@ -685,7 +685,7 @@ index 6d25977a66..788f5c96e7 100644 - return `${product.extensionsGallery.itemUrl}?itemName=${this.publisher}.${this.name}`; + return undefined; // `${product.extensionsGallery.itemUrl}?itemName=${this.publisher}.${this.name}`; diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts -index 1002950c75..8c187d36ff 100644 +index 9df71eeec1..c68c42e922 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileActions.contribution.ts @@ -17 +17 @@ import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/co @@ -699,13 +699,13 @@ index 0bd9b93fcc..1c8adeb5ca 100644 -import { isWindows, isMacintosh } from 'vs/base/common/platform'; +import { isWindows, isMacintosh } from 'vs/base/browser/browser'; diff --git a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts -index e66f74f034..e2c24d851a 100644 +index 45b32eec0a..1f58bdcd70 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts @@ -39 +39 @@ import { DesktopDragAndDropData, ExternalElementsDragAndDropData, ElementsDragAn -import { isMacintosh, isLinux } from 'vs/base/common/platform'; +import { isMacintosh, isLinux } from 'vs/base/browser/browser'; -@@ -586,0 +587 @@ export class FileDragAndDrop implements ITreeDragAndDrop { +@@ -591,0 +592 @@ export class FileDragAndDrop implements ITreeDragAndDrop { + return (require('vs/../../../../packages/vscode/src/workbench') as typeof import('vs/../../../../packages/vscode/src/workbench')).workbench.handleExternalDrop(target, originalEvent); diff --git a/src/vs/workbench/parts/logs/electron-browser/logs.contribution.ts b/src/vs/workbench/parts/logs/electron-browser/logs.contribution.ts index 4015c9cd5d..bebdb25f6c 100644 @@ -854,13 +854,13 @@ index 033bd98d00..ba776c5ff3 100644 -import { isMacintosh } from 'vs/base/common/platform'; +import { isMacintosh } from 'vs/base/browser/browser'; diff --git a/src/vs/workbench/parts/webview/electron-browser/webviewElement.ts b/src/vs/workbench/parts/webview/electron-browser/webviewElement.ts -index 5d9110300f..eb16014814 100644 +index d8de423529..5953e920c3 100644 --- a/src/vs/workbench/parts/webview/electron-browser/webviewElement.ts +++ b/src/vs/workbench/parts/webview/electron-browser/webviewElement.ts @@ -21 +21 @@ import { endsWith } from 'vs/base/common/strings'; -import { isMacintosh } from 'vs/base/common/platform'; +import { isMacintosh } from 'vs/base/browser/browser'; -@@ -261,0 +262,3 @@ export class WebviewElement extends Disposable { +@@ -265,0 +266,3 @@ export class WebviewElement extends Disposable { + Object.defineProperty(this._options, 'useSameOriginForRoot', { + value: true, + });