development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-30 13:10:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Expose navigator methods so I can avoid calling selectNext multiple times per action- it has side effects

Browse source
This commit is contained in:
roblou 2017-01-03 20:09:19 -08:00
parent ecbf70e253
commit 13d401e458
3 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/base/parts/tree/browser/tree.ts
View file

@ -328,7 +328,7 @@ export interface ITree extends Events.IEventEmitter {
* Returns a navigator which allows to discover the visible and
* expanded elements in the tree.
*/
getNavigator(): INavigator<any>;
getNavigator(fromElement?: any, subTreeOnly?: boolean): INavigator<any>;
/**
* Disposes the tree

4
src/vs/base/parts/tree/browser/treeImpl.ts
View file

@ -318,8 +318,8 @@ export class Tree extends Events.EventEmitter implements _.ITree {
return this.model.hasTrait(trait, element);
}
getNavigator(): INavigator<any> {
return new MappedNavigator(this.model.getNavigator(), i => i && i.getElement());
getNavigator(fromElement?: any, subTreeOnly?: boolean): INavigator<any> {
return new MappedNavigator(this.model.getNavigator(fromElement, subTreeOnly), i => i && i.getElement());
}
public dispose(): void {

45
src/vs/workbench/parts/search/browser/searchViewlet.ts
View file

@ -451,52 +451,53 @@ export class SearchViewlet extends Viewlet {
public selectNextResult(): void {
const eventPayload = { focusEditor: true };
const [selected]: FileMatchOrMatch[] = this.tree.getSelection();
const navigator = this.tree.getNavigator(selected, /*subTreeOnly=*/false);
let next = navigator.next();
this.tree.selectNext(undefined, undefined, eventPayload);
let [selected]: FileMatchOrMatch[] = this.tree.getSelection();
if (!selected) {
if (!next) {
return;
}
// Expand and go past FileMatch nodes
if (!(selected instanceof Match)) {
if (!this.tree.isExpanded(selected)) {
this.tree.expand(selected);
if (!(next instanceof Match)) {
if (!this.tree.isExpanded(next)) {
this.tree.expand(next);
}
// Select the FileMatch's first child
this.tree.selectNext(undefined, undefined, eventPayload);
next = navigator.next();
}
// Reveal the newly selected element
[selected] = this.tree.getSelection();
this.tree.reveal(selected);
this.tree.setSelection([next], eventPayload);
this.tree.reveal(next);
}
public selectPreviousResult(): void {
const eventPayload = { focusEditor: true };
const [selected]: FileMatchOrMatch[] = this.tree.getSelection();
const navigator = this.tree.getNavigator(selected, /*subTreeOnly=*/false);
this.tree.selectPrevious(undefined, undefined, eventPayload);
let [selected]: FileMatchOrMatch[] = this.tree.getSelection();
if (!selected) {
let prev = navigator.previous();
if (!prev) {
return;
}
// Expand and go past FileMatch nodes
if (!(selected instanceof Match)) {
this.tree.selectPrevious(undefined, undefined, eventPayload);
[selected] = this.tree.getSelection();
if (!(selected instanceof Match)) {
this.tree.selectNext(undefined, undefined, eventPayload);
this.tree.expand(selected);
this.tree.selectPrevious(undefined, undefined, eventPayload);
if (!(prev instanceof Match)) {
prev = navigator.previous();
if (!(prev instanceof Match)) {
// There is a second non-Match result, which must be a collapsed FileMatch.
// Expand it then select its last child.
navigator.next();
this.tree.expand(prev);
prev = navigator.previous();
}
}
// Reveal the newly selected element
[selected] = this.tree.getSelection();
this.tree.reveal(selected);
this.tree.setSelection([prev], eventPayload);
}
public setVisible(visible: boolean): TPromise<void> {