fixes #71315

microsoft · Sep 18, 2020 · 26f6d2b · 26f6d2b
1 parent cca934d
commit 26f6d2b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/vs/workbench/contrib/files/browser/views/explorerView.ts b/src/vs/workbench/contrib/files/browser/views/explorerView.ts
@@ -588,10 +588,15 @@ export class ExplorerView extends ViewPane {
 		return this.tree.updateChildren(toRefresh, recursive);
 	}
 
-	focusNextIfItemFocused(item: ExplorerItem): void {
+	focusNeighbourIfItemFocused(item: ExplorerItem): void {
 		const focus = this.tree.getFocus();
 		if (focus.length === 1 && focus[0] === item) {
 			this.tree.focusNext();
+			const newFocus = this.tree.getFocus();
+			if (newFocus.length === 1 && newFocus[0] === item) {
+				// There was no next item to focus, focus the previous one
+				this.tree.focusPrevious();
+			}
 		}
 	}
 

diff --git a/src/vs/workbench/contrib/files/common/explorerService.ts b/src/vs/workbench/contrib/files/common/explorerService.ts
@@ -278,7 +278,7 @@ export class ExplorerService implements IExplorerService {
 					const parent = element.parent;
 					// Remove Element from Parent (Model)
 					parent.removeChild(element);
-					this.view?.focusNextIfItemFocused(element);
+					this.view?.focusNeighbourIfItemFocused(element);
 					// Refresh Parent (View)
 					await this.view?.refresh(false, parent);
 				}

diff --git a/src/vs/workbench/contrib/files/common/files.ts b/src/vs/workbench/contrib/files/common/files.ts
@@ -65,7 +65,7 @@ export interface IExplorerView {
 	setTreeInput(): Promise<void>;
 	itemsCopied(tats: ExplorerItem[], cut: boolean, previousCut: ExplorerItem[] | undefined): void;
 	setEditable(stat: ExplorerItem, isEditing: boolean): Promise<void>;
-	focusNextIfItemFocused(item: ExplorerItem): void;
+	focusNeighbourIfItemFocused(item: ExplorerItem): void;
 }
 
 export const IExplorerService = createDecorator<IExplorerService>('explorerService');