Skip to content

Commit 89bbf65

Browse files
committed
Minor Changes
1 parent 298c3a2 commit 89bbf65

4 files changed

Lines changed: 17 additions & 15 deletions

File tree

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public String getCustomMessage() {
3939
return customMessage;
4040
}
4141

42-
public String getDetails() {
43-
return hint != null ? hint : "";
42+
public String getHint() {
43+
return hint;
4444
}
4545

4646
public SourcePosition getPosition() {
@@ -84,10 +84,10 @@ public String toString() {
8484
sb.append(snippet);
8585
}
8686

87-
// details
88-
String details = getDetails();
89-
if (!details.isEmpty()) {
90-
sb.append(" --> ").append(String.join("\n ", details.split("\n"))).append("\n");
87+
// hint
88+
String hint = getHint();
89+
if (hint != null && !hint.isBlank()) {
90+
sb.append(" --> ").append(String.join("\n ", hint.split("\n"))).append("\n");
9191
}
9292

9393
// location
@@ -100,9 +100,9 @@ public String toString() {
100100
if (declPos != null && declPos.getFile() != null && !declPos.equals(position)) {
101101
sb.append(Colors.CYAN).append("\n--> Refinement declared here:\n").append(Colors.RESET);
102102
String declarationSnippet = getSnippet(declPos, 1, 0, Colors.CYAN, null, true);
103-
if (declarationSnippet != null) {
103+
if (declarationSnippet != null)
104104
sb.append(declarationSnippet);
105-
}
105+
106106
sb.append(declPos.getFile().getPath()).append(":").append(declPos.getLine()).append(Colors.RESET)
107107
.append("\n");
108108
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ public SourcePosition getDeclarationPosition() {
4545
}
4646

4747
@Override
48-
public String getDetails() {
48+
public String getHint() {
4949
if (counterexample.isEmpty())
50-
return "";
50+
return null;
5151

5252
String counterexampleString = counterexample.assignments().stream()
5353
.map(a -> VariableFormatter.format(a.first()) + " == " + a.second())

liquidjava-verifier/src/main/java/liquidjava/diagnostics/warnings/ExternalMethodNotFoundWarning.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ public String[] getOverloads() {
3434
}
3535

3636
@Override
37-
public String getDetails() {
38-
return overloads.length > 0 ? String.format("Available overloads:\n %s", String.join("\n ", overloads)) : "";
37+
public String getHint() {
38+
if (overloads.length == 0)
39+
return null;
40+
return String.format("Available overloads:\n %s", String.join("\n ", overloads));
3941
}
4042
}

liquidjava-verifier/src/test/java/liquidjava/rj_language/parsing/RefinementsParserTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ class RefinementsParserTest {
1515
void hintsArrowVsImplication() {
1616
SyntaxError e = assertThrows(SyntaxError.class,
1717
() -> RefinementsParser.createAST("_ == true -> markSupported(this)", ""));
18-
assertEquals("Logical implication is --> (two dashes), not ->", e.getDetails());
18+
assertEquals("Logical implication is --> (two dashes), not ->", e.getHint());
1919
}
2020

2121
@Test
2222
void hintsAssignVsEquals() {
2323
SyntaxError e = assertThrows(SyntaxError.class, () -> RefinementsParser.createAST("_ = 1", ""));
24-
assertEquals("Predicates must be compared with == instead of =", e.getDetails());
24+
assertEquals("Predicates must be compared with == instead of =", e.getHint());
2525
}
2626

2727
@Test
@@ -33,7 +33,7 @@ void noHintForValidImplication() {
3333
@Test
3434
void noHintForUnrelatedSyntaxError() {
3535
SyntaxError e = assertThrows(SyntaxError.class, () -> RefinementsParser.createAST("a +", ""));
36-
assertEquals("", e.getDetails());
36+
assertEquals(null, e.getHint());
3737
}
3838

3939
@Test

0 commit comments

Comments
 (0)