Skip to content
Merged
Show file tree
Hide file tree
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
7 changes: 4 additions & 3 deletions server/src/main/java/dtos/context/VariableDTO.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import dtos.diagnostics.SourcePositionDTO;
import liquidjava.processor.context.PlacementInCode;
import liquidjava.processor.context.RefinedVariable;
import liquidjava.utils.VariableFormatter;

/**
* DTO for serializing RefinedVariable instances to JSON.
Expand All @@ -19,10 +20,10 @@ public static VariableDTO from(RefinedVariable refinedVariable) {
PlacementInCode placement = refinedVariable.getPlacementInCode();
if (placement == null) return null;
return new VariableDTO(
refinedVariable.getName(),
VariableFormatter.formatVariable(refinedVariable.getName()),
ContextHistoryDTO.stringifyType(refinedVariable.getType()),
refinedVariable.getRefinement().toString(),
refinedVariable.getMainRefinement().toString(),
VariableFormatter.formatText(refinedVariable.getRefinement().toString()),
VariableFormatter.formatText(refinedVariable.getMainRefinement().toString()),
SourcePositionDTO.from(placement.getPosition()),
SourcePositionDTO.from(placement.getAnnotationPosition())
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.util.HashMap;

import liquidjava.diagnostics.TranslationTable;
import liquidjava.utils.VariableFormatter;

/**
* DTO for serializing TranslationTable to JSON
Expand All @@ -14,7 +15,7 @@ public static TranslationTableDTO from(TranslationTable translationTable) {
TranslationTableDTO dto = new TranslationTableDTO();
if (translationTable != null) {
translationTable.forEach((key, value) -> {
dto.put(key, PlacementInCodeDTO.from(value));
dto.put(VariableFormatter.formatVariable(key), PlacementInCodeDTO.from(value));
});
}
return dto;
Expand Down