azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

K2: Adjust renaming on import for current package with K1 rules

Browse Source 
Namely, once a file in a package `foo` has import `foo.bar as baz`,
auto imported `bar` from the package name becomes inivisible in the file

^KT-54854 Fixed
This commit is contained in:
Denis.Zharkov
2023-06-22 18:37:57 +02:00
committed by Space Team
parent 5d7ac18778
commit 60f09f6512
11 changed files with 101 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
Generated
+6
View File
@@ -14202,6 +14202,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
runTest("compiler/testData/diagnostics/tests/imports/ImportFromCurrentWithDifferentName.kt");
}
@Test
@TestMetadata("ImportFromCurrentWithDifferentNameComplex.kt")
public void testImportFromCurrentWithDifferentNameComplex() throws Exception {
runTest("compiler/testData/diagnostics/tests/imports/ImportFromCurrentWithDifferentNameComplex.kt");
}
@Test
@TestMetadata("ImportFromObject.kt")
public void testImportFromObject() throws Exception {
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
Generated
+6
View File
@@ -14202,6 +14202,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
runTest("compiler/testData/diagnostics/tests/imports/ImportFromCurrentWithDifferentName.kt");
}
@Test
@TestMetadata("ImportFromCurrentWithDifferentNameComplex.kt")
public void testImportFromCurrentWithDifferentNameComplex() throws Exception {
runTest("compiler/testData/diagnostics/tests/imports/ImportFromCurrentWithDifferentNameComplex.kt");
}
@Test
@TestMetadata("ImportFromObject.kt")
public void testImportFromObject() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -14202,6 +14202,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
runTest("compiler/testData/diagnostics/tests/imports/ImportFromCurrentWithDifferentName.kt");
}
@Test
@TestMetadata("ImportFromCurrentWithDifferentNameComplex.kt")
public void testImportFromCurrentWithDifferentNameComplex() throws Exception {
runTest("compiler/testData/diagnostics/tests/imports/ImportFromCurrentWithDifferentNameComplex.kt");
}
@Test
@TestMetadata("ImportFromObject.kt")
public void testImportFromObject() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -14208,6 +14208,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
runTest("compiler/testData/diagnostics/tests/imports/ImportFromCurrentWithDifferentName.kt");
}
@Test
@TestMetadata("ImportFromCurrentWithDifferentNameComplex.kt")
public void testImportFromCurrentWithDifferentNameComplex() throws Exception {
runTest("compiler/testData/diagnostics/tests/imports/ImportFromCurrentWithDifferentNameComplex.kt");
}
@Test
@TestMetadata("ImportFromObject.kt")
public void testImportFromObject() throws Exception {
compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirPackageMemberScope.kt
+11 -1
View File
@@ -23,17 +23,23 @@ import org.jetbrains.kotlin.utils.SmartList
class FirPackageMemberScope(
val fqName: FqName,
val session: FirSession,
private val symbolProvider: FirSymbolProvider = session.symbolProvider
private val symbolProvider: FirSymbolProvider = session.symbolProvider,
excludedImportNames: Collection<FqName>? = null,
) : FirScope() {
private val classifierCache: MutableMap<Name, FirClassifierSymbol<*>?> = mutableMapOf()
private val functionCache: MutableMap<Name, List<FirNamedFunctionSymbol>> = mutableMapOf()
private val propertyCache: MutableMap<Name, List<FirPropertySymbol>> = mutableMapOf()
private val excludedNames by lazy {
excludedImportNames?.mapNotNullTo(mutableSetOf()) { if (it.parent() == fqName) it.shortName() else null }.orEmpty()
}
override fun processClassifiersByNameWithSubstitution(
name: Name,
processor: (FirClassifierSymbol<*>, ConeSubstitutor) -> Unit
) {
if (name.asString().isEmpty()) return
if (name in excludedNames) return
val symbol = classifierCache.getOrPut(name) {
val unambiguousFqName = ClassId(fqName, name)
@@ -46,6 +52,8 @@ class FirPackageMemberScope(
}
override fun processFunctionsByName(name: Name, processor: (FirNamedFunctionSymbol) -> Unit) {
if (name in excludedNames) return
val symbols = functionCache.getOrPut(name) {
symbolProvider.getTopLevelFunctionSymbols(fqName, name)
}
@@ -55,6 +63,8 @@ class FirPackageMemberScope(
}
override fun processPropertiesByName(name: Name, processor: (FirVariableSymbol<*>) -> Unit) {
if (name in excludedNames) return
val symbols = propertyCache.getOrPut(name) {
symbolProvider.getTopLevelPropertySymbols(fqName, name)
}
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/ImportingScopes.kt
+1 -1
View File
@@ -61,7 +61,7 @@ private fun doCreateImportingScopes(
FirDefaultSimpleImportingScope(session, scopeSession, priority = DefaultImportPriority.HIGH)
},
scopeSession.getOrBuild(file.packageFqName, PACKAGE_MEMBER) {
FirPackageMemberScope(file.packageFqName, session)
FirPackageMemberScope(file.packageFqName, session, excludedImportNames = excludedImportNames)
},
// TODO: explicit simple importing scope should have highest priority (higher than inner scopes added in process)
FirExplicitSimpleImportingScope(file.imports, session, scopeSession)
compiler/testData/diagnostics/tests/imports/ImportFromCurrentWithDifferentName.fir.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
package a
import a.A as ER
interface A {
val a: A
val b: ER
}
compiler/testData/diagnostics/tests/imports/ImportFromCurrentWithDifferentName.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
package a
import a.A as ER
compiler/testData/diagnostics/tests/imports/ImportFromCurrentWithDifferentNameComplex.fir.kt
Vendored
+29
View File
@@ -0,0 +1,29 @@
// ISSUE: KT-54854
package a
import a.A as ER
import a.x as y
import a.foo as bar
val x: Int = 1
fun foo(): Int = 1
class A
interface B {
val a: <!UNRESOLVED_REFERENCE!>A<!>
val b: ER
}
fun main() {
<!UNRESOLVED_REFERENCE!>A<!>()
ER()
a.A()
<!UNRESOLVED_REFERENCE!>x<!> + 1
y + 1
<!UNRESOLVED_REFERENCE!>foo<!>() + 1
bar() + 1
}
compiler/testData/diagnostics/tests/imports/ImportFromCurrentWithDifferentNameComplex.kt
Vendored
+29
View File
@@ -0,0 +1,29 @@
// ISSUE: KT-54854
package a
import a.A as ER
import a.x as y
import a.foo as bar
val x: Int = 1
fun foo(): Int = 1
class A
interface B {
val a: <!UNRESOLVED_REFERENCE!>A<!>
val b: ER
}
fun main() {
<!UNRESOLVED_REFERENCE!>A<!>()
ER()
a.A()
<!UNRESOLVED_REFERENCE!>x<!> <!DEBUG_INFO_MISSING_UNRESOLVED!>+<!> 1
y + 1
<!UNRESOLVED_REFERENCE!>foo<!>() <!DEBUG_INFO_MISSING_UNRESOLVED!>+<!> 1
bar() + 1
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
+6
View File
@@ -14208,6 +14208,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/imports/ImportFromCurrentWithDifferentName.kt");
}
@Test
@TestMetadata("ImportFromCurrentWithDifferentNameComplex.kt")
public void testImportFromCurrentWithDifferentNameComplex() throws Exception {
runTest("compiler/testData/diagnostics/tests/imports/ImportFromCurrentWithDifferentNameComplex.kt");
}
@Test
@TestMetadata("ImportFromObject.kt")
public void testImportFromObject() throws Exception {