From 2d4d48b401c0a1564f937088ecf0731eb45a8f6d Mon Sep 17 00:00:00 2001 From: Roman Golyshev Date: Wed, 9 Sep 2020 12:09:09 +0300 Subject: [PATCH] FIR IDE: Invert the order of the scopes for completion This way local declarations will be fetched first --- .../idea/frontend/api/fir/components/KtFirScopeProvider.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirScopeProvider.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirScopeProvider.kt index f438497a37a..2398a1599ff 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirScopeProvider.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirScopeProvider.kt @@ -137,7 +137,10 @@ internal class KtFirScopeProvider( firLocalScopes.mapTo(this, ::convertToKtScope) } - KtScopeContext(getCompositeScope(allKtScopes), implicitReceiversTypes) + KtScopeContext( + getCompositeScope(allKtScopes.asReversed()), + implicitReceiversTypes.asReversed() + ) } private fun KtFile.findFunctionDeclarationAt(offset: Int): KtNamedFunction? =