Skip to content

Commit c1bc76a

Browse files
authored
Dart 대문자 enum 이름의 숫자 처리를 고침 (OpenAPITools#23894)
Dart generator가 FOO2, FOO_BAR2처럼 숫자가 붙은 대문자 이름을 camelize하지 않고 그대로 보존하도록 정규식을 조정했습니다. 기존 숫자 시작 이름은 계속 정규화되도록 회귀 테스트도 함께 유지했습니다.
1 parent 2579b61 commit c1bc76a

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ public String toVarName(String name) {
416416
name = name.replaceAll("^_", "");
417417

418418
// if it's all upper case, do nothing
419-
if (name.matches("^[A-Z_]*$")) {
419+
if (name.matches("^[A-Z_][A-Z0-9_]*$")) {
420420
return name;
421421
}
422422

modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/DartModelTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,8 @@ public static Object[][] varNames() {
374374
{"hello", "hello"},
375375
{"FOO", "FOO"},
376376
{"FOO_BAR", "FOO_BAR"},
377+
{"FOO2", "FOO2"},
378+
{"FOO_BAR2", "FOO_BAR2"},
377379
{"FOO_BAR_BAZ_", "FOO_BAR_BAZ_"},
378380
{"123hello", "n123hello"},
379381
{"_hello", "hello"},
@@ -418,6 +420,8 @@ public static Object[] enumVarNames() {
418420
new EnumVarName("hello", "hello", "String"),
419421
new EnumVarName("FOO", "FOO", "String"),
420422
new EnumVarName("FOO_BAR", "FOO_BAR", "String"),
423+
new EnumVarName("FOO2", "FOO2", "String"),
424+
new EnumVarName("FOO_BAR2", "FOO_BAR2", "String"),
421425
new EnumVarName("FOO_BAR_BAZ_", "FOO_BAR_BAZ_", "String"),
422426
new EnumVarName("123hello", "n123hello", "String"),
423427
new EnumVarName("_hello", "hello", "String"),

0 commit comments

Comments
 (0)