diff --git a/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts b/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts index 1aa547ec9ad24dbc727118e28e99b67160898611..20854ecf66bc9f40319ed9cc0a6efa71d103458f 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts @@ -20,7 +20,6 @@ import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostC import * as typeConverters from 'vs/workbench/api/node/extHostTypeConverters'; import { URI } from 'vs/base/common/uri'; import { Selection } from 'vs/editor/common/core/selection'; -import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions'; import * as codeInset from 'vs/workbench/contrib/codeinset/codeInset'; @extHostNamedCustomer(MainContext.MainThreadLanguageFeatures) @@ -164,7 +163,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha // -- code inset - $registerCodeInsetSupport(handle: number, selector: ISerializedDocumentFilter[], eventHandle: number, extension: IExtensionDescription): void { + $registerCodeInsetSupport(handle: number, selector: ISerializedDocumentFilter[], eventHandle: number): void { const provider = { provideCodeInsets: (model: ITextModel, token: CancellationToken): CodeInsetDto[] | Thenable => { @@ -178,8 +177,7 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha this._heapService.trackObject(obj); return obj; }); - }, - extensionLocation: extension.extensionLocation + } }; if (typeof eventHandle === 'number') { diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts index dadca886aa0b16f5645c188b76227f05cdbb9115..4dad35ff4dec700748981564ae03ff0257033b14 100644 --- a/src/vs/workbench/api/node/extHost.protocol.ts +++ b/src/vs/workbench/api/node/extHost.protocol.ts @@ -300,7 +300,7 @@ export interface MainThreadLanguageFeaturesShape extends IDisposable { $unregister(handle: number): void; $registerDocumentSymbolProvider(handle: number, selector: ISerializedDocumentFilter[], label: string): void; $registerCodeLensSupport(handle: number, selector: ISerializedDocumentFilter[], eventHandle: number | undefined): void; - $registerCodeInsetSupport(handle: number, selector: ISerializedDocumentFilter[], eventHandle: number, extension: IExtensionDescription): void; + $registerCodeInsetSupport(handle: number, selector: ISerializedDocumentFilter[], eventHandle: number): void; $emitCodeLensEvent(eventHandle: number, event?: any): void; $registerDefinitionSupport(handle: number, selector: ISerializedDocumentFilter[]): void; $registerDeclarationSupport(handle: number, selector: ISerializedDocumentFilter[]): void; diff --git a/src/vs/workbench/api/node/extHostLanguageFeatures.ts b/src/vs/workbench/api/node/extHostLanguageFeatures.ts index 15a14ef8e6e6fc44b03e5edb72d7d61fec08ed4f..ecd56ea3c18f629822bfb56f1742fdbf34926132 100644 --- a/src/vs/workbench/api/node/extHostLanguageFeatures.ts +++ b/src/vs/workbench/api/node/extHostLanguageFeatures.ts @@ -1134,16 +1134,16 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape { registerCodeInsetProvider(extension: IExtensionDescription, selector: vscode.DocumentSelector, provider: vscode.CodeInsetProvider): vscode.Disposable { const handle = this._nextHandle(); - const eventHandle = typeof provider.onDidChangeCodeInsets === 'function' ? this._nextHandle() : undefined; + // const eventHandle = typeof provider.onDidChangeCodeInsets === 'function' ? this._nextHandle() : undefined; this._adapter.set(handle, new AdapterData(new CodeInsetAdapter(this._documents, this._heapService, provider), extension)); - this._proxy.$registerCodeInsetSupport(handle, this._transformDocumentSelector(selector), eventHandle, extension); + this._proxy.$registerCodeInsetSupport(handle, this._transformDocumentSelector(selector), undefined); let result = this._createDisposable(handle); - if (eventHandle !== undefined) { - const subscription = provider.onDidChangeCodeInsets(_ => this._proxy.$emitCodeLensEvent(eventHandle)); - result = Disposable.from(result, subscription); - } + // if (eventHandle !== undefined) { + // const subscription = provider.onDidChangeCodeInsets(_ => this._proxy.$emitCodeLensEvent(eventHandle)); + // result = Disposable.from(result, subscription); + // } return result; } diff --git a/src/vs/workbench/contrib/codeinset/codeInset.ts b/src/vs/workbench/contrib/codeinset/codeInset.ts index a9402e36690f4c052e8af6198926bab586dda45b..c04b07c72c0f702e9a0e624323699aa36d2ce29c 100644 --- a/src/vs/workbench/contrib/codeinset/codeInset.ts +++ b/src/vs/workbench/contrib/codeinset/codeInset.ts @@ -7,7 +7,7 @@ import { registerLanguageCommand } from 'vs/editor/browser/editorExtensions'; import { ITextModel } from 'vs/editor/common/model'; import { onUnexpectedExternalError, illegalArgument } from 'vs/base/common/errors'; import { mergeSort } from 'vs/base/common/arrays'; -import { URI, UriComponents } from 'vs/base/common/uri'; +import { URI } from 'vs/base/common/uri'; import { Event } from 'vs/base/common/event'; import { IModelService } from 'vs/editor/common/services/modelService'; import { CancellationToken } from 'vs/base/common/cancellation'; @@ -23,7 +23,6 @@ export interface ICodeInsetSymbol { export interface CodeInsetProvider { onDidChange?: Event; - extensionLocation: UriComponents; provideCodeInsets(model: ITextModel, token: CancellationToken): ProviderResult; resolveCodeInset(model: ITextModel, codeInset: ICodeInsetSymbol, token: CancellationToken): ProviderResult; }