Fixed regex to search for methods

Author: jisedlac

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

@@ -185,18 +185,16 @@ private static JavaMethod findMethod(String methodName, String modelName, String
 
             // Search for method declaration
             if (endMatcher.find(offset)) {
-                if (offset == endMatcher.start()) {
-                    offset = endMatcher.end() - 1;
-                    if (offset > bodyEnd) return null;
-                    
-                    if (withoutBody && ';' == source.charAt(offset)) return new JavaMethod(methodName, methodSignature, source, nameStart, -1, -1); // NOI18N
+                offset = endMatcher.end() - 1;
+                if (offset > bodyEnd) return null;
 
-                    // Search for method body
-                    int[] bodyOffsets = JavaSourceUtils.getBlockBounds(source, offset, '{', '}'); // NOI18N
-                    if (bodyOffsets[0] == -1 || bodyOffsets[1] == -1 || bodyOffsets[1] > bodyEnd) return null;
+                if (withoutBody && ';' == source.charAt(offset)) return new JavaMethod(methodName, methodSignature, source, nameStart, -1, -1); // NOI18N
 
-                    return new JavaMethod(modelName, methodSignature, source, nameStart, bodyOffsets[0], bodyOffsets[1]); // NOI18N
-                }
+                // Search for method body
+                int[] bodyOffsets = JavaSourceUtils.getBlockBounds(source, offset, '{', '}'); // NOI18N
+                if (bodyOffsets[0] == -1 || bodyOffsets[1] == -1 || bodyOffsets[1] > bodyEnd) return null;
+
+                return new JavaMethod(modelName, methodSignature, source, nameStart, bodyOffsets[0], bodyOffsets[1]); // NOI18N
             }
         }
 

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

@@ -61,9 +61,9 @@ final class JavaSourceUtils {
     static final String INSTANCE_INITIALIZER_REGEX = "[\\{\\};]\\s*\\{";        // NOI18N
 
     static final String DEFINED_METHOD_WITHBODY_START_REGEX = "(?<" + REGEX_GROUP_PREFIX + ">[\\s\\>])" + REGEX_PARAMETER_0 + "\\s*\\("; // NOI18N
-    static final String DEFINED_METHOD_WITHBODY_END_REGEX = "\\s*(" + THROWS_REGEX + ")??\\s*\\{"; // NOI18N
+    static final String DEFINED_METHOD_WITHBODY_END_REGEX = "\\G\\s*(" + THROWS_REGEX + ")??\\s*\\{"; // NOI18N
     /* TODO: review */ static final String DEFINED_METHOD_WITHOUTBODY_START_REGEX = "(?<" + REGEX_GROUP_PREFIX + ">\\Wnative[\\s\\S&&[^;]&&[^\\(]]*?[\\s\\>])" + REGEX_PARAMETER_0 + "\\s*\\("; // NOI18N
-    static final String DEFINED_METHOD_WITHOUTBODY_END_REGEX = "\\s*(" + THROWS_REGEX + ")??\\s*;"; // NOI18N
+    static final String DEFINED_METHOD_WITHOUTBODY_END_REGEX = "\\G\\s*(" + THROWS_REGEX + ")??\\s*;"; // NOI18N
 
 
     private JavaSourceUtils() {}