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

"Absent classpath entry" is now a warning

Browse Source
This commit is contained in:
Andrey Breslav
2013-01-31 17:45:45 +04:00
parent bbde38a6dc
commit e31d5fd3fb
1 changed files with 9 additions and 6 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 -6
View File
@@ -57,6 +57,9 @@ import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.ERROR;
import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.WARNING;
public class JetCoreEnvironment { public class JetCoreEnvironment {
private final JavaCoreApplicationEnvironment applicationEnvironment; private final JavaCoreApplicationEnvironment applicationEnvironment;
@@ -169,11 +172,11 @@ public class JetCoreEnvironment {
VirtualFile vFile = applicationEnvironment.getLocalFileSystem().findFileByPath(path); VirtualFile vFile = applicationEnvironment.getLocalFileSystem().findFileByPath(path);
if (vFile == null) { if (vFile == null) {
reportError("Source file or directory not found: " + path); report(ERROR, "Source file or directory not found: " + path);
return; return;
} }
if (!vFile.isDirectory() && vFile.getFileType() != JetFileType.INSTANCE) { if (!vFile.isDirectory() && vFile.getFileType() != JetFileType.INSTANCE) {
reportError("Source entry is not a Kotlin file: " + path); report(ERROR, "Source entry is not a Kotlin file: " + path);
return; return;
} }
@@ -187,7 +190,7 @@ public class JetCoreEnvironment {
if (path.isFile()) { if (path.isFile()) {
VirtualFile jarFile = applicationEnvironment.getJarFileSystem().findFileByPath(path + "!/"); VirtualFile jarFile = applicationEnvironment.getJarFileSystem().findFileByPath(path + "!/");
if (jarFile == null) { if (jarFile == null) {
reportError("Classpath entry points to a file that is not a JAR archive: " + path); report(WARNING, "Classpath entry points to a file that is not a JAR archive: " + path);
return; return;
} }
projectEnvironment.addJarToClassPath(path); projectEnvironment.addJarToClassPath(path);
@@ -195,7 +198,7 @@ public class JetCoreEnvironment {
else { else {
final VirtualFile root = applicationEnvironment.getLocalFileSystem().findFileByPath(path.getAbsolutePath()); final VirtualFile root = applicationEnvironment.getLocalFileSystem().findFileByPath(path.getAbsolutePath());
if (root == null) { if (root == null) {
reportError("Classpath entry points to a non-existent location: " + path); report(WARNING, "Classpath entry points to a non-existent location: " + path);
return; return;
} }
projectEnvironment.addSourcesToClasspath(root); projectEnvironment.addSourcesToClasspath(root);
@@ -206,10 +209,10 @@ public class JetCoreEnvironment {
return sourceFiles; return sourceFiles;
} }
private void reportError(@NotNull String message) { private void report(@NotNull CompilerMessageSeverity severity, @NotNull String message) {
MessageCollector messageCollector = configuration.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY); MessageCollector messageCollector = configuration.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY);
if (messageCollector != null) { if (messageCollector != null) {
messageCollector.report(CompilerMessageSeverity.ERROR, message, CompilerMessageLocation.NO_LOCATION); messageCollector.report(severity, message, CompilerMessageLocation.NO_LOCATION);
} }
else { else {
throw new CompileEnvironmentException(message); throw new CompileEnvironmentException(message);