Layer breaker: browser/dnd (fixes microsoft#37611)

Benjamin Pasero · Benjamin Pasero · commit ca411762ccd0 · 2017-11-06T15:32:38.000+01:00
diff --git a/src/vs/base/browser/dnd.ts b/src/vs/base/browser/dnd.ts
@@ -6,7 +6,6 @@
 'use strict';
 
 import { $ } from 'vs/base/browser/builder';
-import URI from 'vs/base/common/uri';
 
 /**
  * A helper that will execute a provided function when the provided HTMLElement receives
@@ -40,42 +39,4 @@ export class DelayedDragHandler {
 	public dispose(): void {
 		this.clearDragTimeout();
 	}
-}
-
-export interface IDraggedResource {
-	resource: URI;
-	isExternal: boolean;
-}
-
-export function extractResources(e: DragEvent, externalOnly?: boolean): IDraggedResource[] {
-	const resources: IDraggedResource[] = [];
-	if (e.dataTransfer.types.length > 0) {
-
-		// Check for in-app DND
-		if (!externalOnly) {
-			const rawData = e.dataTransfer.getData('URL');
-			if (rawData) {
-				try {
-					resources.push({ resource: URI.parse(rawData), isExternal: false });
-				} catch (error) {
-					// Invalid URI
-				}
-			}
-		}
-
-		// Check for native file transfer
-		if (e.dataTransfer && e.dataTransfer.files) {
-			for (let i = 0; i < e.dataTransfer.files.length; i++) {
-				if (e.dataTransfer.files[i] && e.dataTransfer.files[i].path) {
-					try {
-						resources.push({ resource: URI.file(e.dataTransfer.files[i].path), isExternal: true });
-					} catch (error) {
-						// Invalid URI
-					}
-				}
-			}
-		}
-	}
-
-	return resources;
 }
diff --git a/src/vs/workbench/browser/editor.ts b/src/vs/workbench/browser/editor.ts
@@ -11,6 +11,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { IConstructorSignature0, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { isArray } from 'vs/base/common/types';
+import URI from 'vs/base/common/uri';
 
 export interface IEditorDescriptor {
 	instantiate(instantiationService: IInstantiationService): BaseEditor;
@@ -196,4 +197,43 @@ export const Extensions = {
 	Editors: 'workbench.contributions.editors'
 };
 
-Registry.add(Extensions.Editors, new EditorRegistry());
+Registry.add(Extensions.Editors, new EditorRegistry());
+
+export interface IDraggedResource {
+	resource: URI;
+	isExternal: boolean;
+}
+
+export function extractResources(e: DragEvent, externalOnly?: boolean): IDraggedResource[] {
+	const resources: IDraggedResource[] = [];
+	if (e.dataTransfer.types.length > 0) {
+
+		// Check for in-app DND
+		if (!externalOnly) {
+			const rawData = e.dataTransfer.getData('URL');
+			if (rawData) {
+				try {
+					resources.push({ resource: URI.parse(rawData), isExternal: false });
+				} catch (error) {
+					// Invalid URI
+				}
+			}
+		}
+
+		// Check for native file transfer
+		if (e.dataTransfer && e.dataTransfer.files) {
+			for (let i = 0; i < e.dataTransfer.files.length; i++) {
+				const file = e.dataTransfer.files[i] as { path: string };
+				if (file && file.path) {
+					try {
+						resources.push({ resource: URI.file(file.path), isExternal: true });
+					} catch (error) {
+						// Invalid URI
+					}
+				}
+			}
+		}
+	}
+
+	return resources;
+}
diff --git a/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts b/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts
@@ -30,7 +30,7 @@ import { TabsTitleControl } from 'vs/workbench/browser/parts/editor/tabsTitleCon
 import { TitleControl, ITitleAreaControl, handleWorkspaceExternalDrop } from 'vs/workbench/browser/parts/editor/titleControl';
 import { NoTabsTitleControl } from 'vs/workbench/browser/parts/editor/noTabsTitleControl';
 import { IEditorStacksModel, IStacksModelChangeEvent, IEditorGroup, EditorOptions, TextEditorOptions, IEditorIdentifier } from 'vs/workbench/common/editor';
-import { extractResources } from 'vs/base/browser/dnd';
+import { extractResources } from 'vs/workbench/browser/editor';
 import { IWindowService, IWindowsService } from 'vs/platform/windows/common/windows';
 import { getCodeEditor } from 'vs/editor/common/services/codeEditorService';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
@@ -36,7 +36,7 @@ import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen';
 import { IDisposable, dispose, combinedDisposable } from 'vs/base/common/lifecycle';
 import { ScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';
-import { extractResources } from 'vs/base/browser/dnd';
+import { extractResources } from 'vs/workbench/browser/editor';
 import { getOrSet } from 'vs/base/common/map';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
diff --git a/src/vs/workbench/browser/parts/editor/titleControl.ts b/src/vs/workbench/browser/parts/editor/titleControl.ts
@@ -39,7 +39,7 @@ import { IMenuService, MenuId, IMenu, ExecuteCommandAction } from 'vs/platform/a
 import { ResourceContextKey } from 'vs/workbench/common/resources';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { Themable } from 'vs/workbench/common/theme';
-import { IDraggedResource } from 'vs/base/browser/dnd';
+import { IDraggedResource } from 'vs/workbench/browser/editor';
 import { WORKSPACE_EXTENSION, IWorkspacesService } from 'vs/platform/workspaces/common/workspaces';
 import { extname } from 'vs/base/common/paths';
 import { IFileService } from 'vs/platform/files/common/files';
diff --git a/src/vs/workbench/parts/files/browser/views/explorerViewer.ts b/src/vs/workbench/parts/files/browser/views/explorerViewer.ts
@@ -55,7 +55,7 @@ import { IWindowService } from 'vs/platform/windows/common/windows';
 import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common/workspaceEditing';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { getPathLabel } from 'vs/base/common/labels';
-import { extractResources } from 'vs/base/browser/dnd';
+import { extractResources } from 'vs/workbench/browser/editor';
 
 export class FileDataSource implements IDataSource {
 	constructor(
