Skip to content

Fix:Strings are concatenated when completing code for % directives #79

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

Merged
merged 1 commit into from
Apr 8, 2025
Merged

Fix:Strings are concatenated when completing code for % directives #79

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
13 changes: 12 additions & 1 deletion ...in/kotlin/org/domaframework/doma/intellij/common/sql/directive/PercentDirectiveHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import com.intellij.codeInsight.lookup.AutoCompletionPolicy
import com.intellij.codeInsight.lookup.LookupElement
import com.intellij.codeInsight.lookup.LookupElementBuilder
import com.intellij.psi.PsiElement
import com.intellij.psi.util.prevLeafs

class PercentDirectiveHandler(
originalFile: PsiElement,
Expand All @@ -32,6 +33,11 @@ class PercentDirectiveHandler(
element,
result,
) { bind ->
val beforeTextChars =
this.element.prevLeafs
.takeWhile { prev -> prev.text != "%" }
.toList()
.size
listOf(
"if",
"elseif",
Expand All @@ -46,7 +52,12 @@ class PercentDirectiveHandler(
}.map {
LookupElementBuilder
.create(it)
.withAutoCompletionPolicy(AutoCompletionPolicy.ALWAYS_AUTOCOMPLETE)
.withInsertHandler { context, _ ->
val start = context.startOffset - beforeTextChars
val tail = context.tailOffset
context.document.replaceString(start, tail, it)
context.editor.caretModel.moveToOffset(start + it.length)
}.withAutoCompletionPolicy(AutoCompletionPolicy.ALWAYS_AUTOCOMPLETE)
}
}

Expand Down
Loading