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

Refactoring: remove monitoring method

Browse Source
This commit is contained in:
Nikolay Krasko
2014-02-11 18:06:08 +04:00
parent aca146726a
commit 356a50325e
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java
+5 -14
View File
@@ -102,12 +102,12 @@ public class IDELightClassGenerationSupport extends LightClassGenerationSupport
if (JetPsiUtil.isLocal(classOrObject)) { if (JetPsiUtil.isLocal(classOrObject)) {
BindingContext bindingContext = session.resolveToElement(classOrObject); BindingContext bindingContext = session.resolveToElement(classOrObject);
forceResolveAllContents(bindingContext.get(BindingContext.CLASS, classOrObject)); ForceResolveUtil.forceResolveAllContents(bindingContext.get(BindingContext.CLASS, classOrObject));
return new LightClassConstructionContext(bindingContext, null); return new LightClassConstructionContext(bindingContext, null);
} }
forceResolveAllContents(session.getClassDescriptor(classOrObject)); ForceResolveUtil.forceResolveAllContents(session.getClassDescriptor(classOrObject));
return new LightClassConstructionContext(session.getBindingContext(), null); return new LightClassConstructionContext(session.getBindingContext(), null);
} }
@@ -132,7 +132,7 @@ public class IDELightClassGenerationSupport extends LightClassGenerationSupport
Name name = jetFunction.getNameAsSafeName(); Name name = jetFunction.getNameAsSafeName();
Collection<FunctionDescriptor> functions = packageDescriptor.getMemberScope().getFunctions(name); Collection<FunctionDescriptor> functions = packageDescriptor.getMemberScope().getFunctions(name);
for (FunctionDescriptor descriptor : functions) { for (FunctionDescriptor descriptor : functions) {
forceResolveAllContents(descriptor); ForceResolveUtil.forceResolveAllContents(descriptor);
} }
} }
else if (declaration instanceof JetProperty) { else if (declaration instanceof JetProperty) {
@@ -140,7 +140,7 @@ public class IDELightClassGenerationSupport extends LightClassGenerationSupport
Name name = jetProperty.getNameAsSafeName(); Name name = jetProperty.getNameAsSafeName();
Collection<VariableDescriptor> properties = packageDescriptor.getMemberScope().getProperties(name); Collection<VariableDescriptor> properties = packageDescriptor.getMemberScope().getProperties(name);
for (VariableDescriptor descriptor : properties) { for (VariableDescriptor descriptor : properties) {
forceResolveAllContents(descriptor); ForceResolveUtil.forceResolveAllContents(descriptor);
} }
} }
else if (declaration instanceof JetClassOrObject) { 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 @NotNull
@Override @Override
public Collection<JetClassOrObject> findClassOrObjectDeclarations(@NotNull FqName fqName, @NotNull GlobalSearchScope searchScope) { public Collection<JetClassOrObject> findClassOrObjectDeclarations(@NotNull FqName fqName, @NotNull GlobalSearchScope searchScope) {
@@ -187,9 +180,7 @@ public class IDELightClassGenerationSupport extends LightClassGenerationSupport
} }
@Override @Override
public boolean packageExists( public boolean packageExists(@NotNull FqName fqName, @NotNull GlobalSearchScope scope) {
@NotNull FqName fqName, @NotNull GlobalSearchScope scope
) {
return !JetAllPackagesIndex.getInstance().get(fqName.asString(), project, kotlinSources(scope)).isEmpty(); return !JetAllPackagesIndex.getInstance().get(fqName.asString(), project, kotlinSources(scope)).isEmpty();
} }