Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions server/src/main/java/LJDiagnosticsHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import liquidjava.diagnostics.Diagnostics;
import liquidjava.diagnostics.ErrorPosition;
import liquidjava.diagnostics.LJDiagnostic;
import liquidjava.diagnostics.errors.CustomError;
import liquidjava.diagnostics.errors.LJError;
import liquidjava.diagnostics.warnings.LJWarning;
import utils.PathUtils;
Expand All @@ -31,19 +32,25 @@ public class LJDiagnosticsHandler {
public static LJDiagnostics getLJDiagnostics(String path) {
List<LJError> errors = new ArrayList<>();
List<LJWarning> warnings = new ArrayList<>();

CommandLineLauncher.launch(path);
Diagnostics diagnostics = Diagnostics.getInstance();
if (diagnostics.foundWarning()) {
warnings.addAll(diagnostics.getWarnings());
try {
CommandLineLauncher.launch(path);
Diagnostics diagnostics = Diagnostics.getInstance();
if (diagnostics.foundWarning()) {
warnings.addAll(diagnostics.getWarnings());
}
if (diagnostics.foundError()) {
System.out.println("Failed verification");
errors.addAll(diagnostics.getErrors());
} else {
System.out.println("Passed verification");
}
return new LJDiagnostics(errors, warnings);
} catch (Exception e) {
System.err.println("LiquidJava verifier exception: " + e.getMessage());
e.printStackTrace();
errors.add(new CustomError("LiquidJava verification failed, check for Java errors"));
return new LJDiagnostics(errors, warnings);
}
if (diagnostics.foundError()) {
System.out.println("Failed verification");
errors.addAll(diagnostics.getErrors());
} else {
System.out.println("Passed verification");
}
return new LJDiagnostics(errors, warnings);
}

/**
Expand Down
Loading