Add ExtensionMethod class

tamasvajk · igfoo · commit 3bfc93daab0b · 2022-05-10T18:45:58.000+01:00
diff --git a/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt b/java/kotlin-extractor/src/main/kotlin/KotlinExtractorExtension.kt
@@ -462,6 +462,8 @@ class KotlinFileExtractor(val logger: FileLogger, val tw: FileTrapWriter, val fi
         val extReceiver = f.extensionReceiverParameter
         if (extReceiver != null) {
             extractValueParameter(extReceiver, id, index--)
+
+            tw.writeKtExtensionFunctions(id)
         }
 
         val dispReceiver = f.dispatchReceiverParameter
diff --git a/java/ql/lib/config/semmlecode.dbscheme b/java/ql/lib/config/semmlecode.dbscheme
@@ -1059,3 +1059,7 @@ ktBreakContinueTarget(
   unique int id: @breakcontinuestmt ref,
   int target: @ktloopstmt ref
 )
+
+ktExtensionFunctions(
+  unique int id: @method ref
+)
diff --git a/java/ql/lib/semmle/code/java/Member.qll b/java/ql/lib/semmle/code/java/Member.qll
@@ -670,3 +670,13 @@ class Field extends Member, ExprParent, @field, Variable {
 class InstanceField extends Field {
   InstanceField() { not this.isStatic() }
 }
+
+/** A Kotlin extension function. */
+class ExtensionMethod extends Method {
+  ExtensionMethod() { ktExtensionFunctions(this) }
+
+  /** Gets the type being extended by this method. */
+  Type getExtendedType() { result = getParameter(-1).getType() }
+
+  override string getAPrimaryQlClass() { result = "ExtensionMethod" }
+}
diff --git a/java/ql/test/kotlin/library-tests/methods/methods.expected b/java/ql/test/kotlin/library-tests/methods/methods.expected
@@ -1,3 +1,4 @@
+methods
 | methods2.kt:4:1:5:1 | fooBarTopLevelMethod |
 | methods2.kt:7:1:10:1 | <init> |
 | methods2.kt:7:1:10:1 | equals |
@@ -17,3 +18,6 @@
 | methods.kt:5:1:13:1 | toString |
 | methods.kt:6:5:7:5 | classMethod |
 | methods.kt:9:5:12:5 | anotherClassMethod |
+extensions
+| methods3.kt:3:1:3:39 | fooBarTopLevelMethod | file://:0:0:0:0 | int |
+| methods3.kt:6:5:6:43 | fooBarTopLevelMethod | file://:0:0:0:0 | int |
diff --git a/java/ql/test/kotlin/library-tests/methods/methods.ql b/java/ql/test/kotlin/library-tests/methods/methods.ql
@@ -1,5 +1,5 @@
 import java
 
-from Method m
-select m
+query predicate methods(Method m) { any() }
 
+query predicate extensions(ExtensionMethod m, Type t) { m.getExtendedType() = t }

Original file line number	Diff line number	Diff line change
`@@ -462,6 +462,8 @@ class KotlinFileExtractor(val logger: FileLogger, val tw: FileTrapWriter, val fi`
`462`	`462`	`val extReceiver = f.extensionReceiverParameter`
`463`	`463`	`if (extReceiver != null) {`
`464`	`464`	`extractValueParameter(extReceiver, id, index--)`
	`465`	`+`
	`466`	`+ tw.writeKtExtensionFunctions(id)`
`465`	`467`	`}`
`466`	`468`
`467`	`469`	`val dispReceiver = f.dispatchReceiverParameter`
Original file line number	Diff line number	Diff line change
`@@ -1059,3 +1059,7 @@ ktBreakContinueTarget(`
`1059`	`1059`	`unique int id: @breakcontinuestmt ref,`
`1060`	`1060`	`int target: @ktloopstmt ref`
`1061`	`1061`	`)`
	`1062`	`+`
	`1063`	`+ktExtensionFunctions(`
	`1064`	`+ unique int id: @method ref`
	`1065`	`+)`