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

JetCoreEnvironment does not extend JavaCoreApplicationEnvironment any more

Browse Source 
Delegation seems more appropriate here.
This commit is contained in:
Andrey Breslav
2012-07-25 15:49:43 +04:00
parent 7a77d39481
commit 0f7bd32608
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
+18 -17
View File
@@ -53,7 +53,7 @@ import java.util.List;
/** /**
* @author yole * @author yole
*/ */
public class JetCoreEnvironment extends JavaCoreApplicationEnvironment { public class JetCoreEnvironment {
@NotNull @NotNull
public static JetCoreEnvironment createCoreEnvironmentForJS(Disposable disposable, @NotNull CompilerConfiguration configuration) { public static JetCoreEnvironment createCoreEnvironmentForJS(Disposable disposable, @NotNull CompilerConfiguration configuration) {
return new JetCoreEnvironment(disposable, configuration); return new JetCoreEnvironment(disposable, configuration);
@@ -64,29 +64,29 @@ public class JetCoreEnvironment extends JavaCoreApplicationEnvironment {
return new JetCoreEnvironment(disposable, configuration); return new JetCoreEnvironment(disposable, configuration);
} }
private final JavaCoreApplicationEnvironment applicationEnvironment;
private final JavaCoreProjectEnvironment projectEnvironment;
private final List<JetFile> sourceFiles = new ArrayList<JetFile>(); private final List<JetFile> sourceFiles = new ArrayList<JetFile>();
private final CoreAnnotationsProvider annotationsProvider; private final CoreAnnotationsProvider annotationsProvider;
private final CompilerConfiguration configuration; private final CompilerConfiguration configuration;
private boolean initialized = false; private boolean initialized = false;
private final JavaCoreProjectEnvironment projectEnvironment;
public JetCoreEnvironment(Disposable parentDisposable, @NotNull CompilerConfiguration configuration) { public JetCoreEnvironment(Disposable parentDisposable, @NotNull CompilerConfiguration configuration) {
super(parentDisposable);
this.configuration = configuration; this.configuration = configuration;
registerFileType(JetFileType.INSTANCE, "kt"); this.applicationEnvironment = new JavaCoreApplicationEnvironment(parentDisposable);
registerFileType(JetFileType.INSTANCE, "kts"); applicationEnvironment.registerFileType(JetFileType.INSTANCE, "kt");
registerFileType(JetFileType.INSTANCE, "ktm"); applicationEnvironment.registerFileType(JetFileType.INSTANCE, "kts");
registerFileType(JetFileType.INSTANCE, JetParser.KTSCRIPT_FILE_SUFFIX); // should be renamed to kts applicationEnvironment.registerFileType(JetFileType.INSTANCE, "ktm");
registerFileType(JetFileType.INSTANCE, "jet"); applicationEnvironment.registerFileType(JetFileType.INSTANCE, JetParser.KTSCRIPT_FILE_SUFFIX); // should be renamed to kts
registerParserDefinition(new JavaParserDefinition()); applicationEnvironment.registerFileType(JetFileType.INSTANCE, "jet");
registerParserDefinition(new JetParserDefinition()); applicationEnvironment.registerParserDefinition(new JavaParserDefinition());
applicationEnvironment.registerParserDefinition(new JetParserDefinition());
projectEnvironment = new JavaCoreProjectEnvironment(parentDisposable, this);
projectEnvironment = new JavaCoreProjectEnvironment(parentDisposable, applicationEnvironment);
MockProject project = projectEnvironment.getProject(); MockProject project = projectEnvironment.getProject();
project.registerService(JetFilesProvider.class, new CliJetFilesProvider(this)); project.registerService(JetFilesProvider.class, new CliJetFilesProvider(this));
@@ -116,8 +116,9 @@ public class JetCoreEnvironment extends JavaCoreApplicationEnvironment {
return configuration; return configuration;
} }
@NotNull
public MockApplication getApplication() { public MockApplication getApplication() {
return myApplication; return applicationEnvironment.getApplication();
} }
@NotNull @NotNull
@@ -139,7 +140,7 @@ public class JetCoreEnvironment extends JavaCoreApplicationEnvironment {
} }
} }
else { else {
VirtualFile fileByPath = getLocalFileSystem().findFileByPath(file.getAbsolutePath()); VirtualFile fileByPath = applicationEnvironment.getLocalFileSystem().findFileByPath(file.getAbsolutePath());
if (fileByPath != null) { if (fileByPath != null) {
PsiFile psiFile = PsiManager.getInstance(getProject()).findFile(fileByPath); PsiFile psiFile = PsiManager.getInstance(getProject()).findFile(fileByPath);
if (psiFile instanceof JetFile) { if (psiFile instanceof JetFile) {
@@ -154,7 +155,7 @@ public class JetCoreEnvironment extends JavaCoreApplicationEnvironment {
return; return;
} }
VirtualFile vFile = getLocalFileSystem().findFileByPath(path); VirtualFile vFile = applicationEnvironment.getLocalFileSystem().findFileByPath(path);
if (vFile == null) { if (vFile == null) {
throw new CompileEnvironmentException("File/directory not found: " + path); throw new CompileEnvironmentException("File/directory not found: " + path);
} }
@@ -173,7 +174,7 @@ public class JetCoreEnvironment extends JavaCoreApplicationEnvironment {
projectEnvironment.addJarToClassPath(path); projectEnvironment.addJarToClassPath(path);
} }
else { else {
final VirtualFile root = getLocalFileSystem().findFileByPath(path.getAbsolutePath()); final VirtualFile root = applicationEnvironment.getLocalFileSystem().findFileByPath(path.getAbsolutePath());
if (root == null) { if (root == null) {
throw new IllegalArgumentException("trying to add non-existing file to classpath: " + path); throw new IllegalArgumentException("trying to add non-existing file to classpath: " + path);
} }