You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by jl...@apache.org on 2019/08/14 06:18:01 UTC
[netbeans] branch master updated: Fixing java.completion tests on
JDK 13.
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 5809534 Fixing java.completion tests on JDK 13.
5809534 is described below
commit 580953444cd15a7e83393b041301ef40815e2c0b
Author: Jan Lahoda <jl...@netbeans.org>
AuthorDate: Wed Aug 14 08:17:54 2019 +0200
Fixing java.completion tests on JDK 13.
---
.../JavaCompletionTaskTest/13/stringContent.pass | 73 ++++++++++++++++++++++
.../source/parsing/ParameterNameProviderImpl.java | 15 +++--
.../api/java/source/SourceUtilsTestUtil2.java | 2 +
3 files changed, 86 insertions(+), 4 deletions(-)
diff --git a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/13/stringContent.pass b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/13/stringContent.pass
new file mode 100644
index 0000000..7ef0846
--- /dev/null
+++ b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/13/stringContent.pass
@@ -0,0 +1,73 @@
+public char charAt(int arg0)
+public IntStream chars()
+public int codePointAt(int arg0)
+public int codePointBefore(int arg0)
+public int codePointCount(int arg0, int arg1)
+public IntStream codePoints()
+public int compareTo(String arg0)
+public int compareToIgnoreCase(String arg0)
+public String concat(String arg0)
+public boolean contains(CharSequence arg0)
+public boolean contentEquals(CharSequence arg0)
+public boolean contentEquals(StringBuffer arg0)
+public Optional<String> describeConstable()
+public boolean endsWith(String arg0)
+public boolean equals(Object arg0)
+public boolean equalsIgnoreCase(String arg0)
+public String formatted(Object... arg0)
+public byte[] getBytes()
+public byte[] getBytes(Charset arg0)
+public byte[] getBytes(String arg0)
+public void getBytes(int arg0, int arg1, byte[] arg2, int arg3)
+public void getChars(int arg0, int arg1, char[] arg2, int arg3)
+public final native Class<?> getClass()
+public int hashCode()
+public String indent(int arg0)
+public int indexOf(String arg0)
+public int indexOf(int arg0)
+public int indexOf(String arg0, int arg1)
+public int indexOf(int arg0, int arg1)
+public native String intern()
+public boolean isBlank()
+public boolean isEmpty()
+public int lastIndexOf(String arg0)
+public int lastIndexOf(int arg0)
+public int lastIndexOf(String arg0, int arg1)
+public int lastIndexOf(int arg0, int arg1)
+public int length()
+public Stream<String> lines()
+public boolean matches(String arg0)
+public final native void notify()
+public final native void notifyAll()
+public int offsetByCodePoints(int arg0, int arg1)
+public boolean regionMatches(int arg0, String arg1, int arg2, int arg3)
+public boolean regionMatches(boolean arg0, int arg1, String arg2, int arg3, int arg4)
+public String repeat(int arg0)
+public String replace(CharSequence arg0, CharSequence arg1)
+public String replace(char arg0, char arg1)
+public String replaceAll(String arg0, String arg1)
+public String replaceFirst(String arg0, String arg1)
+public String resolveConstantDesc(Lookup arg0)
+public String[] split(String arg0)
+public String[] split(String arg0, int arg1)
+public boolean startsWith(String arg0)
+public boolean startsWith(String arg0, int arg1)
+public String strip()
+public String stripIndent()
+public String stripLeading()
+public String stripTrailing()
+public CharSequence subSequence(int arg0, int arg1)
+public String substring(int arg0)
+public String substring(int arg0, int arg1)
+public char[] toCharArray()
+public String toLowerCase()
+public String toLowerCase(Locale arg0)
+public String toString()
+public String toUpperCase()
+public String toUpperCase(Locale arg0)
+public R transform(Function<? super String, ? extends R> arg0)
+public String translateEscapes()
+public String trim()
+public final void wait()
+public final native void wait(long arg0)
+public final void wait(long arg0, int arg1)
diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/ParameterNameProviderImpl.java b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/ParameterNameProviderImpl.java
index 15db262..2f22002 100644
--- a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/ParameterNameProviderImpl.java
+++ b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/ParameterNameProviderImpl.java
@@ -41,6 +41,7 @@ import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -76,6 +77,8 @@ import org.openide.util.Exceptions;
* @author lahvac
*/
public class ParameterNameProviderImpl {
+ public static boolean DISABLE_ARTIFICAL_PARAMETER_NAMES;
+
public static void register(JavacTask task, ClasspathInfo cpInfo) {
try {
Class<?> c = Class.forName("com.sun.source.util.ParameterNameProvider");
@@ -165,10 +168,14 @@ public class ParameterNameProviderImpl {
}
if (names == null) {
- names = artificial_method2Parameters.computeIfAbsent(methodKey, mk -> {
- Set<String> usedNames = new HashSet<>();
- return ((ExecutableElement) method).getParameters().stream().map(p -> generateReadableParameterName(p.asType().toString(), usedNames)).collect(Collectors.toList());
- });
+ if (!DISABLE_ARTIFICAL_PARAMETER_NAMES) {
+ names = artificial_method2Parameters.computeIfAbsent(methodKey, mk -> {
+ Set<String> usedNames = new HashSet<>();
+ return ((ExecutableElement) method).getParameters().stream().map(p -> generateReadableParameterName(p.asType().toString(), usedNames)).collect(Collectors.toList());
+ });
+ } else {
+ names = Collections.emptyList();
+ }
}
capCache(source_toplevelClass2method2Parameters);
diff --git a/java/java.source.base/test/unit/src/org/netbeans/api/java/source/SourceUtilsTestUtil2.java b/java/java.source.base/test/unit/src/org/netbeans/api/java/source/SourceUtilsTestUtil2.java
index 5f8e84f..347040b 100644
--- a/java/java.source.base/test/unit/src/org/netbeans/api/java/source/SourceUtilsTestUtil2.java
+++ b/java/java.source.base/test/unit/src/org/netbeans/api/java/source/SourceUtilsTestUtil2.java
@@ -22,6 +22,7 @@ import com.sun.source.tree.Tree;
import org.apache.lucene.store.FSDirectory;
import org.netbeans.modules.java.source.parsing.JavacParser;
import org.netbeans.modules.java.source.parsing.JavacParser.TreeLoaderRegistry;
+import org.netbeans.modules.java.source.parsing.ParameterNameProviderImpl;
import org.netbeans.modules.java.source.transform.Transformer;
import org.netbeans.modules.parsing.lucene.LuceneIndex;
import org.netbeans.modules.parsing.lucene.support.IndexManagerTestUtilities;
@@ -67,6 +68,7 @@ public final class SourceUtilsTestUtil2 {
} catch (Exception ex) {
//ignore
}
+ ParameterNameProviderImpl.DISABLE_ARTIFICAL_PARAMETER_NAMES = true;
}
public static void disableConfinementTest() {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists