debt - SuggestionType -> SuggestionKind

This commit is contained in:
Johannes Rieken
2018-09-24 15:56:35 +02:00
parent a28f9bc895
commit f79b59416b
18 changed files with 277 additions and 174 deletions

View File

@@ -665,7 +665,7 @@ class SuggestAdapter {
_parentId,
//
label: item.label,
type: typeConvert.CompletionItemKind.from(item.kind),
kind: typeConvert.CompletionItemKind.from(item.kind),
detail: item.detail,
documentation: item.documentation,
filterText: item.filterText,

View File

@@ -479,43 +479,66 @@ export namespace CompletionContext {
export const CompletionItemKind = {
from(kind: types.CompletionItemKind): modes.SuggestionType {
from(kind: types.CompletionItemKind): modes.SuggestionKind {
switch (kind) {
case types.CompletionItemKind.Method: return 'method';
case types.CompletionItemKind.Function: return 'function';
case types.CompletionItemKind.Constructor: return 'constructor';
case types.CompletionItemKind.Field: return 'field';
case types.CompletionItemKind.Variable: return 'variable';
case types.CompletionItemKind.Class: return 'class';
case types.CompletionItemKind.Interface: return 'interface';
case types.CompletionItemKind.Struct: return 'struct';
case types.CompletionItemKind.Module: return 'module';
case types.CompletionItemKind.Property: return 'property';
case types.CompletionItemKind.Unit: return 'unit';
case types.CompletionItemKind.Value: return 'value';
case types.CompletionItemKind.Constant: return 'constant';
case types.CompletionItemKind.Enum: return 'enum';
case types.CompletionItemKind.EnumMember: return 'enum-member';
case types.CompletionItemKind.Keyword: return 'keyword';
case types.CompletionItemKind.Snippet: return 'snippet';
case types.CompletionItemKind.Text: return 'text';
case types.CompletionItemKind.Color: return 'color';
case types.CompletionItemKind.File: return 'file';
case types.CompletionItemKind.Reference: return 'reference';
case types.CompletionItemKind.Folder: return 'folder';
case types.CompletionItemKind.Event: return 'event';
case types.CompletionItemKind.Operator: return 'operator';
case types.CompletionItemKind.TypeParameter: return 'type-parameter';
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;
}
return 'property';
return modes.SuggestionKind.Property;
},
to(type: modes.SuggestionType): types.CompletionItemKind {
if (!type) {
return types.CompletionItemKind.Property;
} else {
return types.CompletionItemKind[type.charAt(0).toUpperCase() + type.substr(1)];
to(kind: modes.SuggestionKind): 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;
}
return types.CompletionItemKind.Property;
}
};
@@ -524,7 +547,7 @@ export namespace Suggest {
export function to(position: types.Position, suggestion: modes.ISuggestion): types.CompletionItem {
const result = new types.CompletionItem(suggestion.label);
result.insertText = suggestion.insertText;
result.kind = CompletionItemKind.to(suggestion.type);
result.kind = CompletionItemKind.to(suggestion.kind);
result.detail = suggestion.detail;
result.documentation = htmlContent.isMarkdownString(suggestion.documentation) ? MarkdownString.to(suggestion.documentation) : suggestion.documentation;
result.sortText = suggestion.sortText;