Fix issue simple lazy resolution with valid leading characters (#1599)

raphw · Feb 23, 2024 · aa5c04a · aa5c04a
1 parent a5a938d
commit aa5c04a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/TypeDescription.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/TypeDescription.java
@@ -8408,7 +8408,7 @@ public String getSimpleName() {
                         return internalName;
                     }
                 }
-                while (simpleNameIndex < internalName.length() && !Character.isLetter(internalName.charAt(simpleNameIndex))) {
+                while (simpleNameIndex < internalName.length() && !Character.isJavaIdentifierStart(internalName.charAt(simpleNameIndex))) {
                     simpleNameIndex += 1;
                 }
                 return internalName.substring(simpleNameIndex);

diff --git a/...rc/test/java/net/bytebuddy/pool/TypePoolDefaultWithLazyResolutionTypeDescriptionTest.java b/...rc/test/java/net/bytebuddy/pool/TypePoolDefaultWithLazyResolutionTypeDescriptionTest.java
@@ -224,6 +224,13 @@ public void testGenericSuperInterfaceNavigatedHierarchyResolutionIsLazy() throws
         verifyNoMoreInteractions(classFileLocator);
     }
 
+    @Test
+    @Override
+    public void testSimpleName() throws Exception {
+        super.testSimpleName();
+        assertThat(describe($DollarInName.class).getSimpleName(), CoreMatchers.is($DollarInName.class.getSimpleName()));
+    }
+
     private static class SuperClass {
         /* empty */
     }
@@ -265,4 +272,8 @@ T foo(T argument) throws T {
             return argument;
         }
     }
+
+    private static class $DollarInName {
+        /* empty */
+    }
 }