From affa1e232fa4791077fb3e0754adbdd626665a31 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 11 Jan 2018 20:11:42 +0300 Subject: [PATCH] 172: Revert "Uast: Constructors.kt testdata fixes" This reverts commit a725f43588a6d2f2d1c79649f46849f8cbabbc8f. --- .../testData/Constructors.log.txt.172 | 161 ++++++++++++++++++ .../testData/Constructors.render.txt.172 | 81 +++++++++ 2 files changed, 242 insertions(+) create mode 100644 plugins/uast-kotlin/testData/Constructors.log.txt.172 create mode 100644 plugins/uast-kotlin/testData/Constructors.render.txt.172 diff --git a/plugins/uast-kotlin/testData/Constructors.log.txt.172 b/plugins/uast-kotlin/testData/Constructors.log.txt.172 new file mode 100644 index 00000000000..c7555e8f464 --- /dev/null +++ b/plugins/uast-kotlin/testData/Constructors.log.txt.172 @@ -0,0 +1,161 @@ +UFile (package = ) + UClass (name = A) + UField (name = str) + UAnnotation (fqName = org.jetbrains.annotations.NotNull) + UAnnotationMethod (name = getStr) + UAnnotationMethod (name = A) + UParameter (name = str) + UAnnotation (fqName = org.jetbrains.annotations.NotNull) + UAnnotationMethod (name = A) + UParameter (name = i) + UAnnotation (fqName = null) + 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 = AWithInit) + UField (name = str) + UAnnotation (fqName = org.jetbrains.annotations.NotNull) + UAnnotationMethod (name = getStr) + UAnnotationMethod (name = AWithInit) + UParameter (name = str) + UAnnotation (fqName = org.jetbrains.annotations.NotNull) + UBlockExpression + UBlockExpression + UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) + UIdentifier (Identifier (println)) + USimpleNameReferenceExpression (identifier = println) + UAnnotationMethod (name = AWithInit) + UParameter (name = i) + UAnnotation (fqName = null) + 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 = AWith2Init) + UField (name = str) + UAnnotation (fqName = org.jetbrains.annotations.NotNull) + UAnnotationMethod (name = getStr) + UAnnotationMethod (name = AWith2Init) + UParameter (name = str) + UAnnotation (fqName = org.jetbrains.annotations.NotNull) + UBlockExpression + UBlockExpression + UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) + UIdentifier (Identifier (println)) + USimpleNameReferenceExpression (identifier = println) + ULiteralExpression (value = 1) + UBlockExpression + UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) + UIdentifier (Identifier (println)) + USimpleNameReferenceExpression (identifier = println) + ULiteralExpression (value = 2) + UAnnotationMethod (name = AWith2Init) + UParameter (name = i) + UAnnotation (fqName = null) + 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 = AOnlyInit) + UAnnotationMethod (name = AOnlyInit) + UBlockExpression + UBlockExpression + UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) + UIdentifier (Identifier (println)) + USimpleNameReferenceExpression (identifier = println) + ULiteralExpression (value = 1) + UBlockExpression + UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1)) + UIdentifier (Identifier (println)) + USimpleNameReferenceExpression (identifier = println) + ULiteralExpression (value = 2) + UClass (name = AWithSecondary) + UField (name = a) + UAnnotation (fqName = org.jetbrains.annotations.NotNull) + UAnnotationMethod (name = getA) + UAnnotationMethod (name = setA) + UParameter (name = p) + UAnnotation (fqName = org.jetbrains.annotations.NotNull) + UAnnotationMethod (name = AWithSecondary) + UParameter (name = i) + UAnnotation (fqName = null) + UBlockExpression + UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) + UIdentifier (Identifier ()) + USimpleNameReferenceExpression (identifier = ) + UBinaryExpression (operator = =) + USimpleNameReferenceExpression (identifier = a) + UQualifiedReferenceExpression + USimpleNameReferenceExpression (identifier = i) + UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) + UIdentifier (Identifier (toString)) + USimpleNameReferenceExpression (identifier = toString) + UAnnotationMethod (name = AWithSecondary) + UParameter (name = s) + UAnnotation (fqName = org.jetbrains.annotations.NotNull) + UBlockExpression + UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) + UIdentifier (Identifier ()) + USimpleNameReferenceExpression (identifier = ) + UBinaryExpression (operator = =) + USimpleNameReferenceExpression (identifier = a) + USimpleNameReferenceExpression (identifier = s) + UClass (name = AWithSecondaryInit) + UField (name = a) + UAnnotation (fqName = org.jetbrains.annotations.NotNull) + UAnnotationMethod (name = getA) + UAnnotationMethod (name = setA) + UParameter (name = p) + UAnnotation (fqName = org.jetbrains.annotations.NotNull) + UAnnotationMethod (name = AWithSecondaryInit) + UParameter (name = i) + UAnnotation (fqName = null) + UBlockExpression + UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) + UIdentifier (Identifier ()) + USimpleNameReferenceExpression (identifier = ) + UBlockExpression + UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) + UIdentifier (Identifier (println)) + USimpleNameReferenceExpression (identifier = println) + UBinaryExpression (operator = =) + USimpleNameReferenceExpression (identifier = a) + UQualifiedReferenceExpression + USimpleNameReferenceExpression (identifier = i) + UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) + UIdentifier (Identifier (toString)) + USimpleNameReferenceExpression (identifier = toString) + UAnnotationMethod (name = AWithSecondaryInit) + UParameter (name = s) + UAnnotation (fqName = org.jetbrains.annotations.NotNull) + UBlockExpression + UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) + UIdentifier (Identifier ()) + USimpleNameReferenceExpression (identifier = ) + UBinaryExpression (operator = =) + USimpleNameReferenceExpression (identifier = a) + USimpleNameReferenceExpression (identifier = s) + UDeclarationsExpression + ULocalVariable (name = local) + USimpleNameReferenceExpression (identifier = s) + UQualifiedReferenceExpression + USimpleNameReferenceExpression (identifier = local) + UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) + UIdentifier (Identifier (toString)) + USimpleNameReferenceExpression (identifier = toString) diff --git a/plugins/uast-kotlin/testData/Constructors.render.txt.172 b/plugins/uast-kotlin/testData/Constructors.render.txt.172 new file mode 100644 index 00000000000..f738959f117 --- /dev/null +++ b/plugins/uast-kotlin/testData/Constructors.render.txt.172 @@ -0,0 +1,81 @@ +public final class A { + @org.jetbrains.annotations.NotNull private final var str: java.lang.String + public final fun getStr() : java.lang.String = UastEmptyExpression + public fun A(@org.jetbrains.annotations.NotNull str: java.lang.String) = UastEmptyExpression + public fun A(@null i: int) { + (i.toString()) + } +} + +public final class AWithInit { + @org.jetbrains.annotations.NotNull private final var str: java.lang.String + public final fun getStr() : java.lang.String = UastEmptyExpression + public fun AWithInit(@org.jetbrains.annotations.NotNull str: java.lang.String) { + { + println() + } + } + public fun AWithInit(@null i: int) { + (i.toString()) + } +} + +public final class AWith2Init { + @org.jetbrains.annotations.NotNull private final var str: java.lang.String + public final fun getStr() : java.lang.String = UastEmptyExpression + public fun AWith2Init(@org.jetbrains.annotations.NotNull str: java.lang.String) { + { + println(1) + } + { + println(2) + } + } + public fun AWith2Init(@null i: int) { + (i.toString()) + } +} + +public final class AOnlyInit { + public fun AOnlyInit() { + { + println(1) + } + { + println(2) + } + } +} + +public final class AWithSecondary { + @org.jetbrains.annotations.NotNull public var a: java.lang.String + public final fun getA() : java.lang.String = UastEmptyExpression + public final fun setA(@org.jetbrains.annotations.NotNull p: java.lang.String) : void = UastEmptyExpression + public fun AWithSecondary(@null i: int) { + () + a = i.toString() + } + public fun AWithSecondary(@org.jetbrains.annotations.NotNull s: java.lang.String) { + () + a = s + } +} + +public final class AWithSecondaryInit { + @org.jetbrains.annotations.NotNull public var a: java.lang.String + public final fun getA() : java.lang.String = UastEmptyExpression + public final fun setA(@org.jetbrains.annotations.NotNull p: java.lang.String) : void = UastEmptyExpression + public fun AWithSecondaryInit(@null i: int) { + () + { + println() + } + a = i.toString() + } + public fun AWithSecondaryInit(@org.jetbrains.annotations.NotNull s: java.lang.String) { + () + a = s + var local: java.lang.String = s + local.toString() + } +}