Merge pull request #10275 from igfoo/igfoo/TypeResults

igfoo · web-flow · commit 6d5d78e975ae · 2022-09-02T14:34:22.000+01:00
Kotlin: Fix the type of TypeResultGeneric.cast
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/TypeResults.kt b/java/kotlin-extractor/src/main/kotlin/utils/TypeResults.kt
@@ -13,9 +13,9 @@ package com.github.codeql
  * "OuterClass<ConcreteArgument>" or "OtherClass<? extends Bound>") or an array ("componentShortName[]").
  */
 data class TypeResultGeneric<SignatureType,out LabelType: AnyDbType>(val id: Label<out LabelType>, val signature: SignatureType, val shortName: String) {
-    fun <U: AnyDbType> cast(): TypeResult<U> {
+    fun <U: AnyDbType> cast(): TypeResultGeneric<SignatureType,U> {
         @Suppress("UNCHECKED_CAST")
-        return this as TypeResult<U>
+        return this as TypeResultGeneric<SignatureType,U>
     }
 }
 data class TypeResultsGeneric<SignatureType>(val javaResult: TypeResultGeneric<SignatureType,DbType>, val kotlinResult: TypeResultGeneric<SignatureType,DbKt_type>)

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@ package com.github.codeql`
`13`	`13`	`* "OuterClass<ConcreteArgument>" or "OtherClass<? extends Bound>") or an array ("componentShortName[]").`
`14`	`14`	`*/`
`15`	`15`	`data class TypeResultGeneric<SignatureType,out LabelType: AnyDbType>(val id: Label<out LabelType>, val signature: SignatureType, val shortName: String) {`
`16`		`- fun <U: AnyDbType> cast(): TypeResult<U> {`
	`16`	`+ fun <U: AnyDbType> cast(): TypeResultGeneric<SignatureType,U> {`
`17`	`17`	`@Suppress("UNCHECKED_CAST")`
`18`		`- return this as TypeResult<U>`
	`18`	`+ return this as TypeResultGeneric<SignatureType,U>`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`	`data class TypeResultsGeneric<SignatureType>(val javaResult: TypeResultGeneric<SignatureType,DbType>, val kotlinResult: TypeResultGeneric<SignatureType,DbKt_type>)`