Remove BindingTrace from Java function and property resolvers

Extract FakeOverrideVisibilityResolver which invokes OverrideResolver with the
trace
This commit is contained in:
Alexander Udalov
2013-08-23 18:58:10 +04:00
parent 480ef9ea66
commit d34a6d85e7
11 changed files with 136 additions and 29 deletions
@@ -37,6 +37,7 @@ import org.jetbrains.jet.lang.resolve.java.JavaBridgeConfiguration;
import org.jetbrains.jet.lang.resolve.java.JavaClassFinderImpl;
import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
import org.jetbrains.jet.lang.resolve.java.PsiClassFinderImpl;
import org.jetbrains.jet.lang.resolve.java.resolver.FakeOverrideVisibilityResolverImpl;
import org.jetbrains.jet.lang.resolve.java.resolver.TraceBasedExternalSignatureResolver;
import org.jetbrains.jet.lang.resolve.java.resolver.TraceBasedJavaResolverCache;
import org.jetbrains.jet.lang.resolve.java.vfilefinder.VirtualFileFinder;
@@ -109,6 +110,7 @@ public class GenerateInjectors {
generator.addField(JavaClassFinderImpl.class);
generator.addField(TraceBasedExternalSignatureResolver.class);
generator.addField(TraceBasedJavaResolverCache.class);
generator.addField(FakeOverrideVisibilityResolverImpl.class);
generator.addPublicField(NamespaceFactoryImpl.class);
generator.addField(false, VirtualFileFinder.class, "virtualFileFinder",
new GivenExpression(
@@ -128,6 +130,7 @@ public class GenerateInjectors {
generator.addField(JavaClassFinderImpl.class);
generator.addField(TraceBasedExternalSignatureResolver.class);
generator.addField(TraceBasedJavaResolverCache.class);
generator.addField(FakeOverrideVisibilityResolverImpl.class);
generator.addPublicField(JavaDescriptorResolver.class);
generator.addPublicField(PsiClassFinderImpl.class);
generator.addField(false, VirtualFileFinder.class, "virtualFileFinder",