From e4150de1544b5db5a397dd3ff51f1a40bec461dd Mon Sep 17 00:00:00 2001 From: Asher Date: Thu, 21 Feb 2019 12:43:49 -0600 Subject: [PATCH] Fix handleExternalDrop event --- packages/vscode/src/client.ts | 4 ++-- scripts/vscode.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/vscode/src/client.ts b/packages/vscode/src/client.ts index 0a489dac6..a087d1988 100644 --- a/packages/vscode/src/client.ts +++ b/packages/vscode/src/client.ts @@ -41,9 +41,9 @@ export class Client extends IdeClient { return this._builtInExtensionsDirectory; } - public async handleExternalDrop(target: ExplorerItem | ExplorerModel, originalEvent: DragMouseEvent): Promise { + public async handleExternalDrop(target: ExplorerItem | ExplorerModel, originalEvent: DragEvent): Promise { await this.upload.uploadDropped( - originalEvent.browserEvent as DragEvent, + originalEvent, (target instanceof ExplorerItem ? target : target.roots[0]).resource, ); } diff --git a/scripts/vscode.patch b/scripts/vscode.patch index dc0aed015..6f2fa8e0c 100644 --- a/scripts/vscode.patch +++ b/scripts/vscode.patch @@ -129,11 +129,11 @@ index 81954344b9..2bdce9603e 100644 - if (!fs.existsSync(this.adapterExecutable.command)) { + if (!(await require("util").promisify(fs.exists)(this.adapterExecutable.command))) { 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..aca6f509b0 100644 +index e66f74f034..759ffe0cef 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts @@ -586,0 +587 @@ export class FileDragAndDrop implements ITreeDragAndDrop { -+ return (require('vs/../../../../packages/vscode') as typeof import ('vs/../../../../packages/vscode')).client.handleExternalDrop(target, originalEvent as any); ++ return (require('vs/../../../../packages/vscode') as typeof import('vs/../../../../packages/vscode')).client.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 --- a/src/vs/workbench/parts/logs/electron-browser/logs.contribution.ts