diff --git a/plugins/uast-kotlin/testData/AnnotationParameters.log.txt.191 b/plugins/uast-kotlin/testData/AnnotationParameters.log.txt.191 deleted file mode 100644 index 7fbc81db93c..00000000000 --- a/plugins/uast-kotlin/testData/AnnotationParameters.log.txt.191 +++ /dev/null @@ -1,79 +0,0 @@ -UFile (package = ) - UClass (name = AnnotationParametersKt) - UAnnotationMethod (name = foo) - UAnnotation (fqName = RequiresPermission) - UNamedExpression (name = anyOf) - UCallExpression (kind = UastCallKind(name='array_initializer'), argCount = 3)) - UIdentifier (Identifier (intArrayOf)) - USimpleNameReferenceExpression (identifier = intArrayOf) - ULiteralExpression (value = 1) - ULiteralExpression (value = 2) - ULiteralExpression (value = 3) - UAnnotation (fqName = IntRange) - UNamedExpression (name = from) - ULiteralExpression (value = 10) - UNamedExpression (name = to) - ULiteralExpression (value = 0) - UAnnotation (fqName = WithDefaultValue) - UAnnotation (fqName = SuppressLint) - UNamedExpression (name = value) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "Lorem") - UBlockExpression - UReturnExpression - ULiteralExpression (value = 5) - UAnnotationMethod (name = bar) - UAnnotation (fqName = IntRange) - UNamedExpression (name = from) - ULiteralExpression (value = 0) - UNamedExpression (name = to) - ULiteralExpression (value = 100) - 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") - UBlockExpression - UReturnExpression - USimpleNameReferenceExpression (identifier = Unit) - UAnnotationMethod (name = fooWithArrLiteral) - UAnnotation (fqName = RequiresPermission) - UNamedExpression (name = anyOf) - UCallExpression (kind = UastCallKind(name='array_initializer'), argCount = 3)) - UIdentifier (Identifier ([)) - ULiteralExpression (value = 1) - ULiteralExpression (value = 2) - ULiteralExpression (value = 3) - UBlockExpression - UReturnExpression - ULiteralExpression (value = 5) - UAnnotationMethod (name = fooWithStrArrLiteral) - UAnnotation (fqName = RequiresStrPermission) - 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") - UBlockExpression - UReturnExpression - ULiteralExpression (value = 3) - UClass (name = IntRange) - UAnnotationMethod (name = from) - UAnnotationMethod (name = to) - UClass (name = RequiresPermission) - UAnnotationMethod (name = anyOf) - UClass (name = RequiresStrPermission) - UAnnotationMethod (name = strs) - UClass (name = WithDefaultValue) - UAnnotationMethod (name = value) - ULiteralExpression (value = 42) - UClass (name = SuppressLint) - UAnnotationMethod (name = value) diff --git a/plugins/uast-kotlin/testData/Assertion.values.txt.191 b/plugins/uast-kotlin/testData/Assertion.values.txt.191 index fab347adb1e..d51e11b7116 100644 --- a/plugins/uast-kotlin/testData/Assertion.values.txt.191 +++ b/plugins/uast-kotlin/testData/Assertion.values.txt.191 @@ -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.log.txt.191 b/plugins/uast-kotlin/testData/ClassAnnotation.log.txt.191 deleted file mode 100644 index 9b5381ae7b0..00000000000 --- a/plugins/uast-kotlin/testData/ClassAnnotation.log.txt.191 +++ /dev/null @@ -1,34 +0,0 @@ -UFile (package = ) - UClass (name = A) - UAnnotation (fqName = null) - UAnnotationMethod (name = A) - UClass (name = MyAnnotation) - UAnnotationMethod (name = text) - UClass (name = B) - UAnnotation (fqName = MyAnnotation) - UNamedExpression (name = text) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "class") - UField (name = Companion) - UAnnotation (fqName = null) - UAnnotationMethod (name = B) - UClass (name = InB) - UAnnotation (fqName = MyAnnotation) - UNamedExpression (name = text) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "inB class") - UAnnotationMethod (name = InB) - UClass (name = Companion) - UAnnotation (fqName = MyAnnotation) - UNamedExpression (name = text) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "companion") - UAnnotationMethod (name = Companion) - UClass (name = Obj) - UAnnotation (fqName = MyAnnotation) - UNamedExpression (name = text) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "object") - UField (name = INSTANCE) - UAnnotation (fqName = null) - UAnnotationMethod (name = Obj) diff --git a/plugins/uast-kotlin/testData/DefaultImpls.log.txt.191 b/plugins/uast-kotlin/testData/DefaultImpls.log.txt.191 deleted file mode 100644 index 35284a53b46..00000000000 --- a/plugins/uast-kotlin/testData/DefaultImpls.log.txt.191 +++ /dev/null @@ -1,9 +0,0 @@ -UFile (package = ) - UClass (name = Foo) - UAnnotationMethod (name = bar) - UBlockExpression - UReturnExpression - UPolyadicExpression (operator = +) - ULiteralExpression (value = "Hello!") - UClass (name = Baz) - UAnnotationMethod (name = Baz) diff --git a/plugins/uast-kotlin/testData/DestructuringDeclaration.log.txt.191 b/plugins/uast-kotlin/testData/DestructuringDeclaration.log.txt.191 deleted file mode 100644 index dc8c23ffccd..00000000000 --- a/plugins/uast-kotlin/testData/DestructuringDeclaration.log.txt.191 +++ /dev/null @@ -1,25 +0,0 @@ -UFile (package = ) - UClass (name = DestructuringDeclarationKt) - UAnnotationMethod (name = foo) - UBlockExpression - UDeclarationsExpression - ULocalVariable (name = var268d4034) - UAnnotation (fqName = null) - UBinaryExpression (operator = ) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "foo") - ULiteralExpression (value = 1) - ULocalVariable (name = a) - UAnnotation (fqName = null) - UQualifiedReferenceExpression - USimpleNameReferenceExpression (identifier = var268d4034) - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) - UIdentifier (Identifier (component1)) - USimpleNameReferenceExpression (identifier = ) - ULocalVariable (name = b) - UAnnotation (fqName = null) - UQualifiedReferenceExpression - USimpleNameReferenceExpression (identifier = var268d4034) - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) - UIdentifier (Identifier (component2)) - USimpleNameReferenceExpression (identifier = ) diff --git a/plugins/uast-kotlin/testData/Elvis.log.txt.191 b/plugins/uast-kotlin/testData/Elvis.log.txt.191 deleted file mode 100644 index 6457169b5ac..00000000000 --- a/plugins/uast-kotlin/testData/Elvis.log.txt.191 +++ /dev/null @@ -1,50 +0,0 @@ -UFile (package = ) - UClass (name = ElvisKt) - UAnnotationMethod (name = foo) - UParameter (name = bar) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UBlockExpression - UReturnExpression - ULiteralExpression (value = null) - UAnnotationMethod (name = bar) - UBlockExpression - UReturnExpression - ULiteralExpression (value = 42) - UAnnotationMethod (name = baz) - UBlockExpression - UReturnExpression - UExpressionList (elvis) - UDeclarationsExpression - ULocalVariable (name = var243c51a0) - UAnnotation (fqName = null) - UExpressionList (elvis) - UDeclarationsExpression - ULocalVariable (name = varc4aef569) - UAnnotation (fqName = null) - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) - UIdentifier (Identifier (foo)) - USimpleNameReferenceExpression (identifier = foo) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "Lorem ipsum") - UIfExpression - UBinaryExpression (operator = !=) - USimpleNameReferenceExpression (identifier = varc4aef569) - ULiteralExpression (value = null) - USimpleNameReferenceExpression (identifier = varc4aef569) - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) - UIdentifier (Identifier (foo)) - USimpleNameReferenceExpression (identifier = foo) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "dolor sit amet") - UIfExpression - UBinaryExpression (operator = !=) - USimpleNameReferenceExpression (identifier = var243c51a0) - ULiteralExpression (value = null) - USimpleNameReferenceExpression (identifier = var243c51a0) - UQualifiedReferenceExpression - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) - UIdentifier (Identifier (bar)) - USimpleNameReferenceExpression (identifier = bar) - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) - UIdentifier (Identifier (toString)) - USimpleNameReferenceExpression (identifier = toString) diff --git a/plugins/uast-kotlin/testData/EnumValueMembers.log.txt.191 b/plugins/uast-kotlin/testData/EnumValueMembers.log.txt.191 deleted file mode 100644 index 9bcd1da79a9..00000000000 --- a/plugins/uast-kotlin/testData/EnumValueMembers.log.txt.191 +++ /dev/null @@ -1,21 +0,0 @@ -UFile (package = ) - UClass (name = Style) - UEnumConstant (name = SHEET) - UAnnotation (fqName = null) - USimpleNameReferenceExpression (identifier = Style) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "foo") - UClass (name = null) - UAnnotationMethod (name = getExitAnimation) - UBlockExpression - UReturnExpression - UPolyadicExpression (operator = +) - ULiteralExpression (value = "bar") - UAnnotationMethod (name = SHEET) - UField (name = value) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UAnnotationMethod (name = getExitAnimation) - UAnnotationMethod (name = getValue) - UAnnotationMethod (name = Style) - UParameter (name = value) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) diff --git a/plugins/uast-kotlin/testData/IfStatement.log.txt.191 b/plugins/uast-kotlin/testData/IfStatement.log.txt.191 deleted file mode 100644 index fb24637db1a..00000000000 --- a/plugins/uast-kotlin/testData/IfStatement.log.txt.191 +++ /dev/null @@ -1,14 +0,0 @@ -UFile (package = ) - UClass (name = IfStatementKt) - UAnnotationMethod (name = foo) - UBlockExpression - UDeclarationsExpression - ULocalVariable (name = x) - UIfExpression - UBinaryExpression (operator = !=) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "abc") - UPolyadicExpression (operator = +) - ULiteralExpression (value = "def") - ULiteralExpression (value = 1) - ULiteralExpression (value = 0) diff --git a/plugins/uast-kotlin/testData/LocalVariableWithAnnotation.log.txt.191 b/plugins/uast-kotlin/testData/LocalVariableWithAnnotation.log.txt.191 deleted file mode 100644 index f48af2b19de..00000000000 --- a/plugins/uast-kotlin/testData/LocalVariableWithAnnotation.log.txt.191 +++ /dev/null @@ -1,10 +0,0 @@ -UFile (package = ) - UClass (name = LocalVariableWithAnnotationKt) - UAnnotationMethod (name = foo) - UBlockExpression - UDeclarationsExpression - ULocalVariable (name = bar) - UAnnotation (fqName = TestAnnotation) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "lorem ipsum") - UClass (name = TestAnnotation) diff --git a/plugins/uast-kotlin/testData/ParametersDisorder.log.txt.191 b/plugins/uast-kotlin/testData/ParametersDisorder.log.txt.191 deleted file mode 100644 index 58b160b8dcb..00000000000 --- a/plugins/uast-kotlin/testData/ParametersDisorder.log.txt.191 +++ /dev/null @@ -1,174 +0,0 @@ -UFile (package = ) - UClass (name = ParametersDisorderKt) - UAnnotationMethod (name = global) - UParameter (name = a) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UParameter (name = b) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UBlockExpression - UAnnotationMethod (name = withDefault) - UParameter (name = c) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - ULiteralExpression (value = 1) - UParameter (name = d) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "aaa") - UBlockExpression - UAnnotationMethod (name = withReceiver) - UParameter (name = $receiver) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UParameter (name = a) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UParameter (name = b) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UBlockExpression - UAnnotationMethod (name = call) - UBlockExpression - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2)) - UIdentifier (Identifier (global)) - USimpleNameReferenceExpression (identifier = global) - ULiteralExpression (value = 2.2) - ULiteralExpression (value = 2) - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) - UIdentifier (Identifier (withDefault)) - USimpleNameReferenceExpression (identifier = withDefault) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "bbb") - UQualifiedReferenceExpression - UPolyadicExpression (operator = +) - ULiteralExpression (value = "abc") - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2)) - UIdentifier (Identifier (withReceiver)) - USimpleNameReferenceExpression (identifier = withReceiver) - ULiteralExpression (value = 1) - ULiteralExpression (value = 1.2) - UQualifiedReferenceExpression - USimpleNameReferenceExpression (identifier = Math) - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2)) - UIdentifier (Identifier (atan2)) - USimpleNameReferenceExpression (identifier = atan2) - ULiteralExpression (value = 1.3) - ULiteralExpression (value = 3.4) - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2)) - UIdentifier (Identifier (unresolvedMethod)) - USimpleNameReferenceExpression (identifier = ) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "param1") - UPolyadicExpression (operator = +) - ULiteralExpression (value = "param2") - UQualifiedReferenceExpression - UQualifiedReferenceExpression - UQualifiedReferenceExpression - USimpleNameReferenceExpression (identifier = java) - USimpleNameReferenceExpression (identifier = lang) - USimpleNameReferenceExpression (identifier = String) - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 4)) - UIdentifier (Identifier (format)) - USimpleNameReferenceExpression (identifier = format) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "%i %i %i") - ULiteralExpression (value = 1) - ULiteralExpression (value = 2) - ULiteralExpression (value = 3) - UQualifiedReferenceExpression - UQualifiedReferenceExpression - UQualifiedReferenceExpression - USimpleNameReferenceExpression (identifier = java) - USimpleNameReferenceExpression (identifier = lang) - USimpleNameReferenceExpression (identifier = String) - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2)) - UIdentifier (Identifier (format)) - USimpleNameReferenceExpression (identifier = format) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "%i %i %i") - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 3)) - UIdentifier (Identifier (arrayOf)) - USimpleNameReferenceExpression (identifier = arrayOf) - ULiteralExpression (value = 1) - ULiteralExpression (value = 2) - ULiteralExpression (value = 3) - UQualifiedReferenceExpression - UQualifiedReferenceExpression - UQualifiedReferenceExpression - USimpleNameReferenceExpression (identifier = java) - USimpleNameReferenceExpression (identifier = lang) - USimpleNameReferenceExpression (identifier = String) - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 3)) - UIdentifier (Identifier (format)) - USimpleNameReferenceExpression (identifier = format) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "%i %i %i") - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 3)) - UIdentifier (Identifier (arrayOf)) - USimpleNameReferenceExpression (identifier = arrayOf) - ULiteralExpression (value = 1) - ULiteralExpression (value = 2) - ULiteralExpression (value = 3) - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 3)) - UIdentifier (Identifier (arrayOf)) - USimpleNameReferenceExpression (identifier = arrayOf) - ULiteralExpression (value = 4) - ULiteralExpression (value = 5) - ULiteralExpression (value = 6) - UQualifiedReferenceExpression - UQualifiedReferenceExpression - UQualifiedReferenceExpression - USimpleNameReferenceExpression (identifier = java) - USimpleNameReferenceExpression (identifier = lang) - USimpleNameReferenceExpression (identifier = String) - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2)) - UIdentifier (Identifier (format)) - USimpleNameReferenceExpression (identifier = format) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "%i %i %i") - UQualifiedReferenceExpression - UQualifiedReferenceExpression - UPolyadicExpression (value = "") - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) - UIdentifier (Identifier (chunked)) - USimpleNameReferenceExpression (identifier = chunked) - ULiteralExpression (value = 2) - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) - UIdentifier (Identifier (toTypedArray)) - USimpleNameReferenceExpression (identifier = toTypedArray) - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2)) - UIdentifier (Identifier (with)) - USimpleNameReferenceExpression (identifier = with) - UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) - UIdentifier (Identifier (A)) - USimpleNameReferenceExpression (identifier = ) - ULambdaExpression - UBlockExpression - UQualifiedReferenceExpression - UPolyadicExpression (operator = +) - ULiteralExpression (value = "def") - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2)) - UIdentifier (Identifier (with2Receivers)) - USimpleNameReferenceExpression (identifier = with2Receivers) - ULiteralExpression (value = 8) - ULiteralExpression (value = 7.0) - UAnnotationMethod (name = objectLiteral) - UBlockExpression - UObjectLiteralExpression - ULiteralExpression (value = 1) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "foo") - UClass (name = null) - UAnnotationMethod (name = ParametersDisorderKt$objectLiteral$1) - UClass (name = A) - UAnnotationMethod (name = with2Receivers) - UParameter (name = $receiver) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UParameter (name = a) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UParameter (name = b) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UBlockExpression - UAnnotationMethod (name = A) - UClass (name = Parent) - UAnnotationMethod (name = Parent) - UParameter (name = a) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UParameter (name = b) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) diff --git a/plugins/uast-kotlin/testData/PropertyDelegate.log.txt.191 b/plugins/uast-kotlin/testData/PropertyDelegate.log.txt.191 deleted file mode 100644 index 5bdbbbf46e2..00000000000 --- a/plugins/uast-kotlin/testData/PropertyDelegate.log.txt.191 +++ /dev/null @@ -1,35 +0,0 @@ -UFile (package = ) - UClass (name = PropertyDelegateKt) - UField (name = sdCardPath$delegate) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) - UIdentifier (Identifier (lazy)) - USimpleNameReferenceExpression (identifier = lazy) - ULambdaExpression - UBlockExpression - UPolyadicExpression (operator = +) - ULiteralExpression (value = "/sdcard") - UField (name = annotatedDelegate$delegate) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UAnnotation (fqName = kotlin.Suppress) - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) - UIdentifier (Identifier (lazy)) - USimpleNameReferenceExpression (identifier = lazy) - ULambdaExpression - UBlockExpression - UBinaryExpression (operator = +) - ULiteralExpression (value = 1) - ULiteralExpression (value = 1) - UAnnotationMethod (name = getSdCardPath) - UAnnotationMethod (name = localPropertyTest) - UBlockExpression - UDeclarationsExpression - ULocalVariable (name = sdCardPathLocal) - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) - UIdentifier (Identifier (lazy)) - USimpleNameReferenceExpression (identifier = lazy) - ULambdaExpression - UBlockExpression - UPolyadicExpression (operator = +) - ULiteralExpression (value = "/sdcard") - UAnnotationMethod (name = getAnnotatedDelegate) diff --git a/plugins/uast-kotlin/testData/PropertyInitializer.log.txt.191 b/plugins/uast-kotlin/testData/PropertyInitializer.log.txt.191 deleted file mode 100644 index 3cbeec00699..00000000000 --- a/plugins/uast-kotlin/testData/PropertyInitializer.log.txt.191 +++ /dev/null @@ -1,18 +0,0 @@ -UFile (package = ) - UClass (name = TestPropertyInitializer) - UField (name = withSetter) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "/sdcard") - UAnnotationMethod (name = getWithSetter) - UBlockExpression - UReturnExpression - USimpleNameReferenceExpression (identifier = field) - UAnnotationMethod (name = setWithSetter) - UParameter (name = p) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UBlockExpression - UBinaryExpression (operator = =) - USimpleNameReferenceExpression (identifier = field) - USimpleNameReferenceExpression (identifier = p) - UAnnotationMethod (name = TestPropertyInitializer) diff --git a/plugins/uast-kotlin/testData/PropertyInitializerWithoutSetter.log.txt.191 b/plugins/uast-kotlin/testData/PropertyInitializerWithoutSetter.log.txt.191 deleted file mode 100644 index 5934da70a88..00000000000 --- a/plugins/uast-kotlin/testData/PropertyInitializerWithoutSetter.log.txt.191 +++ /dev/null @@ -1,13 +0,0 @@ -UFile (package = ) - UClass (name = PropertyInitializerWithoutSetterKt) - UField (name = withoutSetter) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "/sdcard") - UAnnotationMethod (name = getWithoutSetter) - UBlockExpression - UReturnExpression - USimpleNameReferenceExpression (identifier = field) - UAnnotationMethod (name = setWithoutSetter) - UParameter (name = p) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) diff --git a/plugins/uast-kotlin/testData/Simple.log.txt.191 b/plugins/uast-kotlin/testData/Simple.log.txt.191 deleted file mode 100644 index 2ad9c6e3273..00000000000 --- a/plugins/uast-kotlin/testData/Simple.log.txt.191 +++ /dev/null @@ -1,15 +0,0 @@ -UFile (package = ) - UClass (name = Simple) - UField (name = property) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "Mary") - UAnnotationMethod (name = method) - UBlockExpression - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) - UIdentifier (Identifier (println)) - USimpleNameReferenceExpression (identifier = println) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "Hello, world!") - UAnnotationMethod (name = getProperty) - UAnnotationMethod (name = Simple) diff --git a/plugins/uast-kotlin/testData/Simple.values.txt.191 b/plugins/uast-kotlin/testData/Simple.values.txt.191 deleted file mode 100644 index 2b28dd40b63..00000000000 --- a/plugins/uast-kotlin/testData/Simple.values.txt.191 +++ /dev/null @@ -1,15 +0,0 @@ -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" - UAnnotationMethod (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) [println] = external println("Hello, world!")("Hello, world!") - UPolyadicExpression (operator = +) ["Hello, world!"] = "Hello, world!" - ULiteralExpression (value = "Hello, world!") ["Hello, world!"] = "Hello, world!" - UAnnotationMethod (name = getProperty) [public final fun getProperty() : java.lang.String = UastEmptyExpression] - UAnnotationMethod (name = Simple) [public fun Simple() = UastEmptyExpression] diff --git a/plugins/uast-kotlin/testData/SimpleScript.log.txt.191 b/plugins/uast-kotlin/testData/SimpleScript.log.txt.191 deleted file mode 100644 index c3129caabe9..00000000000 --- a/plugins/uast-kotlin/testData/SimpleScript.log.txt.191 +++ /dev/null @@ -1,53 +0,0 @@ -UFile (package = ) - UClass (name = SimpleScript) - UAnnotationMethod (name = getBarOrNull) - UParameter (name = flag) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UBlockExpression - UReturnExpression - UIfExpression - USimpleNameReferenceExpression (identifier = flag) - UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) - UIdentifier (Identifier (Bar)) - USimpleNameReferenceExpression (identifier = ) - ULiteralExpression (value = 42) - ULiteralExpression (value = null) - UAnnotationMethod (name = SimpleScript) - UParameter (name = p) - UAnnotation (fqName = null) - UBlockExpression - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) - UIdentifier (Identifier (println)) - USimpleNameReferenceExpression (identifier = println) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "Hello World!") - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) - UIdentifier (Identifier (getBarOrNull)) - USimpleNameReferenceExpression (identifier = getBarOrNull) - ULiteralExpression (value = true) - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) - UIdentifier (Identifier (println)) - USimpleNameReferenceExpression (identifier = println) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "Goodbye World!") - UClass (name = Bar) - UField (name = b) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - ULiteralExpression (value = 0) - UField (name = a) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UAnnotationMethod (name = getB) - UAnnotationMethod (name = getAPlusB) - UBlockExpression - UReturnExpression - UBinaryExpression (operator = +) - USimpleNameReferenceExpression (identifier = a) - USimpleNameReferenceExpression (identifier = b) - UAnnotationMethod (name = getA) - UAnnotationMethod (name = Bar) - UParameter (name = a) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UClass (name = Baz) - UAnnotationMethod (name = doSomething) - UBlockExpression - UAnnotationMethod (name = Baz) diff --git a/plugins/uast-kotlin/testData/StringTemplate.log.txt.191 b/plugins/uast-kotlin/testData/StringTemplate.log.txt.191 deleted file mode 100644 index 0f11d97a2db..00000000000 --- a/plugins/uast-kotlin/testData/StringTemplate.log.txt.191 +++ /dev/null @@ -1,26 +0,0 @@ -UFile (package = ) - UClass (name = StringTemplateKt) - UField (name = foo) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "lorem") - UField (name = bar) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "ipsum") - UField (name = baz) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "dolor") - UField (name = foobarbaz) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UPolyadicExpression (operator = +) - USimpleNameReferenceExpression (identifier = foo) - ULiteralExpression (value = " ") - USimpleNameReferenceExpression (identifier = bar) - ULiteralExpression (value = " ") - USimpleNameReferenceExpression (identifier = baz) - UAnnotationMethod (name = getFoo) - UAnnotationMethod (name = getBar) - UAnnotationMethod (name = getBaz) - UAnnotationMethod (name = getFoobarbaz) diff --git a/plugins/uast-kotlin/testData/StringTemplate.types.txt.191 b/plugins/uast-kotlin/testData/StringTemplate.types.txt.191 deleted file mode 100644 index a45f71b0e3c..00000000000 --- a/plugins/uast-kotlin/testData/StringTemplate.types.txt.191 +++ /dev/null @@ -1,26 +0,0 @@ -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 - 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 - 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 - 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 - USimpleNameReferenceExpression (identifier = foo) [foo] : PsiType:String - ULiteralExpression (value = " ") [" "] : PsiType:String - USimpleNameReferenceExpression (identifier = bar) [bar] : PsiType:String - ULiteralExpression (value = " ") [" "] : PsiType:String - USimpleNameReferenceExpression (identifier = baz) [baz] : PsiType:String - UAnnotationMethod (name = getFoo) [public static final fun getFoo() : java.lang.String = UastEmptyExpression] - UAnnotationMethod (name = getBar) [public static final fun getBar() : java.lang.String = UastEmptyExpression] - UAnnotationMethod (name = getBaz) [public static final fun getBaz() : java.lang.String = UastEmptyExpression] - UAnnotationMethod (name = getFoobarbaz) [public static final fun getFoobarbaz() : java.lang.String = UastEmptyExpression] diff --git a/plugins/uast-kotlin/testData/StringTemplateComplex.log.txt.191 b/plugins/uast-kotlin/testData/StringTemplateComplex.log.txt.191 deleted file mode 100644 index 8fef37332db..00000000000 --- a/plugins/uast-kotlin/testData/StringTemplateComplex.log.txt.191 +++ /dev/null @@ -1,80 +0,0 @@ -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") - UField (name = case4) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "a ") - UPolyadicExpression (operator = +) - 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 = " ") - UPolyadicExpression (operator = +) - ULiteralExpression (value = "literal") - ULiteralExpression (value = " z") - UField (name = literalInLiteral) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "a ") - UPolyadicExpression (operator = +) - ULiteralExpression (value = "literal") - USimpleNameReferenceExpression (identifier = case4) - ULiteralExpression (value = " z") - UField (name = literalInLiteral2) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "a ") - UQualifiedReferenceExpression - UPolyadicExpression (operator = +) - ULiteralExpression (value = "literal") - USimpleNameReferenceExpression (identifier = case4) - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) - UIdentifier (Identifier (repeat)) - USimpleNameReferenceExpression (identifier = repeat) - ULiteralExpression (value = 4) - ULiteralExpression (value = " z") - UAnnotationMethod (name = getMuchRecur) - UAnnotationMethod (name = getCase4) - UAnnotationMethod (name = getCase5) - UAnnotationMethod (name = getLiteralInLiteral) - UAnnotationMethod (name = getLiteralInLiteral2) - UAnnotationMethod (name = simpleForTemplate) - UParameter (name = i) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - ULiteralExpression (value = 0) - UBlockExpression - UReturnExpression - UPolyadicExpression (operator = +) - USimpleNameReferenceExpression (identifier = i) - UAnnotationMethod (name = foo) - UBlockExpression - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) - UIdentifier (Identifier (println)) - USimpleNameReferenceExpression (identifier = println) - UPolyadicExpression (operator = +) - USimpleNameReferenceExpression (identifier = baz) - UDeclarationsExpression - ULocalVariable (name = template1) - UPolyadicExpression (operator = +) - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) - UIdentifier (Identifier (simpleForTemplate)) - USimpleNameReferenceExpression (identifier = simpleForTemplate) - UDeclarationsExpression - ULocalVariable (name = template2) - UPolyadicExpression (operator = +) - ULiteralExpression (value = ".") - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) - UIdentifier (Identifier (simpleForTemplate)) - USimpleNameReferenceExpression (identifier = simpleForTemplate) diff --git a/plugins/uast-kotlin/testData/StringTemplateComplex.types.txt.191 b/plugins/uast-kotlin/testData/StringTemplateComplex.types.txt.191 deleted file mode 100644 index e9d477a989d..00000000000 --- a/plugins/uast-kotlin/testData/StringTemplateComplex.types.txt.191 +++ /dev/null @@ -1,80 +0,0 @@ -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 - 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 = " 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 = " ") [" "] : PsiType:String - UPolyadicExpression (operator = +) ["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] - UPolyadicExpression (operator = +) ["a " + "literal" + case4 + " z"] : PsiType:String - ULiteralExpression (value = "a ") ["a "] : PsiType:String - UPolyadicExpression (operator = +) ["literal" + case4] : PsiType:String - ULiteralExpression (value = "literal") ["literal"] : PsiType:String - USimpleNameReferenceExpression (identifier = case4) [case4] : PsiType:String - ULiteralExpression (value = " z") [" z"] : PsiType:String - UField (name = literalInLiteral2) [@org.jetbrains.annotations.NotNull private static final var literalInLiteral2: java.lang.String = "a " + "literal" + case4.repeat(4) + " z"] - UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull] - UPolyadicExpression (operator = +) ["a " + "literal" + case4.repeat(4) + " z"] : PsiType:String - ULiteralExpression (value = "a ") ["a "] : PsiType:String - UQualifiedReferenceExpression ["literal" + case4.repeat(4)] : PsiType:String - UPolyadicExpression (operator = +) ["literal" + case4] : PsiType:String - ULiteralExpression (value = "literal") ["literal"] : PsiType:String - USimpleNameReferenceExpression (identifier = case4) [case4] : PsiType:String - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) [repeat(4)] : PsiType:String - UIdentifier (Identifier (repeat)) [UIdentifier (Identifier (repeat))] - USimpleNameReferenceExpression (identifier = repeat) [repeat] : PsiType:String - ULiteralExpression (value = 4) [4] : PsiType:int - ULiteralExpression (value = " z") [" z"] : PsiType:String - UAnnotationMethod (name = getMuchRecur) [public static final fun getMuchRecur() : java.lang.String = UastEmptyExpression] - UAnnotationMethod (name = getCase4) [public static final fun getCase4() : java.lang.String = UastEmptyExpression] - UAnnotationMethod (name = getCase5) [public static final fun getCase5() : java.lang.String = UastEmptyExpression] - UAnnotationMethod (name = getLiteralInLiteral) [public static final fun getLiteralInLiteral() : java.lang.String = UastEmptyExpression] - UAnnotationMethod (name = getLiteralInLiteral2) [public static final fun getLiteralInLiteral2() : java.lang.String = UastEmptyExpression] - UAnnotationMethod (name = simpleForTemplate) [public static final fun simpleForTemplate(@org.jetbrains.annotations.NotNull i: int) : java.lang.String {...}] - UParameter (name = i) [@org.jetbrains.annotations.NotNull var i: int = 0] - UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull] - ULiteralExpression (value = 0) [0] : PsiType:int - UBlockExpression [{...}] - UReturnExpression [return i] - UPolyadicExpression (operator = +) [i] : PsiType:String - USimpleNameReferenceExpression (identifier = i) [i] : PsiType:int - UAnnotationMethod (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) [println] : PsiType:void - UPolyadicExpression (operator = +) [baz] : PsiType:String - 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) [simpleForTemplate] : PsiType:String - UDeclarationsExpression [var template2: java.lang.String = "." + simpleForTemplate()] - ULocalVariable (name = template2) [var template2: java.lang.String = "." + simpleForTemplate()] - UPolyadicExpression (operator = +) ["." + simpleForTemplate()] : PsiType:String - ULiteralExpression (value = ".") ["."] : PsiType:String - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) [simpleForTemplate()] : PsiType:String - UIdentifier (Identifier (simpleForTemplate)) [UIdentifier (Identifier (simpleForTemplate))] - USimpleNameReferenceExpression (identifier = simpleForTemplate) [simpleForTemplate] : PsiType:String diff --git a/plugins/uast-kotlin/testData/SuperCalls.log.txt.191 b/plugins/uast-kotlin/testData/SuperCalls.log.txt.191 deleted file mode 100644 index abc57fa81d4..00000000000 --- a/plugins/uast-kotlin/testData/SuperCalls.log.txt.191 +++ /dev/null @@ -1,114 +0,0 @@ -UFile (package = ) - UClass (name = SuperCallsKt) - UField (name = anon) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UObjectLiteralExpression - UPolyadicExpression (operator = +) - ULiteralExpression (value = "textForAnon") - UClass (name = null) - UAnnotationMethod (name = bar) - UBlockExpression - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) - UIdentifier (Identifier (cons)) - USimpleNameReferenceExpression (identifier = cons) - UObjectLiteralExpression - UPolyadicExpression (operator = +) - ULiteralExpression (value = "inner literal") - UClass (name = null) - UAnnotationMethod (name = SuperCallsKt$anon$1$bar$1) - UAnnotationMethod (name = SuperCallsKt$anon$1) - UClass (name = innerObject) - UField (name = INSTANCE) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UAnnotationMethod (name = innerObject) - UBlockExpression - UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) - UIdentifier (Identifier (A)) - USimpleNameReferenceExpression (identifier = ) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "inner object") - UClass (name = InnerClass) - UAnnotationMethod (name = InnerClass) - UBlockExpression - UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) - UIdentifier (Identifier (A)) - USimpleNameReferenceExpression (identifier = ) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "inner class") - UAnnotationMethod (name = getAnon) - UAnnotationMethod (name = cons) - UParameter (name = a) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UBlockExpression - UClass (name = A) - UField (name = str) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UAnnotationMethod (name = foo) - UParameter (name = a) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UBlockExpression - UAnnotationMethod (name = getStr) - UAnnotationMethod (name = A) - UParameter (name = str) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UAnnotationMethod (name = A) - UParameter (name = i) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UBlockExpression - UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) - UIdentifier (Identifier (this)) - USimpleNameReferenceExpression (identifier = ) - UQualifiedReferenceExpression - USimpleNameReferenceExpression (identifier = i) - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) - UIdentifier (Identifier (toString)) - USimpleNameReferenceExpression (identifier = toString) - UClass (name = B) - UAnnotationMethod (name = B) - UParameter (name = param) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UBlockExpression - UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) - UIdentifier (Identifier (A)) - USimpleNameReferenceExpression (identifier = ) - USimpleNameReferenceExpression (identifier = param) - UClass (name = C) - UAnnotationMethod (name = foo) - UParameter (name = a) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UBlockExpression - UQualifiedReferenceExpression - USuperExpression (label = null) - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) - UIdentifier (Identifier (foo)) - USimpleNameReferenceExpression (identifier = foo) - USimpleNameReferenceExpression (identifier = a) - UAnnotationMethod (name = C) - UParameter (name = p) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UBlockExpression - UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) - UIdentifier (Identifier (super)) - USimpleNameReferenceExpression (identifier = ) - USimpleNameReferenceExpression (identifier = p) - UAnnotationMethod (name = C) - UParameter (name = i) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UBlockExpression - UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) - UIdentifier (Identifier (super)) - USimpleNameReferenceExpression (identifier = ) - USimpleNameReferenceExpression (identifier = i) - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) - UIdentifier (Identifier (println)) - USimpleNameReferenceExpression (identifier = println) - UClass (name = O) - UField (name = INSTANCE) - UAnnotation (fqName = null) - UAnnotationMethod (name = O) - UBlockExpression - UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) - UIdentifier (Identifier (A)) - USimpleNameReferenceExpression (identifier = ) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "text") diff --git a/plugins/uast-kotlin/testData/UnexpectedContainerException.log.txt.191 b/plugins/uast-kotlin/testData/UnexpectedContainerException.log.txt.191 deleted file mode 100644 index fa62a1d85f8..00000000000 --- a/plugins/uast-kotlin/testData/UnexpectedContainerException.log.txt.191 +++ /dev/null @@ -1,39 +0,0 @@ -UFile (package = ) - UClass (name = Callback) - UAnnotationMethod (name = onError) - UParameter (name = throwable) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UClass (name = Model) - UAnnotationMethod (name = crashMe) - UParameter (name = clazz) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UParameter (name = factory) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UBlockExpression - UThrowExpression - UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) - UIdentifier (Identifier (UnsupportedOperationException)) - USimpleNameReferenceExpression (identifier = ) - UAnnotationMethod (name = Model) - UBlockExpression - UBlockExpression - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2)) - UIdentifier (Identifier (crashMe)) - USimpleNameReferenceExpression (identifier = crashMe) - UQualifiedReferenceExpression - UClassLiteralExpression - USimpleNameReferenceExpression (identifier = java) - ULambdaExpression - UBlockExpression - UObjectLiteralExpression - UClass (name = null) - UAnnotationMethod (name = onError) - UParameter (name = throwable) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UBlockExpression - UThrowExpression - UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) - UIdentifier (Identifier (UnsupportedOperationException)) - USimpleNameReferenceExpression (identifier = ) - UPolyadicExpression (value = "") - UAnnotationMethod (name = Model$1$1) diff --git a/plugins/uast-kotlin/testData/UnexpectedContainerException.types.txt.191 b/plugins/uast-kotlin/testData/UnexpectedContainerException.types.txt.191 deleted file mode 100644 index 5aced0bb76a..00000000000 --- a/plugins/uast-kotlin/testData/UnexpectedContainerException.types.txt.191 +++ /dev/null @@ -1,39 +0,0 @@ -UFile (package = ) [public abstract interface Callback {...] - UClass (name = Callback) [public abstract interface Callback {...}] - UAnnotationMethod (name = onError) [public abstract fun onError(@org.jetbrains.annotations.NotNull throwable: java.lang.Throwable) : void = UastEmptyExpression] - UParameter (name = throwable) [@org.jetbrains.annotations.NotNull var throwable: java.lang.Throwable] - UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull] - UClass (name = Model) [public final class Model {...}] - UAnnotationMethod (name = crashMe) [public final fun crashMe(@org.jetbrains.annotations.NotNull clazz: java.lang.Class, @org.jetbrains.annotations.NotNull factory: kotlin.jvm.functions.Function0) : void {...}] - UParameter (name = clazz) [@org.jetbrains.annotations.NotNull var clazz: java.lang.Class] - UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull] - UParameter (name = factory) [@org.jetbrains.annotations.NotNull var factory: kotlin.jvm.functions.Function0] - UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull] - UBlockExpression [{...}] : PsiType:Void - UThrowExpression [throw ()] : PsiType:Void - UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) [()] : PsiType:UnsupportedOperationException - UIdentifier (Identifier (UnsupportedOperationException)) [UIdentifier (Identifier (UnsupportedOperationException))] - USimpleNameReferenceExpression (identifier = ) [] : PsiType:UnsupportedOperationException - UAnnotationMethod (name = Model) [public fun Model() {...}] - UBlockExpression [{...}] - UBlockExpression [{...}] : PsiType:void - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2)) [crashMe(Callback.java, { ...})] : PsiType:void - UIdentifier (Identifier (crashMe)) [UIdentifier (Identifier (crashMe))] - USimpleNameReferenceExpression (identifier = crashMe) [crashMe] : PsiType:void - UQualifiedReferenceExpression [Callback.java] : PsiType:Class - UClassLiteralExpression [Callback] : PsiType:KClass - USimpleNameReferenceExpression (identifier = java) [java] : PsiType:Class - ULambdaExpression [{ ...}] : PsiType: - UBlockExpression [{...}] - UObjectLiteralExpression [anonymous object : Callback {... }] : PsiType:Callback - UClass (name = null) [final class null : Callback {...}] - UAnnotationMethod (name = onError) [public fun onError(@org.jetbrains.annotations.NotNull throwable: java.lang.Throwable) : void {...}] - UParameter (name = throwable) [@org.jetbrains.annotations.NotNull var throwable: java.lang.Throwable] - UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull] - UBlockExpression [{...}] : PsiType:Void - UThrowExpression [throw ("")] : PsiType:Void - UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) [("")] : PsiType:UnsupportedOperationException - UIdentifier (Identifier (UnsupportedOperationException)) [UIdentifier (Identifier (UnsupportedOperationException))] - USimpleNameReferenceExpression (identifier = ) [] : PsiType:UnsupportedOperationException - UPolyadicExpression (value = "") [""] : PsiType:String - UAnnotationMethod (name = Model$1$1) [fun Model$1$1() = UastEmptyExpression] diff --git a/plugins/uast-kotlin/testData/WhenAndDestructing.log.txt.191 b/plugins/uast-kotlin/testData/WhenAndDestructing.log.txt.191 deleted file mode 100644 index 53e426a1acd..00000000000 --- a/plugins/uast-kotlin/testData/WhenAndDestructing.log.txt.191 +++ /dev/null @@ -1,49 +0,0 @@ -UFile (package = ) - UClass (name = WhenAndDestructingKt) - UAnnotationMethod (name = getElementsAdditionalResolve) - UParameter (name = string) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UBlockExpression - UDeclarationsExpression - ULocalVariable (name = arr) - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2)) - UIdentifier (Identifier (listOf)) - USimpleNameReferenceExpression (identifier = listOf) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "1") - UPolyadicExpression (operator = +) - ULiteralExpression (value = "2") - USwitchExpression - USimpleNameReferenceExpression (identifier = string) - UExpressionList (when) - USwitchClauseExpressionWithBody - UPolyadicExpression (operator = +) - ULiteralExpression (value = "aaaa") - UExpressionList (when_entry) - UReturnExpression - UPolyadicExpression (operator = +) - ULiteralExpression (value = "bindingContext") - UBreakExpression (label = null) - USwitchClauseExpressionWithBody - UExpressionList (when_entry) - UDeclarationsExpression - ULocalVariable (name = var837f1e82) - UAnnotation (fqName = null) - USimpleNameReferenceExpression (identifier = arr) - ULocalVariable (name = bindingContext) - UAnnotation (fqName = null) - UQualifiedReferenceExpression - USimpleNameReferenceExpression (identifier = var837f1e82) - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) - UIdentifier (Identifier (component1)) - USimpleNameReferenceExpression (identifier = ) - ULocalVariable (name = statementFilter) - UAnnotation (fqName = null) - UQualifiedReferenceExpression - USimpleNameReferenceExpression (identifier = var837f1e82) - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) - UIdentifier (Identifier (component2)) - USimpleNameReferenceExpression (identifier = ) - UReturnExpression - USimpleNameReferenceExpression (identifier = bindingContext) - UBreakExpression (label = null) diff --git a/plugins/uast-kotlin/testData/WhenIs.log.txt.191 b/plugins/uast-kotlin/testData/WhenIs.log.txt.191 deleted file mode 100644 index 07d3e122d9e..00000000000 --- a/plugins/uast-kotlin/testData/WhenIs.log.txt.191 +++ /dev/null @@ -1,25 +0,0 @@ -UFile (package = ) - UClass (name = WhenIsKt) - UAnnotationMethod (name = foo) - UParameter (name = bar) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UBlockExpression - UReturnExpression - USwitchExpression - USimpleNameReferenceExpression (identifier = bar) - UExpressionList (when) - USwitchClauseExpressionWithBody - UBinaryExpressionWithType - USimpleNameReferenceExpression (identifier = it) - UTypeReferenceExpression (name = java.lang.String) - UExpressionList (when_entry) - USimpleNameReferenceExpression (identifier = bar) - UBreakExpression (label = null) - USwitchClauseExpressionWithBody - UBinaryExpressionWithType - USimpleNameReferenceExpression (identifier = it) - UTypeReferenceExpression (name = java.lang.String) - UExpressionList (when_entry) - UPolyadicExpression (operator = +) - ULiteralExpression (value = "") - UBreakExpression (label = null) diff --git a/plugins/uast-kotlin/testData/WhenStringLiteral.log.txt.191 b/plugins/uast-kotlin/testData/WhenStringLiteral.log.txt.191 deleted file mode 100644 index 67cd36776dc..00000000000 --- a/plugins/uast-kotlin/testData/WhenStringLiteral.log.txt.191 +++ /dev/null @@ -1,38 +0,0 @@ -UFile (package = ) - UClass (name = WhenStringLiteralKt) - UField (name = a) - UAnnotation (fqName = org.jetbrains.annotations.Nullable) - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) - UIdentifier (Identifier (readLine)) - USimpleNameReferenceExpression (identifier = readLine) - UField (name = b) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - USwitchExpression - USimpleNameReferenceExpression (identifier = a) - UExpressionList (when) - USwitchClauseExpressionWithBody - UPolyadicExpression (operator = +) - ULiteralExpression (value = "abc") - UExpressionList (when_entry) - ULiteralExpression (value = 1) - UBreakExpression (label = null) - USwitchClauseExpressionWithBody - UPolyadicExpression (operator = +) - ULiteralExpression (value = "def") - UPolyadicExpression (operator = +) - ULiteralExpression (value = "ghi") - UExpressionList (when_entry) - ULiteralExpression (value = 2) - UBreakExpression (label = null) - USwitchClauseExpressionWithBody - UExpressionList (when_entry) - ULiteralExpression (value = 3) - UBreakExpression (label = null) - UAnnotationMethod (name = getA) - UAnnotationMethod (name = getB) - UAnnotationMethod (name = ) - UBlockExpression - UPolyadicExpression (operator = +) - ULiteralExpression (value = "abc1") - UPolyadicExpression (operator = +) - ULiteralExpression (value = "def1")