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

All IDE code uses VirtualFileFinder instead of KotlinClassFinder + proper service discovery

Browse Source
This commit is contained in:
Andrey Breslav
2014-01-07 20:29:18 +04:00
parent b3f4527bb8
commit 8f8b85101e
10 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/src/org/jetbrains/jet/generators/injectors/GenerateInjectors.java
+2 -2
View File
@@ -138,7 +138,7 @@ public class GenerateInjectors {
generator.addPublicField(JavaPackageFragmentProviderImpl.class);
generator.addField(false, VirtualFileFinder.class, "virtualFileFinder",
new GivenExpression(
"com.intellij.openapi.components.ServiceManager.getService(project, VirtualFileFinder.class)"));
VirtualFileFinder.class.getName() + ".SERVICE.getInstance(project)"));
generator.configure("compiler/frontend.java/src", "org.jetbrains.jet.di", "InjectorForTopDownAnalyzerForJvm",
GenerateInjectors.class);
return generator;
@@ -161,7 +161,7 @@ public class GenerateInjectors {
generator.addPublicField(JavaDescriptorResolver.class);
generator.addField(JavaPackageFragmentProviderImpl.class);
generator.addField(false, VirtualFileFinder.class, "virtualFileFinder",
new GivenExpression("com.intellij.openapi.components.ServiceManager.getService(project, VirtualFileFinder.class)"));
new GivenExpression(VirtualFileFinder.class.getName() + ".SERVICE.getInstance(project)"));
generator.addField(true, ModuleDescriptorImpl.class, "module",
new GivenExpression("org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM.createJavaModule(\"<fake-jdr-module>\")"));