From fae0aa42c4b4f82ff0b7cc24b40e0d0804835d5e Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Wed, 24 Mar 2021 14:10:43 +0300 Subject: [PATCH] [FIR] Update testdata broken in de03124f --- .../psi2fir/testData/rawBuilder/declarations/annotation.txt | 2 +- .../testData/rawBuilder/declarations/derivedClass.txt | 2 +- .../psi2fir/testData/rawBuilder/declarations/enums.txt | 6 +++--- .../psi2fir/testData/rawBuilder/declarations/enums2.txt | 2 +- .../testData/rawBuilder/declarations/nestedClass.txt | 2 +- .../psi2fir/testData/rawBuilder/expressions/annotated.txt | 4 ++-- .../psi2fir/testData/rawBuilder/expressions/arrayAccess.txt | 2 +- .../psi2fir/testData/rawBuilder/expressions/calls.txt | 2 +- .../testData/rawBuilder/expressions/collectionLiterals.txt | 6 +++--- .../testData/rawBuilder/expressions/destructuring.txt | 6 +++--- .../raw-fir/psi2fir/testData/rawBuilder/expressions/for.txt | 4 ++-- .../psi2fir/testData/rawBuilder/expressions/lambda.txt | 4 ++-- .../psi2fir/testData/rawBuilder/expressions/locals.txt | 2 +- .../psi2fir/testData/rawBuilder/expressions/unary.txt | 4 ++-- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/annotation.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/annotation.txt index d845402884b..d88eb8f8346 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/annotation.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/annotation.txt @@ -16,7 +16,7 @@ FILE: annotation.kt super() } - @base() public? final? [IsFromVarargKey=false] val x: Int = R|/x| + @base() public? final? [IsFromPrimaryConstructor=true] val x: Int = R|/x| public? get(): Int @base() public? [ContainingClassKey=correct] constructor(): R|correct| { diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/derivedClass.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/derivedClass.txt index 455c033df97..53ecbc6f651 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/derivedClass.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/derivedClass.txt @@ -4,7 +4,7 @@ FILE: derivedClass.kt super() } - public? final? [IsFromVarargKey=false] val x: T = R|/x| + public? final? [IsFromPrimaryConstructor=true] val x: T = R|/x| public? get(): T } diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/enums.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/enums.txt index fb945f9aabe..3b13e972119 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/enums.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/enums.txt @@ -19,10 +19,10 @@ FILE: enums.kt super|>() } - public? final? [IsFromVarargKey=false] val m: Double = R|/m| + public? final? [IsFromPrimaryConstructor=true] val m: Double = R|/m| public? get(): Double - internal final? [IsFromVarargKey=false] val r: Double = R|/r| + internal final? [IsFromPrimaryConstructor=true] val r: Double = R|/r| internal get(): Double public final static [ContainingClassKey=Planet] enum entry MERCURY: R|Planet| = object : R|Planet| { @@ -85,7 +85,7 @@ FILE: enums.kt super|>() } - public? final? [IsFromVarargKey=false] val signature: String = R|/signature| + public? final? [IsFromPrimaryConstructor=true] val signature: String = R|/signature| public? get(): String public final static [ContainingClassKey=PseudoInsn] enum entry FIX_STACK_BEFORE_JUMP: R|PseudoInsn| = object : R|PseudoInsn| { diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/enums2.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/enums2.txt index 0a4c7ac8a69..b55a76a0577 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/enums2.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/enums2.txt @@ -18,7 +18,7 @@ FILE: enums2.kt super|>() } - public? final? [IsFromVarargKey=false] val x: Some = R|/x| + public? final? [IsFromPrimaryConstructor=true] val x: Some = R|/x| public? get(): Some public final static [ContainingClassKey=SomeEnum] enum entry FIRST: R|SomeEnum| = object : R|SomeEnum| { diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/nestedClass.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/nestedClass.txt index 76f6c3b7075..49d09061a30 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/nestedClass.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/declarations/nestedClass.txt @@ -4,7 +4,7 @@ FILE: nestedClass.kt super() } - public? final? [IsFromVarargKey=false] val s: String = R|/s| + public? final? [IsFromPrimaryConstructor=true] val s: String = R|/s| public? get(): String } diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/annotated.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/annotated.txt index 42a5a7a75e7..7f39ccd7c30 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/annotated.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/annotated.txt @@ -25,10 +25,10 @@ FILE: annotated.kt super() } - public? final? [IsFromVarargKey=false] val x: Int = R|/x| + public? final? [IsFromPrimaryConstructor=true] val x: Int = R|/x| public? get(): Int - public? final? [IsFromVarargKey=false] val y: Int = R|/y| + public? final? [IsFromPrimaryConstructor=true] val y: Int = R|/y| public? get(): Int public final operator fun component1(): Int diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/arrayAccess.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/arrayAccess.txt index 3e56af1a3f9..d7e5460fb14 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/arrayAccess.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/arrayAccess.txt @@ -9,7 +9,7 @@ FILE: arrayAccess.kt super() } - public? final? [IsFromVarargKey=false] val v: IntArray = R|/v| + public? final? [IsFromPrimaryConstructor=true] val v: IntArray = R|/v| public? get(): IntArray } diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/calls.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/calls.txt index a94e3eac89e..f2456c0b04a 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/calls.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/calls.txt @@ -13,7 +13,7 @@ FILE: calls.kt super() } - public? final? [IsFromVarargKey=false] var x: Int = R|/x| + public? final? [IsFromPrimaryConstructor=true] var x: Int = R|/x| public? get(): Int public? set(value: Int): R|kotlin/Unit| diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/collectionLiterals.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/collectionLiterals.txt index 96df81cff65..d9d66d54da9 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/collectionLiterals.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/collectionLiterals.txt @@ -4,7 +4,7 @@ FILE: collectionLiterals.kt super() } - public? final? [IsFromVarargKey=false] val arr: IntArray = R|/arr| + public? final? [IsFromPrimaryConstructor=true] val arr: IntArray = R|/arr| public? get(): IntArray } @@ -13,7 +13,7 @@ FILE: collectionLiterals.kt super() } - public? final? [IsFromVarargKey=false] val arr: DoubleArray = R|/arr| + public? final? [IsFromPrimaryConstructor=true] val arr: DoubleArray = R|/arr| public? get(): DoubleArray } @@ -22,7 +22,7 @@ FILE: collectionLiterals.kt super() } - public? final? [IsFromVarargKey=false] val arr: Array = R|/arr| + public? final? [IsFromPrimaryConstructor=true] val arr: Array = R|/arr| public? get(): Array } diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt index 0b3b6e01049..f6e3bbab64a 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/destructuring.txt @@ -4,13 +4,13 @@ FILE: destructuring.kt super() } - public? final? [IsFromVarargKey=false] val first: Int = R|/first| + public? final? [IsFromPrimaryConstructor=true] val first: Int = R|/first| public? get(): Int - public? final? [IsFromVarargKey=false] val second: Double = R|/second| + public? final? [IsFromPrimaryConstructor=true] val second: Double = R|/second| public? get(): Double - public? final? [IsFromVarargKey=false] val third: String = R|/third| + public? final? [IsFromPrimaryConstructor=true] val third: String = R|/third| public? get(): String public final operator fun component1(): Int diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/for.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/for.txt index 52b7d65f6c0..1109e2fa975 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/for.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/for.txt @@ -42,10 +42,10 @@ FILE: for.kt super() } - public? final? [IsFromVarargKey=false] val x: Int = R|/x| + public? final? [IsFromPrimaryConstructor=true] val x: Int = R|/x| public? get(): Int - public? final? [IsFromVarargKey=false] val y: Int = R|/y| + public? final? [IsFromPrimaryConstructor=true] val y: Int = R|/y| public? get(): Int public final operator fun component1(): Int diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/lambda.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/lambda.txt index 99650853a68..ca55cd8508c 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/lambda.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/lambda.txt @@ -4,10 +4,10 @@ FILE: lambda.kt super() } - public? final? [IsFromVarargKey=false] val x: Int = R|/x| + public? final? [IsFromPrimaryConstructor=true] val x: Int = R|/x| public? get(): Int - public? final? [IsFromVarargKey=false] val y: Int = R|/y| + public? final? [IsFromPrimaryConstructor=true] val y: Int = R|/y| public? get(): Int public final operator fun component1(): Int diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/locals.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/locals.txt index 7aba4988767..631ca1b3588 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/locals.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/locals.txt @@ -5,7 +5,7 @@ FILE: locals.kt super() } - public? final? [IsFromVarargKey=false] val pp: Int = R|/pp| + public? final? [IsFromPrimaryConstructor=true] val pp: Int = R|/pp| public? get(): Int public? final? fun diff(): { diff --git a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/unary.txt b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/unary.txt index da4be2d232f..8111e78ee58 100644 --- a/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/unary.txt +++ b/compiler/fir/raw-fir/psi2fir/testData/rawBuilder/expressions/unary.txt @@ -35,7 +35,7 @@ FILE: unary.kt super() } - public? final? [IsFromVarargKey=false] val i: Int = R|/i| + public? final? [IsFromPrimaryConstructor=true] val i: Int = R|/i| public? get(): Int } @@ -78,7 +78,7 @@ FILE: unary.kt super() } - public? final? [IsFromVarargKey=false] val arr: Array = R|/arr| + public? final? [IsFromPrimaryConstructor=true] val arr: Array = R|/arr| public? get(): Array }