Refactor SQL annotation conversion actions to use a common supported types definition

Author: xterao

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

@@ -15,6 +15,7 @@
  */
 package org.domaframework.doma.intellij.action.dao
 
+import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction
 import com.intellij.codeInsight.intention.preview.IntentionPreviewInfo
 import com.intellij.codeInsight.intention.preview.IntentionPreviewUtils
 import com.intellij.openapi.command.WriteCommandAction
@@ -32,7 +33,7 @@ import org.domaframework.doma.intellij.common.util.PluginLoggerUtil
 /**
  * Intention action to convert @Sql annotation to SQL file
  */
-class ConvertSqlAnnotationToFileAction : ConvertSqlIntentionAction() {
+class ConvertSqlAnnotationToFileAction : PsiElementBaseIntentionAction() {
     override fun getFamilyName(): String = MessageBundle.message("convert.sql.annotation.to.file.family")
 
     override fun getText(): String = MessageBundle.message("convert.sql.annotation.to.file.text")
@@ -54,7 +55,7 @@ class ConvertSqlAnnotationToFileAction : ConvertSqlIntentionAction() {
             return false
         }
 
-        return supportedTypes.any { it.getPsiAnnotation(method) != null }
+        return SqlAnnotationConverter.supportedTypes.any { it.getPsiAnnotation(method) != null }
     }
 
     override fun generatePreview(

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

@@ -15,6 +15,7 @@
  */
 package org.domaframework.doma.intellij.action.dao
 
+import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction
 import com.intellij.codeInsight.intention.preview.IntentionPreviewUtils
 import com.intellij.openapi.command.WriteCommandAction
 import com.intellij.openapi.editor.Editor
@@ -33,7 +34,7 @@ import org.domaframework.doma.intellij.common.util.PluginLoggerUtil
 /**
  * Intention action to convert SQL file to @Sql annotation
  */
-class ConvertSqlFileToAnnotationAction : ConvertSqlIntentionAction() {
+class ConvertSqlFileToAnnotationAction : PsiElementBaseIntentionAction() {
     override fun getFamilyName(): String = MessageBundle.message("convert.sql.file.to.annotation.family")
 
     override fun getText(): String = MessageBundle.message("convert.sql.file.to.annotation.text")
@@ -83,7 +84,7 @@ class ConvertSqlFileToAnnotationAction : ConvertSqlIntentionAction() {
         }
 
         val hasAnnotation =
-            supportedTypes.any { type ->
+            SqlAnnotationConverter.supportedTypes.any { type ->
                 val annotation = type.getPsiAnnotation(daoMethod)
                 annotation != null
             }

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

@@ -48,6 +48,21 @@ class SqlAnnotationConverter(
     private val psiDaoMethod = PsiDaoMethod(project, method)
     private val elementFactory = JavaPsiFacade.getElementFactory(project)
 
+    companion object {
+        val supportedTypes =
+            setOf(
+                DomaAnnotationType.Select,
+                DomaAnnotationType.Script,
+                DomaAnnotationType.SqlProcessor,
+                DomaAnnotationType.Insert,
+                DomaAnnotationType.Update,
+                DomaAnnotationType.Delete,
+                DomaAnnotationType.BatchInsert,
+                DomaAnnotationType.BatchUpdate,
+                DomaAnnotationType.BatchDelete,
+            )
+    }
+
     /**
      * Convert @Sql annotation to SQL file
      */
@@ -95,19 +110,6 @@ class SqlAnnotationConverter(
     }
 
     private fun findTargetAnnotation(): PsiAnnotation? {
-        val supportedTypes =
-            listOf(
-                DomaAnnotationType.Select,
-                DomaAnnotationType.Script,
-                DomaAnnotationType.SqlProcessor,
-                DomaAnnotationType.Insert,
-                DomaAnnotationType.Update,
-                DomaAnnotationType.Delete,
-                DomaAnnotationType.BatchInsert,
-                DomaAnnotationType.BatchUpdate,
-                DomaAnnotationType.BatchDelete,
-            )
-
         for (type in supportedTypes) {
             val annotation = type.getPsiAnnotation(method)
             if (annotation != null) {