diff --git a/idea/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java b/idea/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java index 531bdf36cc1..2c135b9f285 100644 --- a/idea/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java +++ b/idea/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java @@ -102,12 +102,12 @@ public class IDELightClassGenerationSupport extends LightClassGenerationSupport if (JetPsiUtil.isLocal(classOrObject)) { BindingContext bindingContext = session.resolveToElement(classOrObject); - forceResolveAllContents(bindingContext.get(BindingContext.CLASS, classOrObject)); + ForceResolveUtil.forceResolveAllContents(bindingContext.get(BindingContext.CLASS, classOrObject)); return new LightClassConstructionContext(bindingContext, null); } - forceResolveAllContents(session.getClassDescriptor(classOrObject)); + ForceResolveUtil.forceResolveAllContents(session.getClassDescriptor(classOrObject)); return new LightClassConstructionContext(session.getBindingContext(), null); } @@ -132,7 +132,7 @@ public class IDELightClassGenerationSupport extends LightClassGenerationSupport Name name = jetFunction.getNameAsSafeName(); Collection functions = packageDescriptor.getMemberScope().getFunctions(name); for (FunctionDescriptor descriptor : functions) { - forceResolveAllContents(descriptor); + ForceResolveUtil.forceResolveAllContents(descriptor); } } else if (declaration instanceof JetProperty) { @@ -140,7 +140,7 @@ public class IDELightClassGenerationSupport extends LightClassGenerationSupport Name name = jetProperty.getNameAsSafeName(); Collection properties = packageDescriptor.getMemberScope().getProperties(name); for (VariableDescriptor descriptor : properties) { - forceResolveAllContents(descriptor); + ForceResolveUtil.forceResolveAllContents(descriptor); } } else if (declaration instanceof JetClassOrObject) { @@ -153,13 +153,6 @@ public class IDELightClassGenerationSupport extends LightClassGenerationSupport } } - private static void forceResolveAllContents(DeclarationDescriptor descriptor) { - ForceResolveUtil.forceResolveAllContents(descriptor); - if (LOG.isDebugEnabled()) { - LOG.debug("done: " + descriptor); - } - } - @NotNull @Override public Collection findClassOrObjectDeclarations(@NotNull FqName fqName, @NotNull GlobalSearchScope searchScope) { @@ -187,9 +180,7 @@ public class IDELightClassGenerationSupport extends LightClassGenerationSupport } @Override - public boolean packageExists( - @NotNull FqName fqName, @NotNull GlobalSearchScope scope - ) { + public boolean packageExists(@NotNull FqName fqName, @NotNull GlobalSearchScope scope) { return !JetAllPackagesIndex.getInstance().get(fqName.asString(), project, kotlinSources(scope)).isEmpty(); }