Enhance SQL annotation handling by adding DAO class checks in conversion actions

Author: xterao

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

@@ -25,6 +25,7 @@ import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiMethod
 import com.intellij.psi.util.PsiTreeUtil
 import org.domaframework.doma.intellij.bundle.MessageBundle
+import org.domaframework.doma.intellij.common.dao.getDaoClass
 import org.domaframework.doma.intellij.common.psi.PsiDaoMethod
 import org.domaframework.doma.intellij.common.util.PluginLoggerUtil
 
@@ -47,7 +48,9 @@ class ConvertSqlAnnotationToFileAction : ConvertSqlIntentionAction() {
         // Check if method has @Sql annotation
         // When a Sql annotation is present, a virtual SQL file is associated;
         // therefore, check the parent and exclude the injected (inline) SQL.
-        if (!psiDaoMethod.useSqlAnnotation() || psiDaoMethod.sqlFile != null && psiDaoMethod.sqlFile?.parent != null) {
+        if (getDaoClass(method.containingFile) == null || !psiDaoMethod.useSqlAnnotation() ||
+            psiDaoMethod.sqlFile != null && psiDaoMethod.sqlFile?.parent != null
+        ) {
             return false
         }
 

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

@@ -24,6 +24,7 @@ import com.intellij.psi.PsiMethod
 import com.intellij.psi.util.PsiTreeUtil
 import org.domaframework.doma.intellij.bundle.MessageBundle
 import org.domaframework.doma.intellij.common.dao.findDaoMethod
+import org.domaframework.doma.intellij.common.dao.getDaoClass
 import org.domaframework.doma.intellij.common.isJavaOrKotlinFileType
 import org.domaframework.doma.intellij.common.isSupportFileType
 import org.domaframework.doma.intellij.common.psi.PsiDaoMethod
@@ -42,8 +43,8 @@ class ConvertSqlFileToAnnotationAction : ConvertSqlIntentionAction() {
         editor: Editor?,
         element: PsiElement,
     ): Boolean {
-        val file = element.containingFile
-        if (isJavaOrKotlinFileType(file)) {
+        val file = element.containingFile ?: return false
+        if (isJavaOrKotlinFileType(file) && getDaoClass(file) != null) {
             return checkOnMethod(element, project)
         }
 

src/main/kotlin/org/domaframework/doma/intellij/common/dao/DaoClass.kt

@@ -18,8 +18,9 @@ package org.domaframework.doma.intellij.common.dao
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiFile
 import com.intellij.psi.util.PsiTreeUtil
+import org.domaframework.doma.intellij.common.util.DomaClassName
 
 fun getDaoClass(file: PsiFile): PsiClass? =
     PsiTreeUtil
         .findChildrenOfType(file, PsiClass::class.java)
-        .firstOrNull { it.hasAnnotation("org.seasar.doma.Dao") }
+        .firstOrNull { it.hasAnnotation(DomaClassName.DAO.className) }

src/main/kotlin/org/domaframework/doma/intellij/common/util/DomaClassName.kt

@@ -18,6 +18,8 @@ package org.domaframework.doma.intellij.common.util
 enum class DomaClassName(
     val className: String,
 ) {
+    DAO("org.seasar.doma.Dao"),
+
     OPTIONAL("java.util.Optional"),
     OPTIONAL_INT("java.util.OptionalInt"),
     OPTIONAL_DOUBLE("java.util.OptionalDouble"),