Skip to content

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

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

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

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
4 changes: 3 additions & 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 @@ -39,11 +39,13 @@ class DaoMethodVariableSqlVisitor(

// Recursively explore child elements in a file with PsiRecursiveElementVisitor.
override fun visitElement(element: PsiElement) {
val prevElementType = PsiTreeUtil.prevLeaf(element)?.elementType
if ((
element.elementType == SqlTypes.EL_IDENTIFIER ||
element is SqlElPrimaryExpr
) &&
PsiTreeUtil.prevLeaf(element)?.elementType != SqlTypes.DOT
prevElementType != SqlTypes.DOT &&
prevElementType != SqlTypes.AT_SIGN
) {
iterator = args.minus(elements.toSet()).iterator()
while (iterator.hasNext()) {
Expand Down
13 changes: 9 additions & 4 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,11 @@ interface DaoMethodVariableInspectionTestDao {
List<Employee> nonExistSQLFile(String name);

@Select
@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>);
@Sql("select * from employee where name = /* employee.employeeName */'test' and status = /* @doma.example.entity.Project@status */'status'")
Employee noArgumentsUsedInSQLAnnotations(Employee employee,
String <error descr="There are unused parameters in the SQL [employeeName]">employeeName</error>,
String <error descr="There are unused parameters in the SQL [status]">status</error>,
String <error descr="There are unused parameters in the SQL [doma]">doma</error>);

@SqlProcessor
<R> R biFunctionDoesNotCauseError(Integer id, BiFunction<Config, PreparedSql, R> handler);
Expand All @@ -42,10 +45,12 @@ interface DaoMethodVariableInspectionTestDao {
Project selectOptionDoesNotCauseError(Employee <error descr="There are unused parameters in the SQL [employee]">employee</error>,String searchName,SelectOptions options);

@Select(strategy = SelectType.COLLECT)
Project collectDoesNotCauseError(Employee <error descr="There are unused parameters in the SQL [employee]">employee</error>,Integer id,Collector<Project, ?, Project> collector);
Project collectDoesNotCauseError(Employee <error descr="There are unused parameters in the SQL [employee]">employee</error>,Integer id,
Collector<Project, ?, Project> collector);

@Select
Project collectDoesCauseError(Employee <error descr="There are unused parameters in the SQL [employee]">employee</error>,String searchName,Collector<Project, ?, Project> <error descr="There are unused parameters in the SQL [collector]">collector</error>);
Project collectDoesCauseError(Employee <error descr="There are unused parameters in the SQL [employee]">employee</error>,String searchName,
Collector<Project, ?, Project> <error descr="There are unused parameters in the SQL [collector]">collector</error>);

@Select
Project noErrorWhenUsedInFunctionParameters(Employee employee, Integer count);
Expand Down
Loading