Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 12:19:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Expand js/ts document symbols to have entries for each span

Browse Source 
Fixes #54855
This commit is contained in:
Matt Bierner
2018-07-26 16:01:34 -07:00
parent bd1e8d40fd
commit 5e40bd7df9
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
extensions/typescript-language-features/src/features/documentSymbol.ts
View File

@@ -40,7 +40,6 @@ class TypeScriptDocumentSymbolProvider implements vscode.DocumentSymbolProvider
return undefined; return undefined;
} }
let tree: Proto.NavigationTree; let tree: Proto.NavigationTree;
try { try {
const args: Proto.FileRequestArgs = { file }; const args: Proto.FileRequestArgs = { file };
@@ -64,26 +63,33 @@ class TypeScriptDocumentSymbolProvider implements vscode.DocumentSymbolProvider
} }
private static convertNavTree(resource: vscode.Uri, bucket: vscode.DocumentSymbol[], item: Proto.NavigationTree): boolean { private static convertNavTree(resource: vscode.Uri, bucket: vscode.DocumentSymbol[], item: Proto.NavigationTree): boolean {
const symbolInfo = new vscode.DocumentSymbol(
item.text,
'',
getSymbolKind(item.kind),
typeConverters.Range.fromTextSpan(item.spans[0]),
typeConverters.Range.fromTextSpan(item.spans[0]),
);
let shouldInclude = TypeScriptDocumentSymbolProvider.shouldInclueEntry(item); let shouldInclude = TypeScriptDocumentSymbolProvider.shouldInclueEntry(item);
if (item.childItems) { const children = new Set(item.childItems || []);
for (const child of item.childItems) { for (const span of item.spans) {
const includedChild = TypeScriptDocumentSymbolProvider.convertNavTree(resource, symbolInfo.children, child); const range = typeConverters.Range.fromTextSpan(span);
shouldInclude = shouldInclude || includedChild; const symbolInfo = new vscode.DocumentSymbol(
item.text,
'',
getSymbolKind(item.kind),
range,
range);
if (item.childItems) {
for (const child of children) {
if (child.spans.some(span => !!range.intersection(typeConverters.Range.fromTextSpan(span)))) {
const includedChild = TypeScriptDocumentSymbolProvider.convertNavTree(resource, symbolInfo.children, child);
shouldInclude = shouldInclude || includedChild;
children.delete(child);
}
}
}
if (shouldInclude) {
bucket.push(symbolInfo);
} }
} }
if (shouldInclude) {
bucket.push(symbolInfo);
}
return shouldInclude; return shouldInclude;
} }