Skip to content

Commit 689cdbc

Browse files
committed
chore: move and rename handleAdditionalTextEdits method
1 parent 0e22593 commit 689cdbc

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

lib/adapters/autocomplete-adapter.ts

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ import {
1717
ServerCapabilities,
1818
TextEdit,
1919
} from "../languageclient"
20+
import ApplyEditAdapter from "./apply-edit-adapter"
2021
import { Point, TextEditor } from "atom"
2122
import * as ac from "atom/autocomplete-plus"
22-
import { Suggestion, TextSuggestion, SnippetSuggestion } from "../types/autocomplete-extended"
23+
import { Suggestion, TextSuggestion, SnippetSuggestion, SuggestionBase } from "../types/autocomplete-extended"
2324

2425
/**
2526
* Defines the behavior of suggestion acceptance. Assume you have "cons|ole" in the editor ( `|` is the cursor position)
@@ -496,6 +497,16 @@ export default class AutocompleteAdapter {
496497
suggestion.text = textEdit.newText
497498
}
498499

500+
/** Handle additional text edits after a suggestion insert, e.g. `additionalTextEdits`. */
501+
public static applyAdditionalTextEdits(event: ac.SuggestionInsertedEvent): void {
502+
const suggestion = event.suggestion as SuggestionBase
503+
const additionalEdits = suggestion.completionItem?.additionalTextEdits
504+
const buffer = event.editor.getBuffer()
505+
506+
ApplyEditAdapter.applyEdits(buffer, Convert.convertLsTextEdits(additionalEdits))
507+
buffer.groupLastChanges()
508+
}
509+
499510
/**
500511
* Public: Adds a snippet to the suggestion if the CompletionItem contains snippet-formatted text
501512
*

lib/auto-languageclient.ts

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import {
3535
} from "./server-manager.js"
3636
import { Disposable, CompositeDisposable, Point, Range, TextEditor } from "atom"
3737
import * as ac from "atom/autocomplete-plus"
38-
import { SuggestionBase } from "./types/autocomplete-extended"
3938
import { basename } from "path"
4039

4140
export { ActiveServer, LanguageClientConnection, LanguageServerProcess }
@@ -640,7 +639,7 @@ export default class AutoLanguageClient {
640639
filterSuggestions: true,
641640
getSuggestions: this.getSuggestions.bind(this),
642641
onDidInsertSuggestion: (event) => {
643-
this.handleAdditionalTextEdits(event)
642+
AutocompleteAdapter.applyAdditionalTextEdits(event)
644643
this.onDidInsertSuggestion(event)
645644
},
646645
getSuggestionDetailsOnSelect: this.getSuggestionDetailsOnSelect.bind(this),
@@ -682,16 +681,6 @@ export default class AutoLanguageClient {
682681
_request: ac.SuggestionsRequestedEvent
683682
): void {}
684683

685-
/** Handle additional text edits after a suggestion insert, e.g. `additionalTextEdits`. */
686-
private handleAdditionalTextEdits(event: ac.SuggestionInsertedEvent): void {
687-
const suggestion = event.suggestion as SuggestionBase
688-
const additionalEdits = suggestion.completionItem?.additionalTextEdits
689-
const buffer = event.editor.getBuffer()
690-
691-
ApplyEditAdapter.applyEdits(buffer, Convert.convertLsTextEdits(additionalEdits))
692-
buffer.groupLastChanges()
693-
}
694-
695684
protected onDidInsertSuggestion(_arg: ac.SuggestionInsertedEvent): void {}
696685

697686
// Definitions via LS documentHighlight and gotoDefinition------------

0 commit comments

Comments
 (0)