Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-02 06:21:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

debt - modes.ISuggestSupport becomes modes.CompletionItemProvider

Browse Source
This commit is contained in:
Johannes Rieken
2018-10-02 12:30:22 +02:00
parent c994ee22c9
commit 3f12ef35a8
30 changed files with 336 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vs/workbench/api/electron-browser/mainThreadLanguageFeatures.ts
View File

@@ -280,9 +280,9 @@ export class MainThreadLanguageFeatures implements MainThreadLanguageFeaturesSha
// --- suggest
$registerSuggestSupport(handle: number, selector: ISerializedDocumentFilter[], triggerCharacters: string[], supportsResolveDetails: boolean): void {
this._registrations[handle] = modes.SuggestRegistry.register(typeConverters.LanguageSelector.from(selector), <modes.ISuggestSupport>{
this._registrations[handle] = modes.CompletionProviderRegistry.register(typeConverters.LanguageSelector.from(selector), <modes.CompletionItemProvider>{
triggerCharacters,
provideCompletionItems: (model: ITextModel, position: EditorPosition, context: modes.SuggestContext, token: CancellationToken): Thenable<modes.ISuggestResult> => {
provideCompletionItems: (model: ITextModel, position: EditorPosition, context: modes.CompletionContext, token: CancellationToken): Thenable<modes.CompletionList> => {
return this._proxy.$provideCompletionItems(handle, model.uri, position, context, token).then(result => {
if (!result) {
return result;

6
src/vs/workbench/api/node/extHost.protocol.ts
View File

@@ -750,7 +750,7 @@ export class IdObject {
}
}
export interface SuggestionDto extends modes.ISuggestion {
export interface SuggestionDto extends modes.CompletionItem {
_id: number;
_parentId: number;
}
@@ -843,8 +843,8 @@ export interface ExtHostLanguageFeaturesShape {
$releaseWorkspaceSymbols(handle: number, id: number): void;
$provideRenameEdits(handle: number, resource: UriComponents, position: IPosition, newName: string, token: CancellationToken): Thenable<WorkspaceEditDto>;
$resolveRenameLocation(handle: number, resource: UriComponents, position: IPosition, token: CancellationToken): Thenable<modes.RenameLocation>;
$provideCompletionItems(handle: number, resource: UriComponents, position: IPosition, context: modes.SuggestContext, token: CancellationToken): Thenable<SuggestResultDto>;
$resolveCompletionItem(handle: number, resource: UriComponents, position: IPosition, suggestion: modes.ISuggestion, token: CancellationToken): Thenable<modes.ISuggestion>;
$provideCompletionItems(handle: number, resource: UriComponents, position: IPosition, context: modes.CompletionContext, token: CancellationToken): Thenable<SuggestResultDto>;
$resolveCompletionItem(handle: number, resource: UriComponents, position: IPosition, suggestion: modes.CompletionItem, token: CancellationToken): Thenable<modes.CompletionItem>;
$releaseCompletionItems(handle: number, id: number): void;
$provideSignatureHelp(handle: number, resource: UriComponents, position: IPosition, context: modes.SignatureHelpContext, token: CancellationToken): Thenable<modes.SignatureHelp>;
$provideDocumentLinks(handle: number, resource: UriComponents, token: CancellationToken): Thenable<modes.ILink[]>;

2
src/vs/workbench/api/node/extHostApiCommands.ts
View File

@@ -376,7 +376,7 @@ export class ExtHostApiCommands {
triggerCharacter,
maxItemsToResolve
};
return this._commands.executeCommand<modes.ISuggestResult>('_executeCompletionItemProvider', args).then(result => {
return this._commands.executeCommand<modes.CompletionList>('_executeCompletionItemProvider', args).then(result => {
if (result) {
const items = result.suggestions.map(suggestion => typeConverters.Suggest.to(position, suggestion));
return new types.CompletionList(items, result.incomplete);

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

@@ -571,7 +571,7 @@ class SuggestAdapter {
this._provider = provider;
}
provideCompletionItems(resource: URI, position: IPosition, context: modes.SuggestContext, token: CancellationToken): Thenable<SuggestResultDto> {
provideCompletionItems(resource: URI, position: IPosition, context: modes.CompletionContext, token: CancellationToken): Thenable<SuggestResultDto> {
const doc = this._documents.getDocumentData(resource).document;
const pos = typeConvert.Position.to(position);
@@ -618,7 +618,7 @@ class SuggestAdapter {
});
}
resolveCompletionItem(resource: URI, position: IPosition, suggestion: modes.ISuggestion, token: CancellationToken): Thenable<modes.ISuggestion> {
resolveCompletionItem(resource: URI, position: IPosition, suggestion: modes.CompletionItem, token: CancellationToken): Thenable<modes.CompletionItem> {
if (typeof this._provider.resolveCompletionItem !== 'function') {
return Promise.resolve(suggestion);
@@ -1133,11 +1133,11 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape {
return this._createDisposable(handle);
}
$provideCompletionItems(handle: number, resource: UriComponents, position: IPosition, context: modes.SuggestContext, token: CancellationToken): Thenable<SuggestResultDto> {
$provideCompletionItems(handle: number, resource: UriComponents, position: IPosition, context: modes.CompletionContext, token: CancellationToken): Thenable<SuggestResultDto> {
return this._withAdapter(handle, SuggestAdapter, adapter => adapter.provideCompletionItems(URI.revive(resource), position, context, token));
}
$resolveCompletionItem(handle: number, resource: UriComponents, position: IPosition, suggestion: modes.ISuggestion, token: CancellationToken): Thenable<modes.ISuggestion> {
$resolveCompletionItem(handle: number, resource: UriComponents, position: IPosition, suggestion: modes.CompletionItem, token: CancellationToken): Thenable<modes.CompletionItem> {
return this._withAdapter(handle, SuggestAdapter, adapter => adapter.resolveCompletionItem(URI.revive(resource), position, suggestion, token));
}

118
src/vs/workbench/api/node/extHostTypeConverters.ts
View File

@@ -455,13 +455,13 @@ export namespace DocumentHighlight {
}
export namespace CompletionTriggerKind {
export function from(kind: modes.SuggestTriggerKind) {
export function from(kind: modes.CompletionTriggerKind) {
switch (kind) {
case modes.SuggestTriggerKind.TriggerCharacter:
case modes.CompletionTriggerKind.TriggerCharacter:
return types.CompletionTriggerKind.TriggerCharacter;
case modes.SuggestTriggerKind.TriggerForIncompleteCompletions:
case modes.CompletionTriggerKind.TriggerForIncompleteCompletions:
return types.CompletionTriggerKind.TriggerForIncompleteCompletions;
case modes.SuggestTriggerKind.Invoke:
case modes.CompletionTriggerKind.Invoke:
default:
return types.CompletionTriggerKind.Invoke;
}
@@ -469,7 +469,7 @@ export namespace CompletionTriggerKind {
}
export namespace CompletionContext {
export function from(context: modes.SuggestContext): types.CompletionContext {
export function from(context: modes.CompletionContext): types.CompletionContext {
return {
triggerKind: CompletionTriggerKind.from(context.triggerKind),
triggerCharacter: context.triggerCharacter
@@ -479,64 +479,64 @@ export namespace CompletionContext {
export const CompletionItemKind = {
from(kind: types.CompletionItemKind): modes.SuggestionKind {
from(kind: types.CompletionItemKind): modes.CompletionKind {
switch (kind) {
case types.CompletionItemKind.Method: return modes.SuggestionKind.Method;
case types.CompletionItemKind.Function: return modes.SuggestionKind.Function;
case types.CompletionItemKind.Constructor: return modes.SuggestionKind.Constructor;
case types.CompletionItemKind.Field: return modes.SuggestionKind.Field;
case types.CompletionItemKind.Variable: return modes.SuggestionKind.Variable;
case types.CompletionItemKind.Class: return modes.SuggestionKind.Class;
case types.CompletionItemKind.Interface: return modes.SuggestionKind.Interface;
case types.CompletionItemKind.Struct: return modes.SuggestionKind.Struct;
case types.CompletionItemKind.Module: return modes.SuggestionKind.Module;
case types.CompletionItemKind.Property: return modes.SuggestionKind.Property;
case types.CompletionItemKind.Unit: return modes.SuggestionKind.Unit;
case types.CompletionItemKind.Value: return modes.SuggestionKind.Value;
case types.CompletionItemKind.Constant: return modes.SuggestionKind.Constant;
case types.CompletionItemKind.Enum: return modes.SuggestionKind.Enum;
case types.CompletionItemKind.EnumMember: return modes.SuggestionKind.EnumMember;
case types.CompletionItemKind.Keyword: return modes.SuggestionKind.Keyword;
case types.CompletionItemKind.Snippet: return modes.SuggestionKind.Snippet;
case types.CompletionItemKind.Text: return modes.SuggestionKind.Text;
case types.CompletionItemKind.Color: return modes.SuggestionKind.Color;
case types.CompletionItemKind.File: return modes.SuggestionKind.File;
case types.CompletionItemKind.Reference: return modes.SuggestionKind.Reference;
case types.CompletionItemKind.Folder: return modes.SuggestionKind.Folder;
case types.CompletionItemKind.Event: return modes.SuggestionKind.Event;
case types.CompletionItemKind.Operator: return modes.SuggestionKind.Operator;
case types.CompletionItemKind.TypeParameter: return modes.SuggestionKind.TypeParameter;
case types.CompletionItemKind.Method: return modes.CompletionKind.Method;
case types.CompletionItemKind.Function: return modes.CompletionKind.Function;
case types.CompletionItemKind.Constructor: return modes.CompletionKind.Constructor;
case types.CompletionItemKind.Field: return modes.CompletionKind.Field;
case types.CompletionItemKind.Variable: return modes.CompletionKind.Variable;
case types.CompletionItemKind.Class: return modes.CompletionKind.Class;
case types.CompletionItemKind.Interface: return modes.CompletionKind.Interface;
case types.CompletionItemKind.Struct: return modes.CompletionKind.Struct;
case types.CompletionItemKind.Module: return modes.CompletionKind.Module;
case types.CompletionItemKind.Property: return modes.CompletionKind.Property;
case types.CompletionItemKind.Unit: return modes.CompletionKind.Unit;
case types.CompletionItemKind.Value: return modes.CompletionKind.Value;
case types.CompletionItemKind.Constant: return modes.CompletionKind.Constant;
case types.CompletionItemKind.Enum: return modes.CompletionKind.Enum;
case types.CompletionItemKind.EnumMember: return modes.CompletionKind.EnumMember;
case types.CompletionItemKind.Keyword: return modes.CompletionKind.Keyword;
case types.CompletionItemKind.Snippet: return modes.CompletionKind.Snippet;
case types.CompletionItemKind.Text: return modes.CompletionKind.Text;
case types.CompletionItemKind.Color: return modes.CompletionKind.Color;
case types.CompletionItemKind.File: return modes.CompletionKind.File;
case types.CompletionItemKind.Reference: return modes.CompletionKind.Reference;
case types.CompletionItemKind.Folder: return modes.CompletionKind.Folder;
case types.CompletionItemKind.Event: return modes.CompletionKind.Event;
case types.CompletionItemKind.Operator: return modes.CompletionKind.Operator;
case types.CompletionItemKind.TypeParameter: return modes.CompletionKind.TypeParameter;
}
return modes.SuggestionKind.Property;
return modes.CompletionKind.Property;
},
to(kind: modes.SuggestionKind): types.CompletionItemKind {
to(kind: modes.CompletionKind): types.CompletionItemKind {
switch (kind) {
case modes.SuggestionKind.Method: return types.CompletionItemKind.Method;
case modes.SuggestionKind.Function: return types.CompletionItemKind.Function;
case modes.SuggestionKind.Constructor: return types.CompletionItemKind.Constructor;
case modes.SuggestionKind.Field: return types.CompletionItemKind.Field;
case modes.SuggestionKind.Variable: return types.CompletionItemKind.Variable;
case modes.SuggestionKind.Class: return types.CompletionItemKind.Class;
case modes.SuggestionKind.Interface: return types.CompletionItemKind.Interface;
case modes.SuggestionKind.Struct: return types.CompletionItemKind.Struct;
case modes.SuggestionKind.Module: return types.CompletionItemKind.Module;
case modes.SuggestionKind.Property: return types.CompletionItemKind.Property;
case modes.SuggestionKind.Unit: return types.CompletionItemKind.Unit;
case modes.SuggestionKind.Value: return types.CompletionItemKind.Value;
case modes.SuggestionKind.Constant: return types.CompletionItemKind.Constant;
case modes.SuggestionKind.Enum: return types.CompletionItemKind.Enum;
case modes.SuggestionKind.EnumMember: return types.CompletionItemKind.EnumMember;
case modes.SuggestionKind.Keyword: return types.CompletionItemKind.Keyword;
case modes.SuggestionKind.Snippet: return types.CompletionItemKind.Snippet;
case modes.SuggestionKind.Text: return types.CompletionItemKind.Text;
case modes.SuggestionKind.Color: return types.CompletionItemKind.Color;
case modes.SuggestionKind.File: return types.CompletionItemKind.File;
case modes.SuggestionKind.Reference: return types.CompletionItemKind.Reference;
case modes.SuggestionKind.Folder: return types.CompletionItemKind.Folder;
case modes.SuggestionKind.Event: return types.CompletionItemKind.Event;
case modes.SuggestionKind.Operator: return types.CompletionItemKind.Operator;
case modes.SuggestionKind.TypeParameter: return types.CompletionItemKind.TypeParameter;
case modes.CompletionKind.Method: return types.CompletionItemKind.Method;
case modes.CompletionKind.Function: return types.CompletionItemKind.Function;
case modes.CompletionKind.Constructor: return types.CompletionItemKind.Constructor;
case modes.CompletionKind.Field: return types.CompletionItemKind.Field;
case modes.CompletionKind.Variable: return types.CompletionItemKind.Variable;
case modes.CompletionKind.Class: return types.CompletionItemKind.Class;
case modes.CompletionKind.Interface: return types.CompletionItemKind.Interface;
case modes.CompletionKind.Struct: return types.CompletionItemKind.Struct;
case modes.CompletionKind.Module: return types.CompletionItemKind.Module;
case modes.CompletionKind.Property: return types.CompletionItemKind.Property;
case modes.CompletionKind.Unit: return types.CompletionItemKind.Unit;
case modes.CompletionKind.Value: return types.CompletionItemKind.Value;
case modes.CompletionKind.Constant: return types.CompletionItemKind.Constant;
case modes.CompletionKind.Enum: return types.CompletionItemKind.Enum;
case modes.CompletionKind.EnumMember: return types.CompletionItemKind.EnumMember;
case modes.CompletionKind.Keyword: return types.CompletionItemKind.Keyword;
case modes.CompletionKind.Snippet: return types.CompletionItemKind.Snippet;
case modes.CompletionKind.Text: return types.CompletionItemKind.Text;
case modes.CompletionKind.Color: return types.CompletionItemKind.Color;
case modes.CompletionKind.File: return types.CompletionItemKind.File;
case modes.CompletionKind.Reference: return types.CompletionItemKind.Reference;
case modes.CompletionKind.Folder: return types.CompletionItemKind.Folder;
case modes.CompletionKind.Event: return types.CompletionItemKind.Event;
case modes.CompletionKind.Operator: return types.CompletionItemKind.Operator;
case modes.CompletionKind.TypeParameter: return types.CompletionItemKind.TypeParameter;
}
return types.CompletionItemKind.Property;
}
@@ -544,7 +544,7 @@ export const CompletionItemKind = {
export namespace Suggest {
export function to(position: types.Position, suggestion: modes.ISuggestion): types.CompletionItem {
export function to(position: types.Position, suggestion: modes.CompletionItem): types.CompletionItem {
const result = new types.CompletionItem(suggestion.label);
result.insertText = suggestion.insertText;
result.kind = CompletionItemKind.to(suggestion.kind);