development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 21:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use async in TS documentSymbolProvider

Browse source
This commit is contained in:
Matt Bierner 2017-06-12 17:28:48 -07:00
parent 996af4d965
commit bbcd10ae1a
1 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
extensions/typescript/src/features/documentSymbolProvider.ts
View file

@ -33,18 +33,19 @@ export default class TypeScriptDocumentSymbolProvider implements DocumentSymbolP
public constructor(
private client: ITypescriptServiceClient) { }
public provideDocumentSymbols(resource: TextDocument, token: CancellationToken): Promise<SymbolInformation[]> {
public async provideDocumentSymbols(resource: TextDocument, token: CancellationToken): Promise<SymbolInformation[]> {
const filepath = this.client.normalizePath(resource.uri);
if (!filepath) {
return Promise.resolve<SymbolInformation[]>([]);
return [];
}
const args: Proto.FileRequestArgs = {
file: filepath
};
if (this.client.apiVersion.has206Features()) {
return this.client.execute('navtree', args, token).then((response) => {
const result: SymbolInformation[] = [];
try {
const result: SymbolInformation[] = [];
if (this.client.apiVersion.has206Features()) {
const response = await this.client.execute('navtree', args, token);
if (response.body) {
// The root represents the file. Ignore this when showing in the UI
let tree = response.body;
@ -52,21 +53,16 @@ export default class TypeScriptDocumentSymbolProvider implements DocumentSymbolP
tree.childItems.forEach(item => TypeScriptDocumentSymbolProvider.convertNavTree(resource.uri, result, item));
}
}
return result;
}, () => {
return [];
});
} else {
return this.client.execute('navbar', args, token).then((response) => {
const result: SymbolInformation[] = [];
} else {
const response = await this.client.execute('navbar', args, token);
if (response.body) {
let foldingMap: ObjectMap<SymbolInformation> = Object.create(null);
response.body.forEach(item => TypeScriptDocumentSymbolProvider.convertNavBar(resource.uri, 0, foldingMap, result, item));
}
return result;
}, () => {
return [];
});
}
return result;
} catch (e) {
return [];
}
}