Skip to content

Commit fbc91ba

Browse files
committed
Use Expression Formatter
1 parent daa47b4 commit fbc91ba

3 files changed

Lines changed: 8 additions & 7 deletions

File tree

server/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
<dependency>
173173
<groupId>io.github.liquid-java</groupId>
174174
<artifactId>liquidjava-verifier</artifactId>
175-
<version>0.0.18</version>
175+
<version>0.0.19</version>
176176
</dependency>
177177
<dependency>
178178
<groupId>tools.aqua</groupId>

server/src/main/java/dtos/context/VariableDTO.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
import dtos.diagnostics.SourcePositionDTO;
44
import liquidjava.processor.context.PlacementInCode;
55
import liquidjava.processor.context.RefinedVariable;
6-
import liquidjava.utils.VariableFormatter;
6+
import liquidjava.rj_language.ast.formatter.ExpressionFormatter;
7+
import liquidjava.rj_language.ast.formatter.VariableFormatter;
78

89
/**
910
* DTO for serializing RefinedVariable instances to JSON.
@@ -21,11 +22,11 @@ public static VariableDTO from(RefinedVariable refinedVariable) {
2122
PlacementInCode placement = refinedVariable.getPlacementInCode();
2223
if (placement == null) return null;
2324
return new VariableDTO(
24-
VariableFormatter.formatVariable(refinedVariable.getName()),
25+
VariableFormatter.format(refinedVariable.getName()),
2526
refinedVariable.getName(),
2627
ContextHistoryDTO.stringifyType(refinedVariable.getType()),
27-
VariableFormatter.formatText(refinedVariable.getRefinement().toString()),
28-
VariableFormatter.formatText(refinedVariable.getMainRefinement().toString()),
28+
ExpressionFormatter.format(refinedVariable.getRefinement()),
29+
ExpressionFormatter.format(refinedVariable.getMainRefinement()),
2930
SourcePositionDTO.from(placement.getPosition()),
3031
SourcePositionDTO.from(placement.getAnnotationPosition())
3132
);

server/src/main/java/dtos/diagnostics/TranslationTableDTO.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.util.HashMap;
44

55
import liquidjava.diagnostics.TranslationTable;
6-
import liquidjava.utils.VariableFormatter;
6+
import liquidjava.rj_language.ast.formatter.VariableFormatter;
77

88
/**
99
* DTO for serializing TranslationTable to JSON
@@ -15,7 +15,7 @@ public static TranslationTableDTO from(TranslationTable translationTable) {
1515
TranslationTableDTO dto = new TranslationTableDTO();
1616
if (translationTable != null) {
1717
translationTable.forEach((key, value) -> {
18-
dto.put(VariableFormatter.formatVariable(key), PlacementInCodeDTO.from(value));
18+
dto.put(VariableFormatter.format(key), PlacementInCodeDTO.from(value));
1919
});
2020
}
2121
return dto;

0 commit comments

Comments
 (0)