Merge branch 'main' into fix/ignore-specific-dao-method-parameters

xterao · web-flow · commit 3f0c957a87ee · 2025-08-07T19:14:20.000+09:00
diff --git a/src/main/kotlin/org/domaframework/doma/intellij/extension/psi/PsiParameterExtension.kt b/src/main/kotlin/org/domaframework/doma/intellij/extension/psi/PsiParameterExtension.kt
@@ -33,7 +33,7 @@ fun PsiParameter.isIgnoreUsageCheck(): Boolean =
             DomaClassName.SELECT_OPTIONS -> {
                 // Only ignore the exact SelectOptions class, not its subtypes
                 val clazzType = this.typeElement?.type as? PsiClassType
-                clazzType?.canonicalText == type.className
+                clazzType?.rawType()?.canonicalText == type.className
             }
             else -> getSuperClassType(type) != null
         }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ fun PsiParameter.isIgnoreUsageCheck(): Boolean =`
`33`	`33`	`DomaClassName.SELECT_OPTIONS -> {`
`34`	`34`	`// Only ignore the exact SelectOptions class, not its subtypes`
`35`	`35`	`val clazzType = this.typeElement?.type as? PsiClassType`
`36`		`- clazzType?.canonicalText == type.className`
	`36`	`+ clazzType?.rawType()?.canonicalText == type.className`
`37`	`37`	`}`
`38`	`38`	`else -> getSuperClassType(type) != null`
`39`	`39`	`}`