Add support for batch annotation with SQL completion

Author: xterao

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

@@ -48,8 +48,6 @@ import org.domaframework.doma.intellij.extension.psi.findNodeParent
 import org.domaframework.doma.intellij.extension.psi.findSelfBlocks
 import org.domaframework.doma.intellij.extension.psi.findStaticField
 import org.domaframework.doma.intellij.extension.psi.findStaticMethod
-import org.domaframework.doma.intellij.extension.psi.getDomaAnnotationType
-import org.domaframework.doma.intellij.extension.psi.getIterableClazz
 import org.domaframework.doma.intellij.extension.psi.isNotWhiteSpace
 import org.domaframework.doma.intellij.extension.psi.searchParameter
 import org.domaframework.doma.intellij.extension.psi.searchStaticField
@@ -370,8 +368,8 @@ class SqlParameterCompletionProvider : CompletionProvider<CompletionParameters>(
         if (findParam == null) {
             return null
         }
-        val immediate = findParam.getIterableClazz(daoMethod.getDomaAnnotationType())
-        return PsiClassTypeUtil.convertOptionalType(immediate.type, originalFile.project)
+        val immediate = findParam.type
+        return PsiClassTypeUtil.convertOptionalType(immediate, originalFile.project)
     }
 
     private fun getRefClazz(

src/main/kotlin/org/domaframework/doma/intellij/extension/psi/PsiParameterExtension.kt

@@ -17,24 +17,6 @@ package org.domaframework.doma.intellij.extension.psi
 
 import com.intellij.psi.PsiClassType
 import com.intellij.psi.PsiParameter
-import org.domaframework.doma.intellij.common.psi.PsiParentClass
-import org.domaframework.doma.intellij.common.sql.PsiClassTypeUtil
-
-/**
- * For List type, if the annotation type is Batch type,
- * return the content type.
- */
-fun PsiParameter.getIterableClazz(annotationType: DomaAnnotationType): PsiParentClass = getIterableClazz(annotationType.isBatchAnnotation())
-
-fun PsiParameter.getIterableClazz(useListParam: Boolean): PsiParentClass {
-    val immediate = this.type as? PsiClassType
-    val classType = immediate?.let { PsiClassTypeUtil.getPsiTypeByList(it, this.project, useListParam) }
-    if (classType != null) {
-        val convertOptional = PsiClassTypeUtil.convertOptionalType(classType, this.project)
-        return PsiParentClass(convertOptional)
-    }
-    return PsiParentClass(this.type)
-}
 
 val PsiParameter.isFunctionClazz: Boolean
     get() =

src/test/kotlin/org/domaframework/doma/intellij/complate/sql/SqlCompleteTest.kt

@@ -34,6 +34,7 @@ class SqlCompleteTest : DomaSqlTest() {
             "$testDapName/completeInstancePropertyFromDaoArgumentClass.sql",
             "$testDapName/completeJavaPackageClass.sql",
             "$testDapName/completeDirective.sql",
+            "$testDapName/completeBatchInsert.sql",
             "$testDapName/completeStaticPropertyFromStaticPropertyCall.sql",
             "$testDapName/completePropertyAfterStaticPropertyCall.sql",
             "$testDapName/completeBuiltinFunction.sql",
@@ -161,6 +162,21 @@ class SqlCompleteTest : DomaSqlTest() {
         )
     }
 
+    fun testCompleteBatchInsert() {
+        innerDirectiveCompleteTest(
+            "$testDapName/completeBatchInsert.sql",
+            listOf(
+                "employeeId",
+                "employeeName",
+            ),
+            listOf(
+                "userId",
+                "get()",
+                "size()",
+            ),
+        )
+    }
+
     fun testCompleteStaticPropertyFromStaticPropertyCall() {
         innerDirectiveCompleteTest(
             "$testDapName/completeStaticPropertyFromStaticPropertyCall.sql",

src/test/testData/src/main/java/doma/example/dao/SqlCompleteTestDao.java

@@ -25,6 +25,9 @@ interface SqlCompleteTestDao {
   @Update(sqlFile = true)
   int completeDirective(Employee employee);
 
+  @BatchInsert(sqlFile = true)
+  int completeBatchInsert(List<Employee> employees);
+
   @Select
   Project completeStaticPropertyFromStaticPropertyCall(ProjectDetail detail);
 

src/test/testData/src/main/resources/META-INF/doma/example/dao/SqlCompleteTestDao/completeBatchInsert.sql

@@ -0,0 +1,5 @@
+INSERT INTO employee
+            (id
+             , name)
+     VALUES ( /* employees.userId */0
+             , /* employees.<caret>emplo */'name')