merging #69

changes.rst

@@ -1,5 +1,13 @@
 .. currentmodule:: bitproto
 
+Version 1.2.1 (Pending)
+-----------------------
+
+.. _version-1.2.1:
+
+- Bugfix: `pascal_case` formatter. ISSUE #68, PR #69.
+
+
 Version 1.2.0
 -------------
 

compiler/bitproto/utils.py

@@ -343,16 +343,19 @@ def pascal_case(word: str) -> str:
 
     >>> pascal_case("someWord")
     "SomeWord"
+
+    >>> pascal_case("my_prefix_someWord")
+    "MyPrefixSomeWord"
     """
     items: List[str] = []
     parts = word.split("_")
-    contains_underscore = len(parts) > 1
+
     for part in parts:
         if part:
-            if contains_underscore:
-                items.append(part.title())
-            else:
-                first_char, remain_part = part[0], part[1:]
+            first_char, remain_part = part[0], part[1:]
+            if remain_part and remain_part.isupper():  # UPPERCASE
+                items.append(first_char.upper() + remain_part.lower())
+            else:  # flatcase or camelCase or PascalCase
                 items.append(first_char.upper() + remain_part)
     return "".join(items)
 

tests/test_compiler/test_util.py

@@ -122,6 +122,10 @@ def test_pascal_case() -> None:
     assert pascal_case("PASCAL_CASE") == "PascalCase"
     assert pascal_case("pascal_Case") == "PascalCase"
     assert pascal_case("PascalCase") == "PascalCase"
+    # issue#68
+    # https://github.com/hit9/bitproto/issues/68#issuecomment-3219647987
+    assert pascal_case("my_prefix_someWord") == "MyPrefixSomeWord"
+    assert pascal_case("my_prefix_MyMessageType") == "MyPrefixMyMessageType"
 
 
 def test_snake_case() -> None: