multiple selection drag and drop inside workbench

isidorn · isidorn · commit 7086bb87481b · 2018-01-11T11:14:18.000+01:00
diff --git a/src/vs/base/browser/dnd.ts b/src/vs/base/browser/dnd.ts
@@ -49,6 +49,11 @@ export const DataTransfers = {
 	 */
 	URL: 'URL',
 
+	/**
+	 * Application specific resource transfer type when multiple resources are being dragged.
+	 */
+	URLS: 'URLS',
+
 	/**
 	 * Browser specific transfer type to download.
 	 */
@@ -58,4 +63,4 @@ export const DataTransfers = {
 	 * Typicaly transfer type for copy/paste transfers.
 	 */
 	TEXT: 'text/plain'
-};
+};
diff --git a/src/vs/workbench/browser/editor.ts b/src/vs/workbench/browser/editor.ts
@@ -241,13 +241,19 @@ export function extractResources(e: DragEvent, externalOnly?: boolean): (IDragge
 
 			// Data Transfer: URL
 			else {
-				const rawURLData = e.dataTransfer.getData(DataTransfers.URL);
-				if (rawURLData) {
-					try {
-						resources.push({ resource: URI.parse(rawURLData), isExternal: false });
-					} catch (error) {
-						// Invalid URI
+				try {
+					const rawURLsData = e.dataTransfer.getData(DataTransfers.URLS);
+					if (rawURLsData) {
+						const uriStrArray: string[] = JSON.parse(rawURLsData);
+						resources.push(...uriStrArray.map(uriStr => ({ resource: URI.parse(uriStr), isExternal: false })));
+					} else {
+						const rawURLData = e.dataTransfer.getData(DataTransfers.URL);
+						if (rawURLData) {
+							resources.push({ resource: URI.parse(rawURLData), isExternal: false });
+						}
 					}
+				} catch (error) {
+					// Invalid URI
 				}
 			}
 		}
@@ -268,4 +274,4 @@ export function extractResources(e: DragEvent, externalOnly?: boolean): (IDragge
 	}
 
 	return resources;
-}
+}
diff --git a/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts b/src/vs/workbench/parts/files/electron-browser/views/explorerViewer.ts
@@ -726,13 +726,14 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {
 			});
 
 			// Apply some datatransfer types to allow for dragging the element outside of the application
-			// TODO@Isidor check this
 			if (sources.length === 1) {
 				if (!sources[0].isDirectory) {
 					originalEvent.dataTransfer.setData(DataTransfers.DOWNLOAD_URL, [MIME_BINARY, sources[0].name, sources[0].resource.toString()].join(':'));
 				}
 
 				originalEvent.dataTransfer.setData(DataTransfers.TEXT, getPathLabel(sources[0].resource));
+			} else {
+				originalEvent.dataTransfer.setData(DataTransfers.URLS, JSON.stringify(sources.map(s => s.resource.toString())));
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -241,13 +241,19 @@ export function extractResources(e: DragEvent, externalOnly?: boolean): (IDragge`
`241`	`241`
`242`	`242`	`// Data Transfer: URL`
`243`	`243`	`else {`
`244`		`- const rawURLData = e.dataTransfer.getData(DataTransfers.URL);`
`245`		`- if (rawURLData) {`
`246`		`- try {`
`247`		`- resources.push({ resource: URI.parse(rawURLData), isExternal: false });`
`248`		`- } catch (error) {`
`249`		`- // Invalid URI`
	`244`	`+ try {`
	`245`	`+ const rawURLsData = e.dataTransfer.getData(DataTransfers.URLS);`
	`246`	`+ if (rawURLsData) {`
	`247`	`+ const uriStrArray: string[] = JSON.parse(rawURLsData);`
	`248`	`+ resources.push(...uriStrArray.map(uriStr => ({ resource: URI.parse(uriStr), isExternal: false })));`
	`249`	`+ } else {`
	`250`	`+ const rawURLData = e.dataTransfer.getData(DataTransfers.URL);`
	`251`	`+ if (rawURLData) {`
	`252`	`+ resources.push({ resource: URI.parse(rawURLData), isExternal: false });`
	`253`	`+ }`
`250`	`254`	`}`
	`255`	`+ } catch (error) {`
	`256`	`+ // Invalid URI`
`251`	`257`	`}`
`252`	`258`	`}`
`253`	`259`	`}`
`@@ -268,4 +274,4 @@ export function extractResources(e: DragEvent, externalOnly?: boolean): (IDragge`
`268`	`274`	`}`
`269`	`275`
`270`	`276`	`return resources;`
`271`		`-}`
	`277`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -726,13 +726,14 @@ export class FileDragAndDrop extends SimpleFileResourceDragAndDrop {`
`726`	`726`	`});`
`727`	`727`
`728`	`728`	`// Apply some datatransfer types to allow for dragging the element outside of the application`
`729`		`- // TODO@Isidor check this`
`730`	`729`	`if (sources.length === 1) {`
`731`	`730`	`if (!sources[0].isDirectory) {`
`732`	`731`	`originalEvent.dataTransfer.setData(DataTransfers.DOWNLOAD_URL, [MIME_BINARY, sources[0].name, sources[0].resource.toString()].join(':'));`
`733`	`732`	`}`
`734`	`733`
`735`	`734`	`originalEvent.dataTransfer.setData(DataTransfers.TEXT, getPathLabel(sources[0].resource));`
	`735`	`+ } else {`
	`736`	`+ originalEvent.dataTransfer.setData(DataTransfers.URLS, JSON.stringify(sources.map(s => s.resource.toString())));`
`736`	`737`	`}`
`737`	`738`	`}`
`738`	`739`	`}`