Skip to content

Commit 520ef85

Browse files
committed
Minor Changes
1 parent 15c99da commit 520ef85

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,30 +104,31 @@ public String getSnippet() {
104104

105105
// calculate padding for line numbers
106106
int padding = String.valueOf(endLine).length();
107+
String pipe = " | ";
107108

108109
for (int i = startLine; i <= endLine; i++) {
109110
String lineNumStr = String.format("%" + padding + "d", i);
110111
String line = lines.get(i - 1);
111112

112113
// add line
113-
sb.append(Colors.GREY).append(lineNumStr).append(" | ").append(line).append(Colors.RESET).append("\n");
114+
sb.append(Colors.GREY).append(lineNumStr).append(pipe).append(line).append(Colors.RESET).append("\n");
114115

115116
// add error markers on the line(s) with the error
116117
if (i >= position.lineStart() && i <= position.lineEnd()) {
117118
int colStart = (i == position.lineStart()) ? position.colStart() : 1;
118119
int colEnd = (i == position.lineEnd()) ? position.colEnd() : line.length();
119120

120121
if (colStart > 0 && colEnd > 0) {
121-
// line number padding + " | " + column offset
122-
String indent = " ".repeat(padding) + Colors.GREY + " | " + Colors.RESET
122+
// line number padding + pipe + column offset
123+
String indent = " ".repeat(padding) + Colors.GREY + pipe + Colors.RESET
123124
+ " ".repeat(colStart - 1);
124125
String markers = accentColor + "^".repeat(Math.max(1, colEnd - colStart + 1));
125126
sb.append(indent).append(markers);
126127

127128
// custom message
128129
if (customMessage != null && !customMessage.isBlank()) {
129-
String sep = " || ";
130-
sb.append(" " + customMessage.replace(sep, "\n" + " ".repeat(padding + colEnd + sep.length())));
130+
String offset = " ".repeat(padding + colEnd + pipe.length() + 1);
131+
sb.append(" " + customMessage.replace("\n", "\n" + offset));
131132
}
132133
sb.append(Colors.RESET).append("\n");
133134
}

liquidjava-verifier/src/main/java/liquidjava/processor/refinement_checker/object_checkers/AuxStateHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ private static void changeState(TypeChecker tc, VariableInstance vi, List<Object
499499

500500
// combine messages of all state changes
501501
String message = stateChanges.stream().map(ObjectState::getMessage)
502-
.filter(msg -> msg != null && !msg.isBlank()).distinct().collect(Collectors.joining(" || "));
502+
.filter(msg -> msg != null && !msg.isBlank()).distinct().collect(Collectors.joining("\n"));
503503
tc.throwStateRefinementError(invocation.getPosition(), prevState, expectedStatesDisjunction, message);
504504
}
505505
}

0 commit comments

Comments
 (0)