From fd8795de996e946d0745a50f10d1f74bcaf1465d Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Mon, 25 Jan 2021 10:33:50 +0300 Subject: [PATCH] [Test] Fix FirIdenticalChecker and update some FIR_IDENTICAL testdata --- .../redeclarations/shadowedExtension/extensionOnErrorType.kt | 2 +- compiler/testData/diagnostics/tests/resolve/CycleInTypeArgs.kt | 2 +- compiler/testData/diagnostics/tests/subtyping/kt304.kt | 2 +- .../kotlin/test/frontend/fir/handlers/FirIdenticalChecker.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/testData/diagnostics/tests/redeclarations/shadowedExtension/extensionOnErrorType.kt b/compiler/testData/diagnostics/tests/redeclarations/shadowedExtension/extensionOnErrorType.kt index 79f828acfd1..006ee80cd51 100644 --- a/compiler/testData/diagnostics/tests/redeclarations/shadowedExtension/extensionOnErrorType.kt +++ b/compiler/testData/diagnostics/tests/redeclarations/shadowedExtension/extensionOnErrorType.kt @@ -6,4 +6,4 @@ interface G { } fun G.foo() {} -val G.bar: Int get() = 42 \ No newline at end of file +val G.bar: Int get() = 42 diff --git a/compiler/testData/diagnostics/tests/resolve/CycleInTypeArgs.kt b/compiler/testData/diagnostics/tests/resolve/CycleInTypeArgs.kt index 7065ae0cf1a..47e10ceebe0 100644 --- a/compiler/testData/diagnostics/tests/resolve/CycleInTypeArgs.kt +++ b/compiler/testData/diagnostics/tests/resolve/CycleInTypeArgs.kt @@ -2,4 +2,4 @@ class Class1X>>> -class Class2X>>> \ No newline at end of file +class Class2X>>> diff --git a/compiler/testData/diagnostics/tests/subtyping/kt304.kt b/compiler/testData/diagnostics/tests/subtyping/kt304.kt index f8eb56c0730..5387c051147 100644 --- a/compiler/testData/diagnostics/tests/subtyping/kt304.kt +++ b/compiler/testData/diagnostics/tests/subtyping/kt304.kt @@ -6,4 +6,4 @@ open class Foo() : Bar() { } open class Bar() { -} \ No newline at end of file +} diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirIdenticalChecker.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirIdenticalChecker.kt index b3008bcdf96..b0cc9954135 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirIdenticalChecker.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/handlers/FirIdenticalChecker.kt @@ -33,7 +33,7 @@ class FirIdenticalChecker(testServices: TestServices) : AfterAnalysisChecker(tes val classicFile = helper.getClassicFileToCompare(testDataFile) if (helper.contentsAreEquals(classicFile, firFile)) { helper.deleteFirFile(testDataFile) - helper.addDirectiveToClassicFileAndAssert(testDataFile) + helper.addDirectiveToClassicFileAndAssert(classicFile) } } else { removeFirFileIfExist(testDataFile)