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

align names of CompletionItem and ISuggestion

Browse Source
This commit is contained in:
Johannes Rieken
2016-08-16 09:55:42 +02:00
parent cafe4a992b
commit d0b77851a5
12 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -554,7 +554,7 @@ class SuggestAdapter {
// insert the text of the edit and create a dedicated
// suggestion-container with overwrite[Before|After]
suggestion.codeSnippet = item.textEdit.newText;
suggestion.insertText = item.textEdit.newText;
suggestion.overwriteBefore = pos.character - editRange.start.character;
suggestion.overwriteAfter = editRange.end.character - pos.character;

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

@@ -314,10 +314,10 @@ export const Suggest = {
from(item: vscode.CompletionItem): modes.ISuggestion {
const suggestion: modes.ISuggestion = {
label: item.label,
codeSnippet: item.insertText || item.label,
insertText: item.insertText || item.label,
type: CompletionItemKind.from(item.kind),
typeLabel: item.detail,
documentationLabel: item.documentation,
detail: item.detail,
documentation: item.documentation,
sortText: item.sortText,
filterText: item.filterText
};
@@ -326,10 +326,10 @@ export const Suggest = {
to(container: modes.ISuggestResult, position: types.Position, suggestion: modes.ISuggestion): types.CompletionItem {
const result = new types.CompletionItem(suggestion.label);
result.insertText = suggestion.codeSnippet;
result.insertText = suggestion.insertText;
result.kind = CompletionItemKind.to(suggestion.type);
result.detail = suggestion.typeLabel;
result.documentation = suggestion.documentationLabel;
result.detail = suggestion.detail;
result.documentation = suggestion.documentation;
result.sortText = suggestion.sortText;
result.filterText = suggestion.filterText;
@@ -340,7 +340,7 @@ export const Suggest = {
endPosition = new types.Position(position.line, position.character + suggestion.overwriteAfter);
}
result.textEdit = types.TextEdit.replace(new types.Range(startPosition, endPosition), suggestion.codeSnippet);
result.textEdit = types.TextEdit.replace(new types.Range(startPosition, endPosition), suggestion.insertText);
return result;
}
};