KotlinType: accept non-class-or-interface Java types

smowton · igfoo · commit 805b54897e1e · 2022-05-10T19:51:02.000+01:00
diff --git a/java/ql/lib/semmle/code/java/KotlinType.qll b/java/ql/lib/semmle/code/java/KotlinType.qll
@@ -9,18 +9,18 @@ class KotlinType extends Element, @kt_type {
 
 class KotlinNullableType extends KotlinType, @kt_nullable_type {
   override string toString() {
-    exists(ClassOrInterface ci |
-           kt_nullable_types(this, ci) and
-           result = "Kotlin nullable " + ci.toString())
+    exists(RefType javaType |
+           kt_nullable_types(this, javaType) and
+           result = "Kotlin nullable " + javaType.toString())
   }
   override string getAPrimaryQlClass() { result = "KotlinNullableType" }
 }
 
 class KotlinNotnullType extends KotlinType, @kt_notnull_type {
   override string toString() {
-    exists(ClassOrInterface ci |
-           kt_notnull_types(this, ci) and
-           result = "Kotlin not-null " + ci.toString())
+    exists(RefType javaType |
+           kt_notnull_types(this, javaType) and
+           result = "Kotlin not-null " + javaType.toString())
   }
   override string getAPrimaryQlClass() { result = "KotlinNotnullType" }
 }

Original file line number	Diff line number	Diff line change
`@@ -9,18 +9,18 @@ class KotlinType extends Element, @kt_type {`
`9`	`9`
`10`	`10`	`class KotlinNullableType extends KotlinType, @kt_nullable_type {`
`11`	`11`	`override string toString() {`
`12`		`- exists(ClassOrInterface ci \|`
`13`		`- kt_nullable_types(this, ci) and`
`14`		`- result = "Kotlin nullable " + ci.toString())`
	`12`	`+ exists(RefType javaType \|`
	`13`	`+ kt_nullable_types(this, javaType) and`
	`14`	`+ result = "Kotlin nullable " + javaType.toString())`
`15`	`15`	`}`
`16`	`16`	`override string getAPrimaryQlClass() { result = "KotlinNullableType" }`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`class KotlinNotnullType extends KotlinType, @kt_notnull_type {`
`20`	`20`	`override string toString() {`
`21`		`- exists(ClassOrInterface ci \|`
`22`		`- kt_notnull_types(this, ci) and`
`23`		`- result = "Kotlin not-null " + ci.toString())`
	`21`	`+ exists(RefType javaType \|`
	`22`	`+ kt_notnull_types(this, javaType) and`
	`23`	`+ result = "Kotlin not-null " + javaType.toString())`
`24`	`24`	`}`
`25`	`25`	`override string getAPrimaryQlClass() { result = "KotlinNotnullType" }`
`26`	`26`	`}`