Fix to pass the actual SQL file so that the formatting PostProcessor is applied to SQL generated by the action.

Author: xterao

src/main/kotlin/org/domaframework/doma/intellij/action/dao/SqlAnnotationConverter.kt

@@ -186,7 +186,6 @@ class SqlAnnotationConverter(
             // Add at the beginning
             modifierList.add(sqlAnnotation)
         }
-        // PSI変更をコミットしてロック解除
         val psiFile = method.containingFile
         val document = PsiDocumentManager.getInstance(project).getDocument(psiFile)
         if (document != null) {
@@ -241,11 +240,13 @@ class SqlAnnotationConverter(
                 val newPsiDaoMethod = PsiDaoMethod(project, method)
                 val sqlFile = newPsiDaoMethod.sqlFile ?: return@runWriteCommandAction
                 val psiFile = project.findFile(sqlFile) ?: return@runWriteCommandAction
-                val document = PsiDocumentManager.getInstance(project).getDocument(psiFile) ?: return@runWriteCommandAction
+
+                val documentManager = PsiDocumentManager.getInstance(project)
+                val document = documentManager.getDocument(psiFile) ?: return@runWriteCommandAction
 
                 // Replace the default content with the actual SQL content
                 document.setText(content)
-                PsiDocumentManager.getInstance(project).commitDocument(document)
+                documentManager.commitDocument(document)
 
                 // Format Sql
                 formatSql(psiFile)

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

@@ -17,6 +17,7 @@ package org.domaframework.doma.intellij.formatter.processor
 
 import com.intellij.lang.injection.InjectedLanguageManager
 import com.intellij.openapi.command.WriteCommandAction
+import com.intellij.openapi.editor.Document
 import com.intellij.openapi.fileTypes.FileTypeManager
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiDocumentManager
@@ -76,10 +77,8 @@ class InjectionSqlFormatter(
         removeSpace: (String) -> String,
     ) {
         val result = SqlFormatPreProcessor().updateDocument(sqlFile, sqlFile.textRange)
-        val formattedText = result.document?.text ?: return
-
-        val tmpFormatted = formatAsTemporarySqlFile(formattedText)
-        val document = documentManager.getDocument(sqlFile) ?: return
+        val document = result.document ?: return
+        val tmpFormatted = formatAsTemporarySqlFile(document)
         document.replaceString(
             sqlFile.textRange.startOffset,
             sqlFile.textRange.endOffset,
@@ -105,6 +104,23 @@ class InjectionSqlFormatter(
      * Formats SQL text by creating a temporary SQL file and applying code style.
      * Returns original text if formatting fails.
      */
+    private fun formatAsTemporarySqlFile(document: Document): String =
+        runCatching {
+            val tempFileName = "${TEMP_FILE_PREFIX}${SQL_FILE_EXTENSION}"
+            val fileType = fileTypeManager.getFileTypeByExtension("sql")
+            val tempSqlFile =
+                PsiFileFactory
+                    .getInstance(project)
+                    .createFileFromText(tempFileName, fileType, document.text)
+
+            document.setText(tempSqlFile.text)
+            documentManager.commitDocument(document)
+            val psiFile = documentManager.getPsiFile(document) ?: return@runCatching tempSqlFile.text
+
+            codeStyleManager.reformatText(psiFile, 0, tempSqlFile.textLength)
+            psiFile.text
+        }.getOrDefault(document.text)
+
     private fun formatAsTemporarySqlFile(sqlText: String): String =
         runCatching {
             val tempFileName = "${TEMP_FILE_PREFIX}${SQL_FILE_EXTENSION}"