Skip to content

Fix Custom Function Code Completion #184

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 21, 2025
Merged

Fix Custom Function Code Completion #184

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
2 changes: 1 addition & 1 deletion ...ain/kotlin/org/domaframework/doma/intellij/common/sql/directive/StaticDirectiveHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class StaticDirectiveHandler(
}
if (handleResult) return true

if (element.prevSibling?.elementType == SqlTypes.AT_SIGN) {
if (PsiTreeUtil.prevLeaf(element)?.elementType == SqlTypes.AT_SIGN) {
// Built-in function completion
handleResult = builtInDirectiveHandler(element, result)
}
Expand Down
2 changes: 2 additions & 0 deletions ...omaframework/doma/intellij/common/sql/directive/collector/StaticBuildFunctionCollector.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/
package org.domaframework.doma.intellij.common.sql.directive.collector

import com.intellij.codeInsight.lookup.AutoCompletionPolicy
import com.intellij.codeInsight.lookup.LookupElement
import com.intellij.codeInsight.lookup.LookupElementBuilder
import com.intellij.openapi.project.Project
Expand Down Expand Up @@ -74,6 +75,7 @@ class StaticBuildFunctionCollector(
})",
true,
).withTypeText(it.returnType?.presentableText ?: "void")
.withAutoCompletionPolicy(AutoCompletionPolicy.ALWAYS_AUTOCOMPLETE)
}
}

Expand Down
143 changes: 77 additions & 66 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 @@ -22,50 +22,51 @@ import org.domaframework.doma.intellij.inspection.sql.inspector.SqlBindVariableV
* Code completion testing in SQL
*/
class SqlCompleteTest : DomaSqlTest() {
private val testDapName = "SqlCompleteTestDao"
private val testDaoName = "SqlCompleteTestDao"

override fun setUp() {
super.setUp()
addDaoJavaFile(
"$testDapName.java",
"$testDaoName.java",
)
addSqlFile(
"$testDapName/completeDaoArgument.sql",
"$testDapName/completeInstancePropertyFromDaoArgumentClass.sql",
"$testDapName/completeJavaPackageClass.sql",
"$testDapName/completeDirective.sql",
"$testDapName/completeBatchInsert.sql",
"$testDapName/completeStaticPropertyFromStaticPropertyCall.sql",
"$testDapName/completePropertyAfterStaticPropertyCall.sql",
"$testDapName/completeBuiltinFunction.sql",
"$testDapName/completeDirectiveInsideIf.sql",
"$testDapName/completeDirectiveInsideElseIf.sql",
"$testDapName/completeDirectiveInsideFor.sql",
"$testDapName/completeDirectiveFieldInsideIf.sql",
"$testDapName/completeDirectiveFieldInsideElseIf.sql",
"$testDapName/completeDirectiveFieldInsideFor.sql",
"$testDapName/completeConcatenationOperator.sql",
"$testDapName/completeComparisonOperator.sql",
"$testDapName/completeParameterFirst.sql",
"$testDapName/completeParameterFirstProperty.sql",
"$testDapName/completeParameterSecond.sql",
"$testDapName/completeParameterSecondProperty.sql",
"$testDapName/completeCallStaticPropertyClassPackage.sql",
"$testDapName/completeCallStaticPropertyClass.sql",
"$testDapName/completeForItemHasNext.sql",
"$testDapName/completeForItemIndex.sql",
"$testDapName/completeOptionalDaoParam.sql",
"$testDapName/completeOptionalStaticProperty.sql",
"$testDapName/completeOptionalByForItem.sql",
"$testDapName/completeOptionalBatchAnnotation.sql",
"$testDapName/completeForDirectiveItem.sql",
"$testDapName/completeImplementCustomFunction.sql",
"$testDaoName/completeDaoArgument.sql",
"$testDaoName/completeInstancePropertyFromDaoArgumentClass.sql",
"$testDaoName/completeJavaPackageClass.sql",
"$testDaoName/completeDirective.sql",
"$testDaoName/completeBatchInsert.sql",
"$testDaoName/completeStaticPropertyFromStaticPropertyCall.sql",
"$testDaoName/completePropertyAfterStaticPropertyCall.sql",
"$testDaoName/completeBuiltinFunction.sql",
"$testDaoName/completeDirectiveInsideIf.sql",
"$testDaoName/completeDirectiveInsideElseIf.sql",
"$testDaoName/completeDirectiveInsideFor.sql",
"$testDaoName/completeDirectiveFieldInsideIf.sql",
"$testDaoName/completeDirectiveFieldInsideElseIf.sql",
"$testDaoName/completeDirectiveFieldInsideFor.sql",
"$testDaoName/completeConcatenationOperator.sql",
"$testDaoName/completeComparisonOperator.sql",
"$testDaoName/completeParameterFirst.sql",
"$testDaoName/completeParameterFirstProperty.sql",
"$testDaoName/completeParameterSecond.sql",
"$testDaoName/completeParameterSecondProperty.sql",
"$testDaoName/completeCallStaticPropertyClassPackage.sql",
"$testDaoName/completeCallStaticPropertyClass.sql",
"$testDaoName/completeForItemHasNext.sql",
"$testDaoName/completeForItemIndex.sql",
"$testDaoName/completeOptionalDaoParam.sql",
"$testDaoName/completeOptionalStaticProperty.sql",
"$testDaoName/completeOptionalByForItem.sql",
"$testDaoName/completeOptionalBatchAnnotation.sql",
"$testDaoName/completeForDirectiveItem.sql",
"$testDaoName/completeImplementCustomFunction.sql",
"$testDaoName/completeNotImplementCustomFunction.sql",
)
myFixture.enableInspections(SqlBindVariableValidInspector())
}

fun testCompleteDaoArgument() {
val sqlFile = findSqlFile("$testDapName/completeDaoArgument.sql")
val sqlFile = findSqlFile("$testDaoName/completeDaoArgument.sql")
assertNotNull("Not Found SQL File", sqlFile)
if (sqlFile == null) return

Expand All @@ -87,7 +88,7 @@ class SqlCompleteTest : DomaSqlTest() {

fun testCompleteInstancePropertyFromDaoArgumentClass() {
innerDirectiveCompleteTest(
"$testDapName/completeInstancePropertyFromDaoArgumentClass.sql",
"$testDaoName/completeInstancePropertyFromDaoArgumentClass.sql",
listOf(
"employeeId",
"employeeName",
Expand All @@ -102,7 +103,7 @@ class SqlCompleteTest : DomaSqlTest() {

fun testCompleteJavaPackageClass() {
innerDirectiveCompleteTest(
"$testDapName/completeJavaPackageClass.sql",
"$testDaoName/completeJavaPackageClass.sql",
listOf(
"CASE_INSENSITIVE_ORDER",
"toString()",
Expand All @@ -118,7 +119,7 @@ class SqlCompleteTest : DomaSqlTest() {

fun testCompleteForItemHasNext() {
innerDirectiveCompleteTest(
"$testDapName/completeForItemHasNext.sql",
"$testDaoName/completeForItemHasNext.sql",
emptyList(),
listOf(
"get()",
Expand All @@ -137,7 +138,7 @@ class SqlCompleteTest : DomaSqlTest() {

fun testCompleteForItemIndex() {
innerDirectiveCompleteTest(
"$testDapName/completeForItemIndex.sql",
"$testDaoName/completeForItemIndex.sql",
emptyList(),
listOf(
"get()",
Expand All @@ -157,7 +158,7 @@ class SqlCompleteTest : DomaSqlTest() {

fun testCompleteDirective() {
innerDirectiveCompleteTest(
"$testDapName/completeDirective.sql",
"$testDaoName/completeDirective.sql",
listOf(
"elseif",
"else",
Expand All @@ -176,7 +177,7 @@ class SqlCompleteTest : DomaSqlTest() {

fun testCompleteBatchInsert() {
innerDirectiveCompleteTest(
"$testDapName/completeBatchInsert.sql",
"$testDaoName/completeBatchInsert.sql",
listOf(
"employeeId",
"employeeName",
Expand All @@ -191,7 +192,7 @@ class SqlCompleteTest : DomaSqlTest() {

fun testCompleteStaticPropertyFromStaticPropertyCall() {
innerDirectiveCompleteTest(
"$testDapName/completeStaticPropertyFromStaticPropertyCall.sql",
"$testDaoName/completeStaticPropertyFromStaticPropertyCall.sql",
listOf(
"members",
"projectNumber",
Expand All @@ -208,7 +209,7 @@ class SqlCompleteTest : DomaSqlTest() {

fun testCompleteCallStaticPropertyClassPackage() {
innerDirectiveCompleteTest(
"$testDapName/completeCallStaticPropertyClassPackage.sql",
"$testDaoName/completeCallStaticPropertyClassPackage.sql",
listOf(
"doma",
"com",
Expand All @@ -220,7 +221,7 @@ class SqlCompleteTest : DomaSqlTest() {
)

innerDirectiveCompleteTest(
"$testDapName/completeCallStaticPropertyClass.sql",
"$testDaoName/completeCallStaticPropertyClass.sql",
listOf(
"doma.example.entity.Employee",
"doma.example.entity.EmployeeSummary",
Expand All @@ -245,7 +246,7 @@ class SqlCompleteTest : DomaSqlTest() {

fun testCompletePropertyAfterStaticPropertyCall() {
innerDirectiveCompleteTest(
"$testDapName/completePropertyAfterStaticPropertyCall.sql",
"$testDaoName/completePropertyAfterStaticPropertyCall.sql",
listOf(
"managerId",
),
Expand All @@ -258,7 +259,7 @@ class SqlCompleteTest : DomaSqlTest() {

fun testCompleteBuiltinFunction() {
innerDirectiveCompleteTest(
"$testDapName/completeBuiltinFunction.sql",
"$testDaoName/completeBuiltinFunction.sql",
listOf(
"isEmpty()",
"isNotEmpty()",
Expand All @@ -278,35 +279,35 @@ class SqlCompleteTest : DomaSqlTest() {

fun testCompleteDirectiveInside() {
innerDirectiveCompleteTest(
"$testDapName/completeDirectiveInsideIf.sql",
"$testDaoName/completeDirectiveInsideIf.sql",
listOf("employee"),
listOf("project"),
)
innerDirectiveCompleteTest(
"$testDapName/completeDirectiveInsideElseIf.sql",
"$testDaoName/completeDirectiveInsideElseIf.sql",
listOf("employee", "project"),
emptyList(),
)
innerDirectiveCompleteTest(
"$testDapName/completeDirectiveInsideFor.sql",
"$testDaoName/completeDirectiveInsideFor.sql",
listOf("project"),
listOf("employee", "member", "%for"),
)
}

fun testCompleteDirectiveFieldInside() {
innerDirectiveCompleteTest(
"$testDapName/completeDirectiveFieldInsideIf.sql",
"$testDaoName/completeDirectiveFieldInsideIf.sql",
listOf("startsWith()"),
listOf("employee", "project", "toLowCase"),
)
innerDirectiveCompleteTest(
"$testDapName/completeDirectiveFieldInsideElseIf.sql",
"$testDaoName/completeDirectiveFieldInsideElseIf.sql",
listOf("department"),
listOf("employee", "project"),
)
innerDirectiveCompleteTest(
"$testDapName/completeDirectiveFieldInsideFor.sql",
"$testDaoName/completeDirectiveFieldInsideFor.sql",
listOf(
"projectId",
"projectName",
Expand All @@ -323,79 +324,79 @@ class SqlCompleteTest : DomaSqlTest() {

fun testCompleteConcatenationOperator() {
innerDirectiveCompleteTest(
"$testDapName/completeConcatenationOperator.sql",
"$testDaoName/completeConcatenationOperator.sql",
listOf("rank"),
listOf("employee", "employeeId", "department"),
)

innerDirectiveCompleteTest(
"$testDapName/completeComparisonOperator.sql",
"$testDaoName/completeComparisonOperator.sql",
listOf("rank"),
listOf("employee", "employeeId", "department"),
)
}

fun testCompleteParameter() {
innerDirectiveCompleteTest(
"$testDapName/completeParameterFirst.sql",
"$testDaoName/completeParameterFirst.sql",
listOf("employee"),
listOf("employeeId", "department", "rank", "startWith"),
)

innerDirectiveCompleteTest(
"$testDapName/completeParameterFirstProperty.sql",
"$testDaoName/completeParameterFirstProperty.sql",
listOf("employeeId", "department", "rank"),
listOf("employee"),
)

innerDirectiveCompleteTest(
"$testDapName/completeParameterSecond.sql",
"$testDaoName/completeParameterSecond.sql",
listOf("employee"),
listOf("employeeId", "department", "rank", "startWith"),
)

innerDirectiveCompleteTest(
"$testDapName/completeParameterSecondProperty.sql",
"$testDaoName/completeParameterSecondProperty.sql",
listOf("managerId"),
listOf("employee", "department", "rank"),
)
}

fun testCompleteOptionalDaoParam() {
innerDirectiveCompleteTest(
"$testDapName/completeOptionalDaoParam.sql",
"$testDaoName/completeOptionalDaoParam.sql",
listOf("manager", "projectNumber", "getFirstEmployee()"),
listOf("get()", "orElseGet()", "isPresent()"),
)
}

fun testCompleteOptionalStaticProperty() {
innerDirectiveCompleteTest(
"$testDapName/completeOptionalStaticProperty.sql",
"$testDaoName/completeOptionalStaticProperty.sql",
listOf("userId", "userName", "email", "getUserNameFormat()"),
listOf("get()", "orElseGet()", "isPresent()"),
)
}

fun testCompleteOptionalByForItem() {
innerDirectiveCompleteTest(
"$testDapName/completeOptionalByForItem.sql",
"$testDaoName/completeOptionalByForItem.sql",
listOf("manager", "projectNumber", "getFirstEmployee()"),
listOf("get()", "orElseGet()", "isPresent()"),
)
}

fun testCompleteOptionalBatchAnnotation() {
innerDirectiveCompleteTest(
"$testDapName/completeOptionalBatchAnnotation.sql",
"$testDaoName/completeOptionalBatchAnnotation.sql",
listOf("optionalIds"),
listOf("get()", "orElseGet()", "isPresent()", "projectId"),
)
}

fun testCompleteForDirectiveItem() {
innerDirectiveCompleteTest(
"$testDapName/completeForDirectiveItem.sql",
"$testDaoName/completeForDirectiveItem.sql",
listOf("projects", "project", "project_has_next", "project_index"),
listOf("get()", "size()", "toString()", "projectId"),
)
Expand All @@ -406,16 +407,26 @@ class SqlCompleteTest : DomaSqlTest() {
mutableListOf("doma.example.expression.TestExpressionFunctions", "doma.example.expression.TestNotExpressionFunctions"),
)
innerDirectiveCompleteTest(
"$testDapName/completeImplementCustomFunction.sql",
listOf("userId()", "userName()", "userAge()", "langCode()", "isGest()", "isBlank()", "isNotBlank()"),
listOf("getId()", "getName()", "getAge()", "getLangCode()", "isManager()"),
"$testDaoName/completeImplementCustomFunction.sql",
listOf("userId()", "userName()", "userAge()"),
listOf(
"getId()",
"getName()",
"getAge()",
"getLangCode()",
"isManager()",
"langCode()",
"isGest()",
"isBlank()",
"isNotBlank()",
),
)
}

fun testCompleteNotImplementCustomFunction() {
innerDirectiveCompleteTest(
"$testDapName/completeImplementCustomFunction.sql",
listOf("isEmpty()", "roundDownTimePart()", "isBlank()", "isNotBlank()"),
"$testDaoName/completeNotImplementCustomFunction.sql",
listOf("isEmpty()", "isBlank()", "isNotBlank()", "roundDownTimePart()"),
listOf(
"userId()",
"userName()",
Expand Down
2 changes: 2 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 @@ -103,4 +103,6 @@ interface SqlCompleteTestDao {
@Select
Employee completeImplementCustomFunction(Project project);

@Select
Employee completeNotImplementCustomFunction(Project project);
}
2 changes: 1 addition & 1 deletion ...esources/META-INF/doma/example/dao/SqlCompleteTestDao/completeImplementCustomFunction.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SELECT * FROM project
WHERE project_id = /* project.projectId */0
AND manager = /* project.manager.userId */0
AND lang = /* @<caret> */'en'
AND lang = /* @use<caret>() */'en'
4 changes: 4 additions & 0 deletions ...urces/META-INF/doma/example/dao/SqlCompleteTestDao/completeNotImplementCustomFunction.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
SELECT * FROM project
WHERE project_id = /* project.projectId */0
AND manager = /* project.manager.userId */0
AND lang = /* @<caret> */'en'