From ca484fae2ccfb4f166467981134fedf2d76cf56c Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Mon, 5 Feb 2024 20:45:51 +0100 Subject: [PATCH] [LL FIR] KtFirReferenceShortener: add order for FirScriptDeclarationsScope It is similar mostly to FirClassUseSiteMemberScope or NestedClassifier ^KT-65344 --- .../analysis/api/fir/components/KtFirReferenceShortener.kt | 2 ++ .../shortenRange/callInsideScriptExpression.txt | 1 + 2 files changed, 3 insertions(+) diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirReferenceShortener.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirReferenceShortener.kt index 95722af82cb..e91ddb4c672 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirReferenceShortener.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirReferenceShortener.kt @@ -709,6 +709,7 @@ private class ElementsToShortenCollector( val scopeDistanceLevel: Int // Note: Don't use the built-in ordinal since there are some scopes that are at the same level. ) { Local(1), + ScriptDeclarations(2), ClassUseSite(2), NestedClassifier(2), TypeParameter(2), @@ -721,6 +722,7 @@ private class ElementsToShortenCollector( fun FirScope.toPartialOrder(): PartialOrderOfScope { return when (this) { is FirLocalScope -> Local + is FirScriptDeclarationsScope -> ScriptDeclarations is FirClassUseSiteMemberScope -> ClassUseSite is FirNestedClassifierScope -> NestedClassifier is FirTypeParameterScope -> TypeParameter diff --git a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/callInsideScriptExpression.txt b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/callInsideScriptExpression.txt index ee6b4ea2911..cc6d7017164 100644 --- a/analysis/analysis-api/testData/components/referenceShortener/shortenRange/callInsideScriptExpression.txt +++ b/analysis/analysis-api/testData/components/referenceShortener/shortenRange/callInsideScriptExpression.txt @@ -3,6 +3,7 @@ with default settings: [qualifier] one.A with DO_NOT_SHORTEN: with SHORTEN_IF_ALREADY_IMPORTED: +[qualifier] one.A with SHORTEN_AND_IMPORT: [qualifier] one.A with SHORTEN_AND_STAR_IMPORT: