This is an automated email from the ASF dual-hosted git repository.
akshaygupta pushed a commit to branch revert-2283-sealedAutocompletion
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit ec27aa6f6f93ad21c1abec6eb80085ef48e9b861
Author: Akshay Gupta <55184560+akshay-gupta-ora...@users.noreply.github.com>
AuthorDate: Sun Oct 11 05:37:43 2020 +0530
Revert "[NETBEANS-3990]: Auto completion for Sealed Types"
---
.../java/completion/JavaCompletionTask.java | 84 +------
.../15/CreateConstructorNonDefaultConstructor.pass | 155 -------------
...ConstructorNonDefaultConstructorInnerClass.pass | 153 -------------
.../15/CreateConstructorTest.pass | 156 -------------
.../15/CreateConstructorTestInnerClass.pass | 154 -------------
.../15/CreateConstructorWithConstructors.pass | 154 -------------
...reateConstructorWithConstructorsInnerClass.pass | 152 -------------
.../CreateConstructorWithDefaultConstructor.pass | 155 -------------
...onstructorWithDefaultConstructorInnerClass.pass | 153 -------------
.../15/OverrideAbstractList.pass | 176 ---------------
.../15/OverrideAbstractListAbstract.pass | 178 ---------------
.../15/UnimplementedMethod.pass | 142 ------------
.../15/classModifiersWithoutPublic.pass | 8 -
.../15/extendsAndImplementsAndPermitsKeywords.pass | 3 -
.../15/extendsAndPermitsKeywords.pass | 2 -
.../15/implementsAndPermitsKeywords.pass | 2 -
.../15/interfaceMemberModifiersAndTypes.pass | 140 ------------
.../15/memberModifiersStartingWithP.pass | 3 -
.../15/memberModifiersTypesAndGenElements.pass | 142 ------------
.../15/memberModifiersTypesAndGenElements2.pass | 143 ------------
.../15/memberModifiersTypesAndGenElements3.pass | 144 ------------
.../15/memberModifiersTypesAndGenElements4.pass | 150 -------------
.../JavaCompletionTaskTest/15/permitsKeyword.pass | 1 -
.../15/topLevelKeywords.pass | 11 -
.../15/topLevelKeywordsWithoutPackage.pass | 10 -
.../JavaCompletionTask115FeaturesTest.java | 241 ---------------------
.../netbeans/modules/java/source/TreeShims.java | 28 ---
27 files changed, 4 insertions(+), 2836 deletions(-)
diff --git
a/java/java.completion/src/org/netbeans/modules/java/completion/JavaCompletionTask.java
b/java/java.completion/src/org/netbeans/modules/java/completion/JavaCompletionTask.java
index 94d0d1e..47e18e5 100644
---
a/java/java.completion/src/org/netbeans/modules/java/completion/JavaCompletionTask.java
+++
b/java/java.completion/src/org/netbeans/modules/java/completion/JavaCompletionTask.java
@@ -49,7 +49,7 @@ import org.netbeans.api.java.source.ClassIndex.Symbols;
import org.netbeans.api.java.source.support.ErrorAwareTreePathScanner;
import org.netbeans.api.java.source.support.ReferencesCount;
import org.netbeans.api.lexer.TokenSequence;
-import org.netbeans.api.lexer.TokenUtilities;
+import org.netbeans.modules.java.completion.TreeShims;
import org.netbeans.modules.parsing.api.Source;
import org.openide.util.Pair;
@@ -168,19 +168,16 @@ public final class JavaCompletionTask<T> extends BaseTask
{
private static final String MODULE_KEYWORD = "module"; //NOI18N
private static final String NATIVE_KEYWORD = "native"; //NOI18N
private static final String NEW_KEYWORD = "new"; //NOI18N
- private static final String NON_SEALED_KEYWORD = "non-sealed"; //NOI18N
private static final String NULL_KEYWORD = "null"; //NOI18N
private static final String OPEN_KEYWORD = "open"; //NOI18N
private static final String OPENS_KEYWORD = "opens"; //NOI18N
private static final String PACKAGE_KEYWORD = "package"; //NOI18N
- private static final String PERMITS_KEYWORD = "permits"; //NOI18N
private static final String PRIVATE_KEYWORD = "private"; //NOI18N
private static final String PROTECTED_KEYWORD = "protected"; //NOI18N
private static final String PROVIDES_KEYWORD = "provides"; //NOI18N
private static final String PUBLIC_KEYWORD = "public"; //NOI18N
private static final String RETURN_KEYWORD = "return"; //NOI18N
private static final String REQUIRES_KEYWORD = "requires"; //NOI18N
- private static final String SEALED_KEYWORD = "sealed"; //NOI18N
private static final String SHORT_KEYWORD = "short"; //NOI18N
private static final String STATIC_KEYWORD = "static"; //NOI18N
private static final String STRICT_KEYWORD = "strictfp"; //NOI18N
@@ -241,10 +238,8 @@ public final class JavaCompletionTask<T> extends BaseTask {
private static final SourceVersion SOURCE_VERSION_RELEASE_11;
private static final SourceVersion SOURCE_VERSION_RELEASE_13;
private static final SourceVersion SOURCE_VERSION_RELEASE_14;
- private static final SourceVersion SOURCE_VERSION_RELEASE_15;
-
static {
- SourceVersion r10, r11, r13, r14, r15;
+ SourceVersion r10, r11, r13, r14;
try {
r10 = SourceVersion.valueOf("RELEASE_10");
@@ -266,19 +261,12 @@ public final class JavaCompletionTask<T> extends BaseTask
{
} catch (IllegalArgumentException ex) {
r14 = null;
}
-
- try {
- r15 = SourceVersion.valueOf("RELEASE_15");
- } catch (IllegalArgumentException ex) {
- r15 = null;
- }
SOURCE_VERSION_RELEASE_10 = r10;
SOURCE_VERSION_RELEASE_11 = r11;
SOURCE_VERSION_RELEASE_13 = r13;
SOURCE_VERSION_RELEASE_14 = r14;
- SOURCE_VERSION_RELEASE_15 = r15;
- }
+ }
private final ItemFactory<T> itemFactory;
private final Set<Options> options;
@@ -777,26 +765,6 @@ public final class JavaCompletionTask<T> extends BaseTask {
return;
}
TreeUtilities tu = controller.getTreeUtilities();
- Tree lastPerm = null;
- List<? extends Tree> permits = TreeShims.getPermits(cls);
- permits = permits == null ? new ArrayList<>() : permits;
- for (Tree perm : permits) {
- int permPos = (int) sourcePositions.getEndPosition(root, perm);
- if (permPos == Diagnostic.NOPOS || offset <= permPos) {
- break;
- }
- lastPerm = perm;
- startPos = permPos;
- }
- if (lastPerm != null) {
- TokenSequence<JavaTokenId> last = findLastNonWhitespaceToken(env,
startPos, offset);
- if (last != null && last.token().id() == JavaTokenId.COMMA) {
- controller.toPhase(Phase.ELEMENTS_RESOLVED);
- env.addToExcludes(controller.getTrees().getElement(path));
- addClassTypes(env, null);
- }
- return;
- }
Tree lastImpl = null;
for (Tree impl : cls.getImplementsClause()) {
int implPos = (int) sourcePositions.getEndPosition(root, impl);
@@ -812,12 +780,6 @@ public final class JavaCompletionTask<T> extends BaseTask {
controller.toPhase(Phase.ELEMENTS_RESOLVED);
env.addToExcludes(controller.getTrees().getElement(path));
addTypes(env, EnumSet.of(INTERFACE, ANNOTATION_TYPE), null);
- } else if (isSealedSupported(env) && last != null &&
TokenUtilities.textEquals(last.token().text(),PERMITS_KEYWORD)) {
- controller.toPhase(Phase.ELEMENTS_RESOLVED);
- env.addToExcludes(controller.getTrees().getElement(path));
- addClassTypes(env, null);
- } else if (isSealedSupported(env)) {
- addKeyword(env, PERMITS_KEYWORD, SPACE, false);
}
return;
}
@@ -830,15 +792,8 @@ public final class JavaCompletionTask<T> extends BaseTask {
controller.toPhase(Phase.ELEMENTS_RESOLVED);
env.addToExcludes(controller.getTrees().getElement(path));
addTypes(env, EnumSet.of(INTERFACE, ANNOTATION_TYPE),
null);
- } else if (isSealedSupported(env) && last != null &&
TokenUtilities.textEquals(last.token().text(),PERMITS_KEYWORD)) {
- controller.toPhase(Phase.ELEMENTS_RESOLVED);
- env.addToExcludes(controller.getTrees().getElement(path));
- addClassTypes(env, null);
} else {
addKeyword(env, IMPLEMENTS_KEYWORD, SPACE, false);
- if (isSealedSupported(env)) {
- addKeyword(env, PERMITS_KEYWORD, SPACE, false);
- }
}
return;
}
@@ -876,9 +831,6 @@ public final class JavaCompletionTask<T> extends BaseTask {
if (!tu.isAnnotation(cls)) {
if (!tu.isEnum(cls)) {
addKeyword(env, EXTENDS_KEYWORD, SPACE, false);
- if (isSealedSupported(env)) {
- addKeyword(env, PERMITS_KEYWORD, SPACE, false);
- }
}
if (!tu.isInterface(cls)) {
addKeyword(env, IMPLEMENTS_KEYWORD, SPACE, false);
@@ -906,18 +858,9 @@ public final class JavaCompletionTask<T> extends BaseTask {
addTypes(env, EnumSet.of(INTERFACE, ANNOTATION_TYPE),
null);
break;
case IDENTIFIER:
- if (isSealedSupported(env) &&
TokenUtilities.textEquals(lastNonWhitespaceToken.token().text(),PERMITS_KEYWORD))
{
- controller.toPhase(Phase.ELEMENTS_RESOLVED);
-
env.addToExcludes(controller.getTrees().getElement(path));
- addClassTypes(env, null);
- break;
- }
if (!tu.isAnnotation(cls)) {
if (!tu.isEnum(cls)) {
addKeyword(env, EXTENDS_KEYWORD, SPACE, false);
- if (isSealedSupported(env)) {
- addKeyword(env, PERMITS_KEYWORD, SPACE, false);
- }
}
if (!tu.isInterface(cls)) {
addKeyword(env, IMPLEMENTS_KEYWORD, SPACE, false);
@@ -3095,9 +3038,6 @@ public final class JavaCompletionTask<T> extends BaseTask
{
private boolean isRecordSupported(final Env env) {
return (SOURCE_VERSION_RELEASE_14 != null &&
env.getController().getSourceVersion().compareTo(SOURCE_VERSION_RELEASE_14) >=
0);
}
- private boolean isSealedSupported(final Env env) {
- return (SOURCE_VERSION_RELEASE_15 != null &&
env.getController().getSourceVersion().compareTo(SOURCE_VERSION_RELEASE_15) >=
0);
- }
private void insideRecord(Env env) throws IOException {
int offset = env.getOffset();
@@ -4573,10 +4513,6 @@ public final class JavaCompletionTask<T> extends
BaseTask {
if (isRecordSupported(env)) {
kws.add(RECORD_KEYWORD);
}
- if (isSealedSupported(env)) {
- kws.add(SEALED_KEYWORD);
- kws.add(NON_SEALED_KEYWORD);
- }
}
boolean beforeAnyClass = true;
boolean beforePublicClass = true;
@@ -4640,14 +4576,6 @@ public final class JavaCompletionTask<T> extends
BaseTask {
results.add(itemFactory.createKeywordItem(kw, SPACE,
anchorOffset, false));
}
}
- if (isSealedSupported(env)) {
- if (Utilities.startsWith(SEALED_KEYWORD, prefix)) {
- results.add(itemFactory.createKeywordItem(SEALED_KEYWORD,
SPACE, anchorOffset, false));
- }
- if (Utilities.startsWith(NON_SEALED_KEYWORD, prefix)) {
- results.add(itemFactory.createKeywordItem(NON_SEALED_KEYWORD,
SPACE, anchorOffset, false));
- }
- }
if
(env.getController().getSourceVersion().compareTo(SourceVersion.RELEASE_8) >= 0
&& Utilities.startsWith(DEFAULT_KEYWORD, prefix)
&&
env.getController().getTreeUtilities().getPathElementOfKind(Tree.Kind.INTERFACE,
env.getPath()) != null) {
@@ -4851,13 +4779,9 @@ public final class JavaCompletionTask<T> extends
BaseTask {
if (!modifiers.contains(PUBLIC) && !modifiers.contains(PRIVATE)) {
kws.add(PUBLIC_KEYWORD);
}
- if (!modifiers.contains(FINAL) && !modifiers.contains(ABSTRACT) &&
!modifiers.contains(SEALED_KEYWORD) && !modifiers.contains(NON_SEALED_KEYWORD))
{
+ if (!modifiers.contains(FINAL) && !modifiers.contains(ABSTRACT)) {
kws.add(ABSTRACT_KEYWORD);
kws.add(FINAL_KEYWORD);
- if (isSealedSupported(env)) {
- kws.add(SEALED_KEYWORD);
- kws.add(NON_SEALED_KEYWORD);
- }
}
kws.add(CLASS_KEYWORD);
kws.add(INTERFACE_KEYWORD);
diff --git
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/CreateConstructorNonDefaultConstructor.pass
b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/CreateConstructorNonDefaultConstructor.pass
deleted file mode 100644
index 6bff7bf..0000000
---
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/CreateConstructorNonDefaultConstructor.pass
+++ /dev/null
@@ -1,155 +0,0 @@
-public Test() - generate
-protected native Object clone() - override
-public boolean equals(Object arg0) - override
-protected void finalize() - override
-public List<String> getList() - generate
-public double getSomething() - generate
-public String getText() - generate
-public int getTime() - generate
-public native int hashCode() - override
-public void setList(List<String> list) - generate
-public void setSomething(double something) - generate
-public void setText(String text) - generate
-public void setTime(int time) - generate
-public String toString() - override
-abstract
-boolean
-byte
-char
-class
-double
-enum
-final
-float
-int
-interface
-long
-native
-non-sealed
-private
-protected
-public
-record
-sealed
-short
-static
-strictfp
-synchronized
-transient
-void
-volatile
-AbstractMethodError
-Appendable
-ArithmeticException
-ArrayIndexOutOfBoundsException
-ArrayStoreException
-AssertionError
-AutoCloseable
-Boolean
-BootstrapMethodError
-Byte
-CharSequence
-Character
-Class
-ClassCastException
-ClassCircularityError
-ClassFormatError
-ClassLoader
-ClassNotFoundException
-ClassValue
-CloneNotSupportedException
-Cloneable
-Comparable
-Compiler
-Deprecated
-Double
-Enum
-EnumConstantNotPresentException
-Error
-Exception
-ExceptionInInitializerError
-Float
-FunctionalInterface
-HashMap
-IllegalAccessError
-IllegalAccessException
-IllegalArgumentException
-IllegalCallerException
-IllegalMonitorStateException
-IllegalStateException
-IllegalThreadStateException
-IncompatibleClassChangeError
-IndexOutOfBoundsException
-InheritableThreadLocal
-InstantiationError
-InstantiationException
-Integer
-InternalError
-InterruptedException
-Iterable
-LayerInstantiationException
-LinkageError
-List
-Long
-Map
-Math
-Module
-ModuleLayer
-NegativeArraySizeException
-NoClassDefFoundError
-NoSuchFieldError
-NoSuchFieldException
-NoSuchMethodError
-NoSuchMethodException
-NullPointerException
-Number
-NumberFormatException
-Object
-OutOfMemoryError
-Override
-Package
-Process
-ProcessBuilder
-ProcessHandle
-Readable
-Record
-ReflectiveOperationException
-Runnable
-Runtime
-RuntimeException
-RuntimePermission
-SafeVarargs
-SecurityException
-SecurityManager
-Set
-Short
-StackOverflowError
-StackTraceElement
-StackWalker
-StrictMath
-String
-StringBuffer
-StringBuilder
-StringIndexOutOfBoundsException
-SuppressWarnings
-System
-Test
-Thread
-ThreadDeath
-ThreadGroup
-ThreadLocal
-Throwable
-TypeNotPresentException
-UnknownError
-UnsatisfiedLinkError
-UnsupportedClassVersionError
-UnsupportedOperationException
-VerifyError
-VirtualMachineError
-Void
-X
-com
-java
-javax
-org
-sun
diff --git
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/CreateConstructorNonDefaultConstructorInnerClass.pass
b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/CreateConstructorNonDefaultConstructorInnerClass.pass
deleted file mode 100644
index d4687ae..0000000
---
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/CreateConstructorNonDefaultConstructorInnerClass.pass
+++ /dev/null
@@ -1,153 +0,0 @@
-public X() - generate
-protected native Object clone() - override
-public boolean equals(Object arg0) - override
-protected void finalize() - override
-public byte getA() - generate
-public Map<String, Set<String>> getMap1() - generate
-public Map<String, Set<String>> getMap2() - generate
-public native int hashCode() - override
-public void setA(byte a) - generate
-public void setMap1(Map<String, Set<String>> map1) - generate
-public void setMap2(Map<String, Set<String>> map2) - generate
-public String toString() - override
-abstract
-boolean
-byte
-char
-class
-double
-enum
-final
-float
-int
-interface
-long
-native
-non-sealed
-private
-protected
-public
-record
-sealed
-short
-static
-strictfp
-synchronized
-transient
-void
-volatile
-AbstractMethodError
-Appendable
-ArithmeticException
-ArrayIndexOutOfBoundsException
-ArrayStoreException
-AssertionError
-AutoCloseable
-Boolean
-BootstrapMethodError
-Byte
-CharSequence
-Character
-Class
-ClassCastException
-ClassCircularityError
-ClassFormatError
-ClassLoader
-ClassNotFoundException
-ClassValue
-CloneNotSupportedException
-Cloneable
-Comparable
-Compiler
-Deprecated
-Double
-Enum
-EnumConstantNotPresentException
-Error
-Exception
-ExceptionInInitializerError
-Float
-FunctionalInterface
-HashMap
-IllegalAccessError
-IllegalAccessException
-IllegalArgumentException
-IllegalCallerException
-IllegalMonitorStateException
-IllegalStateException
-IllegalThreadStateException
-IncompatibleClassChangeError
-IndexOutOfBoundsException
-InheritableThreadLocal
-InstantiationError
-InstantiationException
-Integer
-InternalError
-InterruptedException
-Iterable
-LayerInstantiationException
-LinkageError
-List
-Long
-Map
-Math
-Module
-ModuleLayer
-NegativeArraySizeException
-NoClassDefFoundError
-NoSuchFieldError
-NoSuchFieldException
-NoSuchMethodError
-NoSuchMethodException
-NullPointerException
-Number
-NumberFormatException
-Object
-OutOfMemoryError
-Override
-Package
-Process
-ProcessBuilder
-ProcessHandle
-Readable
-Record
-ReflectiveOperationException
-Runnable
-Runtime
-RuntimeException
-RuntimePermission
-SafeVarargs
-SecurityException
-SecurityManager
-Set
-Short
-StackOverflowError
-StackTraceElement
-StackWalker
-StrictMath
-String
-StringBuffer
-StringBuilder
-StringIndexOutOfBoundsException
-SuppressWarnings
-System
-Test
-Thread
-ThreadDeath
-ThreadGroup
-ThreadLocal
-Throwable
-TypeNotPresentException
-UnknownError
-UnsatisfiedLinkError
-UnsupportedClassVersionError
-UnsupportedOperationException
-VerifyError
-VirtualMachineError
-Void
-X
-com
-java
-javax
-org
-sun
diff --git
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/CreateConstructorTest.pass
b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/CreateConstructorTest.pass
deleted file mode 100644
index 6c073cf..0000000
---
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/CreateConstructorTest.pass
+++ /dev/null
@@ -1,156 +0,0 @@
-public Test() - generate
-public Test(int time, List<String> list) - generate
-protected native Object clone() - override
-public boolean equals(Object arg0) - override
-protected void finalize() - override
-public List<String> getList() - generate
-public double getSomething() - generate
-public String getText() - generate
-public int getTime() - generate
-public native int hashCode() - override
-public void setList(List<String> list) - generate
-public void setSomething(double something) - generate
-public void setText(String text) - generate
-public void setTime(int time) - generate
-public String toString() - override
-abstract
-boolean
-byte
-char
-class
-double
-enum
-final
-float
-int
-interface
-long
-native
-non-sealed
-private
-protected
-public
-record
-sealed
-short
-static
-strictfp
-synchronized
-transient
-void
-volatile
-AbstractMethodError
-Appendable
-ArithmeticException
-ArrayIndexOutOfBoundsException
-ArrayStoreException
-AssertionError
-AutoCloseable
-Boolean
-BootstrapMethodError
-Byte
-CharSequence
-Character
-Class
-ClassCastException
-ClassCircularityError
-ClassFormatError
-ClassLoader
-ClassNotFoundException
-ClassValue
-CloneNotSupportedException
-Cloneable
-Comparable
-Compiler
-Deprecated
-Double
-Enum
-EnumConstantNotPresentException
-Error
-Exception
-ExceptionInInitializerError
-Float
-FunctionalInterface
-HashMap
-IllegalAccessError
-IllegalAccessException
-IllegalArgumentException
-IllegalCallerException
-IllegalMonitorStateException
-IllegalStateException
-IllegalThreadStateException
-IncompatibleClassChangeError
-IndexOutOfBoundsException
-InheritableThreadLocal
-InstantiationError
-InstantiationException
-Integer
-InternalError
-InterruptedException
-Iterable
-LayerInstantiationException
-LinkageError
-List
-Long
-Map
-Math
-Module
-ModuleLayer
-NegativeArraySizeException
-NoClassDefFoundError
-NoSuchFieldError
-NoSuchFieldException
-NoSuchMethodError
-NoSuchMethodException
-NullPointerException
-Number
-NumberFormatException
-Object
-OutOfMemoryError
-Override
-Package
-Process
-ProcessBuilder
-ProcessHandle
-Readable
-Record
-ReflectiveOperationException
-Runnable
-Runtime
-RuntimeException
-RuntimePermission
-SafeVarargs
-SecurityException
-SecurityManager
-Set
-Short
-StackOverflowError
-StackTraceElement
-StackWalker
-StrictMath
-String
-StringBuffer
-StringBuilder
-StringIndexOutOfBoundsException
-SuppressWarnings
-System
-Test
-Thread
-ThreadDeath
-ThreadGroup
-ThreadLocal
-Throwable
-TypeNotPresentException
-UnknownError
-UnsatisfiedLinkError
-UnsupportedClassVersionError
-UnsupportedOperationException
-VerifyError
-VirtualMachineError
-Void
-X
-com
-java
-javax
-org
-sun
diff --git
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/CreateConstructorTestInnerClass.pass
b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/CreateConstructorTestInnerClass.pass
deleted file mode 100644
index 25d922d..0000000
---
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/CreateConstructorTestInnerClass.pass
+++ /dev/null
@@ -1,154 +0,0 @@
-public X() - generate
-public X(byte a, Map<String, Set<String>> map1) - generate
-protected native Object clone() - override
-public boolean equals(Object arg0) - override
-protected void finalize() - override
-public byte getA() - generate
-public Map<String, Set<String>> getMap1() - generate
-public Map<String, Set<String>> getMap2() - generate
-public native int hashCode() - override
-public void setA(byte a) - generate
-public void setMap1(Map<String, Set<String>> map1) - generate
-public void setMap2(Map<String, Set<String>> map2) - generate
-public String toString() - override
-abstract
-boolean
-byte
-char
-class
-double
-enum
-final
-float
-int
-interface
-long
-native
-non-sealed
-private
-protected
-public
-record
-sealed
-short
-static
-strictfp
-synchronized
-transient
-void
-volatile
-AbstractMethodError
-Appendable
-ArithmeticException
-ArrayIndexOutOfBoundsException
-ArrayStoreException
-AssertionError
-AutoCloseable
-Boolean
-BootstrapMethodError
-Byte
-CharSequence
-Character
-Class
-ClassCastException
-ClassCircularityError
-ClassFormatError
-ClassLoader
-ClassNotFoundException
-ClassValue
-CloneNotSupportedException
-Cloneable
-Comparable
-Compiler
-Deprecated
-Double
-Enum
-EnumConstantNotPresentException
-Error
-Exception
-ExceptionInInitializerError
-Float
-FunctionalInterface
-HashMap
-IllegalAccessError
-IllegalAccessException
-IllegalArgumentException
-IllegalCallerException
-IllegalMonitorStateException
-IllegalStateException
-IllegalThreadStateException
-IncompatibleClassChangeError
-IndexOutOfBoundsException
-InheritableThreadLocal
-InstantiationError
-InstantiationException
-Integer
-InternalError
-InterruptedException
-Iterable
-LayerInstantiationException
-LinkageError
-List
-Long
-Map
-Math
-Module
-ModuleLayer
-NegativeArraySizeException
-NoClassDefFoundError
-NoSuchFieldError
-NoSuchFieldException
-NoSuchMethodError
-NoSuchMethodException
-NullPointerException
-Number
-NumberFormatException
-Object
-OutOfMemoryError
-Override
-Package
-Process
-ProcessBuilder
-ProcessHandle
-Readable
-Record
-ReflectiveOperationException
-Runnable
-Runtime
-RuntimeException
-RuntimePermission
-SafeVarargs
-SecurityException
-SecurityManager
-Set
-Short
-StackOverflowError
-StackTraceElement
-StackWalker
-StrictMath
-String
-StringBuffer
-StringBuilder
-StringIndexOutOfBoundsException
-SuppressWarnings
-System
-Test
-Thread
-ThreadDeath
-ThreadGroup
-ThreadLocal
-Throwable
-TypeNotPresentException
-UnknownError
-UnsatisfiedLinkError
-UnsupportedClassVersionError
-UnsupportedOperationException
-VerifyError
-VirtualMachineError
-Void
-X
-com
-java
-javax
-org
-sun
diff --git
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/CreateConstructorWithConstructors.pass
b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/CreateConstructorWithConstructors.pass
deleted file mode 100644
index 91721ef..0000000
---
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/CreateConstructorWithConstructors.pass
+++ /dev/null
@@ -1,154 +0,0 @@
-protected native Object clone() - override
-public boolean equals(Object arg0) - override
-protected void finalize() - override
-public List<String> getList() - generate
-public double getSomething() - generate
-public String getText() - generate
-public int getTime() - generate
-public native int hashCode() - override
-public void setList(List<String> list) - generate
-public void setSomething(double something) - generate
-public void setText(String text) - generate
-public void setTime(int time) - generate
-public String toString() - override
-abstract
-boolean
-byte
-char
-class
-double
-enum
-final
-float
-int
-interface
-long
-native
-non-sealed
-private
-protected
-public
-record
-sealed
-short
-static
-strictfp
-synchronized
-transient
-void
-volatile
-AbstractMethodError
-Appendable
-ArithmeticException
-ArrayIndexOutOfBoundsException
-ArrayStoreException
-AssertionError
-AutoCloseable
-Boolean
-BootstrapMethodError
-Byte
-CharSequence
-Character
-Class
-ClassCastException
-ClassCircularityError
-ClassFormatError
-ClassLoader
-ClassNotFoundException
-ClassValue
-CloneNotSupportedException
-Cloneable
-Comparable
-Compiler
-Deprecated
-Double
-Enum
-EnumConstantNotPresentException
-Error
-Exception
-ExceptionInInitializerError
-Float
-FunctionalInterface
-HashMap
-IllegalAccessError
-IllegalAccessException
-IllegalArgumentException
-IllegalCallerException
-IllegalMonitorStateException
-IllegalStateException
-IllegalThreadStateException
-IncompatibleClassChangeError
-IndexOutOfBoundsException
-InheritableThreadLocal
-InstantiationError
-InstantiationException
-Integer
-InternalError
-InterruptedException
-Iterable
-LayerInstantiationException
-LinkageError
-List
-Long
-Map
-Math
-Module
-ModuleLayer
-NegativeArraySizeException
-NoClassDefFoundError
-NoSuchFieldError
-NoSuchFieldException
-NoSuchMethodError
-NoSuchMethodException
-NullPointerException
-Number
-NumberFormatException
-Object
-OutOfMemoryError
-Override
-Package
-Process
-ProcessBuilder
-ProcessHandle
-Readable
-Record
-ReflectiveOperationException
-Runnable
-Runtime
-RuntimeException
-RuntimePermission
-SafeVarargs
-SecurityException
-SecurityManager
-Set
-Short
-StackOverflowError
-StackTraceElement
-StackWalker
-StrictMath
-String
-StringBuffer
-StringBuilder
-StringIndexOutOfBoundsException
-SuppressWarnings
-System
-Test
-Thread
-ThreadDeath
-ThreadGroup
-ThreadLocal
-Throwable
-TypeNotPresentException
-UnknownError
-UnsatisfiedLinkError
-UnsupportedClassVersionError
-UnsupportedOperationException
-VerifyError
-VirtualMachineError
-Void
-X
-com
-java
-javax
-org
-sun
diff --git
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/CreateConstructorWithConstructorsInnerClass.pass
b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/CreateConstructorWithConstructorsInnerClass.pass
deleted file mode 100644
index 6510bb4..0000000
---
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/CreateConstructorWithConstructorsInnerClass.pass
+++ /dev/null
@@ -1,152 +0,0 @@
-protected native Object clone() - override
-public boolean equals(Object arg0) - override
-protected void finalize() - override
-public byte getA() - generate
-public Map<String, Set<String>> getMap1() - generate
-public Map<String, Set<String>> getMap2() - generate
-public native int hashCode() - override
-public void setA(byte a) - generate
-public void setMap1(Map<String, Set<String>> map1) - generate
-public void setMap2(Map<String, Set<String>> map2) - generate
-public String toString() - override
-abstract
-boolean
-byte
-char
-class
-double
-enum
-final
-float
-int
-interface
-long
-native
-non-sealed
-private
-protected
-public
-record
-sealed
-short
-static
-strictfp
-synchronized
-transient
-void
-volatile
-AbstractMethodError
-Appendable
-ArithmeticException
-ArrayIndexOutOfBoundsException
-ArrayStoreException
-AssertionError
-AutoCloseable
-Boolean
-BootstrapMethodError
-Byte
-CharSequence
-Character
-Class
-ClassCastException
-ClassCircularityError
-ClassFormatError
-ClassLoader
-ClassNotFoundException
-ClassValue
-CloneNotSupportedException
-Cloneable
-Comparable
-Compiler
-Deprecated
-Double
-Enum
-EnumConstantNotPresentException
-Error
-Exception
-ExceptionInInitializerError
-Float
-FunctionalInterface
-HashMap
-IllegalAccessError
-IllegalAccessException
-IllegalArgumentException
-IllegalCallerException
-IllegalMonitorStateException
-IllegalStateException
-IllegalThreadStateException
-IncompatibleClassChangeError
-IndexOutOfBoundsException
-InheritableThreadLocal
-InstantiationError
-InstantiationException
-Integer
-InternalError
-InterruptedException
-Iterable
-LayerInstantiationException
-LinkageError
-List
-Long
-Map
-Math
-Module
-ModuleLayer
-NegativeArraySizeException
-NoClassDefFoundError
-NoSuchFieldError
-NoSuchFieldException
-NoSuchMethodError
-NoSuchMethodException
-NullPointerException
-Number
-NumberFormatException
-Object
-OutOfMemoryError
-Override
-Package
-Process
-ProcessBuilder
-ProcessHandle
-Readable
-Record
-ReflectiveOperationException
-Runnable
-Runtime
-RuntimeException
-RuntimePermission
-SafeVarargs
-SecurityException
-SecurityManager
-Set
-Short
-StackOverflowError
-StackTraceElement
-StackWalker
-StrictMath
-String
-StringBuffer
-StringBuilder
-StringIndexOutOfBoundsException
-SuppressWarnings
-System
-Test
-Thread
-ThreadDeath
-ThreadGroup
-ThreadLocal
-Throwable
-TypeNotPresentException
-UnknownError
-UnsatisfiedLinkError
-UnsupportedClassVersionError
-UnsupportedOperationException
-VerifyError
-VirtualMachineError
-Void
-X
-com
-java
-javax
-org
-sun
diff --git
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/CreateConstructorWithDefaultConstructor.pass
b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/CreateConstructorWithDefaultConstructor.pass
deleted file mode 100644
index d3aadcf..0000000
---
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/CreateConstructorWithDefaultConstructor.pass
+++ /dev/null
@@ -1,155 +0,0 @@
-public Test(int time, List<String> list) - generate
-protected native Object clone() - override
-public boolean equals(Object arg0) - override
-protected void finalize() - override
-public List<String> getList() - generate
-public double getSomething() - generate
-public String getText() - generate
-public int getTime() - generate
-public native int hashCode() - override
-public void setList(List<String> list) - generate
-public void setSomething(double something) - generate
-public void setText(String text) - generate
-public void setTime(int time) - generate
-public String toString() - override
-abstract
-boolean
-byte
-char
-class
-double
-enum
-final
-float
-int
-interface
-long
-native
-non-sealed
-private
-protected
-public
-record
-sealed
-short
-static
-strictfp
-synchronized
-transient
-void
-volatile
-AbstractMethodError
-Appendable
-ArithmeticException
-ArrayIndexOutOfBoundsException
-ArrayStoreException
-AssertionError
-AutoCloseable
-Boolean
-BootstrapMethodError
-Byte
-CharSequence
-Character
-Class
-ClassCastException
-ClassCircularityError
-ClassFormatError
-ClassLoader
-ClassNotFoundException
-ClassValue
-CloneNotSupportedException
-Cloneable
-Comparable
-Compiler
-Deprecated
-Double
-Enum
-EnumConstantNotPresentException
-Error
-Exception
-ExceptionInInitializerError
-Float
-FunctionalInterface
-HashMap
-IllegalAccessError
-IllegalAccessException
-IllegalArgumentException
-IllegalCallerException
-IllegalMonitorStateException
-IllegalStateException
-IllegalThreadStateException
-IncompatibleClassChangeError
-IndexOutOfBoundsException
-InheritableThreadLocal
-InstantiationError
-InstantiationException
-Integer
-InternalError
-InterruptedException
-Iterable
-LayerInstantiationException
-LinkageError
-List
-Long
-Map
-Math
-Module
-ModuleLayer
-NegativeArraySizeException
-NoClassDefFoundError
-NoSuchFieldError
-NoSuchFieldException
-NoSuchMethodError
-NoSuchMethodException
-NullPointerException
-Number
-NumberFormatException
-Object
-OutOfMemoryError
-Override
-Package
-Process
-ProcessBuilder
-ProcessHandle
-Readable
-Record
-ReflectiveOperationException
-Runnable
-Runtime
-RuntimeException
-RuntimePermission
-SafeVarargs
-SecurityException
-SecurityManager
-Set
-Short
-StackOverflowError
-StackTraceElement
-StackWalker
-StrictMath
-String
-StringBuffer
-StringBuilder
-StringIndexOutOfBoundsException
-SuppressWarnings
-System
-Test
-Thread
-ThreadDeath
-ThreadGroup
-ThreadLocal
-Throwable
-TypeNotPresentException
-UnknownError
-UnsatisfiedLinkError
-UnsupportedClassVersionError
-UnsupportedOperationException
-VerifyError
-VirtualMachineError
-Void
-X
-com
-java
-javax
-org
-sun
diff --git
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/CreateConstructorWithDefaultConstructorInnerClass.pass
b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/CreateConstructorWithDefaultConstructorInnerClass.pass
deleted file mode 100644
index 8ae5c9f..0000000
---
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/CreateConstructorWithDefaultConstructorInnerClass.pass
+++ /dev/null
@@ -1,153 +0,0 @@
-public X(byte a, Map<String, Set<String>> map1) - generate
-protected native Object clone() - override
-public boolean equals(Object arg0) - override
-protected void finalize() - override
-public byte getA() - generate
-public Map<String, Set<String>> getMap1() - generate
-public Map<String, Set<String>> getMap2() - generate
-public native int hashCode() - override
-public void setA(byte a) - generate
-public void setMap1(Map<String, Set<String>> map1) - generate
-public void setMap2(Map<String, Set<String>> map2) - generate
-public String toString() - override
-abstract
-boolean
-byte
-char
-class
-double
-enum
-final
-float
-int
-interface
-long
-native
-non-sealed
-private
-protected
-public
-record
-sealed
-short
-static
-strictfp
-synchronized
-transient
-void
-volatile
-AbstractMethodError
-Appendable
-ArithmeticException
-ArrayIndexOutOfBoundsException
-ArrayStoreException
-AssertionError
-AutoCloseable
-Boolean
-BootstrapMethodError
-Byte
-CharSequence
-Character
-Class
-ClassCastException
-ClassCircularityError
-ClassFormatError
-ClassLoader
-ClassNotFoundException
-ClassValue
-CloneNotSupportedException
-Cloneable
-Comparable
-Compiler
-Deprecated
-Double
-Enum
-EnumConstantNotPresentException
-Error
-Exception
-ExceptionInInitializerError
-Float
-FunctionalInterface
-HashMap
-IllegalAccessError
-IllegalAccessException
-IllegalArgumentException
-IllegalCallerException
-IllegalMonitorStateException
-IllegalStateException
-IllegalThreadStateException
-IncompatibleClassChangeError
-IndexOutOfBoundsException
-InheritableThreadLocal
-InstantiationError
-InstantiationException
-Integer
-InternalError
-InterruptedException
-Iterable
-LayerInstantiationException
-LinkageError
-List
-Long
-Map
-Math
-Module
-ModuleLayer
-NegativeArraySizeException
-NoClassDefFoundError
-NoSuchFieldError
-NoSuchFieldException
-NoSuchMethodError
-NoSuchMethodException
-NullPointerException
-Number
-NumberFormatException
-Object
-OutOfMemoryError
-Override
-Package
-Process
-ProcessBuilder
-ProcessHandle
-Readable
-Record
-ReflectiveOperationException
-Runnable
-Runtime
-RuntimeException
-RuntimePermission
-SafeVarargs
-SecurityException
-SecurityManager
-Set
-Short
-StackOverflowError
-StackTraceElement
-StackWalker
-StrictMath
-String
-StringBuffer
-StringBuilder
-StringIndexOutOfBoundsException
-SuppressWarnings
-System
-Test
-Thread
-ThreadDeath
-ThreadGroup
-ThreadLocal
-Throwable
-TypeNotPresentException
-UnknownError
-UnsatisfiedLinkError
-UnsupportedClassVersionError
-UnsupportedOperationException
-VerifyError
-VirtualMachineError
-Void
-X
-com
-java
-javax
-org
-sun
diff --git
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/OverrideAbstractList.pass
b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/OverrideAbstractList.pass
deleted file mode 100644
index 57bf943..0000000
---
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/OverrideAbstractList.pass
+++ /dev/null
@@ -1,176 +0,0 @@
-public boolean add(Object arg0) - override
-public void add(int arg0, Object arg1) - override
-public boolean addAll(Collection arg0) - override
-public boolean addAll(int arg0, Collection arg1) - override
-public void clear() - override
-protected native Object clone() - override
-public boolean contains(Object arg0) - override
-public boolean containsAll(Collection arg0) - override
-public boolean equals(Object arg0) - override
-protected void finalize() - override
-public default void forEach(Consumer arg0) - override
-public abstract Object get(int arg0) - implement
-public int getModCount() - generate
-public int hashCode() - override
-public int indexOf(Object arg0) - override
-public boolean isEmpty() - override
-public Iterator iterator() - override
-public int lastIndexOf(Object arg0) - override
-public ListIterator listIterator() - override
-public ListIterator listIterator(int arg0) - override
-public default Stream parallelStream() - override
-public boolean remove(Object arg0) - override
-public Object remove(int arg0) - override
-public boolean removeAll(Collection arg0) - override
-public default boolean removeIf(Predicate arg0) - override
-protected void removeRange(int arg0, int arg1) - override
-public default void replaceAll(UnaryOperator arg0) - override
-public boolean retainAll(Collection arg0) - override
-public Object set(int arg0, Object arg1) - override
-public void setModCount(int modCount) - generate
-public abstract int size() - implement
-public default void sort(Comparator arg0) - override
-public default Spliterator spliterator() - override
-public default Stream stream() - override
-public List subList(int arg0, int arg1) - override
-public Object[] toArray() - override
-public default Object[] toArray(IntFunction arg0) - override
-public Object[] toArray(Object[] arg0) - override
-public String toString() - override
-abstract
-boolean
-byte
-char
-class
-double
-enum
-final
-float
-int
-interface
-long
-native
-non-sealed
-private
-protected
-public
-record
-sealed
-short
-static
-strictfp
-synchronized
-transient
-void
-volatile
-AbstractList
-AbstractMethodError
-Appendable
-ArithmeticException
-ArrayIndexOutOfBoundsException
-ArrayStoreException
-AssertionError
-AutoCloseable
-Boolean
-BootstrapMethodError
-Byte
-CharSequence
-Character
-Class
-ClassCastException
-ClassCircularityError
-ClassFormatError
-ClassLoader
-ClassNotFoundException
-ClassValue
-CloneNotSupportedException
-Cloneable
-Comparable
-Compiler
-Deprecated
-Double
-Enum
-EnumConstantNotPresentException
-Error
-Exception
-ExceptionInInitializerError
-Float
-FunctionalInterface
-IllegalAccessError
-IllegalAccessException
-IllegalArgumentException
-IllegalCallerException
-IllegalMonitorStateException
-IllegalStateException
-IllegalThreadStateException
-IncompatibleClassChangeError
-IndexOutOfBoundsException
-InheritableThreadLocal
-InstantiationError
-InstantiationException
-Integer
-InternalError
-InterruptedException
-Iterable
-LayerInstantiationException
-LinkageError
-Long
-Math
-Module
-ModuleLayer
-NegativeArraySizeException
-NoClassDefFoundError
-NoSuchFieldError
-NoSuchFieldException
-NoSuchMethodError
-NoSuchMethodException
-NullPointerException
-Number
-NumberFormatException
-Object
-OutOfMemoryError
-Override
-Package
-Process
-ProcessBuilder
-ProcessHandle
-Readable
-Record
-ReflectiveOperationException
-Runnable
-Runtime
-RuntimeException
-RuntimePermission
-SafeVarargs
-SecurityException
-SecurityManager
-Short
-StackOverflowError
-StackTraceElement
-StackWalker
-StrictMath
-String
-StringBuffer
-StringBuilder
-StringIndexOutOfBoundsException
-SuppressWarnings
-System
-Test
-Thread
-ThreadDeath
-ThreadGroup
-ThreadLocal
-Throwable
-TypeNotPresentException
-UnknownError
-UnsatisfiedLinkError
-UnsupportedClassVersionError
-UnsupportedOperationException
-VerifyError
-VirtualMachineError
-Void
-com
-java
-javax
-org
-sun
diff --git
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/OverrideAbstractListAbstract.pass
b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/OverrideAbstractListAbstract.pass
deleted file mode 100644
index 6803fe3..0000000
---
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/OverrideAbstractListAbstract.pass
+++ /dev/null
@@ -1,178 +0,0 @@
-public boolean add(Object arg0) - override
-public void add(int arg0, Object arg1) - override
-public boolean addAll(Collection arg0) - override
-public boolean addAll(int arg0, Collection arg1) - override
-public void clear() - override
-protected native Object clone() - override
-public boolean contains(Object arg0) - override
-public boolean containsAll(Collection arg0) - override
-public boolean equals(Object arg0) - override
-protected void finalize() - override
-public default void forEach(Consumer arg0) - override
-public abstract Object get(int arg0) - implement
-public abstract Object get(int arg0) - override
-public int getModCount() - generate
-public int hashCode() - override
-public int indexOf(Object arg0) - override
-public boolean isEmpty() - override
-public Iterator iterator() - override
-public int lastIndexOf(Object arg0) - override
-public ListIterator listIterator() - override
-public ListIterator listIterator(int arg0) - override
-public default Stream parallelStream() - override
-public boolean remove(Object arg0) - override
-public Object remove(int arg0) - override
-public boolean removeAll(Collection arg0) - override
-public default boolean removeIf(Predicate arg0) - override
-protected void removeRange(int arg0, int arg1) - override
-public default void replaceAll(UnaryOperator arg0) - override
-public boolean retainAll(Collection arg0) - override
-public Object set(int arg0, Object arg1) - override
-public void setModCount(int modCount) - generate
-public abstract int size() - implement
-public abstract int size() - override
-public default void sort(Comparator arg0) - override
-public default Spliterator spliterator() - override
-public default Stream stream() - override
-public List subList(int arg0, int arg1) - override
-public Object[] toArray() - override
-public default Object[] toArray(IntFunction arg0) - override
-public Object[] toArray(Object[] arg0) - override
-public String toString() - override
-abstract
-boolean
-byte
-char
-class
-double
-enum
-final
-float
-int
-interface
-long
-native
-non-sealed
-private
-protected
-public
-record
-sealed
-short
-static
-strictfp
-synchronized
-transient
-void
-volatile
-AbstractList
-AbstractMethodError
-Appendable
-ArithmeticException
-ArrayIndexOutOfBoundsException
-ArrayStoreException
-AssertionError
-AutoCloseable
-Boolean
-BootstrapMethodError
-Byte
-CharSequence
-Character
-Class
-ClassCastException
-ClassCircularityError
-ClassFormatError
-ClassLoader
-ClassNotFoundException
-ClassValue
-CloneNotSupportedException
-Cloneable
-Comparable
-Compiler
-Deprecated
-Double
-Enum
-EnumConstantNotPresentException
-Error
-Exception
-ExceptionInInitializerError
-Float
-FunctionalInterface
-IllegalAccessError
-IllegalAccessException
-IllegalArgumentException
-IllegalCallerException
-IllegalMonitorStateException
-IllegalStateException
-IllegalThreadStateException
-IncompatibleClassChangeError
-IndexOutOfBoundsException
-InheritableThreadLocal
-InstantiationError
-InstantiationException
-Integer
-InternalError
-InterruptedException
-Iterable
-LayerInstantiationException
-LinkageError
-Long
-Math
-Module
-ModuleLayer
-NegativeArraySizeException
-NoClassDefFoundError
-NoSuchFieldError
-NoSuchFieldException
-NoSuchMethodError
-NoSuchMethodException
-NullPointerException
-Number
-NumberFormatException
-Object
-OutOfMemoryError
-Override
-Package
-Process
-ProcessBuilder
-ProcessHandle
-Readable
-Record
-ReflectiveOperationException
-Runnable
-Runtime
-RuntimeException
-RuntimePermission
-SafeVarargs
-SecurityException
-SecurityManager
-Short
-StackOverflowError
-StackTraceElement
-StackWalker
-StrictMath
-String
-StringBuffer
-StringBuilder
-StringIndexOutOfBoundsException
-SuppressWarnings
-System
-Test
-Thread
-ThreadDeath
-ThreadGroup
-ThreadLocal
-Throwable
-TypeNotPresentException
-UnknownError
-UnsatisfiedLinkError
-UnsupportedClassVersionError
-UnsupportedOperationException
-VerifyError
-VirtualMachineError
-Void
-com
-java
-javax
-org
-sun
diff --git
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/UnimplementedMethod.pass
b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/UnimplementedMethod.pass
deleted file mode 100644
index 534151b..0000000
---
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/UnimplementedMethod.pass
+++ /dev/null
@@ -1,142 +0,0 @@
-protected native Object clone() - override
-public boolean equals(Object arg0) - override
-protected void finalize() - override
-public native int hashCode() - override
-public abstract void run() - implement
-public String toString() - override
-abstract
-boolean
-byte
-char
-class
-double
-enum
-final
-float
-int
-interface
-long
-native
-non-sealed
-private
-protected
-public
-record
-sealed
-short
-static
-strictfp
-synchronized
-transient
-void
-volatile
-AbstractMethodError
-Appendable
-ArithmeticException
-ArrayIndexOutOfBoundsException
-ArrayStoreException
-AssertionError
-AutoCloseable
-Boolean
-BootstrapMethodError
-Byte
-CharSequence
-Character
-Class
-ClassCastException
-ClassCircularityError
-ClassFormatError
-ClassLoader
-ClassNotFoundException
-ClassValue
-CloneNotSupportedException
-Cloneable
-Comparable
-Compiler
-Deprecated
-Double
-Enum
-EnumConstantNotPresentException
-Error
-Exception
-ExceptionInInitializerError
-Float
-FunctionalInterface
-IllegalAccessError
-IllegalAccessException
-IllegalArgumentException
-IllegalCallerException
-IllegalMonitorStateException
-IllegalStateException
-IllegalThreadStateException
-IncompatibleClassChangeError
-IndexOutOfBoundsException
-InheritableThreadLocal
-InstantiationError
-InstantiationException
-Integer
-InternalError
-InterruptedException
-Iterable
-LayerInstantiationException
-LinkageError
-Long
-Math
-Module
-ModuleLayer
-NegativeArraySizeException
-NoClassDefFoundError
-NoSuchFieldError
-NoSuchFieldException
-NoSuchMethodError
-NoSuchMethodException
-NullPointerException
-Number
-NumberFormatException
-Object
-OutOfMemoryError
-Override
-Package
-Process
-ProcessBuilder
-ProcessHandle
-Readable
-Record
-ReflectiveOperationException
-Runnable
-Runtime
-RuntimeException
-RuntimePermission
-SafeVarargs
-SecurityException
-SecurityManager
-Short
-StackOverflowError
-StackTraceElement
-StackWalker
-StrictMath
-String
-StringBuffer
-StringBuilder
-StringIndexOutOfBoundsException
-SuppressWarnings
-System
-Test
-Thread
-ThreadDeath
-ThreadGroup
-ThreadLocal
-Throwable
-TypeNotPresentException
-UnknownError
-UnsatisfiedLinkError
-UnsupportedClassVersionError
-UnsupportedOperationException
-VerifyError
-VirtualMachineError
-Void
-com
-java
-javax
-org
-sun
diff --git
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/classModifiersWithoutPublic.pass
b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/classModifiersWithoutPublic.pass
deleted file mode 100644
index 9e56fb4..0000000
---
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/classModifiersWithoutPublic.pass
+++ /dev/null
@@ -1,8 +0,0 @@
-abstract
-class
-enum
-final
-interface
-non-sealed
-record
-sealed
diff --git
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/extendsAndImplementsAndPermitsKeywords.pass
b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/extendsAndImplementsAndPermitsKeywords.pass
deleted file mode 100644
index d9f7e7b..0000000
---
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/extendsAndImplementsAndPermitsKeywords.pass
+++ /dev/null
@@ -1,3 +0,0 @@
-extends
-implements
-permits
diff --git
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/extendsAndPermitsKeywords.pass
b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/extendsAndPermitsKeywords.pass
deleted file mode 100644
index 35a6953..0000000
---
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/extendsAndPermitsKeywords.pass
+++ /dev/null
@@ -1,2 +0,0 @@
-extends
-permits
diff --git
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/implementsAndPermitsKeywords.pass
b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/implementsAndPermitsKeywords.pass
deleted file mode 100644
index 3cdd9c3..0000000
---
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/implementsAndPermitsKeywords.pass
+++ /dev/null
@@ -1,2 +0,0 @@
-implements
-permits
diff --git
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/interfaceMemberModifiersAndTypes.pass
b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/interfaceMemberModifiersAndTypes.pass
deleted file mode 100644
index b6c03eb..0000000
---
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/interfaceMemberModifiersAndTypes.pass
+++ /dev/null
@@ -1,140 +0,0 @@
-public boolean equals(Object arg0) - override
-public native int hashCode() - override
-public String toString() - override
-abstract
-boolean
-byte
-char
-class
-default
-double
-enum
-final
-float
-int
-interface
-long
-native
-non-sealed
-private
-protected
-public
-record
-sealed
-short
-static
-strictfp
-synchronized
-transient
-void
-volatile
-AbstractMethodError
-Appendable
-ArithmeticException
-ArrayIndexOutOfBoundsException
-ArrayStoreException
-AssertionError
-AutoCloseable
-Boolean
-BootstrapMethodError
-Byte
-CharSequence
-Character
-Class
-ClassCastException
-ClassCircularityError
-ClassFormatError
-ClassLoader
-ClassNotFoundException
-ClassValue
-CloneNotSupportedException
-Cloneable
-Comparable
-Compiler
-Deprecated
-Double
-Enum
-EnumConstantNotPresentException
-Error
-Exception
-ExceptionInInitializerError
-Float
-FunctionalInterface
-IllegalAccessError
-IllegalAccessException
-IllegalArgumentException
-IllegalCallerException
-IllegalMonitorStateException
-IllegalStateException
-IllegalThreadStateException
-IncompatibleClassChangeError
-IndexOutOfBoundsException
-InheritableThreadLocal
-InstantiationError
-InstantiationException
-Integer
-InternalError
-InterruptedException
-Iterable
-LayerInstantiationException
-LinkageError
-Long
-Math
-Module
-ModuleLayer
-NegativeArraySizeException
-NoClassDefFoundError
-NoSuchFieldError
-NoSuchFieldException
-NoSuchMethodError
-NoSuchMethodException
-NullPointerException
-Number
-NumberFormatException
-Object
-OutOfMemoryError
-Override
-Package
-Process
-ProcessBuilder
-ProcessHandle
-Readable
-Record
-ReflectiveOperationException
-Runnable
-Runtime
-RuntimeException
-RuntimePermission
-SafeVarargs
-SecurityException
-SecurityManager
-Short
-StackOverflowError
-StackTraceElement
-StackWalker
-StrictMath
-String
-StringBuffer
-StringBuilder
-StringIndexOutOfBoundsException
-SuppressWarnings
-System
-Test
-Thread
-ThreadDeath
-ThreadGroup
-ThreadLocal
-Throwable
-TypeNotPresentException
-UnknownError
-UnsatisfiedLinkError
-UnsupportedClassVersionError
-UnsupportedOperationException
-VerifyError
-VirtualMachineError
-Void
-com
-java
-javax
-org
-sun
diff --git
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/memberModifiersStartingWithP.pass
b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/memberModifiersStartingWithP.pass
deleted file mode 100644
index c899e54..0000000
---
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/memberModifiersStartingWithP.pass
+++ /dev/null
@@ -1,3 +0,0 @@
-private
-protected
-public
diff --git
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/memberModifiersTypesAndGenElements.pass
b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/memberModifiersTypesAndGenElements.pass
deleted file mode 100644
index eb27878..0000000
---
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/memberModifiersTypesAndGenElements.pass
+++ /dev/null
@@ -1,142 +0,0 @@
-public Test() - generate
-protected native Object clone() - override
-public boolean equals(Object arg0) - override
-protected void finalize() - override
-public native int hashCode() - override
-public String toString() - override
-abstract
-boolean
-byte
-char
-class
-double
-enum
-final
-float
-int
-interface
-long
-native
-non-sealed
-private
-protected
-public
-record
-sealed
-short
-static
-strictfp
-synchronized
-transient
-void
-volatile
-AbstractMethodError
-Appendable
-ArithmeticException
-ArrayIndexOutOfBoundsException
-ArrayStoreException
-AssertionError
-AutoCloseable
-Boolean
-BootstrapMethodError
-Byte
-CharSequence
-Character
-Class
-ClassCastException
-ClassCircularityError
-ClassFormatError
-ClassLoader
-ClassNotFoundException
-ClassValue
-CloneNotSupportedException
-Cloneable
-Comparable
-Compiler
-Deprecated
-Double
-Enum
-EnumConstantNotPresentException
-Error
-Exception
-ExceptionInInitializerError
-Float
-FunctionalInterface
-IllegalAccessError
-IllegalAccessException
-IllegalArgumentException
-IllegalCallerException
-IllegalMonitorStateException
-IllegalStateException
-IllegalThreadStateException
-IncompatibleClassChangeError
-IndexOutOfBoundsException
-InheritableThreadLocal
-InstantiationError
-InstantiationException
-Integer
-InternalError
-InterruptedException
-Iterable
-LayerInstantiationException
-LinkageError
-Long
-Math
-Module
-ModuleLayer
-NegativeArraySizeException
-NoClassDefFoundError
-NoSuchFieldError
-NoSuchFieldException
-NoSuchMethodError
-NoSuchMethodException
-NullPointerException
-Number
-NumberFormatException
-Object
-OutOfMemoryError
-Override
-Package
-Process
-ProcessBuilder
-ProcessHandle
-Readable
-Record
-ReflectiveOperationException
-Runnable
-Runtime
-RuntimeException
-RuntimePermission
-SafeVarargs
-SecurityException
-SecurityManager
-Short
-StackOverflowError
-StackTraceElement
-StackWalker
-StrictMath
-String
-StringBuffer
-StringBuilder
-StringIndexOutOfBoundsException
-SuppressWarnings
-System
-Test
-Thread
-ThreadDeath
-ThreadGroup
-ThreadLocal
-Throwable
-TypeNotPresentException
-UnknownError
-UnsatisfiedLinkError
-UnsupportedClassVersionError
-UnsupportedOperationException
-VerifyError
-VirtualMachineError
-Void
-com
-java
-javax
-org
-sun
diff --git
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/memberModifiersTypesAndGenElements2.pass
b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/memberModifiersTypesAndGenElements2.pass
deleted file mode 100644
index e6d762f..0000000
---
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/memberModifiersTypesAndGenElements2.pass
+++ /dev/null
@@ -1,143 +0,0 @@
-public Test() - generate
-protected native Object clone() - override
-public boolean equals(Object arg0) - override
-protected void finalize() - override
-public native int hashCode() - override
-public abstract void run() - implement
-public String toString() - override
-abstract
-boolean
-byte
-char
-class
-double
-enum
-final
-float
-int
-interface
-long
-native
-non-sealed
-private
-protected
-public
-record
-sealed
-short
-static
-strictfp
-synchronized
-transient
-void
-volatile
-AbstractMethodError
-Appendable
-ArithmeticException
-ArrayIndexOutOfBoundsException
-ArrayStoreException
-AssertionError
-AutoCloseable
-Boolean
-BootstrapMethodError
-Byte
-CharSequence
-Character
-Class
-ClassCastException
-ClassCircularityError
-ClassFormatError
-ClassLoader
-ClassNotFoundException
-ClassValue
-CloneNotSupportedException
-Cloneable
-Comparable
-Compiler
-Deprecated
-Double
-Enum
-EnumConstantNotPresentException
-Error
-Exception
-ExceptionInInitializerError
-Float
-FunctionalInterface
-IllegalAccessError
-IllegalAccessException
-IllegalArgumentException
-IllegalCallerException
-IllegalMonitorStateException
-IllegalStateException
-IllegalThreadStateException
-IncompatibleClassChangeError
-IndexOutOfBoundsException
-InheritableThreadLocal
-InstantiationError
-InstantiationException
-Integer
-InternalError
-InterruptedException
-Iterable
-LayerInstantiationException
-LinkageError
-Long
-Math
-Module
-ModuleLayer
-NegativeArraySizeException
-NoClassDefFoundError
-NoSuchFieldError
-NoSuchFieldException
-NoSuchMethodError
-NoSuchMethodException
-NullPointerException
-Number
-NumberFormatException
-Object
-OutOfMemoryError
-Override
-Package
-Process
-ProcessBuilder
-ProcessHandle
-Readable
-Record
-ReflectiveOperationException
-Runnable
-Runtime
-RuntimeException
-RuntimePermission
-SafeVarargs
-SecurityException
-SecurityManager
-Short
-StackOverflowError
-StackTraceElement
-StackWalker
-StrictMath
-String
-StringBuffer
-StringBuilder
-StringIndexOutOfBoundsException
-SuppressWarnings
-System
-Test
-Thread
-ThreadDeath
-ThreadGroup
-ThreadLocal
-Throwable
-TypeNotPresentException
-UnknownError
-UnsatisfiedLinkError
-UnsupportedClassVersionError
-UnsupportedOperationException
-VerifyError
-VirtualMachineError
-Void
-com
-java
-javax
-org
-sun
diff --git
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/memberModifiersTypesAndGenElements3.pass
b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/memberModifiersTypesAndGenElements3.pass
deleted file mode 100644
index 857ac5c..0000000
---
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/memberModifiersTypesAndGenElements3.pass
+++ /dev/null
@@ -1,144 +0,0 @@
-public Test() - generate
-protected native Object clone() - override
-public boolean equals(Object arg0) - override
-protected void finalize() - override
-public int getField() - generate
-public native int hashCode() - override
-public void setField(int field) - generate
-public String toString() - override
-abstract
-boolean
-byte
-char
-class
-double
-enum
-final
-float
-int
-interface
-long
-native
-non-sealed
-private
-protected
-public
-record
-sealed
-short
-static
-strictfp
-synchronized
-transient
-void
-volatile
-AbstractMethodError
-Appendable
-ArithmeticException
-ArrayIndexOutOfBoundsException
-ArrayStoreException
-AssertionError
-AutoCloseable
-Boolean
-BootstrapMethodError
-Byte
-CharSequence
-Character
-Class
-ClassCastException
-ClassCircularityError
-ClassFormatError
-ClassLoader
-ClassNotFoundException
-ClassValue
-CloneNotSupportedException
-Cloneable
-Comparable
-Compiler
-Deprecated
-Double
-Enum
-EnumConstantNotPresentException
-Error
-Exception
-ExceptionInInitializerError
-Float
-FunctionalInterface
-IllegalAccessError
-IllegalAccessException
-IllegalArgumentException
-IllegalCallerException
-IllegalMonitorStateException
-IllegalStateException
-IllegalThreadStateException
-IncompatibleClassChangeError
-IndexOutOfBoundsException
-InheritableThreadLocal
-InstantiationError
-InstantiationException
-Integer
-InternalError
-InterruptedException
-Iterable
-LayerInstantiationException
-LinkageError
-Long
-Math
-Module
-ModuleLayer
-NegativeArraySizeException
-NoClassDefFoundError
-NoSuchFieldError
-NoSuchFieldException
-NoSuchMethodError
-NoSuchMethodException
-NullPointerException
-Number
-NumberFormatException
-Object
-OutOfMemoryError
-Override
-Package
-Process
-ProcessBuilder
-ProcessHandle
-Readable
-Record
-ReflectiveOperationException
-Runnable
-Runtime
-RuntimeException
-RuntimePermission
-SafeVarargs
-SecurityException
-SecurityManager
-Short
-StackOverflowError
-StackTraceElement
-StackWalker
-StrictMath
-String
-StringBuffer
-StringBuilder
-StringIndexOutOfBoundsException
-SuppressWarnings
-System
-Test
-Thread
-ThreadDeath
-ThreadGroup
-ThreadLocal
-Throwable
-TypeNotPresentException
-UnknownError
-UnsatisfiedLinkError
-UnsupportedClassVersionError
-UnsupportedOperationException
-VerifyError
-VirtualMachineError
-Void
-com
-java
-javax
-org
-sun
diff --git
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/memberModifiersTypesAndGenElements4.pass
b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/memberModifiersTypesAndGenElements4.pass
deleted file mode 100644
index 300f21f..0000000
---
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/memberModifiersTypesAndGenElements4.pass
+++ /dev/null
@@ -1,150 +0,0 @@
-public Test() - generate
-protected native Object clone() - override
-public boolean equals(Object arg0) - override
-protected void finalize() - override
-public int getField() - generate
-public Number getNum() - generate
-public int getStaticField() - generate
-public native int hashCode() - override
-public boolean isB() - generate
-public void setB(boolean b) - generate
-public void setField(int field) - generate
-public void setNum(Number num) - generate
-public void setStaticField(int staticField) - generate
-public String toString() - override
-abstract
-boolean
-byte
-char
-class
-double
-enum
-final
-float
-int
-interface
-long
-native
-non-sealed
-private
-protected
-public
-record
-sealed
-short
-static
-strictfp
-synchronized
-transient
-void
-volatile
-AbstractMethodError
-Appendable
-ArithmeticException
-ArrayIndexOutOfBoundsException
-ArrayStoreException
-AssertionError
-AutoCloseable
-Boolean
-BootstrapMethodError
-Byte
-CharSequence
-Character
-Class
-ClassCastException
-ClassCircularityError
-ClassFormatError
-ClassLoader
-ClassNotFoundException
-ClassValue
-CloneNotSupportedException
-Cloneable
-Comparable
-Compiler
-Deprecated
-Double
-Enum
-EnumConstantNotPresentException
-Error
-Exception
-ExceptionInInitializerError
-Float
-FunctionalInterface
-IllegalAccessError
-IllegalAccessException
-IllegalArgumentException
-IllegalCallerException
-IllegalMonitorStateException
-IllegalStateException
-IllegalThreadStateException
-IncompatibleClassChangeError
-IndexOutOfBoundsException
-InheritableThreadLocal
-InstantiationError
-InstantiationException
-Integer
-InternalError
-InterruptedException
-Iterable
-LayerInstantiationException
-LinkageError
-Long
-Math
-Module
-ModuleLayer
-NegativeArraySizeException
-NoClassDefFoundError
-NoSuchFieldError
-NoSuchFieldException
-NoSuchMethodError
-NoSuchMethodException
-NullPointerException
-Number
-NumberFormatException
-Object
-OutOfMemoryError
-Override
-Package
-Process
-ProcessBuilder
-ProcessHandle
-Readable
-Record
-ReflectiveOperationException
-Runnable
-Runtime
-RuntimeException
-RuntimePermission
-SafeVarargs
-SecurityException
-SecurityManager
-Short
-StackOverflowError
-StackTraceElement
-StackWalker
-StrictMath
-String
-StringBuffer
-StringBuilder
-StringIndexOutOfBoundsException
-SuppressWarnings
-System
-Test
-Thread
-ThreadDeath
-ThreadGroup
-ThreadLocal
-Throwable
-TypeNotPresentException
-UnknownError
-UnsatisfiedLinkError
-UnsupportedClassVersionError
-UnsupportedOperationException
-VerifyError
-VirtualMachineError
-Void
-com
-java
-javax
-org
-sun
diff --git
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/permitsKeyword.pass
b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/permitsKeyword.pass
deleted file mode 100644
index fc98dae..0000000
---
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/permitsKeyword.pass
+++ /dev/null
@@ -1 +0,0 @@
-permits
\ No newline at end of file
diff --git
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/topLevelKeywords.pass
b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/topLevelKeywords.pass
deleted file mode 100644
index b243c95..0000000
---
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/topLevelKeywords.pass
+++ /dev/null
@@ -1,11 +0,0 @@
-abstract
-class
-enum
-final
-import
-interface
-non-sealed
-package
-public
-record
-sealed
diff --git
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/topLevelKeywordsWithoutPackage.pass
b/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/topLevelKeywordsWithoutPackage.pass
deleted file mode 100644
index e7580e3..0000000
---
a/java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/15/topLevelKeywordsWithoutPackage.pass
+++ /dev/null
@@ -1,10 +0,0 @@
-abstract
-class
-enum
-final
-import
-interface
-non-sealed
-public
-record
-sealed
diff --git
a/java/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask115FeaturesTest.java
b/java/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask115FeaturesTest.java
deleted file mode 100644
index 6f27a16..0000000
---
a/java/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask115FeaturesTest.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.netbeans.modules.java.completion;
-
-import javax.lang.model.SourceVersion;
-import org.netbeans.junit.NbTestSuite;
-import org.netbeans.modules.java.source.parsing.JavacParser;
-
-
-/**
- *
- * @author arusinha
- */
-public class JavaCompletionTask115FeaturesTest extends CompletionTestBase {
-
- private static String SOURCE_LEVEL = "15"; //NOI18N
-
- public JavaCompletionTask115FeaturesTest(String testName) {
- super(testName);
- }
-
- public static NbTestSuite suite() {
- NbTestSuite suite = new NbTestSuite();
- try {
- SourceVersion.valueOf("RELEASE_15"); //NOI18N
- suite.addTestSuite(JavaCompletionTask115FeaturesTest.class);
- } catch (IllegalArgumentException ex) {
- //OK, no RELEASE_13, skip tests
- suite.addTest(new JavaCompletionTask115FeaturesTest("noop"));
//NOI18N
- }
- return suite;
- }
-
- public void testAfterTypeParams() throws Exception {
- performTest("Generics", 887, null,
"extendsAndImplementsAndPermitsKeywords.pass",SOURCE_LEVEL);
- }
-
-
- public void testAfterTypingTypeParams() throws Exception {
- performTest("GenericsNoTypeParams", 841, "<X extends Number, Y extends
RuntimeException>", "extendsAndImplementsAndPermitsKeywords.pass",SOURCE_LEVEL);
- }
-
- public void testEmptyFileAfterTypingTypeParams() throws Exception {
- performTest("GenericsStart", 841, "<X extends Number, Y extends
RuntimeException>", "extendsAndImplementsAndPermitsKeywords.pass",SOURCE_LEVEL);
- }
-
- public void testEmptyFileBeforeTypingDefaultModifier() throws Exception {
- performTest("Empty", 808, "package test;\ninterface Test {",
"interfaceMemberModifiersAndTypes.pass", SOURCE_LEVEL);
- }
-
- public void testBeforeDefaultModifier() throws Exception {
- performTest("Interface", 846, null,
"interfaceMemberModifiersAndTypes.pass", SOURCE_LEVEL);
- }
-
- public void testEmptyFileAfterTypingPackageDecl() throws Exception {
- performTest("Empty", 808, "package test;",
"topLevelKeywordsWithoutPackage.pass",SOURCE_LEVEL);
- }
-
- public void testEmptyFileAfterTypingIntefaceName() throws Exception {
- performTest("Empty", 808, "package test;\ninterface Test ",
"extendsAndPermitsKeywords.pass",SOURCE_LEVEL);
- }
-
- public void testEmptyFileBeforeTypingImplementsKeyword() throws Exception {
- performTest("Empty", 808, "package test;\npublic class Test extends
Object ", "implementsAndPermitsKeywords.pass",SOURCE_LEVEL);
- }
-
- public void testEmptyFileAfterTypingFieldDeclaration() throws Exception {
- performTest("MethodStart", 849, "public int field = hashCode() / 10;",
"memberModifiersTypesAndGenElements3.pass",SOURCE_LEVEL);
- }
-
- public void testEmptyFileAfterTypingMethodBody() throws Exception {
- performTest("MethodStart", 849, "public void op() {\n}",
"memberModifiersTypesAndGenElements.pass",SOURCE_LEVEL);
- }
-
- public void testAfterTypingImplementedInterfaceAndSpace() throws Exception
{
- performTest("SimpleNoExtendsAndImplements", 842, "implements Cloneable
", "permitsKeyword.pass",SOURCE_LEVEL);
- }
-
- public void testAfterMethodBody() throws Exception {
- performTest("Method", 940, null,
"memberModifiersTypesAndGenElements.pass",SOURCE_LEVEL);
- }
-
- public void testBeforeTypingImplementsKeyword() throws Exception {
- performTest("SimpleNoExtendsAndImplements", 842, "extends Object ",
"implementsAndPermitsKeywords.pass",SOURCE_LEVEL);
- }
-
- public void testAfterClassBody() throws Exception {
- performTest("Simple", 891, null,
"classModifiersWithoutPublic.pass",SOURCE_LEVEL);
- }
-
- public void testEmptyFile() throws Exception {
- performTest("Empty", 808, null, "topLevelKeywords.pass",SOURCE_LEVEL);
- }
-
- public void testEmptyFileBeforeTypingExtendsKeyword() throws Exception {
- performTest("Empty", 808, "package test;\npublic class Test ",
"extendsAndImplementsAndPermitsKeywords.pass",SOURCE_LEVEL);
- }
-
- public void testBeforeImplementsKeyword() throws Exception {
- performTest("Simple", 857, null,
"implementsAndPermitsKeywords.pass",SOURCE_LEVEL);
- }
- public void testAfterTypingPackageDecl() throws Exception {
- performTest("SimpleNoPackage", 808, "package test;",
"topLevelKeywordsWithoutPackage.pass",SOURCE_LEVEL);
- }
-
- public void testBeforeTypingExtendsKeyword() throws Exception {
- performTest("SimpleNoExtendsAndImplements", 842, null,
"extendsAndImplementsAndPermitsKeywords.pass",SOURCE_LEVEL);
- }
- public void testAfterFieldDeclaration() throws Exception {
- performTest("Field", 884, null,
"memberModifiersTypesAndGenElements4.pass",SOURCE_LEVEL);
- }
-
- public void testFileBeginning() throws Exception {
- performTest("Simple", 808, null, "topLevelKeywords.pass",SOURCE_LEVEL);
- }
-
- public void testBeforeClassKeyword() throws Exception {
- performTest("Simple", 831, null,
"classModifiersWithoutPublic.pass",SOURCE_LEVEL);
- }
-
- public void testAfterTypingIntefaceName() throws Exception {
- performTest("SimpleInterfaceNoExtends", 839, null,
"extendsAndPermitsKeywords.pass",SOURCE_LEVEL);
- }
- public void testEmptyFileTypingPublicKeywordInMethodDecl() throws
Exception {
- performTest("MethodStart", 849, "p",
"memberModifiersStartingWithP.pass",SOURCE_LEVEL);
- }
-
- public void testEmptyFileAfterTypingClassBody() throws Exception {
- performTest("Empty", 808, "package test;\npublic class Test {\n}",
"classModifiersWithoutPublic.pass",SOURCE_LEVEL);
- }
- public void testAfterImportStatement() throws Exception {
- performTest("Import", 845, null,
"topLevelKeywordsWithoutPackage.pass",SOURCE_LEVEL);
- }
- public void testOnPublicKeywordInMethodDecl() throws Exception {
- performTest("Method", 850, null,
"memberModifiersStartingWithP.pass",SOURCE_LEVEL);
- }
-
- public void testAfterImplementedInterfaceAndSpace() throws Exception {
- performTest("Simple", 877, " ", "permitsKeyword.pass",SOURCE_LEVEL);
- }
-
- public void testEmptyFileAfterTypingImportStatement() throws Exception {
- performTest("Empty", 808, "import java.awt.List;",
"topLevelKeywordsWithoutPackage.pass",SOURCE_LEVEL);
- }
-
- public void testBeforeExtendsKeyword() throws Exception {
- performTest("Simple", 842, null,
"extendsAndImplementsAndPermitsKeywords.pass",SOURCE_LEVEL);
- }
-
- public void testInClassBody() throws Exception {
- performTest("Simple", 889, null,
"memberModifiersTypesAndGenElements2.pass",SOURCE_LEVEL);
- }
- public void testAfterTypingImportStatement() throws Exception {
- performTest("Simple", 823, "import java.awt.List;",
"topLevelKeywordsWithoutPackage.pass",SOURCE_LEVEL);
- }
-
- public void testEmptyFileAfterTypingImplementedInterfaceAndSpace() throws
Exception {
- performTest("Empty", 808, "package test;\npublic class Test extends
Object implements Cloneable ", "permitsKeyword.pass",SOURCE_LEVEL);
- }
- public void testEmptyFileTypingClassBody() throws Exception {
- performTest("Empty", 808, "package test;\npublic class Test {",
"memberModifiersTypesAndGenElements.pass",SOURCE_LEVEL);
- }
-
- public void testAfterIntefaceName() throws Exception {
- performTest("SimpleInterface", 839, null,
"extendsAndPermitsKeywords.pass",SOURCE_LEVEL);
- }
-
- public void testEmptyFileBeforeTypingClassKeyword() throws Exception {
- performTest("Empty", 808, "package test;\npublic ",
"classModifiersWithoutPublic.pass",SOURCE_LEVEL);
- }
-
- public void testUnimplementedMethod() throws Exception {
- performTest("UnimplementedMethod", 894, "",
"UnimplementedMethod.pass",SOURCE_LEVEL);
- }
-
- public void testOverrideAbstractList() throws Exception {
- performTest("OverrideAbstractList", 927, "",
"OverrideAbstractList.pass",SOURCE_LEVEL);
- }
-
- /**
- * Checks that cc: offers just one size() for override, but offers size()
for both implement AND override.
- */
- public void testOverrideAbstractListAbstract() throws Exception {
- performTest("OverrideAbstractListAbstract", 935, "",
"OverrideAbstractListAbstract.pass",SOURCE_LEVEL);
- }
-
- public void testCreateConstructorTest() throws Exception {
- performTest("CreateConstructorTest", 1058, "",
"CreateConstructorTest.pass",SOURCE_LEVEL);
- }
-
- public void testCreateConstructorTestInnerClass() throws Exception {
- performTest("CreateConstructorTest", 1243, "",
"CreateConstructorTestInnerClass.pass",SOURCE_LEVEL);
- }
-
- public void testCreateConstructorWithConstructors() throws Exception {
- performTest("CreateConstructorWithConstructors", 1209, "",
"CreateConstructorWithConstructors.pass",SOURCE_LEVEL);
- }
-
- public void testCreateConstructorWithConstructorsInnerClass() throws
Exception {
- performTest("CreateConstructorWithConstructors", 1476, "",
"CreateConstructorWithConstructorsInnerClass.pass",SOURCE_LEVEL);
- }
-
- public void testCreateConstructorWithDefaultConstructor() throws Exception
{
- performTest("CreateConstructorWithDefaultConstructor", 1161, "",
"CreateConstructorWithDefaultConstructor.pass",SOURCE_LEVEL);
- }
-
- public void testCreateConstructorWithDefaultConstructorInnerClass() throws
Exception {
- performTest("CreateConstructorWithDefaultConstructor", 1369, "",
"CreateConstructorWithDefaultConstructorInnerClass.pass",SOURCE_LEVEL);
- }
-
- public void testCreateConstructorNonDefaultConstructor() throws Exception {
- performTest("CreateConstructorNonDefaultConstructor", 1188, "",
"CreateConstructorNonDefaultConstructor.pass",SOURCE_LEVEL);
- }
-
- public void testCreateConstructorNonDefaultConstructorInnerClass() throws
Exception {
- performTest("CreateConstructorNonDefaultConstructor", 1433, "",
"CreateConstructorNonDefaultConstructorInnerClass.pass",SOURCE_LEVEL);
- }
-
- public void noop() {
- }
-
- static {
- JavacParser.DISABLE_SOURCE_LEVEL_DOWNGRADE = true;
- }
-}
diff --git
a/java/java.source.base/src/org/netbeans/modules/java/source/TreeShims.java
b/java/java.source.base/src/org/netbeans/modules/java/source/TreeShims.java
index 273fb15..eb75dd0 100644
--- a/java/java.source.base/src/org/netbeans/modules/java/source/TreeShims.java
+++ b/java/java.source.base/src/org/netbeans/modules/java/source/TreeShims.java
@@ -26,7 +26,6 @@ import com.sun.source.tree.InstanceOfTree;
import com.sun.source.tree.SwitchTree;
import com.sun.source.tree.Tree;
import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.tree.JCTree.JCClassDecl;
import com.sun.tools.javac.tree.TreeMaker;
import com.sun.tools.javac.util.ListBuffer;
import java.lang.reflect.InvocationTargetException;
@@ -164,33 +163,6 @@ public class TreeShims {
return perms;
}
- public static List<? extends Tree> getPermits(JCClassDecl newT) {
- List<JCTree.JCExpression> newPermitings = new ArrayList<>();
- try {
- Class jCClassDecl =
Class.forName("com.sun.tools.javac.tree.JCTree$JCClassDecl");
- newPermitings =
(com.sun.tools.javac.util.List<JCTree.JCExpression>)
jCClassDecl.getDeclaredField("permitting").get(newT);
- } catch (ClassNotFoundException | NoSuchFieldException ex) {
- return null;
- } catch (IllegalArgumentException | IllegalAccessException ex) {
- throw TreeShims.<RuntimeException>throwAny(ex);
- }
- return newPermitings;
- }
-
- public static List<? extends Tree> getPermits(ClassTree node) {
- List<? extends Tree> perms = null;
- try {
- Class classTree = Class.forName("com.sun.source.tree.ClassTree");
- Method getPerms = classTree.getDeclaredMethod("getPermitsClause");
- perms = (List<? extends Tree>) getPerms.invoke(node);
- } catch (ClassNotFoundException | NoSuchMethodException ex) {
- return null;
- } catch (SecurityException | IllegalAccessException |
IllegalArgumentException | InvocationTargetException ex) {
- throw TreeShims.<RuntimeException>throwAny(ex);
- }
- return perms;
- }
-
public static ExpressionTree getYieldValue(Tree node) {
if (!node.getKind().toString().equals(YIELD)) {
return null;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
