Kotlin: Add KotlinType to ExtensionMethod

igfoo · igfoo · commit e61ff60bf88b · 2022-05-10T19:51:00.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt b/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
@@ -986,8 +986,8 @@ open class KotlinFileExtractor(
 
             val extReceiver = f.extensionReceiverParameter
             if (extReceiver != null) {
-                val extendedType = useTypeOld(extReceiver.type)
-                tw.writeKtExtensionFunctions(id, extendedType)
+                val extendedType = useType(extReceiver.type)
+                tw.writeKtExtensionFunctions(id, extendedType.javaResult.id, extendedType.kotlinResult.id)
             }
         }
 
diff --git a/java/ql/lib/config/semmlecode.dbscheme b/java/ql/lib/config/semmlecode.dbscheme
@@ -1085,5 +1085,6 @@ ktBreakContinueTargets(
 
 ktExtensionFunctions(
   unique int id: @method ref,
-  int typeid: @type ref
+  int typeid: @type ref,
+  int kttypeid: @kt_type ref
 )
diff --git a/java/ql/lib/semmle/code/java/Member.qll b/java/ql/lib/semmle/code/java/Member.qll
@@ -689,11 +689,15 @@ class InstanceField extends Field {
 /** A Kotlin extension function. */
 class ExtensionMethod extends Method {
   Type extendedType;
+  KotlinType extendedKotlinType;
 
-  ExtensionMethod() { ktExtensionFunctions(this, extendedType) }
+  ExtensionMethod() { ktExtensionFunctions(this, extendedType, extendedKotlinType) }
 
   /** Gets the type being extended by this method. */
   Type getExtendedType() { result = extendedType }
 
+  /** Gets the Kotlin type being extended by this method. */
+  KotlinType getExtendedKotlinType() { result = extendedKotlinType }
+
   override string getAPrimaryQlClass() { result = "ExtensionMethod" }
 }

Original file line number	Diff line number	Diff line change
`@@ -986,8 +986,8 @@ open class KotlinFileExtractor(`
`986`	`986`
`987`	`987`	`val extReceiver = f.extensionReceiverParameter`
`988`	`988`	`if (extReceiver != null) {`
`989`		`- val extendedType = useTypeOld(extReceiver.type)`
`990`		`- tw.writeKtExtensionFunctions(id, extendedType)`
	`989`	`+ val extendedType = useType(extReceiver.type)`
	`990`	`+ tw.writeKtExtensionFunctions(id, extendedType.javaResult.id, extendedType.kotlinResult.id)`
`991`	`991`	`}`
`992`	`992`	`}`
`993`	`993`
Original file line number	Diff line number	Diff line change
`@@ -1085,5 +1085,6 @@ ktBreakContinueTargets(`
`1085`	`1085`
`1086`	`1086`	`ktExtensionFunctions(`
`1087`	`1087`	`unique int id: @method ref,`
`1088`		`- int typeid: @type ref`
	`1088`	`+ int typeid: @type ref,`
	`1089`	`+ int kttypeid: @kt_type ref`
`1089`	`1090`	`)`