From f489e4044ff7528f273f085feded2ebab41aabb5 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Fri, 17 Apr 2020 13:22:19 +0300 Subject: [PATCH] [FIR-TEST] Update testdata after removal bodies of synthetic data class funs --- .../testData/resolve/constantValues.txt | 28 ++++------------ .../analysis-tests/testData/resolve/copy.txt | 12 ++----- .../diagnostics/incompatibleModifiers.txt | 32 +++++-------------- .../testData/resolve/problems2.txt | 16 +++------- .../testData/resolveWithStdlib/components.txt | 12 ++----- 5 files changed, 25 insertions(+), 75 deletions(-) diff --git a/compiler/fir/analysis-tests/testData/resolve/constantValues.txt b/compiler/fir/analysis-tests/testData/resolve/constantValues.txt index b733892d9e1..9eb98c7d42e 100644 --- a/compiler/fir/analysis-tests/testData/resolve/constantValues.txt +++ b/compiler/fir/analysis-tests/testData/resolve/constantValues.txt @@ -19,17 +19,11 @@ FILE: constantValues.kt public final val arrayNestedness: R|kotlin/Int| = R|/arrayNestedness| public get(): R|kotlin/Int| - public final fun component1(): R|ClassId| { - ^component1 this@R|/ClassLiteralValue|.R|/ClassLiteralValue.classId| - } + public final fun component1(): R|ClassId| - public final fun component2(): R|kotlin/Int| { - ^component2 this@R|/ClassLiteralValue|.R|/ClassLiteralValue.arrayNestedness| - } + public final fun component2(): R|kotlin/Int| - public final fun copy(classId: R|ClassId| = this@R|/ClassLiteralValue|.R|/ClassLiteralValue.classId|, arrayNestedness: R|kotlin/Int| = this@R|/ClassLiteralValue|.R|/ClassLiteralValue.arrayNestedness|): R|ClassLiteralValue| { - ^copy R|/ClassLiteralValue.ClassLiteralValue|(this@R|/ClassLiteralValue|.R|/ClassLiteralValue.classId|, this@R|/ClassLiteralValue|.R|/ClassLiteralValue.arrayNestedness|) - } + public final fun copy(classId: R|ClassId| = this@R|/ClassLiteralValue|.R|/ClassLiteralValue.classId|, arrayNestedness: R|kotlin/Int| = this@R|/ClassLiteralValue|.R|/ClassLiteralValue.arrayNestedness|): R|ClassLiteralValue| } public final class ClassId : R|kotlin/Any| { @@ -68,13 +62,9 @@ FILE: constantValues.kt public final val arrayDimensions: R|kotlin/Int| public get(): R|kotlin/Int| - public final fun component1(): R|ClassLiteralValue| { - ^component1 this@R|/KClassValue.Value.NormalClass|.R|/KClassValue.Value.NormalClass.value| - } + public final fun component1(): R|ClassLiteralValue| - public final fun copy(value: R|ClassLiteralValue| = this@R|/KClassValue.Value.NormalClass|.R|/KClassValue.Value.NormalClass.value|): R|KClassValue.Value.NormalClass| { - ^copy R|/KClassValue.Value.NormalClass.NormalClass|(this@R|/KClassValue.Value.NormalClass|.R|/KClassValue.Value.NormalClass.value|) - } + public final fun copy(value: R|ClassLiteralValue| = this@R|/KClassValue.Value.NormalClass|.R|/KClassValue.Value.NormalClass.value|): R|KClassValue.Value.NormalClass| } @@ -86,13 +76,9 @@ FILE: constantValues.kt public final val type: R|KotlinType| = R|/type| public get(): R|KotlinType| - public final fun component1(): R|KotlinType| { - ^component1 this@R|/KClassValue.Value.LocalClass|.R|/KClassValue.Value.LocalClass.type| - } + public final fun component1(): R|KotlinType| - public final fun copy(type: R|KotlinType| = this@R|/KClassValue.Value.LocalClass|.R|/KClassValue.Value.LocalClass.type|): R|KClassValue.Value.LocalClass| { - ^copy R|/KClassValue.Value.LocalClass.LocalClass|(this@R|/KClassValue.Value.LocalClass|.R|/KClassValue.Value.LocalClass.type|) - } + public final fun copy(type: R|KotlinType| = this@R|/KClassValue.Value.LocalClass|.R|/KClassValue.Value.LocalClass.type|): R|KClassValue.Value.LocalClass| } diff --git a/compiler/fir/analysis-tests/testData/resolve/copy.txt b/compiler/fir/analysis-tests/testData/resolve/copy.txt index e4603034727..a6bbbc6e633 100644 --- a/compiler/fir/analysis-tests/testData/resolve/copy.txt +++ b/compiler/fir/analysis-tests/testData/resolve/copy.txt @@ -10,17 +10,11 @@ FILE: copy.kt public final val y: R|kotlin/String| = R|/y| public get(): R|kotlin/String| - public final fun component1(): R|kotlin/Int| { - ^component1 this@R|/Some|.R|/Some.x| - } + public final fun component1(): R|kotlin/Int| - public final fun component2(): R|kotlin/String| { - ^component2 this@R|/Some|.R|/Some.y| - } + public final fun component2(): R|kotlin/String| - public final fun copy(x: R|kotlin/Int| = this@R|/Some|.R|/Some.x|, y: R|kotlin/String| = this@R|/Some|.R|/Some.y|): R|Some| { - ^copy R|/Some.Some|(this@R|/Some|.R|/Some.x|, this@R|/Some|.R|/Some.y|) - } + public final fun copy(x: R|kotlin/Int| = this@R|/Some|.R|/Some.x|, y: R|kotlin/String| = this@R|/Some|.R|/Some.y|): R|Some| } public final fun test(some: R|Some|): R|kotlin/Unit| { diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/incompatibleModifiers.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/incompatibleModifiers.txt index 4835a4ae72e..cbb3ea84733 100644 --- a/compiler/fir/analysis-tests/testData/resolve/diagnostics/incompatibleModifiers.txt +++ b/compiler/fir/analysis-tests/testData/resolve/diagnostics/incompatibleModifiers.txt @@ -51,13 +51,9 @@ FILE: incompatibleModifiers.kt public final val i: R|kotlin/Int| = R|/i| public get(): R|kotlin/Int| - public final fun component1(): R|kotlin/Int| { - ^component1 this@R|/H|.R|/H.i| - } + public final fun component1(): R|kotlin/Int| - public final fun copy(i: R|kotlin/Int| = this@R|/H|.R|/H.i|): R|H| { - ^copy R|/H.H|(this@R|/H|.R|/H.i|) - } + public final fun copy(i: R|kotlin/Int| = this@R|/H|.R|/H.i|): R|H| } public sealed data class I : R|kotlin/Any| { @@ -68,13 +64,9 @@ FILE: incompatibleModifiers.kt public final val i: R|kotlin/Int| = R|/i| public get(): R|kotlin/Int| - public final fun component1(): R|kotlin/Int| { - ^component1 this@R|/I|.R|/I.i| - } + public final fun component1(): R|kotlin/Int| - public final fun copy(i: R|kotlin/Int| = this@R|/I|.R|/I.i|): R|I| { - ^copy R|/I.I|(this@R|/I|.R|/I.i|) - } + public final fun copy(i: R|kotlin/Int| = this@R|/I|.R|/I.i|): R|I| } public final data inline class J : R|kotlin/Any| { @@ -85,13 +77,9 @@ FILE: incompatibleModifiers.kt public final val i: R|kotlin/Int| = R|/i| public get(): R|kotlin/Int| - public final fun component1(): R|kotlin/Int| { - ^component1 this@R|/J|.R|/J.i| - } + public final fun component1(): R|kotlin/Int| - public final fun copy(i: R|kotlin/Int| = this@R|/J|.R|/J.i|): R|J| { - ^copy R|/J.J|(this@R|/J|.R|/J.i|) - } + public final fun copy(i: R|kotlin/Int| = this@R|/J|.R|/J.i|): R|J| } public abstract class K : R|kotlin/Any| { @@ -131,13 +119,9 @@ FILE: incompatibleModifiers.kt public final val i: R|kotlin/Int| = R|/i| public get(): R|kotlin/Int| - public final fun component1(): R|kotlin/Int| { - ^component1 this@R|/X.Y|.R|/X.Y.i| - } + public final fun component1(): R|kotlin/Int| - public final fun copy(i: R|kotlin/Int| = this@R|/X.Y|.R|/X.Y.i|): R|X.Y| { - ^copy R|/X.Y.Y|(this@R|/X.Y|.R|/X.Y.i|) - } + public final fun copy(i: R|kotlin/Int| = this@R|/X.Y|.R|/X.Y.i|): R|X.Y| } diff --git a/compiler/fir/analysis-tests/testData/resolve/problems2.txt b/compiler/fir/analysis-tests/testData/resolve/problems2.txt index ee40422fecd..0d4d591ad3b 100644 --- a/compiler/fir/analysis-tests/testData/resolve/problems2.txt +++ b/compiler/fir/analysis-tests/testData/resolve/problems2.txt @@ -42,21 +42,13 @@ FILE: problems2.kt public final val s: R|kotlin/String?| = R|/s| public get(): R|kotlin/String?| - public final fun component1(): R|kotlin/Int| { - ^component1 this@R|/Some.WithPrimary|.R|/Some.WithPrimary.x| - } + public final fun component1(): R|kotlin/Int| - public final fun component2(): R|kotlin/Array?| { - ^component2 this@R|/Some.WithPrimary|.R|/Some.WithPrimary.arr| - } + public final fun component2(): R|kotlin/Array?| - public final fun component3(): R|kotlin/String?| { - ^component3 this@R|/Some.WithPrimary|.R|/Some.WithPrimary.s| - } + public final fun component3(): R|kotlin/String?| - public final fun copy(x: R|kotlin/Int| = this@R|/Some.WithPrimary|.R|/Some.WithPrimary.x|, arr: R|kotlin/Array?| = this@R|/Some.WithPrimary|.R|/Some.WithPrimary.arr|, s: R|kotlin/String?| = this@R|/Some.WithPrimary|.R|/Some.WithPrimary.s|): R|Some.WithPrimary| { - ^copy R|/Some.WithPrimary.WithPrimary|(this@R|/Some.WithPrimary|.R|/Some.WithPrimary.x|, this@R|/Some.WithPrimary|.R|/Some.WithPrimary.arr|, this@R|/Some.WithPrimary|.R|/Some.WithPrimary.s|) - } + public final fun copy(x: R|kotlin/Int| = this@R|/Some.WithPrimary|.R|/Some.WithPrimary.x|, arr: R|kotlin/Array?| = this@R|/Some.WithPrimary|.R|/Some.WithPrimary.arr|, s: R|kotlin/String?| = this@R|/Some.WithPrimary|.R|/Some.WithPrimary.s|): R|Some.WithPrimary| } diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/components.txt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/components.txt index b3c21a03207..c8415232c5e 100644 --- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/components.txt +++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/components.txt @@ -10,17 +10,11 @@ FILE: components.kt public final val y: R|kotlin/String| = R|/y| public get(): R|kotlin/String| - public final fun component1(): R|kotlin/Int| { - ^component1 this@R|/D|.R|/D.x| - } + public final fun component1(): R|kotlin/Int| - public final fun component2(): R|kotlin/String| { - ^component2 this@R|/D|.R|/D.y| - } + public final fun component2(): R|kotlin/String| - public final fun copy(x: R|kotlin/Int| = this@R|/D|.R|/D.x|, y: R|kotlin/String| = this@R|/D|.R|/D.y|): R|D| { - ^copy R|/D.D|(this@R|/D|.R|/D.x|, this@R|/D|.R|/D.y|) - } + public final fun copy(x: R|kotlin/Int| = this@R|/D|.R|/D.x|, y: R|kotlin/String| = this@R|/D|.R|/D.y|): R|D| } public final fun foo(list: R|kotlin/collections/List|): R|kotlin/Unit| {