[kotlin2cpg] Add support for KtCallableReferenceExpression #5775
+194
−13
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,157 @@ | ||
| package io.joern.kotlin2cpg.querying | ||
|
|
||
| import io.joern.kotlin2cpg.testfixtures.KotlinCode2CpgFixture | ||
| import io.shiftleft.codepropertygraph.generated.nodes.{Identifier, MethodRef} | ||
| import io.shiftleft.semanticcpg.language.* | ||
|
|
||
| class CallableReferenceTests extends KotlinCode2CpgFixture(withOssDataflow = false) { | ||
|
|
||
| "resolved callable references as call argument should be handled correctly" in { | ||
| val cpg = code(""" | ||
| |package com.test | ||
| | | ||
| |class Bar { | ||
| | fun bar(x: Int) {} | ||
| |} | ||
| | | ||
| |class Foo { | ||
| | fun doNothing(c: (Int) -> Unit) {} | ||
| | | ||
| | fun foo() { | ||
| | doNothing(Bar::bar) | ||
| | } | ||
| |} | ||
| |""".stripMargin) | ||
|
|
||
| inside(cpg.call.name("doNothing").argument.l) { case List(thisArg: Identifier, methodRef: MethodRef) => | ||
| thisArg.name shouldBe "this" | ||
|
|
||
| methodRef.methodFullName shouldBe "com.test.Bar.bar:void(int)" | ||
| methodRef.typeFullName shouldBe "com.test.Bar" | ||
|
Contributor
There was a problem hiding this comment. This is wrong. You seem to have looked at Javasrc2cpg, but that is/was sadly not a good example and Johannes is fixing it there as we speak. You basically have to create a new synthetic TYPE_DECL and a corresponding TYPE which is then referenced here in typeFullName. This new TYPE_DECL then needs bindings that reflect the implemented interface. I suggest you and @johannescoetzee talk tomorrow so that he can tell you the details. |
||
| methodRef.code shouldBe "Bar::bar" | ||
| } | ||
| } | ||
|
|
||
| "callable references with unresolved signature should be handled correctly" in { | ||
| val cpg = code(""" | ||
| |package com.test | ||
| | | ||
| |class Foo { | ||
| | fun doNothing(c: (Int) -> Unit) {} | ||
| | | ||
| | fun foo() { | ||
| | doNothing(Bar::bar) | ||
| | } | ||
| |} | ||
| |""".stripMargin) | ||
|
|
||
| // When Bar class doesn't exist, the callable reference should still be created | ||
| val methodRefs = cpg.methodRef.code("Bar::bar").l | ||
| methodRefs.size shouldBe 1 | ||
| val methodRef = methodRefs.head | ||
|
|
||
| methodRef.methodFullName shouldBe "<unresolvedNamespace>.bar:<unresolvedSignature>" | ||
| methodRef.typeFullName shouldBe "ANY" | ||
| methodRef.code shouldBe "Bar::bar" | ||
| } | ||
|
|
||
| "unresolved callable references should be handled correctly" in { | ||
| val cpg = code(""" | ||
| |fun main() { | ||
| | someFunction(::unknownFunction) | ||
| |} | ||
| |""".stripMargin) | ||
|
|
||
| val methodRefs = cpg.methodRef.code("::unknownFunction").l | ||
| methodRefs.size shouldBe 1 | ||
| val methodRef = methodRefs.head | ||
|
|
||
| methodRef.methodFullName shouldBe "<unresolvedNamespace>.unknownFunction:<unresolvedSignature>" | ||
| methodRef.typeFullName shouldBe "ANY" | ||
| methodRef.code shouldBe "::unknownFunction" | ||
| } | ||
|
|
||
| "resolved instance method refs should be handled correctly" in { | ||
| val cpg = code(""" | ||
| |package com.test | ||
| | | ||
| |class Foo { | ||
| | fun doNothing(c: (Int) -> Unit) {} | ||
| | | ||
| | fun func(x: Int) {} | ||
| | | ||
| | fun foo() { | ||
| | val f = Foo() | ||
| | doNothing(f::func) | ||
| | } | ||
| |} | ||
| |""".stripMargin) | ||
|
|
||
| inside(cpg.call.name("doNothing").argument.l) { case List(thisArg: Identifier, methodRef: MethodRef) => | ||
| thisArg.name shouldBe "this" | ||
|
|
||
| methodRef.methodFullName shouldBe "com.test.Foo.func:void(int)" | ||
| methodRef.typeFullName shouldBe "com.test.Foo" | ||
| methodRef.code shouldBe "f::func" | ||
| } | ||
| } | ||
|
|
||
| "instance method refs with 'this' receiver should be handled correctly" in { | ||
| val cpg = code(""" | ||
| |package com.test | ||
| | | ||
| |class Foo { | ||
| | fun doNothing(c: (Int) -> Unit) {} | ||
| | | ||
| | fun func(x: Int) {} | ||
| | | ||
| | fun foo() { | ||
| | doNothing(this::func) | ||
| | } | ||
| |} | ||
| |""".stripMargin) | ||
|
|
||
| inside(cpg.call.name("doNothing").argument.l) { case List(thisArg: Identifier, methodRef: MethodRef) => | ||
| thisArg.name shouldBe "this" | ||
|
|
||
| methodRef.methodFullName shouldBe "com.test.Foo.func:void(int)" | ||
| methodRef.typeFullName shouldBe "com.test.Foo" | ||
| methodRef.code shouldBe "this::func" | ||
| } | ||
| } | ||
|
|
||
| "callable references with collection receiver should be handled correctly" in { | ||
| val cpg = code(""" | ||
| |fun main() { | ||
| | val numbers = listOf(1, 2, 3) | ||
| | val reference = numbers::forEach | ||
| |} | ||
| |""".stripMargin) | ||
|
|
||
| val methodRefs = cpg.methodRef.code("numbers::forEach").l | ||
| methodRefs.size shouldBe 1 | ||
| val methodRef = methodRefs.head | ||
|
|
||
| // The exact type will depend on Kotlin stdlib resolution | ||
| methodRef.methodFullName should include("forEach") | ||
|
Contributor
There was a problem hiding this comment.
|
||
| methodRef.typeFullName should include("List") | ||
| methodRef.code shouldBe "numbers::forEach" | ||
| } | ||
|
|
||
| "unbound callable references to top-level functions should be handled correctly" in { | ||
| val cpg = code(""" | ||
| |fun isOdd(x: Int) = x % 2 != 0 | ||
| | | ||
| |fun main() { | ||
| | val numbers = listOf(1, 2, 3) | ||
| | numbers.filter(::isOdd) | ||
| |} | ||
| |""".stripMargin) | ||
|
|
||
| inside(cpg.call.name("filter").argument.l) { case List(receiver, methodRef: MethodRef) => | ||
| methodRef.methodFullName shouldBe "<unresolvedNamespace>.isOdd:boolean(int)" | ||
|
Contributor
There was a problem hiding this comment. Does |
||
| methodRef.typeFullName shouldBe "ANY" | ||
| methodRef.code shouldBe "::isOdd" | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Testing for
thisargument does not really belong to the thing we want to check here. Please remove it.