Fix handleExternalDrop event

code-asher · code-asher · commit e4150de1544b · 2019-02-21T14:11:49.000-06:00
diff --git 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<void> {
+	public async handleExternalDrop(target: ExplorerItem | ExplorerModel, originalEvent: DragEvent): Promise<void> {
 		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
@@ -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<ExplorerItem> {
-+		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

Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,9 @@ export class Client extends IdeClient {`
`41`	`41`	`return this._builtInExtensionsDirectory;`
`42`	`42`	`}`
`43`	`43`
`44`		`- public async handleExternalDrop(target: ExplorerItem \| ExplorerModel, originalEvent: DragMouseEvent): Promise<void> {`
	`44`	`+ public async handleExternalDrop(target: ExplorerItem \| ExplorerModel, originalEvent: DragEvent): Promise<void> {`
`45`	`45`	`await this.upload.uploadDropped(`
`46`		`- originalEvent.browserEvent as DragEvent,`
	`46`	`+ originalEvent,`
`47`	`47`	`(target instanceof ExplorerItem ? target : target.roots[0]).resource,`
`48`	`48`	`);`
`49`	`49`	`}`