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

[UAST] Fix mapping types containing type aliases

Browse Source 
#KT-27935 Fixed
This commit is contained in:
Mikhail Zarechenskiy
2020-04-03 20:08:23 +03:00
parent 73e1ddc505
commit 86fd4da567
15 changed files with 106 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/uast-kotlin/testData/TypeAliasExpansionWithOtherAliasInArgument.kt
Vendored
+5
View File
@@ -0,0 +1,5 @@
typealias A = String
typealias My = (Map<A, Int>) -> Unit
fun My.foo(x: My): My? = null
fun Map<A, Int>.bar(x: Map<A, Int>): Map<A, Int>? = null
plugins/uast-kotlin/testData/TypeAliasExpansionWithOtherAliasInArgument.log.txt
Vendored
+18
View File
@@ -0,0 +1,18 @@
UFile (package = )
UClass (name = TypeAliasExpansionWithOtherAliasInArgumentKt)
UMethod (name = foo)
UParameter (name = $this$foo)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
UParameter (name = x)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
UBlockExpression
UReturnExpression
ULiteralExpression (value = null)
UMethod (name = bar)
UParameter (name = $this$bar)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
UParameter (name = x)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
UBlockExpression
UReturnExpression
ULiteralExpression (value = null)
plugins/uast-kotlin/testData/TypeAliasExpansionWithOtherAliasInArgument.render.txt
Vendored
+8
View File
@@ -0,0 +1,8 @@
public final class TypeAliasExpansionWithOtherAliasInArgumentKt {
public static final fun foo(@org.jetbrains.annotations.NotNull $this$foo: kotlin.jvm.functions.Function1<? super java.util.Map<java.lang.String,java.lang.Integer>,kotlin.Unit>, @org.jetbrains.annotations.NotNull x: kotlin.jvm.functions.Function1<? super java.util.Map<java.lang.String,java.lang.Integer>,kotlin.Unit>) : kotlin.jvm.functions.Function1<java.util.Map<java.lang.String,java.lang.Integer>,kotlin.Unit> {
return null
}
public static final fun bar(@org.jetbrains.annotations.NotNull $this$bar: java.util.Map<java.lang.String,java.lang.Integer>, @org.jetbrains.annotations.NotNull x: java.util.Map<java.lang.String,java.lang.Integer>) : java.util.Map<java.lang.String,java.lang.Integer> {
return null
}
}