Skip to content

No error when a field-access element shares the same name as a parameter #241

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
Jun 5, 2025
Merged

No error when a field-access element shares the same name as a parameter #241

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
5 changes: 2 additions & 3 deletions src/main/kotlin/org/domaframework/doma/intellij/common/psi/PsiPatternUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import com.intellij.psi.TokenType
import com.intellij.psi.tree.IElementType
import com.intellij.psi.util.PsiTreeUtil
import com.intellij.psi.util.elementType
import com.intellij.psi.util.prevLeaf
import com.intellij.psi.util.prevLeafs
import com.intellij.util.ProcessingContext
import org.domaframework.doma.intellij.common.sql.directive.DirectiveCompletion
Expand Down Expand Up @@ -79,11 +78,11 @@ object PsiPatternUtil {
element: PsiElement,
context: ProcessingContext?,
): Boolean {
val bindText = element.prevLeaf()?.text ?: ""
val bindText = PsiTreeUtil.prevLeaf(element)?.text ?: ""
val directiveSymbol = DirectiveCompletion.directiveSymbols
return directiveSymbol.any {
bindText.startsWith(it) ||
(element.elementType == SqlTypes.EL_IDENTIFIER && element.prevLeaf()?.text == it) ||
(element.elementType == SqlTypes.EL_IDENTIFIER && PsiTreeUtil.prevLeaf(element)?.text == it) ||
(
element.elementType == TokenType.BAD_CHARACTER &&
element.parent
Expand Down
4 changes: 2 additions & 2 deletions src/main/kotlin/org/domaframework/doma/intellij/common/sql/directive/DirectiveHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
package org.domaframework.doma.intellij.common.sql.directive

import com.intellij.psi.PsiElement
import com.intellij.psi.util.PsiTreeUtil
import org.domaframework.doma.intellij.common.psi.PsiPatternUtil
import org.jetbrains.kotlin.psi.psiUtil.prevLeaf

/**
* Determine directive elements and perform code completion
Expand All @@ -31,7 +31,7 @@ open class DirectiveHandler(
it: PsiElement,
symbol: String,
): Boolean {
val prev = it.prevLeaf()
val prev = PsiTreeUtil.prevLeaf(it)
return (
prev?.text == symbol ||
it.text.startsWith(symbol)
Expand Down
2 changes: 1 addition & 1 deletion ...lin/org/domaframework/doma/intellij/inspection/dao/visitor/DaoMethodVariableSqlVisitor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class DaoMethodVariableSqlVisitor(
element.elementType == SqlTypes.EL_IDENTIFIER ||
element is SqlElPrimaryExpr
) &&
element.prevSibling?.elementType != SqlTypes.DOT
PsiTreeUtil.prevLeaf(element)?.elementType != SqlTypes.DOT
) {
iterator = args.minus(elements.toSet()).iterator()
while (iterator.hasNext()) {
Expand Down
4 changes: 2 additions & 2 deletions src/test/testData/src/main/java/doma/example/dao/DaoMethodVariableInspectionTestDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ interface DaoMethodVariableInspectionTestDao {
List<Employee> nonExistSQLFile(String name);

@Select
@Sql("select * from employee where name = /* name */'test'")
Employee noArgumentsUsedInSQLAnnotations(String name,Integer <error descr="There are unused parameters in the SQL [id]">id</error>);
@Sql("select * from employee where name = /* employee.employeeName */'test'")
Employee noArgumentsUsedInSQLAnnotations(Employee employee,String <error descr="There are unused parameters in the SQL [employeeName]">employeeName</error>);

@SqlProcessor
<R> R biFunctionDoesNotCauseError(Integer id, BiFunction<Config, PreparedSql, R> handler);
Expand Down
Loading