Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 11:08:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

know what vscode-engine extensions are targetting, #3210

Browse Source
This commit is contained in:
Johannes Rieken
2016-11-14 11:13:51 +01:00
parent 5bf5fc2a9e
commit 9f0b720440
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/api/node/extHost.api.impl.ts
View File

@@ -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.id);
return languageFeatures.registerCompletionItemProvider(selector, provider, triggerCharacters, extension);
},
registerDocumentLinkProvider(selector: vscode.DocumentSelector, provider: vscode.DocumentLinkProvider): vscode.Disposable {
return languageFeatures.registerDocumentLinkProvider(selector, provider);

27
src/vs/workbench/api/node/extHostLanguageFeatures.ts
View File

@@ -20,6 +20,8 @@ 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';
import * as semver from 'semver';
// --- adapter
@@ -412,14 +414,27 @@ class SuggestAdapter {
private _commands: CommandsConverter;
private _heapService: ExtHostHeapService;
private _provider: vscode.CompletionItemProvider;
private _extensionId: string;
private _extension: IExtensionDescription;
private _extensionIsBefore180: boolean;
constructor(documents: ExtHostDocuments, commands: CommandsConverter, heapService: ExtHostHeapService, provider: vscode.CompletionItemProvider, extensionId?: string) {
constructor(documents: ExtHostDocuments, commands: CommandsConverter, heapService: ExtHostHeapService, provider: vscode.CompletionItemProvider, extension?: IExtensionDescription) {
this._documents = documents;
this._commands = commands;
this._heapService = heapService;
this._provider = provider;
this._extensionId = extensionId;
this._extension = extension;
this._extensionIsBefore180 = SuggestAdapter._isBefore180(extension);
}
private static _isBefore180(extension: IExtensionDescription): boolean {
if (extension) {
let versionOrRange = extension.engines.vscode;
if (semver.valid(versionOrRange)) {
return semver.lt(versionOrRange, '1.8.0');
} else if (semver.validRange(versionOrRange)) {
return semver.gtr('1.8.0', versionOrRange);
}
}
}
provideCompletionItems(resource: URI, position: IPosition): TPromise<modes.ISuggestResult> {
@@ -479,7 +494,7 @@ class SuggestAdapter {
suggestion.overwriteAfter = 0;
}
suggestion._extensionId = this._extensionId;
suggestion._extensionId = this._extension && this._extension.id;
suggestion.snippetType = 'internal';
// store suggestion
@@ -776,9 +791,9 @@ export class ExtHostLanguageFeatures extends ExtHostLanguageFeaturesShape {
// --- suggestion
registerCompletionItemProvider(selector: vscode.DocumentSelector, provider: vscode.CompletionItemProvider, triggerCharacters: string[], extensionId?: string): vscode.Disposable {
registerCompletionItemProvider(selector: vscode.DocumentSelector, provider: vscode.CompletionItemProvider, triggerCharacters: string[], extension?: IExtensionDescription): vscode.Disposable {
const handle = this._nextHandle();
this._adapter[handle] = new SuggestAdapter(this._documents, this._commands.converter, this._heapService, provider, extensionId);
this._adapter[handle] = new SuggestAdapter(this._documents, this._commands.converter, this._heapService, provider, extension);
this._proxy.$registerSuggestSupport(handle, selector, triggerCharacters);
return this._createDisposable(handle);
}