diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b97a269c..ad595c8f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -29,4 +29,4 @@ kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
 qodana = { id = "org.jetbrains.qodana", version.ref = "qodana" }
 grammarkit= { id = "org.jetbrains.grammarkit", version.ref = "grammarkit" }
-spotless = { id = "com.diffplug.spotless", version = "7.0.2" }
+spotless = { id = "com.diffplug.spotless", version = "7.0.3" }
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/common/sql/directive/PercentDirectiveHandler.kt b/src/main/kotlin/org/domaframework/doma/intellij/common/sql/directive/PercentDirectiveHandler.kt
index cd0b50d8..b91605b2 100644
--- a/src/main/kotlin/org/domaframework/doma/intellij/common/sql/directive/PercentDirectiveHandler.kt
+++ b/src/main/kotlin/org/domaframework/doma/intellij/common/sql/directive/PercentDirectiveHandler.kt
@@ -33,7 +33,7 @@ class PercentDirectiveHandler(
             element,
             result,
         ) { bind ->
-            val beforeTextChars =
+            val prevLeafCount =
                 this.element.prevLeafs
                     .takeWhile { prev -> prev.text != "%" }
                     .toList()
@@ -53,7 +53,7 @@ class PercentDirectiveHandler(
                 LookupElementBuilder
                     .create(it)
                     .withInsertHandler { context, _ ->
-                        val start = context.startOffset - beforeTextChars
+                        val start = context.startOffset - prevLeafCount
                         val tail = context.tailOffset
                         context.document.replaceString(start, tail, it)
                         context.editor.caretModel.moveToOffset(start + it.length)
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/formatter/SqlFormatPreProcessor.kt b/src/main/kotlin/org/domaframework/doma/intellij/formatter/SqlFormatPreProcessor.kt
index 409e4b16..b5d6f95e 100644
--- a/src/main/kotlin/org/domaframework/doma/intellij/formatter/SqlFormatPreProcessor.kt
+++ b/src/main/kotlin/org/domaframework/doma/intellij/formatter/SqlFormatPreProcessor.kt
@@ -27,7 +27,6 @@ import com.intellij.psi.TokenType
 import com.intellij.psi.impl.source.codeStyle.PreFormatProcessor
 import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.psi.util.elementType
-import com.intellij.psi.util.endOffset
 import com.intellij.psi.util.prevLeafs
 import org.domaframework.doma.intellij.psi.SqlBlockComment
 import org.domaframework.doma.intellij.psi.SqlTypes