Refactor string utility usage for line separation and single space in SQL formatting

Author: xterao

src/main/kotlin/org/domaframework/doma/intellij/contributor/sql/provider/SqlParameterCompletionProvider.kt

@@ -43,6 +43,7 @@ import org.domaframework.doma.intellij.common.util.ForDirectiveUtil
 import org.domaframework.doma.intellij.common.util.PluginLoggerUtil
 import org.domaframework.doma.intellij.common.util.SqlCompletionUtil.createMethodLookupElement
 import org.domaframework.doma.intellij.common.util.StringUtil
+import org.domaframework.doma.intellij.common.util.StringUtil.SINGLE_SPACE
 import org.domaframework.doma.intellij.common.validation.result.ValidationCompleteResult
 import org.domaframework.doma.intellij.contributor.sql.processor.SqlCompletionDirectiveBlockProcessor
 import org.domaframework.doma.intellij.contributor.sql.processor.SqlCompletionOtherBlockProcessor
@@ -207,7 +208,7 @@ class SqlParameterCompletionProvider : CompletionProvider<CompletionParameters>(
                 val fqdn =
                     StringUtil.getSqlElClassText(
                         PsiPatternUtil
-                            .getBindSearchWord(originalFile, top, " "),
+                            .getBindSearchWord(originalFile, top, SINGLE_SPACE),
                     )
                 topElementType = getElementTypeByPrevSqlElClassWords(project, fqdn, topText)
             }

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

@@ -28,7 +28,8 @@ import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.psi.util.elementType
 import org.domaframework.doma.intellij.common.util.InjectionSqlUtil.isInjectedSqlFile
 import org.domaframework.doma.intellij.common.util.PluginLoggerUtil
-import org.domaframework.doma.intellij.common.util.StringUtil
+import org.domaframework.doma.intellij.common.util.StringUtil.LINE_SEPARATE
+import org.domaframework.doma.intellij.common.util.StringUtil.SINGLE_SPACE
 import org.domaframework.doma.intellij.formatter.util.CreateQueryType
 import org.domaframework.doma.intellij.formatter.util.SqlKeywordUtil
 import org.domaframework.doma.intellij.formatter.visitor.SqlFormatVisitor
@@ -139,38 +140,37 @@ class SqlFormatPreProcessor : PreFormatProcessor {
         document: Document,
         element: PsiWhiteSpace,
     ) {
-        val singleSpace = " "
         val range = element.textRange
         val originalText = document.getText(range)
         val nextElement = element.nextSibling
         val nextElementText = nextElement?.let { document.getText(it.textRange) } ?: ""
 
         var newText = ""
         if (!targetElementTypes.contains(nextElement?.elementType)) {
-            newText = originalText.replace(originalText, singleSpace)
+            newText = originalText.replace(originalText, SINGLE_SPACE)
         } else {
             newText =
                 if (element.prevSibling == null) {
                     ""
                 } else {
                     when (nextElement.elementType) {
                         SqlTypes.LINE_COMMENT -> {
-                            if (nextElementText.startsWith(StringUtil.LINE_SEPARATE)) {
-                                originalText.replace(originalText, singleSpace)
-                            } else if (originalText.contains(StringUtil.LINE_SEPARATE)) {
-                                originalText.replace(Regex("\\s*\\n\\s*"), StringUtil.LINE_SEPARATE)
+                            if (nextElementText.startsWith(LINE_SEPARATE)) {
+                                originalText.replace(originalText, SINGLE_SPACE)
+                            } else if (originalText.contains(LINE_SEPARATE)) {
+                                originalText.replace(Regex("\\s*\\n\\s*"), LINE_SEPARATE)
                             } else {
-                                originalText.replace(originalText, singleSpace)
+                                originalText.replace(originalText, SINGLE_SPACE)
                             }
                         }
 
                         else -> {
-                            if (nextElementText.contains(StringUtil.LINE_SEPARATE) == true) {
-                                originalText.replace(originalText, singleSpace)
-                            } else if (originalText.contains(StringUtil.LINE_SEPARATE)) {
-                                originalText.replace(Regex("\\s*\\n\\s*"), StringUtil.LINE_SEPARATE)
+                            if (nextElementText.contains(LINE_SEPARATE) == true) {
+                                originalText.replace(originalText, SINGLE_SPACE)
+                            } else if (originalText.contains(LINE_SEPARATE)) {
+                                originalText.replace(Regex("\\s*\\n\\s*"), LINE_SEPARATE)
                             } else {
-                                originalText.replace(originalText, StringUtil.LINE_SEPARATE)
+                                originalText.replace(originalText, LINE_SEPARATE)
                             }
                         }
                     }
@@ -256,10 +256,10 @@ class SqlFormatPreProcessor : PreFormatProcessor {
         prevElement: PsiElement?,
         text: String,
     ): String =
-        if (prevElement?.text?.contains(StringUtil.LINE_SEPARATE) == false &&
+        if (prevElement?.text?.contains(LINE_SEPARATE) == false &&
             PsiTreeUtil.prevLeaf(prevElement) != null
         ) {
-            "${StringUtil.LINE_SEPARATE}$text"
+            "$LINE_SEPARATE$text"
         } else {
             text
         }

src/main/kotlin/org/domaframework/doma/intellij/formatter/visitor/DaoInjectionSqlVisitor.kt

@@ -26,9 +26,8 @@ import com.intellij.psi.PsiLiteralExpression
 import com.intellij.psi.codeStyle.CodeStyleManager
 import org.domaframework.doma.intellij.common.util.InjectionSqlUtil
 import org.domaframework.doma.intellij.common.util.StringUtil
+import org.domaframework.doma.intellij.common.util.StringUtil.SINGLE_SPACE
 import kotlin.text.isBlank
-import kotlin.text.isNotBlank
-import kotlin.text.takeWhile
 
 /**
  * Visitor for processing and formatting SQL injections in DAO files.

src/main/kotlin/org/domaframework/doma/intellij/inspection/dao/processor/TypeCheckerProcessor.kt

@@ -24,6 +24,7 @@ import com.intellij.psi.PsiType
 import org.domaframework.doma.intellij.common.psi.PsiDaoMethod
 import org.domaframework.doma.intellij.common.psi.PsiTypeChecker
 import org.domaframework.doma.intellij.common.util.DomaClassName
+import org.domaframework.doma.intellij.common.util.StringUtil.SINGLE_SPACE
 import org.domaframework.doma.intellij.extension.getJavaClazz
 import org.domaframework.doma.intellij.extension.psi.getSuperType
 import org.domaframework.doma.intellij.extension.psi.isDomain
@@ -99,13 +100,13 @@ abstract class TypeCheckerProcessor(
     }
 
     protected fun checkMapType(paramTypeCanonicalText: String): Boolean {
-        val mapClassName = paramTypeCanonicalText.replace(" ", "")
+        val mapClassName = paramTypeCanonicalText.replace(SINGLE_SPACE, "")
         val mapExpectedType =
             DomaClassName.MAP
                 .getGenericParamCanonicalText(
                     DomaClassName.STRING.className,
                     DomaClassName.OBJECT.className,
-                ).replace(" ", "")
+                ).replace(SINGLE_SPACE, "")
         return mapClassName == mapExpectedType
     }
 }