From 99c7fab40107ff6068057330375e2e56b825b6b1 Mon Sep 17 00:00:00 2001 From: Roman Golyshev Date: Thu, 30 Nov 2023 15:48:36 +0100 Subject: [PATCH] KT-59732 [FIR] Adjust test data for the absence of unresolved imports Now there are no real unresolved imports - all imports are considered resolved starting from the IMPORTS phase and until they are proven otherwise in the checkers. Because of that, some `UNRESOLVED_REFERENCE` diagnostics are gone - in the cases when such references were actually resolved through those unsupported imports. The compilation of incorrect files should not be affected by this, the checkers would still prevent the compilation of the files with incorrect imports. But now the references to the declarations from such imports no longer will be highlighted as unresolved references. --- .../inImport/firstImportNamePart.txt | 2 +- .../inImport/firstImportNamePartScript.txt | 2 +- .../inImport/middleImportNamePart.txt | 2 +- .../inImport/middleImportNamePartScript.txt | 2 +- .../inImport/qualifiedImportNamePart.txt | 2 +- .../qualifiedImportNamePartScript.txt | 2 +- .../inImport/wholeImportDirective.txt | 2 +- .../inImport/wholeImportDirectiveScript.txt | 2 +- .../inImport/wholeImportName.txt | 2 +- .../inImport/wholeImportNameScript.txt | 2 +- .../imports/ImportFromCompanionObject.fir.kt | 6 ++--- .../tests/imports/ImportFromObject.fir.kt | 6 ++--- .../diagnostics/tests/imports/Imports.fir.kt | 2 +- .../tests/imports/twoImportLists.fir.kt | 2 +- .../diagnostics/tests/scopes/kt900-1.fir.kt | 24 +++++++++++++++++++ .../diagnostics/tests/scopes/kt900-1.kt | 1 - .../diagnostics/tests/scopes/kt900-2.fir.kt | 2 +- 17 files changed, 43 insertions(+), 20 deletions(-) create mode 100644 compiler/testData/diagnostics/tests/scopes/kt900-1.fir.kt diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/firstImportNamePart.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/firstImportNamePart.txt index 9778604c7da..dc309f2c7fe 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/firstImportNamePart.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/firstImportNamePart.txt @@ -1,5 +1,5 @@ KT element: KtNameReferenceExpression -FIR element: FirImportImpl +FIR element: FirResolvedImportImpl FIR source kind: KtRealSourceElementKind FIR element rendered: diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/firstImportNamePartScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/firstImportNamePartScript.txt index f48a153ae84..be88ea4e6a3 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/firstImportNamePartScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/firstImportNamePartScript.txt @@ -1,5 +1,5 @@ KT element: KtNameReferenceExpression -FIR element: FirImportImpl +FIR element: FirResolvedImportImpl FIR source kind: KtRealSourceElementKind FIR element rendered: diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/middleImportNamePart.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/middleImportNamePart.txt index a2fd47d36a4..5b6847b4cbc 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/middleImportNamePart.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/middleImportNamePart.txt @@ -1,5 +1,5 @@ KT element: KtNameReferenceExpression -FIR element: FirImportImpl +FIR element: FirResolvedImportImpl FIR source kind: KtRealSourceElementKind FIR element rendered: diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/middleImportNamePartScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/middleImportNamePartScript.txt index 79013e0830e..ed4ee477f06 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/middleImportNamePartScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/middleImportNamePartScript.txt @@ -1,5 +1,5 @@ KT element: KtNameReferenceExpression -FIR element: FirImportImpl +FIR element: FirResolvedImportImpl FIR source kind: KtRealSourceElementKind FIR element rendered: diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/qualifiedImportNamePart.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/qualifiedImportNamePart.txt index b694a450ca5..8f08a2e748e 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/qualifiedImportNamePart.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/qualifiedImportNamePart.txt @@ -1,5 +1,5 @@ KT element: KtDotQualifiedExpression -FIR element: FirImportImpl +FIR element: FirResolvedImportImpl FIR source kind: KtRealSourceElementKind FIR element rendered: diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/qualifiedImportNamePartScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/qualifiedImportNamePartScript.txt index b38c5ef4b60..2b4cecce5a7 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/qualifiedImportNamePartScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/qualifiedImportNamePartScript.txt @@ -1,5 +1,5 @@ KT element: KtDotQualifiedExpression -FIR element: FirImportImpl +FIR element: FirResolvedImportImpl FIR source kind: KtRealSourceElementKind FIR element rendered: diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/wholeImportDirective.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/wholeImportDirective.txt index 2066c30f239..ce25e622039 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/wholeImportDirective.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/wholeImportDirective.txt @@ -1,5 +1,5 @@ KT element: KtImportDirective -FIR element: FirImportImpl +FIR element: FirResolvedImportImpl FIR source kind: KtRealSourceElementKind FIR element rendered: diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/wholeImportDirectiveScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/wholeImportDirectiveScript.txt index d4d92eba5fd..2dabc9c4d5e 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/wholeImportDirectiveScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/wholeImportDirectiveScript.txt @@ -1,5 +1,5 @@ KT element: KtImportDirective -FIR element: FirImportImpl +FIR element: FirResolvedImportImpl FIR source kind: KtRealSourceElementKind FIR element rendered: diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/wholeImportName.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/wholeImportName.txt index 34abbe4aec3..135fb431706 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/wholeImportName.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/wholeImportName.txt @@ -1,5 +1,5 @@ KT element: KtDotQualifiedExpression -FIR element: FirImportImpl +FIR element: FirResolvedImportImpl FIR source kind: KtRealSourceElementKind FIR element rendered: diff --git a/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/wholeImportNameScript.txt b/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/wholeImportNameScript.txt index 62942aef3e2..fe541029f72 100644 --- a/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/wholeImportNameScript.txt +++ b/analysis/low-level-api-fir/testData/getOrBuildFir/inImport/wholeImportNameScript.txt @@ -1,5 +1,5 @@ KT element: KtDotQualifiedExpression -FIR element: FirImportImpl +FIR element: FirResolvedImportImpl FIR source kind: KtRealSourceElementKind FIR element rendered: diff --git a/compiler/testData/diagnostics/tests/imports/ImportFromCompanionObject.fir.kt b/compiler/testData/diagnostics/tests/imports/ImportFromCompanionObject.fir.kt index fa0c1a9cb51..5d57ca1ce9b 100644 --- a/compiler/testData/diagnostics/tests/imports/ImportFromCompanionObject.fir.kt +++ b/compiler/testData/diagnostics/tests/imports/ImportFromCompanionObject.fir.kt @@ -63,9 +63,9 @@ package b import a.C1.O.* fun testErroneusAllUnderImportFromObject() { - A() - B - bar() + A() + B + bar() } // FILE: c.kt diff --git a/compiler/testData/diagnostics/tests/imports/ImportFromObject.fir.kt b/compiler/testData/diagnostics/tests/imports/ImportFromObject.fir.kt index 9b49913ce19..a7039a2635c 100644 --- a/compiler/testData/diagnostics/tests/imports/ImportFromObject.fir.kt +++ b/compiler/testData/diagnostics/tests/imports/ImportFromObject.fir.kt @@ -57,9 +57,9 @@ package b import a.O.* fun testErroneusAllUnderImportFromObject() { - A() - B - bar() + A() + B + bar() } // FILE: c.kt diff --git a/compiler/testData/diagnostics/tests/imports/Imports.fir.kt b/compiler/testData/diagnostics/tests/imports/Imports.fir.kt index ca0512d883a..3559cb74ea4 100644 --- a/compiler/testData/diagnostics/tests/imports/Imports.fir.kt +++ b/compiler/testData/diagnostics/tests/imports/Imports.fir.kt @@ -81,7 +81,7 @@ object C { } fun foo() { - if (i == 3) f() + if (i == 3) f() } //FILE:d.kt diff --git a/compiler/testData/diagnostics/tests/imports/twoImportLists.fir.kt b/compiler/testData/diagnostics/tests/imports/twoImportLists.fir.kt index 3ee6f3d97b4..74d62f9117c 100644 --- a/compiler/testData/diagnostics/tests/imports/twoImportLists.fir.kt +++ b/compiler/testData/diagnostics/tests/imports/twoImportLists.fir.kt @@ -84,7 +84,7 @@ object C { } fun foo() { - if (i == 3) f() + if (i == 3) f() } //FILE:d.kt diff --git a/compiler/testData/diagnostics/tests/scopes/kt900-1.fir.kt b/compiler/testData/diagnostics/tests/scopes/kt900-1.fir.kt new file mode 100644 index 00000000000..cbaac154779 --- /dev/null +++ b/compiler/testData/diagnostics/tests/scopes/kt900-1.fir.kt @@ -0,0 +1,24 @@ +// import all members from companion object +package c + +import c.A.Companion.B +import c.M.* + +fun foo() { + val b: B = B() + var r: R = R() +} + +class A() { + companion object { + class B() { + companion object { + } + } + } +} + +object M { + fun foo() {} + class R() {} +} diff --git a/compiler/testData/diagnostics/tests/scopes/kt900-1.kt b/compiler/testData/diagnostics/tests/scopes/kt900-1.kt index 4faf6bb7b22..55602aa81bd 100644 --- a/compiler/testData/diagnostics/tests/scopes/kt900-1.kt +++ b/compiler/testData/diagnostics/tests/scopes/kt900-1.kt @@ -1,4 +1,3 @@ -// FIR_IDENTICAL // import all members from companion object package c diff --git a/compiler/testData/diagnostics/tests/scopes/kt900-2.fir.kt b/compiler/testData/diagnostics/tests/scopes/kt900-2.fir.kt index b67a139ebf3..c89932677b3 100644 --- a/compiler/testData/diagnostics/tests/scopes/kt900-2.fir.kt +++ b/compiler/testData/diagnostics/tests/scopes/kt900-2.fir.kt @@ -14,7 +14,7 @@ val y: T = Y fun f() { bar() R.bar() - B.foo() + B.foo() } object M {