Fixed anonymous class discovery: Test<String> t = new<String>Test<String>() {}

Author: jisedlac

plugins/sources/src/org/graalvm/visualvm/sources/java/JavaClass.java

@@ -182,46 +182,59 @@ private static List<JavaClass> populateAnonymousClasses(String source, List<Java
 
         String _source = JavaSourceUtils.maskClasses(source, innerClasses);
 
-        Pattern pattern = Pattern.compile(JavaSourceUtils.ANONYMOUS_CLASS_REGEX);
-        Matcher matcher = pattern.matcher(_source);
+        Pattern pattern = Pattern.compile(JavaSourceUtils.ANONYMOUS_CLASS_START_REGEX);
+        Matcher startMatcher = pattern.matcher(_source);
+        Matcher endMatcher = null;
 
-        while (startOffset <= endOffset && matcher.find(startOffset)) {
-            startOffset = matcher.end();
+        while (startOffset <= endOffset && startMatcher.find(startOffset)) {
+            startOffset = startMatcher.end();
 
             // Generics
-            if (_source.charAt(startOffset) == '<') {                           // NOI18N
-                startOffset = JavaSourceUtils.skipBlock(_source, startOffset, '<', '>'); // NOI18N
-                startOffset = JavaSourceUtils.skipWhiteSpaces(_source, startOffset);
+            if (_source.charAt(startOffset - 1) == '<') {                       // NOI18N
+                startOffset = JavaSourceUtils.skipBlock(_source, startOffset - 1, '<', '>'); // NOI18N
             }
 
-            // Array definition
-            if (_source.charAt(startOffset) == '[') {                           // NOI18N
-                while (_source.charAt(startOffset) == '[' && startOffset < endOffset) // NOI18N
-                    startOffset = JavaSourceUtils.skipBlock(_source, startOffset, '[', ']'); // NOI18N
-                startOffset = JavaSourceUtils.skipWhiteSpaces(_source, startOffset);
-            // Anonymous class
-            } else {
-                // Not expected
-                if (_source.charAt(startOffset) != '(') {                       // NOI18N
-                    // nothing we can do here, just search again
-                } else {
-                    // TODO do not skipBlock to search the parameters as well
-                    // but the numbering of anonymous classes becomes broken
-                    startOffset = JavaSourceUtils.skipBlock(_source, startOffset, '(', ')'); // NOI18N
+            if (endMatcher == null) {
+                pattern = Pattern.compile(JavaSourceUtils.ANONYMOUS_CLASS_END_REGEX);
+                endMatcher = pattern.matcher(_source);
+            }
+            
+            if (endMatcher.find(startOffset)) {
+                startOffset = endMatcher.end();
+                
+                // Generics
+                if (_source.charAt(startOffset) == '<') {                           // NOI18N
+                    startOffset = JavaSourceUtils.skipBlock(_source, startOffset, '<', '>'); // NOI18N
+                    startOffset = JavaSourceUtils.skipWhiteSpaces(_source, startOffset);
+                }
+
+                // Array definition
+                if (_source.charAt(startOffset) == '[') {                           // NOI18N
+                    while (_source.charAt(startOffset) == '[' && startOffset < endOffset) // NOI18N
+                        startOffset = JavaSourceUtils.skipBlock(_source, startOffset, '[', ']'); // NOI18N
                     startOffset = JavaSourceUtils.skipWhiteSpaces(_source, startOffset);
-                    // Object creation only
-                    if (_source.charAt(startOffset) != '{') {                   // NOI18N
+                // Anonymous class
+                } else {
+                    // Not expected
+                    if (_source.charAt(startOffset) != '(') {                       // NOI18N
                         // nothing we can do here, just search again
-                    // Anonymous class
                     } else {
-                        int nameOffset = JavaSourceUtils.skipWhiteSpaces(_source, matcher.start() + "_new".length()); // NOI18N
-                        
-                        int[] bodyOffsets = JavaSourceUtils.getBlockBounds(_source, startOffset, '{', '}'); // NOI18N
-                        if (bodyOffsets[0] == -1 || bodyOffsets[1] == -1 || bodyOffsets[1] > endOffset) break;
-                        
-                        classes.add(new JavaClass(Integer.toString(classes.size() + 1), source, nameOffset, bodyOffsets[0], bodyOffsets[1]));
-                        
-                        startOffset = bodyOffsets[1] + 1;
+                        // TODO do not skipBlock to search the parameters as well
+                        // but the numbering of anonymous classes becomes broken
+                        startOffset = JavaSourceUtils.skipBlock(_source, startOffset, '(', ')'); // NOI18N
+                        startOffset = JavaSourceUtils.skipWhiteSpaces(_source, startOffset);
+                        // Object creation only
+                        if (_source.charAt(startOffset) != '{') {                   // NOI18N
+                            // nothing we can do here, just search again
+                        // Anonymous class
+                        } else {
+                            int[] bodyOffsets = JavaSourceUtils.getBlockBounds(_source, startOffset, '{', '}'); // NOI18N
+                            if (bodyOffsets[0] == -1 || bodyOffsets[1] == -1 || bodyOffsets[1] > endOffset) break;
+
+                            classes.add(new JavaClass(Integer.toString(classes.size() + 1), source, endMatcher.start(JavaSourceUtils.REGEX_GROUP_NAME), bodyOffsets[0], bodyOffsets[1]));
+
+                            startOffset = bodyOffsets[1] + 1;
+                        }
                     }
                 }
             }

plugins/sources/src/org/graalvm/visualvm/sources/java/JavaSourceUtils.java

@@ -55,7 +55,8 @@ final class JavaSourceUtils {
 
     static final String ANONYMOUS_LOCAL_CLASSNAME_REGEX = "(?<" + REGEX_GROUP_INDEX + ">[\\d]+)(?<" + REGEX_GROUP_NAME + ">[\\D]*)"; // NOI18N
     static final String CLASS_REGEX = "(^|[\\W&&[^.]])(class|interface|enum)\\s+(?<" + REGEX_GROUP_NAME + ">" + IDENTIFIER_REGEX + ")[^\\p{javaJavaIdentifierPart}]"; // NOI18N
-    static final String ANONYMOUS_CLASS_REGEX = "\\Wnew\\s+" + FULLY_QUALIFIED_IDENTIFIER_REGEX + "\\s*"; // NOI18N
+    static final String ANONYMOUS_CLASS_START_REGEX = "\\Wnew(\\s+|\\s*\\<)"; // NOI18N
+    static final String ANONYMOUS_CLASS_END_REGEX = "\\G\\s*(?<" + REGEX_GROUP_NAME + ">" + FULLY_QUALIFIED_IDENTIFIER_REGEX + ")\\s*"; // NOI18N
 
     static final String CLASS_INITIALIZER_REGEX = "\\Wstatic\\s*\\{";           // NOI18N
     static final String INSTANCE_INITIALIZER_REGEX = "[\\{\\};]\\s*\\{";        // NOI18N