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

Uast: converting Unit to void on type mapping (KT-25249)

Browse Source
This commit is contained in:
Nicolay Mitropolsky
2018-07-03 20:59:58 +03:00
parent 39fc7cffe1
commit 5d9807ac36
9 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightAnnotationsValues.kt
+1
View File
@@ -82,6 +82,7 @@ private fun psiType(kotlinType: KotlinType, context: PsiElement): PsiType? {
"kotlin.Char" -> PsiType.CHAR
"kotlin.Double" -> PsiType.DOUBLE
"kotlin.Float" -> PsiType.FLOAT
"kotlin.Unit" -> PsiType.VOID
"kotlin.String" -> PsiType.getJavaLangString(context.manager, context.resolveScope)
else -> PsiType.getTypeByName(typeFqName, context.project, context.resolveScope)
}
compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightAnnotationsValues.kt.173
+1
View File
@@ -82,6 +82,7 @@ private fun psiType(kotlinType: KotlinType, context: PsiElement): PsiType? {
"kotlin.Char" -> PsiType.CHAR
"kotlin.Double" -> PsiType.DOUBLE
"kotlin.Float" -> PsiType.FLOAT
"kotlin.Unit" -> PsiType.VOID
"kotlin.String" -> PsiType.getJavaLangString(context.manager, context.resolveScope)
else -> PsiType.getTypeByName(typeFqName, context.project, context.resolveScope)
}
plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/kotlinInternalUastUtils.kt
+1
View File
@@ -182,6 +182,7 @@ internal fun KotlinType.toPsiType(lightDeclaration: PsiModifierListOwner?, conte
"kotlin.Char" -> PsiType.CHAR.orBoxed()
"kotlin.Double" -> PsiType.DOUBLE.orBoxed()
"kotlin.Float" -> PsiType.FLOAT.orBoxed()
"kotlin.Unit" -> PsiType.VOID.orBoxed()
"kotlin.String" -> PsiType.getJavaLangString(context.manager, context.resolveScope)
else -> {
val typeConstructor = this.constructor
plugins/uast-kotlin/testData/StringTemplateComplex.types.txt
Vendored
+3 -3
View File
@@ -51,10 +51,10 @@ UFile (package = ) [public final class StringTemplateComplexKt {...]
UReturnExpression [return i]
USimpleNameReferenceExpression (identifier = i) [i] : PsiType:int
UAnnotationMethod (name = foo) [public static final fun foo() : void {...}]
UBlockExpression [{...}] : PsiType:Unit
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [println(baz)] : PsiType:Unit
UBlockExpression [{...}] : PsiType:void
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [println(baz)] : PsiType:void
UIdentifier (Identifier (println)) [UIdentifier (Identifier (println))]
USimpleNameReferenceExpression (identifier = println) [println] : PsiType:Unit
USimpleNameReferenceExpression (identifier = println) [println] : PsiType:void
USimpleNameReferenceExpression (identifier = baz) [baz]
UDeclarationsExpression [var template1: java.lang.String = simpleForTemplate()]
ULocalVariable (name = template1) [var template1: java.lang.String = simpleForTemplate()]
plugins/uast-kotlin/testData/StringTemplateComplex.types.txt.172
Vendored
+3 -3
View File
@@ -51,10 +51,10 @@ UFile (package = ) [public final class StringTemplateComplexKt {...]
UReturnExpression [return i]
USimpleNameReferenceExpression (identifier = i) [i] : PsiType:int
UAnnotationMethod (name = foo) [public static final fun foo() : void {...}]
UBlockExpression [{...}] : PsiType:Unit
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [println(baz)] : PsiType:Unit
UBlockExpression [{...}] : PsiType:void
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [println(baz)] : PsiType:void
UIdentifier (Identifier (println)) [UIdentifier (Identifier (println))]
USimpleNameReferenceExpression (identifier = println) [println] : PsiType:Unit
USimpleNameReferenceExpression (identifier = println) [println] : PsiType:void
USimpleNameReferenceExpression (identifier = baz) [baz]
UDeclarationsExpression [var template1: java.lang.String = simpleForTemplate()]
ULocalVariable (name = template1) [var template1: java.lang.String = simpleForTemplate()]
plugins/uast-kotlin/testData/UnexpectedContainerException.types.txt
Vendored
+3 -3
View File
@@ -16,10 +16,10 @@ UFile (package = ) [public abstract interface Callback {...]
USimpleNameReferenceExpression (identifier = <init>) [<init>] : PsiType:UnsupportedOperationException
UAnnotationMethod (name = Model) [public fun Model() {...}]
UBlockExpression [{...}]
UBlockExpression [{...}] : PsiType:Unit
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2)) [crashMe(Callback.java, { ...})] : PsiType:Unit
UBlockExpression [{...}] : PsiType:void
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2)) [crashMe(Callback.java, { ...})] : PsiType:void
UIdentifier (Identifier (crashMe)) [UIdentifier (Identifier (crashMe))]
USimpleNameReferenceExpression (identifier = crashMe) [crashMe] : PsiType:Unit
USimpleNameReferenceExpression (identifier = crashMe) [crashMe] : PsiType:void
UQualifiedReferenceExpression [Callback.java] : PsiType:Class<Callback>
UClassLiteralExpression [Callback] : PsiType:KClass<Callback>
USimpleNameReferenceExpression (identifier = java) [java] : PsiType:Class<Callback>
plugins/uast-kotlin/testData/UnexpectedContainerException.types.txt.172
Vendored
+3 -3
View File
@@ -16,10 +16,10 @@ UFile (package = ) [public abstract interface Callback {...]
USimpleNameReferenceExpression (identifier = <init>) [<init>] : PsiType:UnsupportedOperationException
UAnnotationMethod (name = Model) [public fun Model() {...}]
UBlockExpression [{...}]
UBlockExpression [{...}] : PsiType:Unit
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2)) [crashMe(Callback.java, { ...})] : PsiType:Unit
UBlockExpression [{...}] : PsiType:void
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2)) [crashMe(Callback.java, { ...})] : PsiType:void
UIdentifier (Identifier (crashMe)) [UIdentifier (Identifier (crashMe))]
USimpleNameReferenceExpression (identifier = crashMe) [crashMe] : PsiType:Unit
USimpleNameReferenceExpression (identifier = crashMe) [crashMe] : PsiType:void
UQualifiedReferenceExpression [Callback.java] : PsiType:Class<Callback>
UClassLiteralExpression [Callback] : PsiType:KClass<Callback>
USimpleNameReferenceExpression (identifier = java) [java] : PsiType:Class<Callback>
plugins/uast-kotlin/testData/ea101715.types.txt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
UFile (package = ) [public final class Ea101715Kt {...]
UClass (name = Ea101715Kt) [public final class Ea101715Kt {...}]
UAnnotationMethod (name = a) [public static final fun a() : void {...}]
UBlockExpression [{...}] : PsiType:Unit
UBlockExpression [{...}] : PsiType:void
UDeclarationsExpression [var a: <ErrorType> = Obj(555)]
ULocalVariable (name = a) [var a: <ErrorType> = Obj(555)]
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [Obj(555)]
plugins/uast-kotlin/testData/ea101715.types.txt.172
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
UFile (package = ) [public final class Ea101715Kt {...]
UClass (name = Ea101715Kt) [public final class Ea101715Kt {...}]
UAnnotationMethod (name = a) [public static final fun a() : void {...}]
UBlockExpression [{...}] : PsiType:Unit
UBlockExpression [{...}] : PsiType:void
UDeclarationsExpression [var a: <ErrorType> = Obj(555)]
ULocalVariable (name = a) [var a: <ErrorType> = Obj(555)]
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [Obj(555)]