ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-22 12:50:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 5b9869eb02fa4c96205a74d05cad9164dfd06d60 (#5607)

Browse Source
This commit is contained in:
Anthony Dresser
2019-05-24 12:20:30 -07:00
committed by GitHub
parent 361ada4963
commit bcc449b524
126 changed files with 3096 additions and 2255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/vs/workbench/contrib/quickopen/browser/gotoSymbolHandler.ts
View File

@@ -390,7 +390,7 @@ export class GotoSymbolHandler extends QuickOpenHandler {
this.rangeHighlightDecorationId = undefined;
}
getResults(searchValue: string, token: CancellationToken): Promise<QuickOpenModel | null> {
async getResults(searchValue: string, token: CancellationToken): Promise<QuickOpenModel | null> {
searchValue = searchValue.trim();
// Support to cancel pending outline requests
@@ -407,20 +407,19 @@ export class GotoSymbolHandler extends QuickOpenHandler {
}
// Resolve Outline Model
return this.getOutline().then(outline => {
if (!outline) {
return outline;
}
if (token.isCancellationRequested) {
return outline;
}
// Filter by search
outline.applyFilter(searchValue);
const outline = await this.getOutline();
if (!outline) {
return outline;
});
}
if (token.isCancellationRequested) {
return outline;
}
// Filter by search
outline.applyFilter(searchValue);
return outline;
}
getEmptyLabel(searchString: string): string {