From c5afc219b998dec46f561518344abb5c64a32d60 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Fri, 21 Nov 2014 18:14:08 +0300
Subject: [PATCH] Added assert + removed qualified names

---
 .../jetbrains/jet/generators/injectors/GenerateInjectors.kt  | 2 +-
 .../jet/lang/resolve/lazy/PartialBodyResolveFilter.kt        | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/generators/src/org/jetbrains/jet/generators/injectors/GenerateInjectors.kt b/generators/src/org/jetbrains/jet/generators/injectors/GenerateInjectors.kt
index fa54baf0588..ba23b446565 100644
--- a/generators/src/org/jetbrains/jet/generators/injectors/GenerateInjectors.kt
+++ b/generators/src/org/jetbrains/jet/generators/injectors/GenerateInjectors.kt
@@ -258,7 +258,7 @@ private fun generatorForBodyResolve() =
             parameter(javaClass<BindingTrace>())
             parameter(javaClass<ModuleDescriptor>(), useAsContext = true)
             parameter(javaClass<AdditionalCheckerProvider>())
-            parameter(javaClass<org.jetbrains.jet.lang.resolve.PartialBodyResolveProvider>())
+            parameter(javaClass<PartialBodyResolveProvider>())
 
             publicField(javaClass<BodyResolver>())
         }
diff --git a/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/PartialBodyResolveFilter.kt b/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/PartialBodyResolveFilter.kt
index 442846df196..8b2ac0dcd4a 100644
--- a/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/PartialBodyResolveFilter.kt
+++ b/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/PartialBodyResolveFilter.kt
@@ -28,6 +28,7 @@ import org.jetbrains.jet.JetNodeTypes
 import org.jetbrains.jet.lang.psi.psiUtil.isProbablyNothing
 import org.jetbrains.jet.utils.addToStdlib.firstIsInstanceOrNull
 import org.jetbrains.jet.lang.psi.psiUtil.isAncestor
+import org.jetbrains.jet.lang.resolve.PartialBodyResolveProvider
 
 //TODO: do resolve anonymous object's body
 
@@ -35,7 +36,7 @@ class PartialBodyResolveFilter(
         elementToResolve: JetElement,
         private val declaration: JetDeclaration,
         probablyNothingCallableNames: ProbablyNothingCallableNames
-) : org.jetbrains.jet.lang.resolve.PartialBodyResolveProvider() {
+) : PartialBodyResolveProvider() {
 
     private val statementMarks = StatementMarks()
 
@@ -46,6 +47,8 @@ class PartialBodyResolveFilter(
 
     ;{
         assert(declaration.isAncestor(elementToResolve))
+        assert(!JetPsiUtil.isLocal(declaration),
+               "Should never be invoked on local declaration otherwise we may miss some local declarations with type Nothing")
 
         declaration.accept(object : JetVisitorVoid() {
             override fun visitNamedFunction(function: JetNamedFunction) {