Handle $ at the end of class names for better Scala support

See https://stackoverflow.com/questions/41570148/why-does-scala-place-a-dollar-sign-at-the-end-of-class-names Signed-off-by: Dimitry Polivaev <[email protected]>
TNG · Mar 21, 2024 · 6e1fc69 · 6e1fc69
1 parent 1ed20d5
commit 6e1fc69
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/archunit/src/main/java/com/tngtech/archunit/core/domain/Formatters.java b/archunit/src/main/java/com/tngtech/archunit/core/domain/Formatters.java
@@ -118,7 +118,11 @@ public static String ensureSimpleName(String name) {
         int lastIndexOfDot = name.lastIndexOf('.');
         String partAfterDot = lastIndexOfDot >= 0 ? name.substring(lastIndexOfDot + 1) : name;
 
-        int lastIndexOf$ = partAfterDot.lastIndexOf('$');
+        int lastFinalNon$ = partAfterDot.length() - 1;
+        while(lastFinalNon$ > 0 && partAfterDot.charAt(lastFinalNon$) == '$') {
+            lastFinalNon$--;
+        }
+        int lastIndexOf$ = lastFinalNon$ > 0 ? partAfterDot.lastIndexOf('$', lastFinalNon$ - 1): -1;
         String simpleNameCandidate = lastIndexOf$ >= 0 ? partAfterDot.substring(lastIndexOf$ + 1) : partAfterDot;
 
         for (int i = 0; i < simpleNameCandidate.length(); i++) {

diff --git a/archunit/src/test/java/com/tngtech/archunit/core/domain/FormattersTest.java b/archunit/src/test/java/com/tngtech/archunit/core/domain/FormattersTest.java
@@ -62,8 +62,13 @@ public static Object[][] simple_name_test_cases() {
                 $("", ""),
                 $("Dummy", "Dummy"),
                 $("org.example.Dummy", "Dummy"),
+                $("org.example.Dummy$", "Dummy$"),
+                $("org.example.Dummy$$", "Dummy$$"),
+                $("org.example.Dummy$$$", "Dummy$$$"),
+                $("org.example.$$$", "$$$"),
                 $("org.example.Dummy$123", ""),
                 $("org.example.Dummy$NestedClass", "NestedClass"),
+                $("org.example.Dummy$NestedClass$", "NestedClass$"),
                 $("org.example.Dummy$NestedClass123", "NestedClass123"),
                 $("org.example.Dummy$NestedClass$123", ""),
                 $("org.example.Dummy$NestedClass$MoreNestedClass", "MoreNestedClass"),