Add SQL completion tests for top element before at-sign and static property after other element

Author: xterao

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

@@ -32,13 +32,15 @@ class SqlCompleteTest : DomaSqlTest() {
             "$testDaoName/completeDaoArgument.sql",
             "$testDaoName/completeInstancePropertyFromDaoArgumentClass.sql",
             "$testDaoName/completeInstancePropertyWithMethodParameter.sql",
+            "$testDaoName/completeTopElementBeforeAtsign.sql",
             "$testDaoName/completeJavaPackageClass.sql",
             "$testDaoName/completeDirective.sql",
             "$testDaoName/completeBatchInsert.sql",
             "$testDaoName/completeStaticPropertyFromStaticPropertyCall.sql",
             "$testDaoName/completePropertyAfterStaticPropertyCall.sql",
             "$testDaoName/completePropertyAfterStaticPropertyCallWithMethodParameter.sql",
             "$testDaoName/completePropertyAfterStaticMethodCall.sql",
+            "$testDaoName/completeStaticPropertyAfterOtherElement.sql",
             "$testDaoName/completeBuiltinFunction.sql",
             "$testDaoName/completeDirectiveInsideIf.sql",
             "$testDaoName/completeDirectiveFieldInsideIfWithMethodParameter.sql",
@@ -131,6 +133,24 @@ class SqlCompleteTest : DomaSqlTest() {
                 "isBlank()",
             ),
         )
+        innerDirectiveCompleteTest(
+            "$testDaoName/completeTopElementBeforeAtsign.sql",
+            listOf(
+                "employee",
+                "id",
+                "userIds",
+                "userId",
+                "userId_has_next",
+                "userId_index",
+            ),
+            listOf(
+                "doma",
+                "example",
+                "projectNumber",
+                "subProjects",
+                "valueOf()",
+            ),
+        )
     }
 
     fun testCompleteJavaPackageClass() {
@@ -245,20 +265,36 @@ class SqlCompleteTest : DomaSqlTest() {
                 "projectNumber",
                 "projectName",
                 "projectCategory",
+                "status",
+                "manager",
+                "getFirstEmployee()",
+                "getTermNumber()",
             ),
             listOf(
                 "projectDetailId",
                 "members",
-                "manager",
-                "getFirstEmployee()",
-                "getTermNumber()",
                 "employeeId",
                 "projects",
-                "rank",
                 "contains()",
                 "isBlank()",
             ),
         )
+        innerDirectiveCompleteTest(
+            "$testDaoName/completeStaticPropertyAfterOtherElement.sql",
+            listOf(
+                "projectNumber",
+                "projectName",
+                "projectCategory",
+                "manager",
+                "subProjects",
+                "getTermNumber()",
+                "getCustomNumber()",
+            ),
+            listOf(
+                "doma",
+                "employee",
+            ),
+        )
     }
 
     fun testCompleteCallStaticPropertyClassPackage() {

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

@@ -22,6 +22,9 @@ interface SqlCompleteTestDao {
   @Select
   Employee completeInstancePropertyWithMethodParameter(Employee employee, String name);
 
+  @Select
+  Employee completeTopElementBeforeAtsign(Employee employee, Integer id, List<Integer> userIds);
+
   @Insert(sqlFile = true)
   int completeJavaPackageClass(Employee employee);
 
@@ -43,6 +46,9 @@ interface SqlCompleteTestDao {
   @Select
   Project completePropertyAfterStaticMethodCall();
 
+  @Select
+  Employee completeStaticPropertyAfterOtherElement(Employee employee);
+
   @Select
   Project completeBuiltinFunction(ProjectDetail detail);
 

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

@@ -7,5 +7,4 @@ from project p
  inner join project_detail pd
   on p.project_id = pd.project_id
  where
-  -- Code completion for static fields and methods
-  and pd.manager_id = /* @doma.example.entity.ProjectDetail@getProject(employee.rank).<caret>pro */'TODO'
+  and pd.manager_id = /* @doma.example.entity.ProjectDetail@getProject(employee.rank).<caret> */'TODO'

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

@@ -0,0 +1,15 @@
+select
+   p.project_id
+   , p.statis
+   , p.project_name
+   , p.rank
+from project p
+ inner join project_detail pd
+  on p.project_id = pd.project_id
+ where
+  /*%for userId : userIds */
+   pd.manager_id = /* id @doma.example.entity.ProjectDetail@<caret> */'TODO'
+   /*%if userId_has_next */
+    /*# "OR" */
+   /*%end */
+  /*%end */

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

@@ -0,0 +1,15 @@
+select
+   p.project_id
+   , p.statis
+   , p.project_name
+   , p.rank
+from project p
+ inner join project_detail pd
+  on p.project_id = pd.project_id
+ where
+  /*%for userId : userIds */
+   pd.manager_id = /* id <caret> @doma.example.entity.ProjectDetail@manager */'TODO'
+   /*%if userId_has_next */
+    /*# "OR" */
+   /*%end */
+  /*%end */