fix microsoft#205648 (microsoft#205653)

Author: benibenj

src/vs/workbench/contrib/files/browser/views/openEditorsView.ts

@@ -67,6 +67,7 @@ export class OpenEditorsView extends ViewPane {
 	private dirtyCountElement!: HTMLElement;
 	private listRefreshScheduler: RunOnceScheduler | undefined;
 	private structuralRefreshDelay: number;
+	private dnd: OpenEditorsDragAndDrop | undefined;
 	private list: WorkbenchList<OpenEditor | IEditorGroup> | undefined;
 	private listLabels: ResourceLabels | undefined;
 	private needsRefresh = false;
@@ -198,13 +199,16 @@ export class OpenEditorsView extends ViewPane {
 		if (this.listLabels) {
 			this.listLabels.clear();
 		}
+
+		this.dnd = new OpenEditorsDragAndDrop(this.sortOrder, this.instantiationService, this.editorGroupService);
+
 		this.listLabels = this.instantiationService.createInstance(ResourceLabels, { onDidChangeVisibility: this.onDidChangeBodyVisibility });
 		this.list = this.instantiationService.createInstance(WorkbenchList, 'OpenEditors', container, delegate, [
 			new EditorGroupRenderer(this.keybindingService, this.instantiationService),
 			new OpenEditorRenderer(this.listLabels, this.instantiationService, this.keybindingService, this.configurationService)
 		], {
 			identityProvider: { getId: (element: OpenEditor | IEditorGroup) => element instanceof OpenEditor ? element.getId() : element.id.toString() },
-			dnd: new OpenEditorsDragAndDrop(this.instantiationService, this.editorGroupService),
+			dnd: this.dnd,
 			overrideStyles: {
 				listBackground: this.getBackgroundColor()
 			},
@@ -448,6 +452,9 @@ export class OpenEditorsView extends ViewPane {
 		// Trigger a 'repaint' when decoration settings change or the sort order changed
 		if (event.affectsConfiguration('explorer.decorations') || event.affectsConfiguration('explorer.openEditors.sortOrder')) {
 			this.sortOrder = this.configurationService.getValue('explorer.openEditors.sortOrder');
+			if (this.dnd) {
+				this.dnd.sortOrder = this.sortOrder;
+			}
 			this.listRefreshScheduler?.schedule();
 		}
 	}
@@ -672,10 +679,18 @@ class OpenEditorRenderer implements IListRenderer<OpenEditor, IOpenEditorTemplat
 
 class OpenEditorsDragAndDrop implements IListDragAndDrop<OpenEditor | IEditorGroup> {
 
+	private _sortOrder: 'editorOrder' | 'alphabetical' | 'fullPath';
+	public set sortOrder(value: 'editorOrder' | 'alphabetical' | 'fullPath') {
+		this._sortOrder = value;
+	}
+
 	constructor(
+		sortOrder: 'editorOrder' | 'alphabetical' | 'fullPath',
 		private instantiationService: IInstantiationService,
 		private editorGroupService: IEditorGroupsService
-	) { }
+	) {
+		this._sortOrder = sortOrder;
+	}
 
 	@memoize private get dropHandler(): ResourcesDropHandler {
 		return this.instantiationService.createInstance(ResourcesDropHandler, { allowWorkspaceOpen: false });
@@ -724,6 +739,16 @@ class OpenEditorsDragAndDrop implements IListDragAndDrop<OpenEditor | IEditorGro
 			}
 		}
 
+		if (this._sortOrder !== 'editorOrder') {
+			if (data instanceof ElementsDragAndDropData) {
+				// No reordering supported when sorted
+				return false;
+			} else {
+				// Allow droping files to open them
+				return { accept: true, effect: { type: ListDragOverEffectType.Move }, feedback: [-1] } as IListDragOverReaction;
+			}
+		}
+
 		let dropEffectPosition: ListDragOverEffectPosition | undefined = undefined;
 		switch (targetSector) {
 			case ListViewTargetSector.TOP: