diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts index b5041e64357..61d20f9ebfe 100644 --- a/src/vs/vscode.d.ts +++ b/src/vs/vscode.d.ts @@ -2611,12 +2611,14 @@ declare module 'vscode' { provideDocumentSymbols(document: TextDocument, token: CancellationToken): ProviderResult; } + /** + * Metadata about a document symbol provider. + */ export interface DocumentSymbolProviderMetadata { /** - * If there is more than one outline provider, this name will be used in the outline tree to - * distinguish between them. + * A human readable string that is shown when multiple outlines trees show for one document. */ - displayName?: string; + label?: string; } /** diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts index 0db9f340d53..58363b7e6e5 100644 --- a/src/vs/workbench/api/node/extHost.protocol.ts +++ b/src/vs/workbench/api/node/extHost.protocol.ts @@ -278,7 +278,7 @@ export interface ISerializedSignatureHelpProviderMetadata { export interface MainThreadLanguageFeaturesShape extends IDisposable { $unregister(handle: number): void; - $registerOutlineSupport(handle: number, selector: ISerializedDocumentFilter[], extensionId: string): void; + $registerOutlineSupport(handle: number, selector: ISerializedDocumentFilter[], label: string): void; $registerCodeLensSupport(handle: number, selector: ISerializedDocumentFilter[], eventHandle: number): void; $emitCodeLensEvent(eventHandle: number, event?: any): void; $registerDefinitionSupport(handle: number, selector: ISerializedDocumentFilter[]): void; diff --git a/src/vs/workbench/api/node/extHostLanguageFeatures.ts b/src/vs/workbench/api/node/extHostLanguageFeatures.ts index 6f1ae0d1891..b735f50fbf6 100644 --- a/src/vs/workbench/api/node/extHostLanguageFeatures.ts +++ b/src/vs/workbench/api/node/extHostLanguageFeatures.ts @@ -975,7 +975,7 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape { registerDocumentSymbolProvider(extension: IExtensionDescription, selector: vscode.DocumentSelector, provider: vscode.DocumentSymbolProvider, metadata?: vscode.DocumentSymbolProviderMetadata): vscode.Disposable { const handle = this._addNewAdapter(new OutlineAdapter(this._documents, provider), extension); - const displayName = (metadata && metadata.displayName) || (extension && (extension.displayName || extension.name)) || undefined; + const displayName = (metadata && metadata.label) || (extension && (extension.displayName || extension.name)) || undefined; this._proxy.$registerOutlineSupport(handle, this._transformDocumentSelector(selector), displayName); return this._createDisposable(handle); }