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

Revert "Uast: forcing kotlin.uast.force.uinjectionhost=true always"

Browse Source 
This reverts commit e4b7c391
This commit is contained in:
Nicolay Mitropolsky
2020-04-29 12:41:38 +03:00
parent 00b44c1e68
commit 43549baf58
52 changed files with 165 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/resources/META-INF/jvm-common.xml
+1 -1
View File
@@ -156,7 +156,7 @@
<registryKey key="kotlin.uast.force.uinjectionhost"
description="Whether to convert `KtStringTemplateExpression` to `KotlinStringTemplateUPolyadicExpression` in all cases"
defaultValue="true"
defaultValue="false"
restartRequired="false"/>
<registryKey key="kotlin.jps.instrument.bytecode"
plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt
+1 -1
View File
@@ -317,7 +317,7 @@ internal object KotlinConverter {
}
}
var forceUInjectionHost = Registry.`is`("kotlin.uast.force.uinjectionhost", true)
var forceUInjectionHost = Registry.`is`("kotlin.uast.force.uinjectionhost", false)
@TestOnly
set(value) {
field = value
plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/expressions/KotlinUSwitchExpression.kt
+1 -1
View File
@@ -86,7 +86,7 @@ class KotlinUSwitchEntry(
override val annotations: List<UAnnotation>
get() = emptyList()
override val expression: UExpression?
get() = userExpressions.lastOrNull()?.sourcePsi.safeAs<KtExpression>()
get() = userExpressions.lastOrNull()?.sourcePsi?.let { it.safeAs<KtExpression>() ?: it.parent.safeAs() }
?.let { KotlinConverter.convertExpression(it, this, DEFAULT_EXPRESSION_TYPES_LIST) }
}
else emptyList()
plugins/uast-kotlin/testData/AnnotatedExpressions.log.txt
Vendored
+1 -2
View File
@@ -49,8 +49,7 @@ UFile (package = )
UQualifiedReferenceExpression
UAnnotation (fqName = kotlin.Suppress)
UNamedExpression (name = names)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "DEPRECATION")
ULiteralExpression (value = "DEPRECATION")
USimpleNameReferenceExpression (identifier = str)
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
UIdentifier (Identifier (isBlank))
plugins/uast-kotlin/testData/AnnotatedExpressions.log.txt.192
Vendored
+1 -2
View File
@@ -49,8 +49,7 @@ UFile (package = )
UQualifiedReferenceExpression
UAnnotation (fqName = kotlin.Suppress)
UNamedExpression (name = names)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "DEPRECATION")
ULiteralExpression (value = "DEPRECATION")
USimpleNameReferenceExpression (identifier = str)
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
UIdentifier (Identifier (isBlank))
plugins/uast-kotlin/testData/AnnotationComplex.log.txt
Vendored
+6 -12
View File
@@ -19,10 +19,8 @@ UFile (package = )
UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 2))
UIdentifier (Identifier (Annotation))
USimpleNameReferenceExpression (identifier = <init>, resolvesTo = Annotation)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "sv1")
UPolyadicExpression (operator = +)
ULiteralExpression (value = "sv2")
ULiteralExpression (value = "sv1")
ULiteralExpression (value = "sv2")
UMethod (name = B2)
UClass (name = AnnotationArray)
UAnnotationMethod (name = value)
@@ -35,10 +33,8 @@ UFile (package = )
UCallExpression (kind = UastCallKind(name='array_initializer'), argCount = 2))
UIdentifier (Identifier (arrayOf))
USimpleNameReferenceExpression (identifier = arrayOf, resolvesTo = null)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "sar1")
UPolyadicExpression (operator = +)
ULiteralExpression (value = "sar2")
ULiteralExpression (value = "sar1")
ULiteralExpression (value = "sar2")
UMethod (name = C)
UClass (name = C2)
UAnnotation (fqName = AnnotationArray)
@@ -48,8 +44,6 @@ UFile (package = )
USimpleNameReferenceExpression (identifier = <init>, resolvesTo = Annotation)
UCallExpression (kind = UastCallKind(name='array_initializer'), argCount = 2))
UIdentifier (Identifier ([))
UPolyadicExpression (operator = +)
ULiteralExpression (value = "[sar]1")
UPolyadicExpression (operator = +)
ULiteralExpression (value = "[sar]2")
ULiteralExpression (value = "[sar]1")
ULiteralExpression (value = "[sar]2")
UMethod (name = C2)
plugins/uast-kotlin/testData/AnnotationParameters.log.txt
Vendored
+7 -14
View File
@@ -17,8 +17,7 @@ UFile (package = )
UAnnotation (fqName = WithDefaultValue)
UAnnotation (fqName = SuppressLint)
UNamedExpression (name = value)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "Lorem")
ULiteralExpression (value = "Lorem")
UBlockExpression
UReturnExpression
ULiteralExpression (value = 5)
@@ -31,12 +30,9 @@ UFile (package = )
UAnnotation (fqName = SuppressLint)
UNamedExpression (name = value)
UCallExpression (kind = UastCallKind(name='array_initializer'), argCount = 3))
UPolyadicExpression (operator = +)
ULiteralExpression (value = "Lorem")
UPolyadicExpression (operator = +)
ULiteralExpression (value = "Ipsum")
UPolyadicExpression (operator = +)
ULiteralExpression (value = "Dolor")
ULiteralExpression (value = "Lorem")
ULiteralExpression (value = "Ipsum")
ULiteralExpression (value = "Dolor")
UBlockExpression
UReturnExpression
USimpleNameReferenceExpression (identifier = Unit)
@@ -56,12 +52,9 @@ UFile (package = )
UNamedExpression (name = strs)
UCallExpression (kind = UastCallKind(name='array_initializer'), argCount = 3))
UIdentifier (Identifier ([))
UPolyadicExpression (operator = +)
ULiteralExpression (value = "a")
UPolyadicExpression (operator = +)
ULiteralExpression (value = "b")
UPolyadicExpression (operator = +)
ULiteralExpression (value = "c")
ULiteralExpression (value = "a")
ULiteralExpression (value = "b")
ULiteralExpression (value = "c")
UBlockExpression
UReturnExpression
ULiteralExpression (value = 3)
plugins/uast-kotlin/testData/Assertion.values.txt
Vendored
+1 -2
View File
@@ -4,8 +4,7 @@ UFile (package = ) [public final class AssertionKt {...]
UBlockExpression [{...}] = Nothing
UDeclarationsExpression [var s: java.lang.String = "Not Null"] = Undetermined
ULocalVariable (name = s) [var s: java.lang.String = "Not Null"]
UPolyadicExpression (operator = +) ["Not Null"] = "Not Null"
ULiteralExpression (value = "Not Null") ["Not Null"] = "Not Null"
ULiteralExpression (value = "Not Null") ["Not Null"] = "Not Null"
UReturnExpression [return s!!] = Nothing
UPostfixExpression (operator = !!) [s!!] = (var s = "Not Null")
USimpleNameReferenceExpression (identifier = s) [s] = (var s = "Not Null")
plugins/uast-kotlin/testData/ClassAnnotation.altlog.txt
Vendored
+4 -4
View File
@@ -21,7 +21,7 @@
[1]:[UTypeReferenceExpression (name = MyAnnotation)]
[1]:[USimpleNameReferenceExpression (identifier = MyAnnotation)]
[1]:[UIdentifier (Identifier (MyAnnotation))]
[1]:[UPolyadicExpression (operator = +)]
[1]:[ULiteralExpression (value = "class")]
[1]:[ULiteralExpression (value = "class")]
[1]:[UIdentifier (Identifier (B))]
[1]:[UExpressionList (class_body)]
@@ -31,7 +31,7 @@
[1]:[UTypeReferenceExpression (name = MyAnnotation)]
[1]:[USimpleNameReferenceExpression (identifier = MyAnnotation)]
[1]:[UIdentifier (Identifier (MyAnnotation))]
[1]:[UPolyadicExpression (operator = +)]
[1]:[ULiteralExpression (value = "inB class")]
[1]:[ULiteralExpression (value = "inB class")]
[1]:[UIdentifier (Identifier (InB))]
[1]:[UExpressionList (class_body)]
@@ -41,7 +41,7 @@
[1]:[UTypeReferenceExpression (name = MyAnnotation)]
[1]:[USimpleNameReferenceExpression (identifier = MyAnnotation)]
[1]:[UIdentifier (Identifier (MyAnnotation))]
[1]:[UPolyadicExpression (operator = +)]
[1]:[ULiteralExpression (value = "companion")]
[1]:[ULiteralExpression (value = "companion")]
[1]:[UIdentifier (Identifier (object))]
[1]:[UExpressionList (class_body)]
@@ -51,6 +51,6 @@
[1]:[UTypeReferenceExpression (name = MyAnnotation)]
[1]:[USimpleNameReferenceExpression (identifier = MyAnnotation)]
[1]:[UIdentifier (Identifier (MyAnnotation))]
[1]:[UPolyadicExpression (operator = +)]
[1]:[ULiteralExpression (value = "object")]
[1]:[ULiteralExpression (value = "object")]
[1]:[UIdentifier (Identifier (Obj))]
plugins/uast-kotlin/testData/ClassAnnotation.log.txt
Vendored
+4 -8
View File
@@ -7,28 +7,24 @@ UFile (package = )
UClass (name = B)
UAnnotation (fqName = MyAnnotation)
UNamedExpression (name = text)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "class")
ULiteralExpression (value = "class")
UField (name = Companion)
UAnnotation (fqName = null)
UMethod (name = B)
UClass (name = InB)
UAnnotation (fqName = MyAnnotation)
UNamedExpression (name = text)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "inB class")
ULiteralExpression (value = "inB class")
UMethod (name = InB)
UClass (name = Companion)
UAnnotation (fqName = MyAnnotation)
UNamedExpression (name = text)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "companion")
ULiteralExpression (value = "companion")
UMethod (name = Companion)
UClass (name = Obj)
UAnnotation (fqName = MyAnnotation)
UNamedExpression (name = text)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "object")
ULiteralExpression (value = "object")
UField (name = INSTANCE)
UAnnotation (fqName = null)
UMethod (name = Obj)
plugins/uast-kotlin/testData/ConstructorDelegate.log-ide.txt
Vendored
+1 -2
View File
@@ -33,8 +33,7 @@ UFile (package = )
ULiteralExpression (value = 10)
UExpressionList (super_delegation)
UTypeReferenceExpression (name = java.lang.CharSequence)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "abc")
ULiteralExpression (value = "abc")
UMethod (name = Derived)
UParameter (name = b)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
plugins/uast-kotlin/testData/ConstructorDelegate.log.txt
Vendored
+1 -2
View File
@@ -33,8 +33,7 @@ UFile (package = )
ULiteralExpression (value = 10)
UExpressionList (super_delegation)
UTypeReferenceExpression (name = java.lang.CharSequence)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "abc")
ULiteralExpression (value = "abc")
UMethod (name = Derived)
UParameter (name = b)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
plugins/uast-kotlin/testData/DefaultImpls.log.txt
Vendored
+1 -2
View File
@@ -3,7 +3,6 @@ UFile (package = )
UMethod (name = bar)
UBlockExpression
UReturnExpression
UPolyadicExpression (operator = +)
ULiteralExpression (value = "Hello!")
ULiteralExpression (value = "Hello!")
UClass (name = Baz)
UMethod (name = Baz)
plugins/uast-kotlin/testData/DeprecatedHidden.log.txt
Vendored
+1 -2
View File
@@ -10,6 +10,5 @@ UFile (package = test.pkg)
USimpleNameReferenceExpression (identifier = DeprecationLevel)
USimpleNameReferenceExpression (identifier = HIDDEN)
UNamedExpression (name = message)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "nothing")
ULiteralExpression (value = "nothing")
UBlockExpression
plugins/uast-kotlin/testData/DestructuringDeclaration.log.txt
Vendored
+2 -4
View File
@@ -8,8 +8,7 @@ UFile (package = )
ULocalVariable (name = var268d41a5)
UAnnotation (fqName = null)
UBinaryExpression (operator = <other>)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "foo")
ULiteralExpression (value = "foo")
ULiteralExpression (value = 1)
ULocalVariable (name = a)
UAnnotation (fqName = null)
@@ -30,8 +29,7 @@ UFile (package = )
UAnnotation (fqName = null)
UAnnotation (fqName = kotlin.Suppress)
UNamedExpression (name = names)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "UNCHECKED_CAST")
ULiteralExpression (value = "UNCHECKED_CAST")
UBinaryExpressionWithType
USimpleNameReferenceExpression (identifier = data)
UTypeReferenceExpression (name = kotlin.Pair<? extends java.lang.String,? extends java.lang.String>)
plugins/uast-kotlin/testData/Elvis.log.txt
Vendored
+2 -4
View File
@@ -22,8 +22,7 @@ UFile (package = )
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
UIdentifier (Identifier (foo))
USimpleNameReferenceExpression (identifier = foo, resolvesTo = null)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "Lorem ipsum")
ULiteralExpression (value = "Lorem ipsum")
UIfExpression
UBinaryExpression (operator = !=)
USimpleNameReferenceExpression (identifier = varc4aef569)
@@ -32,8 +31,7 @@ UFile (package = )
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
UIdentifier (Identifier (foo))
USimpleNameReferenceExpression (identifier = foo, resolvesTo = null)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "dolor sit amet")
ULiteralExpression (value = "dolor sit amet")
UIfExpression
UBinaryExpression (operator = !=)
USimpleNameReferenceExpression (identifier = var243c51a0)
plugins/uast-kotlin/testData/EnumValueMembers.log-ide.txt
Vendored
+2 -4
View File
@@ -5,14 +5,12 @@ UFile (package = )
UEnumConstant (name = SHEET)
UAnnotation (fqName = null)
USimpleNameReferenceExpression (identifier = Style)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "foo")
ULiteralExpression (value = "foo")
UClass (name = SHEET)
UMethod (name = getExitAnimation)
UBlockExpression
UReturnExpression
UPolyadicExpression (operator = +)
ULiteralExpression (value = "bar")
ULiteralExpression (value = "bar")
UMethod (name = SHEET)
UMethod (name = getExitAnimation)
UMethod (name = getValue)
plugins/uast-kotlin/testData/EnumValueMembers.log.txt
Vendored
+2 -4
View File
@@ -3,14 +3,12 @@ UFile (package = )
UEnumConstant (name = SHEET)
UAnnotation (fqName = null)
USimpleNameReferenceExpression (identifier = Style)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "foo")
ULiteralExpression (value = "foo")
UClass (name = null)
UMethod (name = getExitAnimation)
UBlockExpression
UReturnExpression
UPolyadicExpression (operator = +)
ULiteralExpression (value = "bar")
ULiteralExpression (value = "bar")
UMethod (name = SHEET)
UField (name = value)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
plugins/uast-kotlin/testData/EnumValuesConstructors.log-ide.txt
Vendored
+3 -6
View File
@@ -5,18 +5,15 @@ UFile (package = )
UEnumConstant (name = SYSTEM)
UAnnotation (fqName = null)
USimpleNameReferenceExpression (identifier = Style)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "system")
ULiteralExpression (value = "system")
UEnumConstant (name = USER)
UAnnotation (fqName = null)
USimpleNameReferenceExpression (identifier = Style)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "user")
ULiteralExpression (value = "user")
UEnumConstant (name = INTERNAL)
UAnnotation (fqName = null)
USimpleNameReferenceExpression (identifier = Style)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "internal")
ULiteralExpression (value = "internal")
UEnumConstant (name = UNKNOWN)
UAnnotation (fqName = null)
USimpleNameReferenceExpression (identifier = Style)
plugins/uast-kotlin/testData/EnumValuesConstructors.log.txt
Vendored
+3 -6
View File
@@ -3,18 +3,15 @@ UFile (package = )
UEnumConstant (name = SYSTEM)
UAnnotation (fqName = null)
USimpleNameReferenceExpression (identifier = Style)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "system")
ULiteralExpression (value = "system")
UEnumConstant (name = USER)
UAnnotation (fqName = null)
USimpleNameReferenceExpression (identifier = Style)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "user")
ULiteralExpression (value = "user")
UEnumConstant (name = INTERNAL)
UAnnotation (fqName = null)
USimpleNameReferenceExpression (identifier = Style)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "internal")
ULiteralExpression (value = "internal")
UEnumConstant (name = UNKNOWN)
UAnnotation (fqName = null)
USimpleNameReferenceExpression (identifier = Style)
plugins/uast-kotlin/testData/IfStatement.log.txt
Vendored
+2 -4
View File
@@ -6,9 +6,7 @@ UFile (package = )
ULocalVariable (name = x)
UIfExpression
UBinaryExpression (operator = !=)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "abc")
UPolyadicExpression (operator = +)
ULiteralExpression (value = "def")
ULiteralExpression (value = "abc")
ULiteralExpression (value = "def")
ULiteralExpression (value = 1)
ULiteralExpression (value = 0)
plugins/uast-kotlin/testData/LambdaReturn.log.txt
Vendored
+4 -8
View File
@@ -60,18 +60,15 @@ UFile (package = org.jetbrains.uast.kotlin)
USimpleNameReferenceExpression (identifier = a)
ULiteralExpression (value = 5)
UReturnExpression
UPolyadicExpression (operator = +)
ULiteralExpression (value = "5")
ULiteralExpression (value = "5")
UIfExpression
UBinaryExpression (operator = >)
USimpleNameReferenceExpression (identifier = a)
ULiteralExpression (value = 0)
UReturnExpression
UPolyadicExpression (operator = +)
ULiteralExpression (value = "1")
ULiteralExpression (value = "1")
UReturnExpression
UPolyadicExpression (operator = +)
ULiteralExpression (value = "2")
ULiteralExpression (value = "2")
UDeclarationsExpression
ULocalVariable (name = lam5)
ULambdaExpression
@@ -80,8 +77,7 @@ UFile (package = org.jetbrains.uast.kotlin)
UBlockExpression
UReturnExpression
UBinaryExpression (operator = +)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "a")
ULiteralExpression (value = "a")
USimpleNameReferenceExpression (identifier = a)
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
UIdentifier (Identifier (bar))
plugins/uast-kotlin/testData/LocalVariableWithAnnotation.log.txt
Vendored
+1 -2
View File
@@ -5,6 +5,5 @@ UFile (package = )
UDeclarationsExpression
ULocalVariable (name = bar)
UAnnotation (fqName = TestAnnotation)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "lorem ipsum")
ULiteralExpression (value = "lorem ipsum")
UClass (name = TestAnnotation)
plugins/uast-kotlin/testData/ParametersDisorder.log-ide.txt
Vendored
+12 -24
View File
@@ -12,8 +12,7 @@ UFile (package = )
ULiteralExpression (value = 1)
UParameter (name = d)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "aaa")
ULiteralExpression (value = "aaa")
UBlockExpression
UMethod (name = withReceiver)
UParameter (name = $this$withReceiver)
@@ -33,11 +32,9 @@ UFile (package = )
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
UIdentifier (Identifier (withDefault))
USimpleNameReferenceExpression (identifier = withDefault, resolvesTo = null)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "bbb")
ULiteralExpression (value = "bbb")
UQualifiedReferenceExpression
UPolyadicExpression (operator = +)
ULiteralExpression (value = "abc")
ULiteralExpression (value = "abc")
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))
UIdentifier (Identifier (withReceiver))
USimpleNameReferenceExpression (identifier = withReceiver, resolvesTo = null)
@@ -53,10 +50,8 @@ UFile (package = )
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))
UIdentifier (Identifier (unresolvedMethod))
USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "param1")
UPolyadicExpression (operator = +)
ULiteralExpression (value = "param2")
ULiteralExpression (value = "param1")
ULiteralExpression (value = "param2")
UQualifiedReferenceExpression
UQualifiedReferenceExpression
UQualifiedReferenceExpression
@@ -66,8 +61,7 @@ UFile (package = )
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 4))
UIdentifier (Identifier (format))
USimpleNameReferenceExpression (identifier = format, resolvesTo = null)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "%i %i %i")
ULiteralExpression (value = "%i %i %i")
ULiteralExpression (value = 1)
ULiteralExpression (value = 2)
ULiteralExpression (value = 3)
@@ -80,8 +74,7 @@ UFile (package = )
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))
UIdentifier (Identifier (format))
USimpleNameReferenceExpression (identifier = format, resolvesTo = null)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "%i %i %i")
ULiteralExpression (value = "%i %i %i")
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 3))
UIdentifier (Identifier (arrayOf))
USimpleNameReferenceExpression (identifier = arrayOf, resolvesTo = null)
@@ -97,8 +90,7 @@ UFile (package = )
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 3))
UIdentifier (Identifier (format))
USimpleNameReferenceExpression (identifier = format, resolvesTo = null)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "%i %i %i")
ULiteralExpression (value = "%i %i %i")
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 3))
UIdentifier (Identifier (arrayOf))
USimpleNameReferenceExpression (identifier = arrayOf, resolvesTo = null)
@@ -120,12 +112,10 @@ UFile (package = )
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))
UIdentifier (Identifier (format))
USimpleNameReferenceExpression (identifier = format, resolvesTo = null)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "%i %i %i")
ULiteralExpression (value = "%i %i %i")
UQualifiedReferenceExpression
UQualifiedReferenceExpression
UPolyadicExpression (operator = +)
ULiteralExpression (value = "")
ULiteralExpression (value = "")
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
UIdentifier (Identifier (chunked))
USimpleNameReferenceExpression (identifier = chunked, resolvesTo = null)
@@ -142,8 +132,7 @@ UFile (package = )
ULambdaExpression
UBlockExpression
UQualifiedReferenceExpression
UPolyadicExpression (operator = +)
ULiteralExpression (value = "def")
ULiteralExpression (value = "def")
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))
UIdentifier (Identifier (with2Receivers))
USimpleNameReferenceExpression (identifier = with2Receivers, resolvesTo = null)
@@ -153,8 +142,7 @@ UFile (package = )
UBlockExpression
UObjectLiteralExpression
ULiteralExpression (value = 1)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "foo")
ULiteralExpression (value = "foo")
UClass (name = null)
UMethod (name = )
UClass (name = A)
plugins/uast-kotlin/testData/ParametersDisorder.log.txt
Vendored
+12 -24
View File
@@ -12,8 +12,7 @@ UFile (package = )
ULiteralExpression (value = 1)
UParameter (name = d)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "aaa")
ULiteralExpression (value = "aaa")
UBlockExpression
UMethod (name = withReceiver)
UParameter (name = $this$withReceiver)
@@ -33,11 +32,9 @@ UFile (package = )
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
UIdentifier (Identifier (withDefault))
USimpleNameReferenceExpression (identifier = withDefault, resolvesTo = null)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "bbb")
ULiteralExpression (value = "bbb")
UQualifiedReferenceExpression
UPolyadicExpression (operator = +)
ULiteralExpression (value = "abc")
ULiteralExpression (value = "abc")
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))
UIdentifier (Identifier (withReceiver))
USimpleNameReferenceExpression (identifier = withReceiver, resolvesTo = null)
@@ -53,10 +50,8 @@ UFile (package = )
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))
UIdentifier (Identifier (unresolvedMethod))
USimpleNameReferenceExpression (identifier = <anonymous class>, resolvesTo = null)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "param1")
UPolyadicExpression (operator = +)
ULiteralExpression (value = "param2")
ULiteralExpression (value = "param1")
ULiteralExpression (value = "param2")
UQualifiedReferenceExpression
UQualifiedReferenceExpression
UQualifiedReferenceExpression
@@ -66,8 +61,7 @@ UFile (package = )
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 4))
UIdentifier (Identifier (format))
USimpleNameReferenceExpression (identifier = format, resolvesTo = null)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "%i %i %i")
ULiteralExpression (value = "%i %i %i")
ULiteralExpression (value = 1)
ULiteralExpression (value = 2)
ULiteralExpression (value = 3)
@@ -80,8 +74,7 @@ UFile (package = )
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))
UIdentifier (Identifier (format))
USimpleNameReferenceExpression (identifier = format, resolvesTo = null)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "%i %i %i")
ULiteralExpression (value = "%i %i %i")
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 3))
UIdentifier (Identifier (arrayOf))
USimpleNameReferenceExpression (identifier = arrayOf, resolvesTo = null)
@@ -97,8 +90,7 @@ UFile (package = )
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 3))
UIdentifier (Identifier (format))
USimpleNameReferenceExpression (identifier = format, resolvesTo = null)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "%i %i %i")
ULiteralExpression (value = "%i %i %i")
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 3))
UIdentifier (Identifier (arrayOf))
USimpleNameReferenceExpression (identifier = arrayOf, resolvesTo = null)
@@ -120,12 +112,10 @@ UFile (package = )
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))
UIdentifier (Identifier (format))
USimpleNameReferenceExpression (identifier = format, resolvesTo = null)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "%i %i %i")
ULiteralExpression (value = "%i %i %i")
UQualifiedReferenceExpression
UQualifiedReferenceExpression
UPolyadicExpression (operator = +)
ULiteralExpression (value = "")
ULiteralExpression (value = "")
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
UIdentifier (Identifier (chunked))
USimpleNameReferenceExpression (identifier = chunked, resolvesTo = null)
@@ -142,8 +132,7 @@ UFile (package = )
ULambdaExpression
UBlockExpression
UQualifiedReferenceExpression
UPolyadicExpression (operator = +)
ULiteralExpression (value = "def")
ULiteralExpression (value = "def")
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))
UIdentifier (Identifier (with2Receivers))
USimpleNameReferenceExpression (identifier = with2Receivers, resolvesTo = null)
@@ -153,8 +142,7 @@ UFile (package = )
UBlockExpression
UObjectLiteralExpression
ULiteralExpression (value = 1)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "foo")
ULiteralExpression (value = "foo")
UClass (name = null)
UMethod (name = ParametersDisorderKt$objectLiteral$1)
UClass (name = A)
plugins/uast-kotlin/testData/PropertyDelegate.log.txt
Vendored
+2 -4
View File
@@ -8,8 +8,7 @@ UFile (package = )
ULambdaExpression
UBlockExpression
UReturnExpression
UPolyadicExpression (operator = +)
ULiteralExpression (value = "/sdcard")
ULiteralExpression (value = "/sdcard")
UField (name = annotatedDelegate$delegate)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
UAnnotation (fqName = kotlin.Suppress)
@@ -33,6 +32,5 @@ UFile (package = )
ULambdaExpression
UBlockExpression
UReturnExpression
UPolyadicExpression (operator = +)
ULiteralExpression (value = "/sdcard")
ULiteralExpression (value = "/sdcard")
UMethod (name = getAnnotatedDelegate)
plugins/uast-kotlin/testData/PropertyInitializer.log.txt
Vendored
+1 -2
View File
@@ -2,8 +2,7 @@ UFile (package = )
UClass (name = TestPropertyInitializer)
UField (name = withSetter)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "/sdcard")
ULiteralExpression (value = "/sdcard")
UMethod (name = getWithSetter)
UBlockExpression
UReturnExpression
plugins/uast-kotlin/testData/PropertyInitializerWithoutSetter.log-ide.txt
Vendored
+2 -3
View File
@@ -2,12 +2,11 @@ UFile (package = )
UClass (name = PropertyInitializerWithoutSetterKt)
UField (name = withoutSetter)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "/sdcard")
ULiteralExpression (value = "/sdcard")
UMethod (name = getWithoutSetter)
UBlockExpression
UReturnExpression
USimpleNameReferenceExpression (identifier = field)
UMethod (name = setWithoutSetter)
UParameter (name = withoutSetter)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
plugins/uast-kotlin/testData/PropertyInitializerWithoutSetter.log.txt
Vendored
+1 -2
View File
@@ -2,8 +2,7 @@ UFile (package = )
UClass (name = PropertyInitializerWithoutSetterKt)
UField (name = withoutSetter)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "/sdcard")
ULiteralExpression (value = "/sdcard")
UMethod (name = getWithoutSetter)
UBlockExpression
UReturnExpression
plugins/uast-kotlin/testData/ReifiedParameters.log.txt
Vendored
+2 -4
View File
@@ -42,8 +42,7 @@ UFile (package = )
UAnnotation (fqName = org.jetbrains.annotations.Nullable)
UAnnotation (fqName = kotlin.Suppress)
UNamedExpression (name = names)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "s")
ULiteralExpression (value = "s")
UBlockExpression
UReturnExpression
USimpleNameReferenceExpression (identifier = t)
@@ -52,8 +51,7 @@ UFile (package = )
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
UAnnotation (fqName = kotlin.Suppress)
UNamedExpression (name = names)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "s")
ULiteralExpression (value = "s")
UBlockExpression
UReturnExpression
USimpleNameReferenceExpression (identifier = t)
plugins/uast-kotlin/testData/Simple.log.txt
Vendored
+2 -4
View File
@@ -2,14 +2,12 @@ UFile (package = )
UClass (name = Simple)
UField (name = property)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "Mary")
ULiteralExpression (value = "Mary")
UMethod (name = method)
UBlockExpression
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
UIdentifier (Identifier (println))
USimpleNameReferenceExpression (identifier = println, resolvesTo = null)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "Hello, world!")
ULiteralExpression (value = "Hello, world!")
UMethod (name = getProperty)
UMethod (name = Simple)
plugins/uast-kotlin/testData/Simple.values.txt
Vendored
+2 -4
View File
@@ -2,14 +2,12 @@ UFile (package = ) [public final class Simple {...]
UClass (name = Simple) [public final class Simple {...}]
UField (name = property) [@org.jetbrains.annotations.NotNull private final var property: java.lang.String = "Mary"]
UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
UPolyadicExpression (operator = +) ["Mary"] = "Mary"
ULiteralExpression (value = "Mary") ["Mary"] = "Mary"
ULiteralExpression (value = "Mary") ["Mary"] = "Mary"
UMethod (name = method) [public final fun method() : void {...}]
UBlockExpression [{...}] = external println("Hello, world!")("Hello, world!")
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [println("Hello, world!")] = external println("Hello, world!")("Hello, world!")
UIdentifier (Identifier (println)) [UIdentifier (Identifier (println))]
USimpleNameReferenceExpression (identifier = println, resolvesTo = null) [println] = external println("Hello, world!")("Hello, world!")
UPolyadicExpression (operator = +) ["Hello, world!"] = "Hello, world!"
ULiteralExpression (value = "Hello, world!") ["Hello, world!"] = "Hello, world!"
ULiteralExpression (value = "Hello, world!") ["Hello, world!"] = "Hello, world!"
UMethod (name = getProperty) [public final fun getProperty() : java.lang.String = UastEmptyExpression]
UMethod (name = Simple) [public fun Simple() = UastEmptyExpression]
plugins/uast-kotlin/testData/SimpleScript.log.txt
Vendored
+2 -4
View File
@@ -22,8 +22,7 @@ UFile (package = )
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
UIdentifier (Identifier (println))
USimpleNameReferenceExpression (identifier = println, resolvesTo = null)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "Hello World!")
ULiteralExpression (value = "Hello World!")
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
UIdentifier (Identifier (getBarOrNull))
USimpleNameReferenceExpression (identifier = getBarOrNull, resolvesTo = null)
@@ -31,8 +30,7 @@ UFile (package = )
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
UIdentifier (Identifier (println))
USimpleNameReferenceExpression (identifier = println, resolvesTo = null)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "Goodbye World!")
ULiteralExpression (value = "Goodbye World!")
UClass (name = Bar)
UField (name = b)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
plugins/uast-kotlin/testData/StringTemplate.log.txt
Vendored
+3 -6
View File
@@ -2,16 +2,13 @@ UFile (package = )
UClass (name = StringTemplateKt)
UField (name = foo)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "lorem")
ULiteralExpression (value = "lorem")
UField (name = bar)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "ipsum")
ULiteralExpression (value = "ipsum")
UField (name = baz)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "dolor")
ULiteralExpression (value = "dolor")
UField (name = foobarbaz)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
UPolyadicExpression (operator = +)
plugins/uast-kotlin/testData/StringTemplate.types.txt
Vendored
+3 -6
View File
@@ -2,16 +2,13 @@ UFile (package = ) [public final class StringTemplateKt {...]
UClass (name = StringTemplateKt) [public final class StringTemplateKt {...}]
UField (name = foo) [@org.jetbrains.annotations.NotNull private static final var foo: java.lang.String = "lorem"]
UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
UPolyadicExpression (operator = +) ["lorem"] : PsiType:String
ULiteralExpression (value = "lorem") ["lorem"] : PsiType:String
ULiteralExpression (value = "lorem") ["lorem"] : PsiType:String
UField (name = bar) [@org.jetbrains.annotations.NotNull private static final var bar: java.lang.String = "ipsum"]
UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
UPolyadicExpression (operator = +) ["ipsum"] : PsiType:String
ULiteralExpression (value = "ipsum") ["ipsum"] : PsiType:String
ULiteralExpression (value = "ipsum") ["ipsum"] : PsiType:String
UField (name = baz) [@org.jetbrains.annotations.NotNull private static final var baz: java.lang.String = "dolor"]
UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
UPolyadicExpression (operator = +) ["dolor"] : PsiType:String
ULiteralExpression (value = "dolor") ["dolor"] : PsiType:String
ULiteralExpression (value = "dolor") ["dolor"] : PsiType:String
UField (name = foobarbaz) [@org.jetbrains.annotations.NotNull private static final var foobarbaz: java.lang.String = foo + " " + bar + " " + baz]
UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
UPolyadicExpression (operator = +) [foo + " " + bar + " " + baz] : PsiType:String
plugins/uast-kotlin/testData/StringTemplateComplex.log.txt
Vendored
+10 -21
View File
@@ -2,27 +2,20 @@ UFile (package = )
UClass (name = StringTemplateComplexKt)
UField (name = muchRecur)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
UPolyadicExpression (operator = +)
UPolyadicExpression (operator = +)
UPolyadicExpression (operator = +)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "abc")
ULiteralExpression (value = "abc")
UField (name = case4)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "a ")
UPolyadicExpression (operator = +)
ULiteralExpression (value = "literal")
ULiteralExpression (value = "literal")
ULiteralExpression (value = " z")
UField (name = case5)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "a ")
UPolyadicExpression (operator = +)
ULiteralExpression (value = "literal")
ULiteralExpression (value = "literal")
ULiteralExpression (value = " ")
UPolyadicExpression (operator = +)
ULiteralExpression (value = "literal")
ULiteralExpression (value = "literal")
ULiteralExpression (value = " z")
UField (name = literalInLiteral)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
@@ -47,8 +40,7 @@ UFile (package = )
ULiteralExpression (value = " z")
UField (name = empty)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "")
ULiteralExpression (value = "")
UMethod (name = getMuchRecur)
UMethod (name = getCase4)
UMethod (name = getCase5)
@@ -61,21 +53,18 @@ UFile (package = )
ULiteralExpression (value = 0)
UBlockExpression
UReturnExpression
UPolyadicExpression (operator = +)
USimpleNameReferenceExpression (identifier = i)
USimpleNameReferenceExpression (identifier = i)
UMethod (name = foo)
UBlockExpression
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))
UIdentifier (Identifier (println))
USimpleNameReferenceExpression (identifier = println, resolvesTo = null)
UPolyadicExpression (operator = +)
USimpleNameReferenceExpression (identifier = baz)
USimpleNameReferenceExpression (identifier = baz)
UDeclarationsExpression
ULocalVariable (name = template1)
UPolyadicExpression (operator = +)
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
UIdentifier (Identifier (simpleForTemplate))
USimpleNameReferenceExpression (identifier = simpleForTemplate, resolvesTo = null)
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
UIdentifier (Identifier (simpleForTemplate))
USimpleNameReferenceExpression (identifier = simpleForTemplate, resolvesTo = null)
UDeclarationsExpression
ULocalVariable (name = template2)
UPolyadicExpression (operator = +)
plugins/uast-kotlin/testData/StringTemplateComplex.types.txt
Vendored
+10 -21
View File
@@ -2,27 +2,20 @@ UFile (package = ) [public final class StringTemplateComplexKt {...]
UClass (name = StringTemplateComplexKt) [public final class StringTemplateComplexKt {...}]
UField (name = muchRecur) [@org.jetbrains.annotations.NotNull private static final var muchRecur: java.lang.String = "abc"]
UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
UPolyadicExpression (operator = +) ["abc"] : PsiType:String
UPolyadicExpression (operator = +) ["abc"] : PsiType:String
UPolyadicExpression (operator = +) ["abc"] : PsiType:String
UPolyadicExpression (operator = +) ["abc"] : PsiType:String
ULiteralExpression (value = "abc") ["abc"] : PsiType:String
ULiteralExpression (value = "abc") ["abc"] : PsiType:String
UField (name = case4) [@org.jetbrains.annotations.NotNull private static final var case4: java.lang.String = "a " + "literal" + " z"]
UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
UPolyadicExpression (operator = +) ["a " + "literal" + " z"] : PsiType:String
ULiteralExpression (value = "a ") ["a "] : PsiType:String
UPolyadicExpression (operator = +) ["literal"] : PsiType:String
ULiteralExpression (value = "literal") ["literal"] : PsiType:String
ULiteralExpression (value = "literal") ["literal"] : PsiType:String
ULiteralExpression (value = " z") [" z"] : PsiType:String
UField (name = case5) [@org.jetbrains.annotations.NotNull private static final var case5: java.lang.String = "a " + "literal" + " " + "literal" + " z"]
UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
UPolyadicExpression (operator = +) ["a " + "literal" + " " + "literal" + " z"] : PsiType:String
ULiteralExpression (value = "a ") ["a "] : PsiType:String
UPolyadicExpression (operator = +) ["literal"] : PsiType:String
ULiteralExpression (value = "literal") ["literal"] : PsiType:String
ULiteralExpression (value = "literal") ["literal"] : PsiType:String
ULiteralExpression (value = " ") [" "] : PsiType:String
UPolyadicExpression (operator = +) ["literal"] : PsiType:String
ULiteralExpression (value = "literal") ["literal"] : PsiType:String
ULiteralExpression (value = "literal") ["literal"] : PsiType:String
ULiteralExpression (value = " z") [" z"] : PsiType:String
UField (name = literalInLiteral) [@org.jetbrains.annotations.NotNull private static final var literalInLiteral: java.lang.String = "a " + "literal" + case4 + " z"]
UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
@@ -47,8 +40,7 @@ UFile (package = ) [public final class StringTemplateComplexKt {...]
ULiteralExpression (value = " z") [" z"] : PsiType:String
UField (name = empty) [@org.jetbrains.annotations.NotNull private static final var empty: java.lang.String = ""]
UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
UPolyadicExpression (operator = +) [""] : PsiType:String
ULiteralExpression (value = "") [""] : PsiType:String
ULiteralExpression (value = "") [""] : PsiType:String
UMethod (name = getMuchRecur) [public static final fun getMuchRecur() : java.lang.String = UastEmptyExpression]
UMethod (name = getCase4) [public static final fun getCase4() : java.lang.String = UastEmptyExpression]
UMethod (name = getCase5) [public static final fun getCase5() : java.lang.String = UastEmptyExpression]
@@ -61,21 +53,18 @@ UFile (package = ) [public final class StringTemplateComplexKt {...]
ULiteralExpression (value = 0) [0] : PsiType:int
UBlockExpression [{...}]
UReturnExpression [return i]
UPolyadicExpression (operator = +) [i] : PsiType:String
USimpleNameReferenceExpression (identifier = i) [i] : PsiType:int
USimpleNameReferenceExpression (identifier = i) [i] : PsiType:int
UMethod (name = foo) [public static final fun foo() : void {...}]
UBlockExpression [{...}] : PsiType:void
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [println(baz)] : PsiType:void
UIdentifier (Identifier (println)) [UIdentifier (Identifier (println))]
USimpleNameReferenceExpression (identifier = println, resolvesTo = null) [println] : PsiType:void
UPolyadicExpression (operator = +) [baz] : PsiType:String
USimpleNameReferenceExpression (identifier = baz) [baz]
USimpleNameReferenceExpression (identifier = baz) [baz]
UDeclarationsExpression [var template1: java.lang.String = simpleForTemplate()]
ULocalVariable (name = template1) [var template1: java.lang.String = simpleForTemplate()]
UPolyadicExpression (operator = +) [simpleForTemplate()] : PsiType:String
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) [simpleForTemplate()] : PsiType:String
UIdentifier (Identifier (simpleForTemplate)) [UIdentifier (Identifier (simpleForTemplate))]
USimpleNameReferenceExpression (identifier = simpleForTemplate, resolvesTo = null) [simpleForTemplate] : PsiType:String
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) [simpleForTemplate()] : PsiType:String
UIdentifier (Identifier (simpleForTemplate)) [UIdentifier (Identifier (simpleForTemplate))]
USimpleNameReferenceExpression (identifier = simpleForTemplate, resolvesTo = null) [simpleForTemplate] : PsiType:String
UDeclarationsExpression [var template2: java.lang.String = "." + simpleForTemplate()]
ULocalVariable (name = template2) [var template2: java.lang.String = "." + simpleForTemplate()]
UPolyadicExpression (operator = +) ["." + simpleForTemplate()] : PsiType:String
plugins/uast-kotlin/testData/StringTemplateComplex.values.txt
Vendored
+10 -21
View File
@@ -2,27 +2,20 @@ UFile (package = ) [public final class StringTemplateComplexKt {...]
UClass (name = StringTemplateComplexKt) [public final class StringTemplateComplexKt {...}]
UField (name = muchRecur) [@org.jetbrains.annotations.NotNull private static final var muchRecur: java.lang.String = "abc"]
UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
UPolyadicExpression (operator = +) ["abc"] = "abc"
UPolyadicExpression (operator = +) ["abc"] = "abc"
UPolyadicExpression (operator = +) ["abc"] = "abc"
UPolyadicExpression (operator = +) ["abc"] = "abc"
ULiteralExpression (value = "abc") ["abc"] = "abc"
ULiteralExpression (value = "abc") ["abc"] = "abc"
UField (name = case4) [@org.jetbrains.annotations.NotNull private static final var case4: java.lang.String = "a " + "literal" + " z"]
UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
UPolyadicExpression (operator = +) ["a " + "literal" + " z"] = "a literal z"
ULiteralExpression (value = "a ") ["a "] = "a "
UPolyadicExpression (operator = +) ["literal"] = "literal"
ULiteralExpression (value = "literal") ["literal"] = "literal"
ULiteralExpression (value = "literal") ["literal"] = "literal"
ULiteralExpression (value = " z") [" z"] = " z"
UField (name = case5) [@org.jetbrains.annotations.NotNull private static final var case5: java.lang.String = "a " + "literal" + " " + "literal" + " z"]
UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
UPolyadicExpression (operator = +) ["a " + "literal" + " " + "literal" + " z"] = "a literal literal z"
ULiteralExpression (value = "a ") ["a "] = "a "
UPolyadicExpression (operator = +) ["literal"] = "literal"
ULiteralExpression (value = "literal") ["literal"] = "literal"
ULiteralExpression (value = "literal") ["literal"] = "literal"
ULiteralExpression (value = " ") [" "] = " "
UPolyadicExpression (operator = +) ["literal"] = "literal"
ULiteralExpression (value = "literal") ["literal"] = "literal"
ULiteralExpression (value = "literal") ["literal"] = "literal"
ULiteralExpression (value = " z") [" z"] = " z"
UField (name = literalInLiteral) [@org.jetbrains.annotations.NotNull private static final var literalInLiteral: java.lang.String = "a " + "literal" + case4 + " z"]
UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
@@ -47,8 +40,7 @@ UFile (package = ) [public final class StringTemplateComplexKt {...]
ULiteralExpression (value = " z") [" z"] = " z"
UField (name = empty) [@org.jetbrains.annotations.NotNull private static final var empty: java.lang.String = ""]
UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull]
UPolyadicExpression (operator = +) [""] = ""
ULiteralExpression (value = "") [""] = ""
ULiteralExpression (value = "") [""] = ""
UMethod (name = getMuchRecur) [public static final fun getMuchRecur() : java.lang.String = UastEmptyExpression]
UMethod (name = getCase4) [public static final fun getCase4() : java.lang.String = UastEmptyExpression]
UMethod (name = getCase5) [public static final fun getCase5() : java.lang.String = UastEmptyExpression]
@@ -61,21 +53,18 @@ UFile (package = ) [public final class StringTemplateComplexKt {...]
ULiteralExpression (value = 0) [0] = 0
UBlockExpression [{...}] = Nothing
UReturnExpression [return i] = Nothing
UPolyadicExpression (operator = +) [i] = Undetermined
USimpleNameReferenceExpression (identifier = i) [i] = Undetermined
USimpleNameReferenceExpression (identifier = i) [i] = Undetermined
UMethod (name = foo) [public static final fun foo() : void {...}]
UBlockExpression [{...}] = Undetermined
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [println(baz)] = external println(baz)(external baz())
UIdentifier (Identifier (println)) [UIdentifier (Identifier (println))]
USimpleNameReferenceExpression (identifier = println, resolvesTo = null) [println] = external println(baz)(external baz())
UPolyadicExpression (operator = +) [baz] = external baz()
USimpleNameReferenceExpression (identifier = baz) [baz] = external baz()
USimpleNameReferenceExpression (identifier = baz) [baz] = external baz()
UDeclarationsExpression [var template1: java.lang.String = simpleForTemplate()] = Undetermined
ULocalVariable (name = template1) [var template1: java.lang.String = simpleForTemplate()]
UPolyadicExpression (operator = +) [simpleForTemplate()] = external simpleForTemplate()()
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) [simpleForTemplate()] = external simpleForTemplate()()
UIdentifier (Identifier (simpleForTemplate)) [UIdentifier (Identifier (simpleForTemplate))]
USimpleNameReferenceExpression (identifier = simpleForTemplate, resolvesTo = null) [simpleForTemplate] = external simpleForTemplate()()
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) [simpleForTemplate()] = external simpleForTemplate()()
UIdentifier (Identifier (simpleForTemplate)) [UIdentifier (Identifier (simpleForTemplate))]
USimpleNameReferenceExpression (identifier = simpleForTemplate, resolvesTo = null) [simpleForTemplate] = external simpleForTemplate()()
UDeclarationsExpression [var template2: java.lang.String = "." + simpleForTemplate()] = Undetermined
ULocalVariable (name = template2) [var template2: java.lang.String = "." + simpleForTemplate()]
UPolyadicExpression (operator = +) ["." + simpleForTemplate()] = Undetermined
plugins/uast-kotlin/testData/SuperCalls.log-ide.txt
Vendored
+4 -8
View File
@@ -3,8 +3,7 @@ UFile (package = )
UField (name = anon)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
UObjectLiteralExpression
UPolyadicExpression (operator = +)
ULiteralExpression (value = "textForAnon")
ULiteralExpression (value = "textForAnon")
UClass (name = null)
UMethod (name = bar)
UBlockExpression
@@ -12,8 +11,7 @@ UFile (package = )
UIdentifier (Identifier (cons))
USimpleNameReferenceExpression (identifier = cons, resolvesTo = null)
UObjectLiteralExpression
UPolyadicExpression (operator = +)
ULiteralExpression (value = "inner literal")
ULiteralExpression (value = "inner literal")
UClass (name = null)
UMethod (name = )
UMethod (name = )
@@ -23,8 +21,7 @@ UFile (package = )
UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))
UIdentifier (Identifier (A))
USimpleNameReferenceExpression (identifier = <init>, resolvesTo = A)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "inner class")
ULiteralExpression (value = "inner class")
UMethod (name = getAnon)
UMethod (name = cons)
UParameter (name = a)
@@ -100,5 +97,4 @@ UFile (package = )
UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))
UIdentifier (Identifier (A))
USimpleNameReferenceExpression (identifier = <init>, resolvesTo = A)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "text")
ULiteralExpression (value = "text")
plugins/uast-kotlin/testData/SuperCalls.log.txt
Vendored
+4 -8
View File
@@ -3,8 +3,7 @@ UFile (package = )
UField (name = anon)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
UObjectLiteralExpression
UPolyadicExpression (operator = +)
ULiteralExpression (value = "textForAnon")
ULiteralExpression (value = "textForAnon")
UClass (name = null)
UMethod (name = bar)
UBlockExpression
@@ -12,8 +11,7 @@ UFile (package = )
UIdentifier (Identifier (cons))
USimpleNameReferenceExpression (identifier = cons, resolvesTo = null)
UObjectLiteralExpression
UPolyadicExpression (operator = +)
ULiteralExpression (value = "inner literal")
ULiteralExpression (value = "inner literal")
UClass (name = null)
UMethod (name = SuperCallsKt$anon$1$bar$1)
UMethod (name = SuperCallsKt$anon$1)
@@ -23,8 +21,7 @@ UFile (package = )
UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))
UIdentifier (Identifier (A))
USimpleNameReferenceExpression (identifier = <init>, resolvesTo = A)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "inner class")
ULiteralExpression (value = "inner class")
UMethod (name = getAnon)
UMethod (name = cons)
UParameter (name = a)
@@ -100,5 +97,4 @@ UFile (package = )
UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))
UIdentifier (Identifier (A))
USimpleNameReferenceExpression (identifier = <init>, resolvesTo = A)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "text")
ULiteralExpression (value = "text")
plugins/uast-kotlin/testData/TryCatch.log.txt
Vendored
+2 -4
View File
@@ -29,8 +29,7 @@ UFile (package = )
UMethod (name = catches)
UAnnotation (fqName = java.lang.SuppressWarnings)
UNamedExpression (name = value)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "Something")
ULiteralExpression (value = "Something")
UBlockExpression
UTryExpression
UBlockExpression
@@ -42,8 +41,7 @@ UFile (package = )
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
UAnnotation (fqName = java.lang.SuppressWarnings)
UNamedExpression (name = value)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "Something")
ULiteralExpression (value = "Something")
UBlockExpression
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))
UIdentifier (Identifier (catcher))
plugins/uast-kotlin/testData/TypeReferences.log.txt
Vendored
+2 -4
View File
@@ -6,12 +6,10 @@ UFile (package = )
UBlockExpression
UDeclarationsExpression
ULocalVariable (name = varWithType)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "Not Null")
ULiteralExpression (value = "Not Null")
UDeclarationsExpression
ULocalVariable (name = varWithoutType)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "lorem ipsum")
ULiteralExpression (value = "lorem ipsum")
UDeclarationsExpression
ULocalVariable (name = result)
UBinaryExpression (operator = +)
plugins/uast-kotlin/testData/UnexpectedContainerException.log-ide.txt
Vendored
+1 -2
View File
@@ -36,6 +36,5 @@ UFile (package = )
UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))
UIdentifier (Identifier (UnsupportedOperationException))
USimpleNameReferenceExpression (identifier = <init>, resolvesTo = UnsupportedOperationException)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "")
ULiteralExpression (value = "")
UMethod (name = )
plugins/uast-kotlin/testData/UnexpectedContainerException.log.txt
Vendored
+1 -2
View File
@@ -36,6 +36,5 @@ UFile (package = )
UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1))
UIdentifier (Identifier (UnsupportedOperationException))
USimpleNameReferenceExpression (identifier = <init>, resolvesTo = UnsupportedOperationException)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "")
ULiteralExpression (value = "")
UMethod (name = Model$1$1)
plugins/uast-kotlin/testData/UnexpectedContainerException.types.txt
Vendored
+1 -2
View File
@@ -36,6 +36,5 @@ UFile (package = ) [public abstract interface Callback {...]
UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) [<init>("")] : PsiType:UnsupportedOperationException
UIdentifier (Identifier (UnsupportedOperationException)) [UIdentifier (Identifier (UnsupportedOperationException))]
USimpleNameReferenceExpression (identifier = <init>, resolvesTo = UnsupportedOperationException) [<init>] : PsiType:UnsupportedOperationException
UPolyadicExpression (operator = +) [""] : PsiType:String
ULiteralExpression (value = "") [""] : PsiType:String
ULiteralExpression (value = "") [""] : PsiType:String
UMethod (name = Model$1$1) [fun Model$1$1() = UastEmptyExpression]
plugins/uast-kotlin/testData/WhenAndDestructing.log.txt
Vendored
+5 -10
View File
@@ -9,24 +9,19 @@ UFile (package = )
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))
UIdentifier (Identifier (listOf))
USimpleNameReferenceExpression (identifier = listOf, resolvesTo = null)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "1")
UPolyadicExpression (operator = +)
ULiteralExpression (value = "2")
ULiteralExpression (value = "1")
ULiteralExpression (value = "2")
USwitchExpression
USimpleNameReferenceExpression (identifier = string)
UExpressionList (when)
USwitchClauseExpressionWithBody
UPolyadicExpression (operator = +)
ULiteralExpression (value = "aaaa")
ULiteralExpression (value = "aaaa")
UExpressionList (when_entry)
UYieldExpression
UReturnExpression
UPolyadicExpression (operator = +)
ULiteralExpression (value = "bindingContext")
ULiteralExpression (value = "bindingContext")
USwitchClauseExpressionWithBody
UPolyadicExpression (operator = +)
ULiteralExpression (value = "empty-switch")
ULiteralExpression (value = "empty-switch")
UExpressionList (when_entry)
USwitchClauseExpressionWithBody
UExpressionList (when_entry)
plugins/uast-kotlin/testData/WhenAndDestructing.log.txt.192
Vendored
+5 -10
View File
@@ -9,24 +9,19 @@ UFile (package = )
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))
UIdentifier (Identifier (listOf))
USimpleNameReferenceExpression (identifier = listOf, resolvesTo = null)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "1")
UPolyadicExpression (operator = +)
ULiteralExpression (value = "2")
ULiteralExpression (value = "1")
ULiteralExpression (value = "2")
USwitchExpression
USimpleNameReferenceExpression (identifier = string)
UExpressionList (when)
USwitchClauseExpressionWithBody
UPolyadicExpression (operator = +)
ULiteralExpression (value = "aaaa")
ULiteralExpression (value = "aaaa")
UExpressionList (when_entry)
UReturnExpression
UPolyadicExpression (operator = +)
ULiteralExpression (value = "bindingContext")
ULiteralExpression (value = "bindingContext")
UBreakExpression (label = null)
USwitchClauseExpressionWithBody
UPolyadicExpression (operator = +)
ULiteralExpression (value = "empty-switch")
ULiteralExpression (value = "empty-switch")
UExpressionList (when_entry)
UBreakExpression (label = null)
USwitchClauseExpressionWithBody
plugins/uast-kotlin/testData/WhenIs.log.txt
Vendored
+1 -2
View File
@@ -21,5 +21,4 @@ UFile (package = )
UTypeReferenceExpression (name = java.lang.String)
UExpressionList (when_entry)
UYieldExpression
UPolyadicExpression (operator = +)
ULiteralExpression (value = "<error>")
ULiteralExpression (value = "<error>")
plugins/uast-kotlin/testData/WhenIs.log.txt.192
Vendored
+1 -2
View File
@@ -20,6 +20,5 @@ UFile (package = )
USimpleNameReferenceExpression (identifier = it)
UTypeReferenceExpression (name = java.lang.String)
UExpressionList (when_entry)
UPolyadicExpression (operator = +)
ULiteralExpression (value = "<error>")
ULiteralExpression (value = "<error>")
UBreakExpression (label = null)
plugins/uast-kotlin/testData/WhenStringLiteral.log.txt
Vendored
+5 -10
View File
@@ -11,16 +11,13 @@ UFile (package = )
USimpleNameReferenceExpression (identifier = a)
UExpressionList (when)
USwitchClauseExpressionWithBody
UPolyadicExpression (operator = +)
ULiteralExpression (value = "abc")
ULiteralExpression (value = "abc")
UExpressionList (when_entry)
UYieldExpression
ULiteralExpression (value = 1)
USwitchClauseExpressionWithBody
UPolyadicExpression (operator = +)
ULiteralExpression (value = "def")
UPolyadicExpression (operator = +)
ULiteralExpression (value = "ghi")
ULiteralExpression (value = "def")
ULiteralExpression (value = "ghi")
UExpressionList (when_entry)
UYieldExpression
ULiteralExpression (value = 2)
@@ -32,7 +29,5 @@ UFile (package = )
UMethod (name = getB)
UMethod (name = <no name provided>)
UBlockExpression
UPolyadicExpression (operator = +)
ULiteralExpression (value = "abc1")
UPolyadicExpression (operator = +)
ULiteralExpression (value = "def1")
ULiteralExpression (value = "abc1")
ULiteralExpression (value = "def1")
plugins/uast-kotlin/testData/WhenStringLiteral.log.txt.192
Vendored
+5 -10
View File
@@ -11,16 +11,13 @@ UFile (package = )
USimpleNameReferenceExpression (identifier = a)
UExpressionList (when)
USwitchClauseExpressionWithBody
UPolyadicExpression (operator = +)
ULiteralExpression (value = "abc")
ULiteralExpression (value = "abc")
UExpressionList (when_entry)
ULiteralExpression (value = 1)
UBreakExpression (label = null)
USwitchClauseExpressionWithBody
UPolyadicExpression (operator = +)
ULiteralExpression (value = "def")
UPolyadicExpression (operator = +)
ULiteralExpression (value = "ghi")
ULiteralExpression (value = "def")
ULiteralExpression (value = "ghi")
UExpressionList (when_entry)
ULiteralExpression (value = 2)
UBreakExpression (label = null)
@@ -32,7 +29,5 @@ UFile (package = )
UMethod (name = getB)
UMethod (name = <no name provided>)
UBlockExpression
UPolyadicExpression (operator = +)
ULiteralExpression (value = "abc1")
UPolyadicExpression (operator = +)
ULiteralExpression (value = "def1")
ULiteralExpression (value = "abc1")
ULiteralExpression (value = "def1")
plugins/uast-kotlin/tests/KotlinUastResolveApiTest.kt
+2 -2
View File
@@ -103,7 +103,7 @@ class KotlinUastResolveApiTest : KotlinLightCodeInsightFixtureTestCase() {
TestCase.assertEquals(PsiType.VOID, functionCall.getExpressionType())
val firstArgument = main.findElementByText<UElement>("\"1\"")
val firstArgument = main.findElementByText<UElement>("1")
val firstParameter = functionCall.getArgumentForParameter(0)
TestCase.assertEquals(firstArgument, firstParameter)
}
@@ -144,7 +144,7 @@ class KotlinUastResolveApiTest : KotlinLightCodeInsightFixtureTestCase() {
TestCase.assertEquals(PsiType.VOID, functionCall.getExpressionType())
val firstArgument = main.findElementByText<UElement>("\"1\"")
val firstArgument = main.findElementByText<UElement>("1")
val firstParameter = functionCall.getArgumentForParameter(0)
TestCase.assertEquals(firstArgument, firstParameter)
}