Formatter processor support for platform version 233

Author: xterao

src/main/kotlin/org/domaframework/doma/intellij/formatter/SqlBlockBuilder.kt

@@ -1,3 +1,18 @@
+/*
+ * Copyright Doma Tools Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.domaframework.doma.intellij.formatter
 
 import org.domaframework.doma.intellij.formatter.block.SqlBlock

src/main/kotlin/org/domaframework/doma/intellij/formatter/SqlFormatPreProcessor.kt

@@ -25,13 +25,12 @@ import com.intellij.psi.PsiWhiteSpace
 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.prevLeafs
 import org.domaframework.doma.intellij.psi.SqlBlockComment
 import org.domaframework.doma.intellij.psi.SqlTypes
 import org.domaframework.doma.intellij.setting.SqlLanguage
-import org.jetbrains.kotlin.idea.base.codeInsight.handlers.fixers.end
-import org.jetbrains.kotlin.idea.base.codeInsight.handlers.fixers.start
-import org.toml.lang.psi.ext.elementType
+import org.jetbrains.kotlin.psi.psiUtil.startOffset
 
 class SqlFormatPreProcessor : PreFormatProcessor {
     enum class CreateQueryType {
@@ -74,6 +73,8 @@ class SqlFormatPreProcessor : PreFormatProcessor {
 
         visitor.replaces.asReversed().forEach {
             val isCreateTableGroup = isCreateTableGroup(keywordList, index)
+            val textRangeStart = it.startOffset
+            val textRangeEnd = textRangeStart + it.text.length
             if (it.elementType != TokenType.WHITE_SPACE) {
                 index--
                 var newKeyword = getUpperText(it)
@@ -150,8 +151,8 @@ class SqlFormatPreProcessor : PreFormatProcessor {
                         newKeyword = getNewLineString(it)
                     }
                 }
-                document.deleteString(it.textRange.start, it.textRange.end)
-                document.insertString(it.textRange.start, newKeyword)
+                document.deleteString(textRangeStart, textRangeEnd)
+                document.insertString(textRangeStart, newKeyword)
             } else {
                 if (keywordIndex < replaceKeywordList.size) {
                     val nextElement = replaceKeywordList[keywordIndex]
@@ -166,18 +167,17 @@ class SqlFormatPreProcessor : PreFormatProcessor {
                             isNewLineOnlyCreateTable(nextElement) && isCreateTableGroup
                         )
                     ) {
-                        val start = it.textRange.start
-                        document.deleteString(start, it.textRange.end)
-                        document.insertString(start, " ")
+                        document.deleteString(textRangeStart, textRangeEnd)
+                        document.insertString(textRangeStart, " ")
                     } else {
                         val currentIndent = it.text.substringAfter("\n", "").length
-                        val start = it.textRange.end - currentIndent
-                        document.deleteString(start, it.textRange.end)
+                        val start = textRangeEnd - currentIndent
+                        document.deleteString(start, textRangeEnd)
                     }
                 } else {
                     val currentIndent = it.text.substringAfter("\n", "").length
-                    val start = it.textRange.end - currentIndent
-                    document.deleteString(start, it.textRange.end)
+                    val start = textRangeEnd - currentIndent
+                    document.deleteString(start, textRangeEnd)
                 }
             }
         }