Try to diagnose NoDescriptorForDeclarationException in completion

compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt

@@ -22,12 +22,8 @@ import org.jetbrains.kotlin.context.ModuleContext
 import org.jetbrains.kotlin.extensions.StorageComponentContainerContributor
 import org.jetbrains.kotlin.incremental.components.LookupTracker
 import org.jetbrains.kotlin.resolve.*
-import org.jetbrains.kotlin.resolve.lazy.FileScopeProvider
-import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer
-import org.jetbrains.kotlin.resolve.lazy.NoTopLevelDescriptorProvider
-import org.jetbrains.kotlin.resolve.lazy.ResolveSession
+import org.jetbrains.kotlin.resolve.lazy.*
 import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory
-import org.jetbrains.kotlin.resolve.scopes.SyntheticScopes
 import org.jetbrains.kotlin.types.expressions.DeclarationScopeProviderForLocalClassifierAnalyzer
 import org.jetbrains.kotlin.types.expressions.LocalClassDescriptorHolder
 import org.jetbrains.kotlin.types.expressions.LocalLazyDeclarationResolver
@@ -90,6 +86,7 @@ fun createContainerForLazyBodyResolve(
     useInstance(kotlinCodeAnalyzer.getFileScopeProvider())
     useInstance(bodyResolveCache)
     useImpl<LazyTopDownAnalyzerForTopLevel>()
+    useImpl<BasicAbsentDescriptorHandler>()
 }
 
 fun createContainerForLazyLocalClassifierAnalyzer(

compiler/frontend/src/org/jetbrains/kotlin/resolve/CompilerEnvironment.kt

@@ -20,10 +20,12 @@ import org.jetbrains.kotlin.container.StorageComponentContainer
 import org.jetbrains.kotlin.container.useImpl
 import org.jetbrains.kotlin.container.useInstance
 import org.jetbrains.kotlin.resolve.lazy.CompilerLocalDescriptorResolver
+import org.jetbrains.kotlin.resolve.lazy.BasicAbsentDescriptorHandler
 
 object CompilerEnvironment : TargetEnvironment("Compiler") {
     override fun configure(container: StorageComponentContainer) {
         container.useInstance(BodyResolveCache.ThrowException)
         container.useImpl<CompilerLocalDescriptorResolver>()
+        container.useImpl<BasicAbsentDescriptorHandler>()
     }
 }

compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/AbsentDescriptorHandler.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,18 @@
 
 package org.jetbrains.kotlin.resolve.lazy
 
+import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext
 
-class NoDescriptorForDeclarationException(declaration: KtDeclaration) :
-        IllegalStateException("Descriptor wasn't found for declaration $declaration\n${declaration.getElementTextWithContext()}")
+interface AbsentDescriptorHandler {
+    fun diagnoseDescriptorNotFound(declaration: KtDeclaration): DeclarationDescriptor
+}
+
+class BasicAbsentDescriptorHandler : AbsentDescriptorHandler {
+    override fun diagnoseDescriptorNotFound(declaration: KtDeclaration) = throw NoDescriptorForDeclarationException(declaration)
+}
+
+class NoDescriptorForDeclarationException @JvmOverloads constructor(declaration: KtDeclaration, additionalDetails: String? = null) :
+        IllegalStateException("Descriptor wasn't found for declaration $declaration\n${declaration.getElementTextWithContext()}"
+                              + (additionalDetails?.let { "\n---------------------------------------------------\n$it" } ?: ""))

compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java

@@ -41,6 +41,7 @@ import java.util.List;
 public class LazyDeclarationResolver {
 
     @NotNull private final TopLevelDescriptorProvider topLevelDescriptorProvider;
+    @NotNull private final AbsentDescriptorHandler absentDescriptorHandler;
     @NotNull private final BindingTrace trace;
 
     protected DeclarationScopeProvider scopeProvider;
@@ -55,9 +56,11 @@ public class LazyDeclarationResolver {
     public LazyDeclarationResolver(
             @NotNull GlobalContext globalContext,
             @NotNull BindingTrace delegationTrace,
-            @NotNull TopLevelDescriptorProvider topLevelDescriptorProvider
+            @NotNull TopLevelDescriptorProvider topLevelDescriptorProvider,
+            @NotNull AbsentDescriptorHandler absentDescriptorHandler
     ) {
         this.topLevelDescriptorProvider = topLevelDescriptorProvider;
+        this.absentDescriptorHandler = absentDescriptorHandler;
         LockBasedLazyResolveStorageManager lockBasedLazyResolveStorageManager =
                 new LockBasedLazyResolveStorageManager(globalContext.getStorageManager());
 
@@ -233,7 +236,7 @@ public class LazyDeclarationResolver {
             }
         }, null);
         if (result == null) {
-            throw new NoDescriptorForDeclarationException(declaration);
+            return absentDescriptorHandler.diagnoseDescriptorNotFound(declaration);
         }
         return result;
     }

compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LocalClassifierAnalyzer.kt

@@ -166,8 +166,9 @@ class LocalLazyDeclarationResolver(
         globalContext: GlobalContext,
         trace: BindingTrace,
         private val localClassDescriptorManager: LocalClassDescriptorHolder,
-        topLevelDescriptorProvider : TopLevelDescriptorProvider
-) : LazyDeclarationResolver(globalContext, trace, topLevelDescriptorProvider) {
+        topLevelDescriptorProvider : TopLevelDescriptorProvider,
+        absentDescriptorHandler: AbsentDescriptorHandler
+) : LazyDeclarationResolver(globalContext, trace, topLevelDescriptorProvider, absentDescriptorHandler) {
 
     override fun getClassDescriptor(classOrObject: KtClassOrObject, location: LookupLocation): ClassDescriptor {
         if (localClassDescriptorManager.isMyClass(classOrObject)) {