Align enum rawName with fn-form labels during canonicalization.
Derive transition and state rawName from package-canonical fullIdentifier so JSON exports stay consistent when bare constants or mismatched short forms appear in source. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -180,10 +180,14 @@ public final class MachineEnumCanonicalizer {
|
||||
String canonical = canonicalizeLabel(
|
||||
event.fullIdentifier() != null ? event.fullIdentifier() : event.rawName(),
|
||||
enumTypeFqn);
|
||||
if (canonical.equals(event.fullIdentifier())) {
|
||||
String fnRaw = toFnForm(canonical, enumTypeFqn);
|
||||
if (fnRaw == null) {
|
||||
fnRaw = event.rawName();
|
||||
}
|
||||
if (canonical.equals(event.fullIdentifier()) && fnRaw.equals(event.rawName())) {
|
||||
return event;
|
||||
}
|
||||
return Event.of(event.rawName(), canonical);
|
||||
return Event.of(fnRaw, canonical);
|
||||
}
|
||||
|
||||
static State canonicalizeState(State state, String enumTypeFqn) {
|
||||
@@ -200,6 +204,11 @@ public final class MachineEnumCanonicalizer {
|
||||
if (isStringOrPrimitiveType(enumTypeFqn) && canonical.startsWith(enumTypeFqn + ".")) {
|
||||
String constant = canonical.substring(enumTypeFqn.length() + 1);
|
||||
raw = "\"" + constant + "\"";
|
||||
} else {
|
||||
String fnRaw = toFnForm(canonical, enumTypeFqn);
|
||||
if (fnRaw != null) {
|
||||
raw = fnRaw;
|
||||
}
|
||||
}
|
||||
return State.of(raw, canonical);
|
||||
}
|
||||
@@ -315,4 +324,25 @@ public final class MachineEnumCanonicalizer {
|
||||
private static String simpleName(String fqn) {
|
||||
return fqn.contains(".") ? fqn.substring(fqn.lastIndexOf('.') + 1) : fqn;
|
||||
}
|
||||
|
||||
/**
|
||||
* Derives {@code EnumFormat.fn} display form ({@code OrderEvent.PAY}) from a package-canonical identifier.
|
||||
*/
|
||||
static String toFnForm(String canonicalFqn, String enumTypeFqn) {
|
||||
if (canonicalFqn == null || canonicalFqn.isBlank() || isStringOrPrimitiveType(enumTypeFqn)) {
|
||||
return null;
|
||||
}
|
||||
if (canonicalFqn.startsWith("<") || canonicalFqn.startsWith("\"")) {
|
||||
return null;
|
||||
}
|
||||
if (!canonicalFqn.contains(".")) {
|
||||
return canonicalFqn;
|
||||
}
|
||||
int lastDot = canonicalFqn.lastIndexOf('.');
|
||||
int prevDot = canonicalFqn.lastIndexOf('.', lastDot - 1);
|
||||
if (prevDot > 0) {
|
||||
return canonicalFqn.substring(prevDot + 1);
|
||||
}
|
||||
return simpleName(enumTypeFqn) + "." + canonicalFqn.substring(lastDot + 1);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user