diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts index 419759fbf32..f3c6d995363 100644 --- a/src/vs/editor/common/modes.ts +++ b/src/vs/editor/common/modes.ts @@ -191,7 +191,6 @@ export interface ISuggestion { additionalTextEdits?: editorCommon.ISingleEditOperation[]; command?: Command; snippetType?: SnippetType; - _extensionId?: string; } /** diff --git a/src/vs/editor/contrib/suggest/browser/suggestController.ts b/src/vs/editor/contrib/suggest/browser/suggestController.ts index 9b36f080e7d..770663c78ea 100644 --- a/src/vs/editor/contrib/suggest/browser/suggestController.ts +++ b/src/vs/editor/contrib/suggest/browser/suggestController.ts @@ -111,17 +111,6 @@ export class SuggestController implements IEditorContribution { this.telemetryService.publicLog('suggestSnippetInsert', { hasPlaceholders: snippet.placeHolders.length > 0 }); - - // telemetry experiment to figure out which extensions use - // the internal snippet syntax today and which use the tm - // snippet syntax (by accident?) - if (suggestion._extensionId) { - this.telemetryService.publicLog('suggestSnippetInsert2', { - extension: suggestion._extensionId, - internalPlaceholders: snippet.placeHolders.length, - tmPlaceholders: CodeSnippet.fromTextmate(suggestion.insertText).placeHolders.length - }); - } } } diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts index e7ee3be9ea0..be5a2dfb6b0 100644 --- a/src/vs/workbench/api/node/extHost.api.impl.ts +++ b/src/vs/workbench/api/node/extHost.api.impl.ts @@ -211,7 +211,7 @@ export function createApiFactory(initData: IInitData, threadService: IThreadServ return languageFeatures.registerSignatureHelpProvider(selector, provider, triggerCharacters); }, registerCompletionItemProvider(selector: vscode.DocumentSelector, provider: vscode.CompletionItemProvider, ...triggerCharacters: string[]): vscode.Disposable { - return languageFeatures.registerCompletionItemProvider(selector, provider, triggerCharacters, extension); + return languageFeatures.registerCompletionItemProvider(selector, provider, triggerCharacters); }, registerDocumentLinkProvider(selector: vscode.DocumentSelector, provider: vscode.DocumentLinkProvider): vscode.Disposable { return languageFeatures.registerDocumentLinkProvider(selector, provider); diff --git a/src/vs/workbench/api/node/extHostLanguageFeatures.ts b/src/vs/workbench/api/node/extHostLanguageFeatures.ts index c872dadf205..dfce64cc6fb 100644 --- a/src/vs/workbench/api/node/extHostLanguageFeatures.ts +++ b/src/vs/workbench/api/node/extHostLanguageFeatures.ts @@ -21,7 +21,6 @@ import { IWorkspaceSymbolProvider, IWorkspaceSymbol } from 'vs/workbench/parts/s import { asWinJsPromise } from 'vs/base/common/async'; import { MainContext, MainThreadLanguageFeaturesShape, ExtHostLanguageFeaturesShape, ObjectIdentifier } from './extHost.protocol'; import { regExpLeadsToEndlessLoop } from 'vs/base/common/strings'; -import { IExtensionDescription } from 'vs/platform/extensions/common/extensions'; // --- adapter @@ -414,14 +413,12 @@ class SuggestAdapter { private _commands: CommandsConverter; private _heapService: ExtHostHeapService; private _provider: vscode.CompletionItemProvider; - private _extension: IExtensionDescription; - constructor(documents: ExtHostDocuments, commands: CommandsConverter, heapService: ExtHostHeapService, provider: vscode.CompletionItemProvider, extension?: IExtensionDescription) { + constructor(documents: ExtHostDocuments, commands: CommandsConverter, heapService: ExtHostHeapService, provider: vscode.CompletionItemProvider) { this._documents = documents; this._commands = commands; this._heapService = heapService; this._provider = provider; - this._extension = extension; } provideCompletionItems(resource: URI, position: IPosition): TPromise { @@ -825,9 +822,9 @@ export class ExtHostLanguageFeatures extends ExtHostLanguageFeaturesShape { // --- suggestion - registerCompletionItemProvider(selector: vscode.DocumentSelector, provider: vscode.CompletionItemProvider, triggerCharacters: string[], extension?: IExtensionDescription): vscode.Disposable { + registerCompletionItemProvider(selector: vscode.DocumentSelector, provider: vscode.CompletionItemProvider, triggerCharacters: string[]): vscode.Disposable { const handle = this._nextHandle(); - this._adapter[handle] = new SuggestAdapter(this._documents, this._commands.converter, this._heapService, provider, extension); + this._adapter[handle] = new SuggestAdapter(this._documents, this._commands.converter, this._heapService, provider); this._proxy.$registerSuggestSupport(handle, selector, triggerCharacters); return this._createDisposable(handle); }