Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use textEdit of completionItem unconditionally #207

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use textEdit of completionItem unconditionally #207

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions lib/adapters/autocomplete-adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,15 +191,12 @@ export default class AutocompleteAdapter {
)
)

// spec guarantees all edits are on the same line, so we only need to check the columns
const triggerColumns: [number, number] = [triggerPoint.column, request.bufferPosition.column]

// Setup the cache for subsequent filtered results
const isComplete = completions === null || Array.isArray(completions) || !completions.isIncomplete
const suggestionMap = this.completionItemsToSuggestions(
completions,
request,
triggerColumns,
[],
shouldReplace,
onDidConvertCompletionItem
)
Expand Down Expand Up @@ -357,6 +354,7 @@ export default class AutocompleteAdapter {
* @param completionItems An {Array} of {CompletionItem} objects or a {CompletionList} containing completion items to
* be converted.
* @param request The {atom$AutocompleteRequest} to satisfy.
* @param triggerColumns Deprecated, and have no effect.
* @param shouldReplace The behavior of suggestion acceptance (see {ShouldReplace}).
* @param onDidConvertCompletionItem A function that takes a {CompletionItem}, an {atom$AutocompleteSuggestion} and a
* {atom$AutocompleteRequest} allowing you to adjust converted items.
Expand All @@ -365,7 +363,7 @@ export default class AutocompleteAdapter {
public completionItemsToSuggestions(
completionItems: CompletionItem[] | CompletionList | null,
request: ac.SuggestionsRequestedEvent,
triggerColumns: [number, number],
triggerColumns: number[],
shouldReplace: ShouldReplace,
onDidConvertCompletionItem?: CompletionItemAdjuster
): Map<Suggestion, PossiblyResolvedCompletionItem> {
Expand Down Expand Up @@ -395,6 +393,7 @@ export default class AutocompleteAdapter {
* @param item An {CompletionItem} containing a completion item to be converted.
* @param suggestion A {atom$AutocompleteSuggestion} to have the conversion applied to.
* @param request The {atom$AutocompleteRequest} to satisfy.
* @param triggerColumns Deprecated, and have no effect.
* @param shouldReplace The behavior of suggestion acceptance (see {ShouldReplace}).
* @param onDidConvertCompletionItem A function that takes a {CompletionItem}, an {atom$AutocompleteSuggestion} and a
* {atom$AutocompleteRequest} allowing you to adjust converted items.
Expand All @@ -404,7 +403,7 @@ export default class AutocompleteAdapter {
item: CompletionItem,
suggestion: Suggestion,
request: ac.SuggestionsRequestedEvent,
triggerColumns: [number, number],
triggerColumns: number[],
shouldReplace: ShouldReplace,
onDidConvertCompletionItem?: CompletionItemAdjuster
): Suggestion {
Expand Down Expand Up @@ -466,13 +465,14 @@ export default class AutocompleteAdapter {
*
* @param textEdit A {TextEdit} from a CompletionItem to apply.
* @param editor An Atom {TextEditor} used to obtain the necessary text replacement.
* @param triggerColumns Deprecated, and have no effect.
* @param suggestion An {atom$AutocompleteSuggestion} to set the replacementPrefix and text properties of.
* @param shouldReplace The behavior of suggestion acceptance (see {ShouldReplace}).
*/
public static applyTextEditToSuggestion(
textEdit: TextEdit | InsertReplaceEdit | undefined,
editor: TextEditor,
triggerColumns: [number, number],
triggerColumns: number[],
originalBufferPosition: Point,
suggestion: TextSuggestion,
shouldReplace: ShouldReplace
Expand All @@ -489,10 +489,9 @@ export default class AutocompleteAdapter {
range = textEdit.insert
}

if (range.start.character !== triggerColumns[0]) {
const atomRange = Convert.lsRangeToAtomRange(range)
suggestion.customReplacmentPrefix = editor.getTextInBufferRange([atomRange.start, originalBufferPosition])
}
const atomRange = Convert.lsRangeToAtomRange(range)
suggestion.customReplacmentPrefix = editor.getTextInBufferRange([atomRange.start, originalBufferPosition])

suggestion.text = textEdit.newText
}

Expand Down