Skip to content
This repository has been archived by the owner on Jun 15, 2023. It is now read-only.

Fix multiple string replacement when using TextEdit #158

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

Fix multiple string replacement when using TextEdit #158

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
15 changes: 11 additions & 4 deletions intellij-lsp/src/com/github/gtache/lsp/editor/EditorEventManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,14 +379,14 @@ class EditorEventManager(val editor: Editor, val mouseListener: EditorMouseListe
})
}

def applyEdits(edit: Seq[TextEdit], moveToCaret: Boolean): Unit = {
def applyEdits(edit: Seq[TextEdit], moveToCaret: Boolean, textToBeReplaced : String = ""): Unit = {
invokeLater(() => {
if (edit != null && edit.nonEmpty) {
applyEdit(edits = edit, name = "Completion : " + label)
}
execCommand(command)
if (moveToCaret) {
editor.getCaretModel.moveCaretRelatively(textEdit.getNewText.length, 0, false, false, true)
editor.getCaretModel.moveCaretRelatively(textEdit.getNewText.length - textToBeReplaced.length, 0, false, false, true)
}
})
}
Expand All @@ -405,14 +405,21 @@ class EditorEventManager(val editor: Editor, val mouseListener: EditorMouseListe
})
.withLookupString(presentableText)
} else {
lookupElementBuilder = LookupElementBuilder.create(presentableText, "")
// Get current range as offset
val offsetStart = editor.getDocument.getLineStartOffset(pos.getLine) + textEdit.getRange.getStart.getCharacter;
val offsetEnd = editor.getDocument.getLineStartOffset(pos.getLine) + textEdit.getRange.getEnd.getCharacter;

// Get text to be replaced
val textToBeReplaced = editor.getDocument.getText(new TextRange(offsetStart, offsetEnd))

lookupElementBuilder = LookupElementBuilder.create(presentableText, textToBeReplaced)
.withInsertHandler((context: InsertionContext, _: LookupElement) => {
context.commitDocument()
if (insertFormat == InsertTextFormat.Snippet) {
val template = prepareTemplate(textEdit.getNewText)
runSnippet(template)
} else {
applyEdits(Seq(textEdit), moveToCaret = true)
applyEdits(Seq(textEdit), moveToCaret = true, textToBeReplaced)
}
})
.withLookupString(presentableText)
Expand Down