azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use custom exception class to represent the "no descriptor for declaration" case

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-08-26 13:24:14 +02:00
parent a2a259552b
commit ca20d9c1b3
4 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.java
+2 -5
View File
@@ -54,10 +54,7 @@ import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage;
import org.jetbrains.kotlin.resolve.BindingContext;
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode;
import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil;
import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer;
import org.jetbrains.kotlin.resolve.lazy.ResolveSession;
import org.jetbrains.kotlin.resolve.lazy.*;
import org.jetbrains.kotlin.resolve.scopes.JetScope;
import java.io.IOException;
@@ -310,7 +307,7 @@ public class IDELightClassGenerationSupport extends LightClassGenerationSupport
try {
return (ClassDescriptor) ResolvePackage.resolveToDescriptor(classOrObject);
}
catch (IllegalStateException e) {
catch (NoDescriptorForDeclarationException e) {
return null;
}
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/IdeaLocalDescriptorResolver.kt
+3 -6
View File
@@ -18,20 +18,17 @@ package org.jetbrains.kotlin.idea.project
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.psi.JetDeclaration
import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.BindingContextUtils
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
import org.jetbrains.kotlin.resolve.lazy.LocalDescriptorResolver
import org.jetbrains.kotlin.resolve.lazy.NoDescriptorForDeclarationException
public class IdeaLocalDescriptorResolver(
private val resolveElementCache: ResolveElementCache
): LocalDescriptorResolver {
override fun resolveLocalDeclaration(declaration: JetDeclaration): DeclarationDescriptor {
val context = resolveElementCache.resolveToElement(declaration, BodyResolveMode.FULL)
return BindingContextUtils.getNotNull(
context, BindingContext.DECLARATION_TO_DESCRIPTOR, declaration,
"Descriptor wasn't found for declaration $declaration\n${declaration.getElementTextWithContext()}"
)
return context.get(BindingContext.DECLARATION_TO_DESCRIPTOR, declaration)
?: throw NoDescriptorForDeclarationException(declaration)
}
}