From 3152d722cddee60a469f09579e8aa3bd528a509d Mon Sep 17 00:00:00 2001
From: Stanislav Erokhin <Stanislav.Erokhin@jetbrains.com>
Date: Sun, 23 Aug 2015 17:32:15 +0300
Subject: [PATCH] Fix bug in ScopeUtils.

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

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/utils/ScopeUtils.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/utils/ScopeUtils.kt
index cf6b6ecb424..9b9dc1ca771 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/utils/ScopeUtils.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/utils/ScopeUtils.kt
@@ -138,7 +138,6 @@ private inline fun <T: Any> LexicalScope.collectFromMeAndParent(
         if (element != null) {
             if (result == null) {
                 result = SmartList()
-                return emptyList()
             }
             result!!.add(element)
         }