Skip to content

Commit d243c73

Browse files
committed
Replace Details Field with Method
1 parent ead2569 commit d243c73

14 files changed

+27
-36
lines changed

liquidjava-verifier/src/main/java/liquidjava/diagnostics/LJDiagnostic.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,13 @@ public class LJDiagnostic extends RuntimeException {
1010

1111
private final String title;
1212
private final String message;
13-
private final String details;
1413
private final String file;
1514
private final ErrorPosition position;
1615
private final String accentColor;
1716

18-
public LJDiagnostic(String title, String message, String details, SourcePosition pos, String accentColor) {
17+
public LJDiagnostic(String title, String message, SourcePosition pos, String accentColor) {
1918
this.title = title;
2019
this.message = message;
21-
this.details = details;
2220
this.file = (pos != null && pos.getFile() != null) ? pos.getFile().getPath() : null;
2321
this.position = ErrorPosition.fromSpoonPosition(pos);
2422
this.accentColor = accentColor;
@@ -33,7 +31,7 @@ public String getMessage() {
3331
}
3432

3533
public String getDetails() {
36-
return details;
34+
return "";
3735
}
3836

3937
public ErrorPosition getPosition() {
@@ -63,7 +61,8 @@ public String toString() {
6361
}
6462

6563
// details
66-
if (details != null && !details.isEmpty()) {
64+
String details = getDetails();
65+
if (!details.isEmpty()) {
6766
sb.append(" --> ").append(String.join("\n ", details.split("\n"))).append("\n");
6867
}
6968

@@ -128,7 +127,6 @@ public boolean equals(Object obj) {
128127
return false;
129128
LJDiagnostic other = (LJDiagnostic) obj;
130129
return title.equals(other.title) && message.equals(other.message)
131-
&& ((details == null && other.details == null) || (details != null && details.equals(other.details)))
132130
&& ((file == null && other.file == null) || (file != null && file.equals(other.file)))
133131
&& ((position == null && other.position == null)
134132
|| (position != null && position.equals(other.position)));
@@ -138,7 +136,6 @@ public boolean equals(Object obj) {
138136
public int hashCode() {
139137
int result = title.hashCode();
140138
result = 31 * result + message.hashCode();
141-
result = 31 * result + (details != null ? details.hashCode() : 0);
142139
result = 31 * result + (file != null ? file.hashCode() : 0);
143140
result = 31 * result + (position != null ? position.hashCode() : 0);
144141
return result;

liquidjava-verifier/src/main/java/liquidjava/diagnostics/errors/CustomError.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,10 @@
1010
public class CustomError extends LJError {
1111

1212
public CustomError(String message) {
13-
super("Error", message, null, null, null);
13+
super("Error", message, null, null);
1414
}
1515

1616
public CustomError(String message, SourcePosition position) {
17-
super("Error", message, null, position, null);
18-
}
19-
20-
public CustomError(String message, SourcePosition position, String details) {
21-
super("Error", message, details, position, null);
17+
super("Error", message, position, null);
2218
}
2319
}

liquidjava-verifier/src/main/java/liquidjava/diagnostics/errors/IllegalConstructorTransitionError.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
public class IllegalConstructorTransitionError extends LJError {
1111

1212
public IllegalConstructorTransitionError(CtElement element) {
13-
super("Illegal Constructor Transition Error", "Found constructor with 'from' state",
14-
"Constructor methods should only have a 'to' state", element.getPosition(), null);
13+
super("Illegal Constructor Transition Error", "Found constructor with 'from' state: constructors should only have a 'to' state", element.getPosition(), null);
1514
}
1615
}

liquidjava-verifier/src/main/java/liquidjava/diagnostics/errors/InvalidRefinementError.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class InvalidRefinementError extends LJError {
1212
private final String refinement;
1313

1414
public InvalidRefinementError(SourcePosition position, String message, String refinement) {
15-
super("Invalid Refinement", message, "", position, null);
15+
super("Invalid Refinement", message, position, null);
1616
this.refinement = refinement;
1717
}
1818

liquidjava-verifier/src/main/java/liquidjava/diagnostics/errors/LJError.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ public abstract class LJError extends LJDiagnostic {
1212

1313
private final TranslationTable translationTable;
1414

15-
public LJError(String title, String message, String details, SourcePosition pos,
15+
public LJError(String title, String message, SourcePosition pos,
1616
TranslationTable translationTable) {
17-
super(title, message, details, pos, Colors.BOLD_RED);
17+
super(title, message, pos, Colors.BOLD_RED);
1818
this.translationTable = translationTable != null ? translationTable : new TranslationTable();
1919
}
2020

liquidjava-verifier/src/main/java/liquidjava/diagnostics/errors/NotFoundError.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class NotFoundError extends LJError {
1616

1717
public NotFoundError(SourcePosition position, String message, String name, String kind,
1818
TranslationTable translationTable) {
19-
super("Not Found Error", message, "", position, translationTable);
19+
super("Not Found Error", message, position, translationTable);
2020
this.name = Utils.getSimpleName(name);
2121
this.kind = kind;
2222
}

liquidjava-verifier/src/main/java/liquidjava/diagnostics/errors/RefinementError.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class RefinementError extends LJError {
1818
public RefinementError(SourcePosition position, Expression expected, ValDerivationNode found,
1919
TranslationTable translationTable) {
2020
super("Refinement Error",
21-
String.format("%s is not a subtype of %s", found.getValue(), expected.toSimplifiedString()), "",
21+
String.format("%s is not a subtype of %s", found.getValue(), expected.toSimplifiedString()),
2222
position, translationTable);
2323
this.expected = expected.toSimplifiedString();
2424
this.found = found;

liquidjava-verifier/src/main/java/liquidjava/diagnostics/errors/StateConflictError.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ public class StateConflictError extends LJError {
1414
private final String state;;
1515

1616
public StateConflictError(SourcePosition position, Expression state, TranslationTable translationTable) {
17-
super("State Conflict Error", "Found multiple disjoint states in state transition",
18-
"State transition can only go to one state of each state set", position, translationTable);
17+
super("State Conflict Error", "Found multiple disjoint states in state transition: state transition can only go to one state of each state set", position, translationTable);
1918
this.state = state.toSimplifiedString();
2019
}
2120

liquidjava-verifier/src/main/java/liquidjava/diagnostics/errors/StateRefinementError.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class StateRefinementError extends LJError {
1717
public StateRefinementError(SourcePosition position, Expression expected, Expression found,
1818
TranslationTable translationTable) {
1919
super("State Refinement Error", String.format("Expected state %s but found %s", expected.toSimplifiedString(),
20-
found.toSimplifiedString()), null, position, translationTable);
20+
found.toSimplifiedString()), position, translationTable);
2121
this.expected = expected.toSimplifiedString();
2222
this.found = found.toSimplifiedString();
2323
}

liquidjava-verifier/src/main/java/liquidjava/diagnostics/errors/SyntaxError.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public SyntaxError(String message, String refinement) {
1616
}
1717

1818
public SyntaxError(String message, SourcePosition pos, String refinement) {
19-
super("Syntax Error", message, "", pos, null);
19+
super("Syntax Error", message, pos, null);
2020
this.refinement = refinement;
2121
}
2222

0 commit comments

Comments
 (0)