diff --git a/idea/resources/META-INF/jvm-common.xml b/idea/resources/META-INF/jvm-common.xml index 99a176dc5bc..912cc002c22 100644 --- a/idea/resources/META-INF/jvm-common.xml +++ b/idea/resources/META-INF/jvm-common.xml @@ -156,7 +156,7 @@ get() = emptyList() override val expression: UExpression? - get() = userExpressions.lastOrNull()?.sourcePsi.safeAs() + get() = userExpressions.lastOrNull()?.sourcePsi?.let { it.safeAs() ?: it.parent.safeAs() } ?.let { KotlinConverter.convertExpression(it, this, DEFAULT_EXPRESSION_TYPES_LIST) } } else emptyList() diff --git a/plugins/uast-kotlin/testData/AnnotatedExpressions.log.txt b/plugins/uast-kotlin/testData/AnnotatedExpressions.log.txt index a3cfac55590..0efcd06420a 100644 --- a/plugins/uast-kotlin/testData/AnnotatedExpressions.log.txt +++ b/plugins/uast-kotlin/testData/AnnotatedExpressions.log.txt @@ -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)) diff --git a/plugins/uast-kotlin/testData/AnnotatedExpressions.log.txt.192 b/plugins/uast-kotlin/testData/AnnotatedExpressions.log.txt.192 index 970e077fe0a..c300fb5b5ea 100644 --- a/plugins/uast-kotlin/testData/AnnotatedExpressions.log.txt.192 +++ b/plugins/uast-kotlin/testData/AnnotatedExpressions.log.txt.192 @@ -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)) diff --git a/plugins/uast-kotlin/testData/AnnotationComplex.log.txt b/plugins/uast-kotlin/testData/AnnotationComplex.log.txt index 85dcbc0b8e3..75c68f444ed 100644 --- a/plugins/uast-kotlin/testData/AnnotationComplex.log.txt +++ b/plugins/uast-kotlin/testData/AnnotationComplex.log.txt @@ -19,10 +19,8 @@ UFile (package = ) UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 2)) UIdentifier (Identifier (Annotation)) USimpleNameReferenceExpression (identifier = , 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 = , 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) diff --git a/plugins/uast-kotlin/testData/AnnotationParameters.log.txt b/plugins/uast-kotlin/testData/AnnotationParameters.log.txt index 2493c83b6d1..fe14237f6a7 100644 --- a/plugins/uast-kotlin/testData/AnnotationParameters.log.txt +++ b/plugins/uast-kotlin/testData/AnnotationParameters.log.txt @@ -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) diff --git a/plugins/uast-kotlin/testData/Assertion.values.txt b/plugins/uast-kotlin/testData/Assertion.values.txt index 0e5aac01119..db956afc60a 100644 --- a/plugins/uast-kotlin/testData/Assertion.values.txt +++ b/plugins/uast-kotlin/testData/Assertion.values.txt @@ -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") diff --git a/plugins/uast-kotlin/testData/ClassAnnotation.altlog.txt b/plugins/uast-kotlin/testData/ClassAnnotation.altlog.txt index 7c48bbb3827..5153489ad5d 100644 --- a/plugins/uast-kotlin/testData/ClassAnnotation.altlog.txt +++ b/plugins/uast-kotlin/testData/ClassAnnotation.altlog.txt @@ -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))] diff --git a/plugins/uast-kotlin/testData/ClassAnnotation.log.txt b/plugins/uast-kotlin/testData/ClassAnnotation.log.txt index 045ca3e82d7..fce8469ccd1 100644 --- a/plugins/uast-kotlin/testData/ClassAnnotation.log.txt +++ b/plugins/uast-kotlin/testData/ClassAnnotation.log.txt @@ -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) diff --git a/plugins/uast-kotlin/testData/ConstructorDelegate.log-ide.txt b/plugins/uast-kotlin/testData/ConstructorDelegate.log-ide.txt index d710b60f30f..2d91310ba21 100644 --- a/plugins/uast-kotlin/testData/ConstructorDelegate.log-ide.txt +++ b/plugins/uast-kotlin/testData/ConstructorDelegate.log-ide.txt @@ -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) diff --git a/plugins/uast-kotlin/testData/ConstructorDelegate.log.txt b/plugins/uast-kotlin/testData/ConstructorDelegate.log.txt index c52ff446a8e..8bf1fc9d014 100644 --- a/plugins/uast-kotlin/testData/ConstructorDelegate.log.txt +++ b/plugins/uast-kotlin/testData/ConstructorDelegate.log.txt @@ -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) diff --git a/plugins/uast-kotlin/testData/DefaultImpls.log.txt b/plugins/uast-kotlin/testData/DefaultImpls.log.txt index 55b91423be2..571591722f8 100644 --- a/plugins/uast-kotlin/testData/DefaultImpls.log.txt +++ b/plugins/uast-kotlin/testData/DefaultImpls.log.txt @@ -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) diff --git a/plugins/uast-kotlin/testData/DeprecatedHidden.log.txt b/plugins/uast-kotlin/testData/DeprecatedHidden.log.txt index d53ee9c9825..201285b464b 100644 --- a/plugins/uast-kotlin/testData/DeprecatedHidden.log.txt +++ b/plugins/uast-kotlin/testData/DeprecatedHidden.log.txt @@ -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 diff --git a/plugins/uast-kotlin/testData/DestructuringDeclaration.log.txt b/plugins/uast-kotlin/testData/DestructuringDeclaration.log.txt index a9ae113df8c..288d88dd8e1 100644 --- a/plugins/uast-kotlin/testData/DestructuringDeclaration.log.txt +++ b/plugins/uast-kotlin/testData/DestructuringDeclaration.log.txt @@ -8,8 +8,7 @@ UFile (package = ) ULocalVariable (name = var268d41a5) UAnnotation (fqName = null) UBinaryExpression (operator = ) - 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) diff --git a/plugins/uast-kotlin/testData/Elvis.log.txt b/plugins/uast-kotlin/testData/Elvis.log.txt index de6992a14f9..33160a30513 100644 --- a/plugins/uast-kotlin/testData/Elvis.log.txt +++ b/plugins/uast-kotlin/testData/Elvis.log.txt @@ -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) diff --git a/plugins/uast-kotlin/testData/EnumValueMembers.log-ide.txt b/plugins/uast-kotlin/testData/EnumValueMembers.log-ide.txt index 03dcfa075fa..bd07a46ab5d 100644 --- a/plugins/uast-kotlin/testData/EnumValueMembers.log-ide.txt +++ b/plugins/uast-kotlin/testData/EnumValueMembers.log-ide.txt @@ -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) diff --git a/plugins/uast-kotlin/testData/EnumValueMembers.log.txt b/plugins/uast-kotlin/testData/EnumValueMembers.log.txt index 70a629a4251..5c76f6d87a9 100644 --- a/plugins/uast-kotlin/testData/EnumValueMembers.log.txt +++ b/plugins/uast-kotlin/testData/EnumValueMembers.log.txt @@ -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) diff --git a/plugins/uast-kotlin/testData/EnumValuesConstructors.log-ide.txt b/plugins/uast-kotlin/testData/EnumValuesConstructors.log-ide.txt index 40dcfc29152..130f197f532 100644 --- a/plugins/uast-kotlin/testData/EnumValuesConstructors.log-ide.txt +++ b/plugins/uast-kotlin/testData/EnumValuesConstructors.log-ide.txt @@ -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) diff --git a/plugins/uast-kotlin/testData/EnumValuesConstructors.log.txt b/plugins/uast-kotlin/testData/EnumValuesConstructors.log.txt index 15e48087df0..71229cd080b 100644 --- a/plugins/uast-kotlin/testData/EnumValuesConstructors.log.txt +++ b/plugins/uast-kotlin/testData/EnumValuesConstructors.log.txt @@ -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) diff --git a/plugins/uast-kotlin/testData/IfStatement.log.txt b/plugins/uast-kotlin/testData/IfStatement.log.txt index c2e75ac1ed0..fdce860179d 100644 --- a/plugins/uast-kotlin/testData/IfStatement.log.txt +++ b/plugins/uast-kotlin/testData/IfStatement.log.txt @@ -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) diff --git a/plugins/uast-kotlin/testData/LambdaReturn.log.txt b/plugins/uast-kotlin/testData/LambdaReturn.log.txt index 29accedb9c5..39d0e1e7366 100644 --- a/plugins/uast-kotlin/testData/LambdaReturn.log.txt +++ b/plugins/uast-kotlin/testData/LambdaReturn.log.txt @@ -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)) diff --git a/plugins/uast-kotlin/testData/LocalVariableWithAnnotation.log.txt b/plugins/uast-kotlin/testData/LocalVariableWithAnnotation.log.txt index 0d80a5a877c..0576c834e75 100644 --- a/plugins/uast-kotlin/testData/LocalVariableWithAnnotation.log.txt +++ b/plugins/uast-kotlin/testData/LocalVariableWithAnnotation.log.txt @@ -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) diff --git a/plugins/uast-kotlin/testData/ParametersDisorder.log-ide.txt b/plugins/uast-kotlin/testData/ParametersDisorder.log-ide.txt index 1180ec3dc49..41b9a91c725 100644 --- a/plugins/uast-kotlin/testData/ParametersDisorder.log-ide.txt +++ b/plugins/uast-kotlin/testData/ParametersDisorder.log-ide.txt @@ -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 = , 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) diff --git a/plugins/uast-kotlin/testData/ParametersDisorder.log.txt b/plugins/uast-kotlin/testData/ParametersDisorder.log.txt index 09db7541e93..e8a37796eef 100644 --- a/plugins/uast-kotlin/testData/ParametersDisorder.log.txt +++ b/plugins/uast-kotlin/testData/ParametersDisorder.log.txt @@ -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 = , 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) diff --git a/plugins/uast-kotlin/testData/PropertyDelegate.log.txt b/plugins/uast-kotlin/testData/PropertyDelegate.log.txt index 4b51c13ea04..42d7e5aa6fe 100644 --- a/plugins/uast-kotlin/testData/PropertyDelegate.log.txt +++ b/plugins/uast-kotlin/testData/PropertyDelegate.log.txt @@ -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) diff --git a/plugins/uast-kotlin/testData/PropertyInitializer.log.txt b/plugins/uast-kotlin/testData/PropertyInitializer.log.txt index 6275b88baae..0445696ef71 100644 --- a/plugins/uast-kotlin/testData/PropertyInitializer.log.txt +++ b/plugins/uast-kotlin/testData/PropertyInitializer.log.txt @@ -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 diff --git a/plugins/uast-kotlin/testData/PropertyInitializerWithoutSetter.log-ide.txt b/plugins/uast-kotlin/testData/PropertyInitializerWithoutSetter.log-ide.txt index 393ccf749c7..7eaac7d90ec 100644 --- a/plugins/uast-kotlin/testData/PropertyInitializerWithoutSetter.log-ide.txt +++ b/plugins/uast-kotlin/testData/PropertyInitializerWithoutSetter.log-ide.txt @@ -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) \ No newline at end of file diff --git a/plugins/uast-kotlin/testData/PropertyInitializerWithoutSetter.log.txt b/plugins/uast-kotlin/testData/PropertyInitializerWithoutSetter.log.txt index ee33807a98e..2617618a649 100644 --- a/plugins/uast-kotlin/testData/PropertyInitializerWithoutSetter.log.txt +++ b/plugins/uast-kotlin/testData/PropertyInitializerWithoutSetter.log.txt @@ -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 diff --git a/plugins/uast-kotlin/testData/ReifiedParameters.log.txt b/plugins/uast-kotlin/testData/ReifiedParameters.log.txt index 103f76bb0ff..40cdfa7cd48 100644 --- a/plugins/uast-kotlin/testData/ReifiedParameters.log.txt +++ b/plugins/uast-kotlin/testData/ReifiedParameters.log.txt @@ -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) diff --git a/plugins/uast-kotlin/testData/Simple.log.txt b/plugins/uast-kotlin/testData/Simple.log.txt index ae1a89bc75c..f352eb5b902 100644 --- a/plugins/uast-kotlin/testData/Simple.log.txt +++ b/plugins/uast-kotlin/testData/Simple.log.txt @@ -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) diff --git a/plugins/uast-kotlin/testData/Simple.values.txt b/plugins/uast-kotlin/testData/Simple.values.txt index 4c83c6a9bb6..24a7ff0f4aa 100644 --- a/plugins/uast-kotlin/testData/Simple.values.txt +++ b/plugins/uast-kotlin/testData/Simple.values.txt @@ -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] diff --git a/plugins/uast-kotlin/testData/SimpleScript.log.txt b/plugins/uast-kotlin/testData/SimpleScript.log.txt index 4efd0d1119e..af6b6f03ba0 100644 --- a/plugins/uast-kotlin/testData/SimpleScript.log.txt +++ b/plugins/uast-kotlin/testData/SimpleScript.log.txt @@ -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) diff --git a/plugins/uast-kotlin/testData/StringTemplate.log.txt b/plugins/uast-kotlin/testData/StringTemplate.log.txt index 548702812cc..1f25dbd51a5 100644 --- a/plugins/uast-kotlin/testData/StringTemplate.log.txt +++ b/plugins/uast-kotlin/testData/StringTemplate.log.txt @@ -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 = +) diff --git a/plugins/uast-kotlin/testData/StringTemplate.types.txt b/plugins/uast-kotlin/testData/StringTemplate.types.txt index 14c966253b3..01a7d9cdde5 100644 --- a/plugins/uast-kotlin/testData/StringTemplate.types.txt +++ b/plugins/uast-kotlin/testData/StringTemplate.types.txt @@ -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 diff --git a/plugins/uast-kotlin/testData/StringTemplateComplex.log.txt b/plugins/uast-kotlin/testData/StringTemplateComplex.log.txt index e8a7e234744..e72af36b37c 100644 --- a/plugins/uast-kotlin/testData/StringTemplateComplex.log.txt +++ b/plugins/uast-kotlin/testData/StringTemplateComplex.log.txt @@ -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 = +) diff --git a/plugins/uast-kotlin/testData/StringTemplateComplex.types.txt b/plugins/uast-kotlin/testData/StringTemplateComplex.types.txt index 195832288ee..a62d726cd84 100644 --- a/plugins/uast-kotlin/testData/StringTemplateComplex.types.txt +++ b/plugins/uast-kotlin/testData/StringTemplateComplex.types.txt @@ -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 diff --git a/plugins/uast-kotlin/testData/StringTemplateComplex.values.txt b/plugins/uast-kotlin/testData/StringTemplateComplex.values.txt index 78490ce39d3..f8b6b9f738c 100644 --- a/plugins/uast-kotlin/testData/StringTemplateComplex.values.txt +++ b/plugins/uast-kotlin/testData/StringTemplateComplex.values.txt @@ -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 diff --git a/plugins/uast-kotlin/testData/SuperCalls.log-ide.txt b/plugins/uast-kotlin/testData/SuperCalls.log-ide.txt index 3924d4b727b..e55664a2f9a 100644 --- a/plugins/uast-kotlin/testData/SuperCalls.log-ide.txt +++ b/plugins/uast-kotlin/testData/SuperCalls.log-ide.txt @@ -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 = , 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 = , resolvesTo = A) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "text") + ULiteralExpression (value = "text") diff --git a/plugins/uast-kotlin/testData/SuperCalls.log.txt b/plugins/uast-kotlin/testData/SuperCalls.log.txt index 7f449519c10..5cdd4558f78 100644 --- a/plugins/uast-kotlin/testData/SuperCalls.log.txt +++ b/plugins/uast-kotlin/testData/SuperCalls.log.txt @@ -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 = , 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 = , resolvesTo = A) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "text") + ULiteralExpression (value = "text") diff --git a/plugins/uast-kotlin/testData/TryCatch.log.txt b/plugins/uast-kotlin/testData/TryCatch.log.txt index 2a36b4ae4cb..c53ba2040c9 100644 --- a/plugins/uast-kotlin/testData/TryCatch.log.txt +++ b/plugins/uast-kotlin/testData/TryCatch.log.txt @@ -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)) diff --git a/plugins/uast-kotlin/testData/TypeReferences.log.txt b/plugins/uast-kotlin/testData/TypeReferences.log.txt index ba3d2505dc8..aab40335748 100644 --- a/plugins/uast-kotlin/testData/TypeReferences.log.txt +++ b/plugins/uast-kotlin/testData/TypeReferences.log.txt @@ -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 = +) diff --git a/plugins/uast-kotlin/testData/UnexpectedContainerException.log-ide.txt b/plugins/uast-kotlin/testData/UnexpectedContainerException.log-ide.txt index f5a6d6985c9..29df09cd201 100644 --- a/plugins/uast-kotlin/testData/UnexpectedContainerException.log-ide.txt +++ b/plugins/uast-kotlin/testData/UnexpectedContainerException.log-ide.txt @@ -36,6 +36,5 @@ UFile (package = ) UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) UIdentifier (Identifier (UnsupportedOperationException)) USimpleNameReferenceExpression (identifier = , resolvesTo = UnsupportedOperationException) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "") + ULiteralExpression (value = "") UMethod (name = ) diff --git a/plugins/uast-kotlin/testData/UnexpectedContainerException.log.txt b/plugins/uast-kotlin/testData/UnexpectedContainerException.log.txt index 35eacfcab7d..d8b0fa29d03 100644 --- a/plugins/uast-kotlin/testData/UnexpectedContainerException.log.txt +++ b/plugins/uast-kotlin/testData/UnexpectedContainerException.log.txt @@ -36,6 +36,5 @@ UFile (package = ) UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) UIdentifier (Identifier (UnsupportedOperationException)) USimpleNameReferenceExpression (identifier = , resolvesTo = UnsupportedOperationException) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "") + ULiteralExpression (value = "") UMethod (name = Model$1$1) diff --git a/plugins/uast-kotlin/testData/UnexpectedContainerException.types.txt b/plugins/uast-kotlin/testData/UnexpectedContainerException.types.txt index 8a368df31cc..9b22766399f 100644 --- a/plugins/uast-kotlin/testData/UnexpectedContainerException.types.txt +++ b/plugins/uast-kotlin/testData/UnexpectedContainerException.types.txt @@ -36,6 +36,5 @@ UFile (package = ) [public abstract interface Callback {...] UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) [("")] : PsiType:UnsupportedOperationException UIdentifier (Identifier (UnsupportedOperationException)) [UIdentifier (Identifier (UnsupportedOperationException))] USimpleNameReferenceExpression (identifier = , resolvesTo = UnsupportedOperationException) [] : PsiType:UnsupportedOperationException - UPolyadicExpression (operator = +) [""] : PsiType:String - ULiteralExpression (value = "") [""] : PsiType:String + ULiteralExpression (value = "") [""] : PsiType:String UMethod (name = Model$1$1) [fun Model$1$1() = UastEmptyExpression] diff --git a/plugins/uast-kotlin/testData/WhenAndDestructing.log.txt b/plugins/uast-kotlin/testData/WhenAndDestructing.log.txt index b7f3b82bc31..542a41e1ccd 100644 --- a/plugins/uast-kotlin/testData/WhenAndDestructing.log.txt +++ b/plugins/uast-kotlin/testData/WhenAndDestructing.log.txt @@ -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) diff --git a/plugins/uast-kotlin/testData/WhenAndDestructing.log.txt.192 b/plugins/uast-kotlin/testData/WhenAndDestructing.log.txt.192 index f54c38324c6..4b01e9ae238 100644 --- a/plugins/uast-kotlin/testData/WhenAndDestructing.log.txt.192 +++ b/plugins/uast-kotlin/testData/WhenAndDestructing.log.txt.192 @@ -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 diff --git a/plugins/uast-kotlin/testData/WhenIs.log.txt b/plugins/uast-kotlin/testData/WhenIs.log.txt index 77ca2a8e0b1..ae871ce7762 100644 --- a/plugins/uast-kotlin/testData/WhenIs.log.txt +++ b/plugins/uast-kotlin/testData/WhenIs.log.txt @@ -21,5 +21,4 @@ UFile (package = ) UTypeReferenceExpression (name = java.lang.String) UExpressionList (when_entry) UYieldExpression - UPolyadicExpression (operator = +) - ULiteralExpression (value = "") + ULiteralExpression (value = "") diff --git a/plugins/uast-kotlin/testData/WhenIs.log.txt.192 b/plugins/uast-kotlin/testData/WhenIs.log.txt.192 index 0ce880d5d62..0941dd1c738 100644 --- a/plugins/uast-kotlin/testData/WhenIs.log.txt.192 +++ b/plugins/uast-kotlin/testData/WhenIs.log.txt.192 @@ -20,6 +20,5 @@ UFile (package = ) USimpleNameReferenceExpression (identifier = it) UTypeReferenceExpression (name = java.lang.String) UExpressionList (when_entry) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "") + ULiteralExpression (value = "") UBreakExpression (label = null) diff --git a/plugins/uast-kotlin/testData/WhenStringLiteral.log.txt b/plugins/uast-kotlin/testData/WhenStringLiteral.log.txt index 939dd479dd5..f58b40c2640 100644 --- a/plugins/uast-kotlin/testData/WhenStringLiteral.log.txt +++ b/plugins/uast-kotlin/testData/WhenStringLiteral.log.txt @@ -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 = ) UBlockExpression - UPolyadicExpression (operator = +) - ULiteralExpression (value = "abc1") - UPolyadicExpression (operator = +) - ULiteralExpression (value = "def1") + ULiteralExpression (value = "abc1") + ULiteralExpression (value = "def1") diff --git a/plugins/uast-kotlin/testData/WhenStringLiteral.log.txt.192 b/plugins/uast-kotlin/testData/WhenStringLiteral.log.txt.192 index 5773cba2846..e689d23089e 100644 --- a/plugins/uast-kotlin/testData/WhenStringLiteral.log.txt.192 +++ b/plugins/uast-kotlin/testData/WhenStringLiteral.log.txt.192 @@ -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 = ) UBlockExpression - UPolyadicExpression (operator = +) - ULiteralExpression (value = "abc1") - UPolyadicExpression (operator = +) - ULiteralExpression (value = "def1") + ULiteralExpression (value = "abc1") + ULiteralExpression (value = "def1") diff --git a/plugins/uast-kotlin/tests/KotlinUastResolveApiTest.kt b/plugins/uast-kotlin/tests/KotlinUastResolveApiTest.kt index 49a1d281327..924ecbac62e 100644 --- a/plugins/uast-kotlin/tests/KotlinUastResolveApiTest.kt +++ b/plugins/uast-kotlin/tests/KotlinUastResolveApiTest.kt @@ -103,7 +103,7 @@ class KotlinUastResolveApiTest : KotlinLightCodeInsightFixtureTestCase() { TestCase.assertEquals(PsiType.VOID, functionCall.getExpressionType()) - val firstArgument = main.findElementByText("\"1\"") + val firstArgument = main.findElementByText("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("\"1\"") + val firstArgument = main.findElementByText("1") val firstParameter = functionCall.getArgumentForParameter(0) TestCase.assertEquals(firstArgument, firstParameter) }