diff --git a/extensions/typescript-language-features/src/features/documentSymbol.ts b/extensions/typescript-language-features/src/features/documentSymbol.ts
index 7d3e198ffd3033f3368ba2d27d92d9fd6a7b65dc..506aaa676a765d7ed3085d490d9112d86c057fb6 100644
--- a/extensions/typescript-language-features/src/features/documentSymbol.ts
+++ b/extensions/typescript-language-features/src/features/documentSymbol.ts
@@ -40,7 +40,6 @@ class TypeScriptDocumentSymbolProvider implements vscode.DocumentSymbolProvider
 			return undefined;
 		}
 
-
 		let tree: Proto.NavigationTree;
 		try {
 			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 {
-		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);
 
-		if (item.childItems) {
-			for (const child of item.childItems) {
-				const includedChild = TypeScriptDocumentSymbolProvider.convertNavTree(resource, symbolInfo.children, child);
-				shouldInclude = shouldInclude || includedChild;
+		const children = new Set(item.childItems || []);
+		for (const span of item.spans) {
+			const range = typeConverters.Range.fromTextSpan(span);
+			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;
 	}