more tweaks microsoft#34968

jrieken · jrieken · commit 681a9e0d5485 · 2018-05-07T10:03:31.000+02:00
diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
@@ -485,7 +485,7 @@ declare module 'vscode' {
 	}
 
 	export interface DocumentSymbolProvider {
-		provideDocumentSymbols(document: TextDocument, token: CancellationToken): ProviderResult<HierarchicalSymbolInformation | SymbolInformation[]>;
+		provideDocumentSymbols(document: TextDocument, token: CancellationToken): ProviderResult<HierarchicalSymbolInformation[] | SymbolInformation[]>;
 	}
 
 	//#endregion
diff --git a/src/vs/workbench/api/node/extHostLanguageFeatures.ts b/src/vs/workbench/api/node/extHostLanguageFeatures.ts
@@ -9,7 +9,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { mixin } from 'vs/base/common/objects';
 import * as vscode from 'vscode';
 import * as typeConvert from 'vs/workbench/api/node/extHostTypeConverters';
-import { Range, Disposable, CompletionList, SnippetString, CodeActionKind, HierarchicalSymbolInformation } from 'vs/workbench/api/node/extHostTypes';
+import { Range, Disposable, CompletionList, SnippetString, CodeActionKind, HierarchicalSymbolInformation, SymbolInformation } from 'vs/workbench/api/node/extHostTypes';
 import { ISingleEditOperation } from 'vs/editor/common/model';
 import * as modes from 'vs/editor/common/modes';
 import { ExtHostHeapService } from 'vs/workbench/api/node/extHostHeapService';
@@ -39,13 +39,15 @@ class OutlineAdapter {
 	provideDocumentSymbols(resource: URI): TPromise<SymbolInformationDto[]> {
 		let doc = this._documents.getDocumentData(resource).document;
 		return asWinJsPromise(token => this._provider.provideDocumentSymbols(doc, token)).then(value => {
-			if (value instanceof HierarchicalSymbolInformation) {
-				return [typeConvert.HierarchicalSymbolInformation.from(value)];
+			if (isFalsyOrEmpty(value)) {
+				return undefined;
 			}
-			if (Array.isArray(value)) {
-				return value.map(typeConvert.SymbolInformation.from);
+			let [probe] = value;
+			if (probe instanceof HierarchicalSymbolInformation) {
+				return (<HierarchicalSymbolInformation[]>value).map(typeConvert.HierarchicalSymbolInformation.from);
+			} else {
+				return (<SymbolInformation[]>value).map(typeConvert.SymbolInformation.from);
 			}
-			return undefined;
 		});
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -485,7 +485,7 @@ declare module 'vscode' {`
`485`	`485`	`}`
`486`	`486`
`487`	`487`	`export interface DocumentSymbolProvider {`
`488`		`- provideDocumentSymbols(document: TextDocument, token: CancellationToken): ProviderResult<HierarchicalSymbolInformation \| SymbolInformation[]>;`
	`488`	`+ provideDocumentSymbols(document: TextDocument, token: CancellationToken): ProviderResult<HierarchicalSymbolInformation[] \| SymbolInformation[]>;`
`489`	`489`	`}`
`490`	`490`
`491`	`491`	`//#endregion`