azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Uast: implicit receiver for local function calls (KT-25524)

Browse Source
This commit is contained in:
Nicolay Mitropolsky
2018-07-17 11:36:33 +03:00
parent 5212728a82
commit a616f6cca9
8 changed files with 179 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/uast-kotlin/tests/KotlinUastApiTest.kt
+48
View File
@@ -407,6 +407,54 @@ class KotlinUastApiTest : AbstractKotlinUastTest() {
}
}
@Test
fun testLocalLambdaCall() {
doTest("Lambdas") { _, file ->
val lambdaCall = file.findElementByTextFromPsi<UCallExpression>("baz()")
assertEquals(
"UIdentifier (Identifier (baz))",
lambdaCall.methodIdentifier?.asLogString()
)
assertEquals(
"baz",
lambdaCall.methodIdentifier?.name
)
assertEquals(
"invoke",
lambdaCall.methodName
)
val receiver = lambdaCall.receiver ?: kotlin.test.fail("receiver expected")
assertEquals("UReferenceExpression", receiver.asLogString())
val uParameter = (receiver as UReferenceExpression).resolve().toUElement() ?: kotlin.test.fail("uelement expected")
assertEquals("ULocalVariable (name = baz)", uParameter.asLogString())
}
}
@Test
fun testLocalDeclarationCall() {
doTest("LocalDeclarations") { _, file ->
val localFunction = file.findElementByTextFromPsi<UElement>("bar() == Local()").
findElementByText<UCallExpression>("bar()")
assertEquals(
"UIdentifier (Identifier (bar))",
localFunction.methodIdentifier?.asLogString()
)
assertEquals(
"bar",
localFunction.methodIdentifier?.name
)
assertEquals(
"bar",
localFunction.methodName
)
assertNull(localFunction.resolve())
val receiver = localFunction.receiver ?: kotlin.test.fail("receiver expected")
assertEquals("UReferenceExpression", receiver.asLogString())
val uParameter = (receiver as UReferenceExpression).resolve().toUElement() ?: kotlin.test.fail("uelement expected")
assertEquals("ULambdaExpression", uParameter.asLogString())
}
}
}
fun <T, R> Iterable<T>.assertedFind(value: R, transform: (T) -> R): T =
plugins/uast-kotlin/tests/KotlinUastApiTest.kt.172
+48
View File
@@ -252,4 +252,52 @@ class KotlinUastApiTest : AbstractKotlinUastTest() {
}
}
@Test
fun testLocalLambdaCall() {
doTest("Lambdas") { _, file ->
val lambdaCall = file.findElementByTextFromPsi<UCallExpression>("baz()")
assertEquals(
"UIdentifier (Identifier (baz))",
lambdaCall.methodIdentifier?.asLogString()
)
assertEquals(
"baz",
lambdaCall.methodIdentifier?.name
)
assertEquals(
"invoke",
lambdaCall.methodName
)
val receiver = lambdaCall.receiver ?: kotlin.test.fail("receiver expected")
assertEquals("UReferenceExpression", receiver.asLogString())
val uParameter = (receiver as UReferenceExpression).resolve().toUElement() ?: kotlin.test.fail("uelement expected")
assertEquals("ULocalVariable (name = baz)", uParameter.asLogString())
}
}
@Test
fun testLocalDeclarationCall() {
doTest("LocalDeclarations") { _, file ->
val localFunction = file.findElementByTextFromPsi<UElement>("bar() == Local()").
findElementByText<UCallExpression>("bar()")
assertEquals(
"UIdentifier (Identifier (bar))",
localFunction.methodIdentifier?.asLogString()
)
assertEquals(
"bar",
localFunction.methodIdentifier?.name
)
assertEquals(
"bar",
localFunction.methodName
)
assertNull(localFunction.resolve())
val receiver = localFunction.receiver ?: kotlin.test.fail("receiver expected")
assertEquals("UReferenceExpression", receiver.asLogString())
val uParameter = (receiver as UReferenceExpression).resolve().toUElement() ?: kotlin.test.fail("uelement expected")
assertEquals("ULambdaExpression", uParameter.asLogString())
}
}
}
plugins/uast-kotlin/tests/KotlinUastApiTest.kt.173
+48
View File
@@ -371,6 +371,54 @@ class KotlinUastApiTest : AbstractKotlinUastTest() {
}
}
@Test
fun testLocalLambdaCall() {
doTest("Lambdas") { _, file ->
val lambdaCall = file.findElementByTextFromPsi<UCallExpression>("baz()")
assertEquals(
"UIdentifier (Identifier (baz))",
lambdaCall.methodIdentifier?.asLogString()
)
assertEquals(
"baz",
lambdaCall.methodIdentifier?.name
)
assertEquals(
"invoke",
lambdaCall.methodName
)
val receiver = lambdaCall.receiver ?: kotlin.test.fail("receiver expected")
assertEquals("UReferenceExpression", receiver.asLogString())
val uParameter = (receiver as UReferenceExpression).resolve().toUElement() ?: kotlin.test.fail("uelement expected")
assertEquals("ULocalVariable (name = baz)", uParameter.asLogString())
}
}
@Test
fun testLocalDeclarationCall() {
doTest("LocalDeclarations") { _, file ->
val localFunction = file.findElementByTextFromPsi<UElement>("bar() == Local()").
findElementByText<UCallExpression>("bar()")
assertEquals(
"UIdentifier (Identifier (bar))",
localFunction.methodIdentifier?.asLogString()
)
assertEquals(
"bar",
localFunction.methodIdentifier?.name
)
assertEquals(
"bar",
localFunction.methodName
)
assertNull(localFunction.resolve())
val receiver = localFunction.receiver ?: kotlin.test.fail("receiver expected")
assertEquals("UReferenceExpression", receiver.asLogString())
val uParameter = (receiver as UReferenceExpression).resolve().toUElement() ?: kotlin.test.fail("uelement expected")
assertEquals("ULambdaExpression", uParameter.asLogString())
}
}
}
fun <T, R> Iterable<T>.assertedFind(value: R, transform: (T) -> R): T = find { transform(it) == value } ?: throw AssertionError("'$value' not found, only ${this.joinToString { transform(it).toString() }}")