Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-18 01:20:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes #71315

Browse Source
This commit is contained in:
isidor
2020-10-30 11:09:06 +01:00
parent 0bf6df8da2
commit b30bbdeba9
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/files/browser/views/explorerView.ts
+12 -6
View File
@@ -590,14 +590,20 @@ export class ExplorerView extends ViewPane {
return;
}
const compressedController = this.renderer.getCompressedNavigationController(focus[0]) || this.renderer.getCompressedNavigationController(item);
const itemsCompressedTogether = compressedController && (compressedController.items.indexOf(focus[0]) >= 0) && (compressedController.items.indexOf(item) >= 0);
const indexOfItem = compressedController?.items.indexOf(item) || -1;
const itemsCompressedTogether = compressedController && (compressedController.items.indexOf(focus[0]) >= 0) && (indexOfItem >= 0);
if (focus[0] === item || itemsCompressedTogether) {
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();
if (itemsCompressedTogether && indexOfItem > 0 && item.parent) {
// In case of compact items just focus the parent if it is part of the compact item. So the focus stays
this.tree.setFocus([item.parent]);
} else {
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();
}
}
}
}