Skip to content

Instance member suggestions missing inside static property call arguments #213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 29, 2025
Merged

Instance member suggestions missing inside static property call arguments #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions ...rg/domaframework/doma/intellij/contributor/sql/provider/SqlParameterCompletionProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,9 +295,13 @@ class SqlParameterCompletionProvider : CompletionProvider<CompletionParameters>(

var isBatchAnnotation = false
if (top.parent !is PsiFile && top.parent?.parent !is PsiDirectory) {
val staticDirective = top.findNodeParent(SqlTypes.EL_STATIC_FIELD_ACCESS_EXPR)
staticDirective?.let {
topElementType = getElementTypeByStaticFieldAccess(top, it, topText) ?: return
// In function-parameter elements, apply the same processing as normal field access.
val parameter = top.findNodeParent(SqlTypes.EL_PARAMETERS)
if (parameter == null) {
val staticDirective = top.findNodeParent(SqlTypes.EL_STATIC_FIELD_ACCESS_EXPR)
staticDirective?.let {
topElementType = getElementTypeByStaticFieldAccess(top, it, topText) ?: return
}
}
}

Expand Down
132 changes: 132 additions & 0 deletions src/test/kotlin/org/domaframework/doma/intellij/complate/sql/SqlCompleteTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,14 @@ class SqlCompleteTest : DomaSqlTest() {
"$testDaoName/completeParameterFirstProperty.sql",
"$testDaoName/completeParameterSecond.sql",
"$testDaoName/completeParameterSecondProperty.sql",
"$testDaoName/completeParameterFirstInStaticAccess.sql",
"$testDaoName/completeParameterFirstPropertyInStaticAccess.sql",
"$testDaoName/completeParameterSecondInStaticAccess.sql",
"$testDaoName/completeParameterSecondPropertyInStaticAccess.sql",
"$testDaoName/completeParameterFirstInCustomFunctions.sql",
"$testDaoName/completeParameterFirstPropertyInCustomFunctions.sql",
"$testDaoName/completeParameterSecondInCustomFunctions.sql",
"$testDaoName/completeParameterSecondPropertyInCustomFunctions.sql",
"$testDaoName/completeCallStaticPropertyClassPackage.sql",
"$testDaoName/completeCallStaticPropertyClass.sql",
"$testDaoName/completeForItemHasNext.sql",
Expand Down Expand Up @@ -379,6 +387,130 @@ class SqlCompleteTest : DomaSqlTest() {
)
}

fun testCompleteParameterInStaticAccess() {
innerDirectiveCompleteTest(
"$testDaoName/completeParameterFirstInStaticAccess.sql",
listOf(
"project",
),
listOf(
"projectId",
"projectName",
"rank",
"projectNumber",
"projectCategory",
"getFirstEmployee()",
"getTermNumber()",
),
)

innerDirectiveCompleteTest(
"$testDaoName/completeParameterFirstPropertyInStaticAccess.sql",
listOf(
"projectId",
"projectName",
"rank",
"projectNumber",
"projectCategory",
"getFirstEmployee()",
"getTermNumber()",
),
listOf(
"project",
),
)

innerDirectiveCompleteTest(
"$testDaoName/completeParameterSecondInStaticAccess.sql",
listOf("project"),
listOf(
"projectId",
"projectName",
"rank",
"projectNumber",
"projectCategory",
"getFirstEmployee()",
"getTermNumber()",
),
)

innerDirectiveCompleteTest(
"$testDaoName/completeParameterSecondPropertyInStaticAccess.sql",
listOf(
"projectId",
"projectName",
"rank",
"projectNumber",
"projectCategory",
"getFirstEmployee()",
"getTermNumber()",
),
listOf("project"),
)
}

fun testCompleteParameterInCustomFunctions() {
innerDirectiveCompleteTest(
"$testDaoName/completeParameterFirstInCustomFunctions.sql",
listOf(
"project",
),
listOf(
"projectId",
"projectName",
"rank",
"projectNumber",
"projectCategory",
"getFirstEmployee()",
"getTermNumber()",
),
)

innerDirectiveCompleteTest(
"$testDaoName/completeParameterFirstPropertyInCustomFunctions.sql",
listOf(
"projectId",
"projectName",
"rank",
"projectNumber",
"projectCategory",
"getFirstEmployee()",
"getTermNumber()",
),
listOf(
"project",
),
)

innerDirectiveCompleteTest(
"$testDaoName/completeParameterSecondInCustomFunctions.sql",
listOf("project"),
listOf(
"projectId",
"projectName",
"rank",
"projectNumber",
"projectCategory",
"getFirstEmployee()",
"getTermNumber()",
),
)

innerDirectiveCompleteTest(
"$testDaoName/completeParameterSecondPropertyInCustomFunctions.sql",
listOf(
"projectId",
"projectName",
"rank",
"projectNumber",
"projectCategory",
"getFirstEmployee()",
"getTermNumber()",
),
listOf("project"),
)
}

fun testCompleteOptionalDaoParam() {
innerDirectiveCompleteTest(
"$testDaoName/completeOptionalDaoParam.sql",
Expand Down
25 changes: 25 additions & 0 deletions src/test/testData/src/main/java/doma/example/dao/SqlCompleteTestDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,30 @@ interface SqlCompleteTestDao {
@Select
Employee completeParameterSecondProperty(Employee employee);

@Select
ProjectDetail completeParameterFirstInStaticAccess(Project project);

@Select
ProjectDetail completeParameterFirstPropertyInStaticAccess(Project project);

@Select
ProjectDetail completeParameterSecondInStaticAccess(Project project);

@Select
ProjectDetail completeParameterSecondPropertyInStaticAccess(Project project);

@Select
ProjectDetail completeParameterFirstInCustomFunctions(Project project);

@Select
ProjectDetail completeParameterFirstPropertyInCustomFunctions(Project project);

@Select
ProjectDetail completeParameterSecondInCustomFunctions(Project project);

@Select
ProjectDetail completeParameterSecondPropertyInCustomFunctions(Project project);

@Select
Employee completeCallStaticPropertyClassPackage();

Expand Down Expand Up @@ -108,4 +132,5 @@ interface SqlCompleteTestDao {

@Select
Employee completeNotImplementCustomFunction(Project project);

}
2 changes: 2 additions & 0 deletions .../META-INF/doma/example/dao/SqlCompleteTestDao/completeParameterFirstInCustomFunctions.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
select * from project_detail
where number = /* @langCode(<caret>) */1
2 changes: 2 additions & 0 deletions ...ces/META-INF/doma/example/dao/SqlCompleteTestDao/completeParameterFirstInStaticAccess.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
select * from project_detail
where number = /* @doma.example.entity.Project@getTermNumber(<caret>) */1
2 changes: 2 additions & 0 deletions ...F/doma/example/dao/SqlCompleteTestDao/completeParameterFirstPropertyInCustomFunctions.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
select * from project_detail
where number = /* @langCode(project.<caret>) */1
2 changes: 2 additions & 0 deletions ...-INF/doma/example/dao/SqlCompleteTestDao/completeParameterFirstPropertyInStaticAccess.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
select * from project_detail
where number = /* @doma.example.entity.Project@getTermNumber(project.<caret>) */1
2 changes: 2 additions & 0 deletions ...META-INF/doma/example/dao/SqlCompleteTestDao/completeParameterSecondInCustomFunctions.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
select * from project_detail
where number = /* @langCode(project.cons, <caret>) */1
2 changes: 2 additions & 0 deletions ...es/META-INF/doma/example/dao/SqlCompleteTestDao/completeParameterSecondInStaticAccess.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
select * from project_detail
where number = /* @doma.example.entity.Project@getTermNumber(project.cons, <caret>) */1
2 changes: 2 additions & 0 deletions .../doma/example/dao/SqlCompleteTestDao/completeParameterSecondPropertyInCustomFunctions.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
select * from project_detail
where number = /* @langCode(project.cost, project.<caret>) */1
2 changes: 2 additions & 0 deletions ...INF/doma/example/dao/SqlCompleteTestDao/completeParameterSecondPropertyInStaticAccess.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
select * from project_detail
where number = /* @doma.example.entity.Project@getTermNumber(project.cost, project.<caret>) */1
Loading