From 8cd35f67fdb6a0a10bd585831441006cff4eeda4 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Mon, 7 Nov 2016 13:56:26 +0300
Subject: [PATCH] More correct implementation of addImportingScopes

---
 .../src/org/jetbrains/kotlin/resolve/scopes/utils/ScopeUtils.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/scopes/utils/ScopeUtils.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/scopes/utils/ScopeUtils.kt
index 51209f389d4..03027108ef4 100644
--- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/scopes/utils/ScopeUtils.kt
+++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/scopes/utils/ScopeUtils.kt
@@ -180,7 +180,7 @@ fun LexicalScope.addImportingScopes(importScopes: List<ImportingScope>): Lexical
     val lastLexicalScope = parentsWithSelf.last { it is LexicalScope }
     val firstImporting = lastLexicalScope.parent as ImportingScope
     val newFirstImporting = chainImportingScopes(importScopes, firstImporting)
-    return LexicalScopeWrapper(this, newFirstImporting!!)
+    return replaceImportingScopes(newFirstImporting)
 }
 
 fun LexicalScope.addImportingScope(importScope: ImportingScope): LexicalScope