Added assertion in JetCoreEnvironment.addToClasspath() prohibiting to invoke it when environment is initialized.
This commit is contained in:
@@ -41,8 +41,6 @@ import org.jetbrains.jet.plugin.JetFileType;
|
|||||||
import org.jetbrains.jet.utils.PathUtil;
|
import org.jetbrains.jet.utils.PathUtil;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.net.URL;
|
|
||||||
import java.net.URLClassLoader;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@@ -53,6 +51,7 @@ public class JetCoreEnvironment extends JavaCoreEnvironment {
|
|||||||
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;
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
public static JetCoreEnvironment createCoreEnvironmentForJS(Disposable disposable, @NotNull CompilerConfiguration configuration) {
|
public static JetCoreEnvironment createCoreEnvironmentForJS(Disposable disposable, @NotNull CompilerConfiguration configuration) {
|
||||||
@@ -96,6 +95,7 @@ public class JetCoreEnvironment extends JavaCoreEnvironment {
|
|||||||
}
|
}
|
||||||
|
|
||||||
JetStandardLibrary.initialize(getProject());
|
JetStandardLibrary.initialize(getProject());
|
||||||
|
initialized = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public CompilerConfiguration getConfiguration() {
|
public CompilerConfiguration getConfiguration() {
|
||||||
@@ -146,6 +146,14 @@ public class JetCoreEnvironment extends JavaCoreEnvironment {
|
|||||||
addSources(new File(path));
|
addSources(new File(path));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void addToClasspath(File path) {
|
||||||
|
if (initialized) {
|
||||||
|
throw new IllegalStateException("Cannot add class path when JetCoreEnvironment is already initialized");
|
||||||
|
}
|
||||||
|
super.addToClasspath(path);
|
||||||
|
}
|
||||||
|
|
||||||
public List<JetFile> getSourceFiles() {
|
public List<JetFile> getSourceFiles() {
|
||||||
return sourceFiles;
|
return sourceFiles;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user