Fix for #808: look for <dl>...</dl> in javadoc and parse parameter names

groovy · Feb 12, 2019 · cdb5498 · cdb5498
1 parent c1f8850
commit cdb5498
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 0 deletions.
diff --git a/jdt-patch/e410/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BinaryMethod.java b/jdt-patch/e410/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BinaryMethod.java
@@ -1,3 +1,4 @@
+// GROOVY PATCHED
 /*******************************************************************************
  * Copyright (c) 2000, 2016 IBM Corporation and others.
  *
@@ -14,6 +15,11 @@
  *******************************************************************************/
 package org.eclipse.jdt.internal.core;
 
+import java.util.List;
+import java.util.ArrayList;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jdt.core.Flags;
 import org.eclipse.jdt.core.IAnnotation;
@@ -374,6 +380,17 @@ public void run() {
 			}
 		}
 		if (methodDoc != null) {
+			// GROOVY add
+			int indexOfDefsList = methodDoc.indexOf("<dl>");
+			if (indexOfDefsList != -1) { List<String> names = new ArrayList<>();
+				String defsList = methodDoc.substring(indexOfDefsList, methodDoc.indexOf("</dl>", indexOfDefsList) + 5);
+				Matcher matcher = Pattern.compile("<dd><code>(\\p{javaJavaIdentifierPart}+)</code>.*?</dd>").matcher(defsList);
+				while (matcher.find()) {
+					names.add(matcher.group(1));
+				}
+				return this.parameterNames = names.toArray(new String[names.size()]);
+			}
+			// GROOVY end
 			int indexOfOpenParen = methodDoc.indexOf('(');
 			// Annotations may have parameters, so make sure we are parsing the actual method parameters.
 			if (info.getAnnotations() != null) {

diff --git a/jdt-patch/e411/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BinaryMethod.java b/jdt-patch/e411/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BinaryMethod.java
@@ -1,3 +1,4 @@
+// GROOVY PATCHED
 /*******************************************************************************
  * Copyright (c) 2000, 2016 IBM Corporation and others.
  *
@@ -14,6 +15,11 @@
  *******************************************************************************/
 package org.eclipse.jdt.internal.core;
 
+import java.util.List;
+import java.util.ArrayList;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jdt.core.Flags;
 import org.eclipse.jdt.core.IAnnotation;
@@ -374,6 +380,17 @@ public void run() {
 			}
 		}
 		if (methodDoc != null) {
+			// GROOVY add
+			int indexOfDefsList = methodDoc.indexOf("<dl>");
+			if (indexOfDefsList != -1) { List<String> names = new ArrayList<>();
+				String defsList = methodDoc.substring(indexOfDefsList, methodDoc.indexOf("</dl>", indexOfDefsList) + 5);
+				Matcher matcher = Pattern.compile("<dd><code>(\\p{javaJavaIdentifierPart}+)</code>.*?</dd>").matcher(defsList);
+				while (matcher.find()) {
+					names.add(matcher.group(1));
+				}
+				return this.parameterNames = names.toArray(new String[names.size()]);
+			}
+			// GROOVY end
 			int indexOfOpenParen = methodDoc.indexOf('(');
 			// Annotations may have parameters, so make sure we are parsing the actual method parameters.
 			if (info.getAnnotations() != null) {

diff --git a/jdt-patch/e47/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BinaryMethod.java b/jdt-patch/e47/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BinaryMethod.java
@@ -1,3 +1,4 @@
+// GROOVY PATCHED
 /*******************************************************************************
  * Copyright (c) 2000, 2016 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
@@ -11,6 +12,11 @@
  *******************************************************************************/
 package org.eclipse.jdt.internal.core;
 
+import java.util.List;
+import java.util.ArrayList;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jdt.core.Flags;
 import org.eclipse.jdt.core.IAnnotation;
@@ -358,6 +364,17 @@ public void run() {
 			}
 		}
 		if (methodDoc != null) {
+			// GROOVY add
+			int indexOfDefsList = methodDoc.indexOf("<dl>");
+			if (indexOfDefsList != -1) { List<String> names = new ArrayList<String>();
+				String defsList = methodDoc.substring(indexOfDefsList, methodDoc.indexOf("</dl>", indexOfDefsList) + 5);
+				Matcher matcher = Pattern.compile("<dd><code>(\\p{javaJavaIdentifierPart}+)</code>.*?</dd>").matcher(defsList);
+				while (matcher.find()) {
+					names.add(matcher.group(1));
+				}
+				return this.parameterNames = names.toArray(new String[names.size()]);
+			}
+			// GROOVY end
 			int indexOfOpenParen = methodDoc.indexOf('(');
 			// Annotations may have parameters, so make sure we are parsing the actual method parameters.
 			if (info.getAnnotations() != null) {

diff --git a/jdt-patch/e48/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BinaryMethod.java b/jdt-patch/e48/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BinaryMethod.java
@@ -1,3 +1,4 @@
+// GROOVY PATCHED
 /*******************************************************************************
  * Copyright (c) 2000, 2016 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
@@ -11,6 +12,11 @@
  *******************************************************************************/
 package org.eclipse.jdt.internal.core;
 
+import java.util.List;
+import java.util.ArrayList;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jdt.core.Flags;
 import org.eclipse.jdt.core.IAnnotation;
@@ -371,6 +377,17 @@ public void run() {
 			}
 		}
 		if (methodDoc != null) {
+			// GROOVY add
+			int indexOfDefsList = methodDoc.indexOf("<dl>");
+			if (indexOfDefsList != -1) { List<String> names = new ArrayList<>();
+				String defsList = methodDoc.substring(indexOfDefsList, methodDoc.indexOf("</dl>", indexOfDefsList) + 5);
+				Matcher matcher = Pattern.compile("<dd><code>(\\p{javaJavaIdentifierPart}+)</code>.*?</dd>").matcher(defsList);
+				while (matcher.find()) {
+					names.add(matcher.group(1));
+				}
+				return this.parameterNames = names.toArray(new String[names.size()]);
+			}
+			// GROOVY end
 			int indexOfOpenParen = methodDoc.indexOf('(');
 			// Annotations may have parameters, so make sure we are parsing the actual method parameters.
 			if (info.getAnnotations() != null) {

diff --git a/jdt-patch/e49/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BinaryMethod.java b/jdt-patch/e49/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BinaryMethod.java
@@ -1,3 +1,4 @@
+// GROOVY PATCHED
 /*******************************************************************************
  * Copyright (c) 2000, 2016 IBM Corporation and others.
  *
@@ -14,6 +15,11 @@
  *******************************************************************************/
 package org.eclipse.jdt.internal.core;
 
+import java.util.List;
+import java.util.ArrayList;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jdt.core.Flags;
 import org.eclipse.jdt.core.IAnnotation;
@@ -374,6 +380,17 @@ public void run() {
 			}
 		}
 		if (methodDoc != null) {
+			// GROOVY add
+			int indexOfDefsList = methodDoc.indexOf("<dl>");
+			if (indexOfDefsList != -1) { List<String> names = new ArrayList<>();
+				String defsList = methodDoc.substring(indexOfDefsList, methodDoc.indexOf("</dl>", indexOfDefsList) + 5);
+				Matcher matcher = Pattern.compile("<dd><code>(\\p{javaJavaIdentifierPart}+)</code>.*?</dd>").matcher(defsList);
+				while (matcher.find()) {
+					names.add(matcher.group(1));
+				}
+				return this.parameterNames = names.toArray(new String[names.size()]);
+			}
+			// GROOVY end
 			int indexOfOpenParen = methodDoc.indexOf('(');
 			// Annotations may have parameters, so make sure we are parsing the actual method parameters.
 			if (info.getAnnotations() != null) {