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

Introduce VirtualFileFinder interface

Browse Source 
Provide different implementations in Cli and Ide
This commit is contained in:
Pavel V. Talanov
2013-07-23 21:34:34 +04:00
parent b9f663a487
commit 52de4215b5
6 changed files with 167 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
+9 -2
View File
@@ -51,7 +51,8 @@ import org.jetbrains.jet.lang.parsing.JetParserDefinition;
import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.resolve.java.JetFilesProvider;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.lang.resolve.java.vfilefinder.CliVirtualFileFinder;
import org.jetbrains.jet.lang.resolve.java.vfilefinder.VirtualFileFinder;
import org.jetbrains.jet.plugin.JetFileType;
import org.jetbrains.jet.utils.PathUtil;
@@ -67,6 +68,7 @@ public class JetCoreEnvironment {
private final JavaCoreApplicationEnvironment applicationEnvironment;
private final JavaCoreProjectEnvironment projectEnvironment;
private final List<JetFile> sourceFiles = new ArrayList<JetFile>();
private final ClassPath classPath = new ClassPath();
private final CoreExternalAnnotationsManager annotationsManager;
@@ -123,7 +125,10 @@ public class JetCoreEnvironment {
addSources(path);
}
JetScriptDefinitionProvider.getInstance(project).addScriptDefinitions(configuration.getList(CommonConfigurationKeys.SCRIPT_DEFINITIONS_KEY));
JetScriptDefinitionProvider.getInstance(project).addScriptDefinitions(
configuration.getList(CommonConfigurationKeys.SCRIPT_DEFINITIONS_KEY));
project.registerService(VirtualFileFinder.class, new CliVirtualFileFinder(classPath));
}
public CompilerConfiguration getConfiguration() {
@@ -194,6 +199,7 @@ public class JetCoreEnvironment {
return;
}
projectEnvironment.addJarToClassPath(path);
classPath.add(jarFile);
}
else {
VirtualFile root = applicationEnvironment.getLocalFileSystem().findFileByPath(path.getAbsolutePath());
@@ -202,6 +208,7 @@ public class JetCoreEnvironment {
return;
}
projectEnvironment.addSourcesToClasspath(root);
classPath.add(root);
}
}