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 2018/07/03 04:17:40 UTC
[incubator-netbeans] branch master updated (e0ee005 -> 90c92b2)
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git.
from e0ee005 Merge pull request #606 from matthiasblaesing/sgml_w3c
new 9151fac Fixing code completion tests on JDK 10 and 11 with nb-javac.
new 849532e Changes to help java.completion to pass on JDK 11.
new 78a5e0a A few completion fixes.
new 7b6fd75 Generalizing golden file lookup.
new 90c92b2 [NETBEANS-895] Fixing adding imports when completing field initializer.
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/completion/JavaCompletionTask.java | 5 +-
.../CreateConstructorNonDefaultConstructor.pass | 1 -
...ConstructorNonDefaultConstructorInnerClass.pass | 1 -
.../1.8/CreateConstructorTest.pass | 1 -
.../1.8/CreateConstructorTestInnerClass.pass | 1 -
.../1.8/CreateConstructorWithConstructors.pass | 1 -
...reateConstructorWithConstructorsInnerClass.pass | 1 -
.../CreateConstructorWithDefaultConstructor.pass | 1 -
...onstructorWithDefaultConstructorInnerClass.pass | 1 -
.../1.8/OverrideAbstractList.pass | 1 -
.../1.8/OverrideAbstractListAbstract.pass | 1 -
.../1.8/UnimplementedMethod.pass | 1 -
.../JavaCompletionTaskTest/1.8/allPackages.pass | 1 -
.../JavaCompletionTaskTest/1.8/autoCloseables.pass | 1 -
.../1.8/blockContentAfterFor.pass | 1 -
.../1.8/blockContentAfterForEach.pass | 1 -
.../JavaCompletionTaskTest/1.8/declaredTypes.pass | 1 -
.../1.8/declaredTypesAndSmartInt.pass | 1 -
.../1.8/finalAndAutoCloseables.pass | 1 -
.../1.8/initBlockContent.pass | 1 -
.../1.8/initBlockTypesAndLocalMembers.pass | 1 -
.../JavaCompletionTaskTest/1.8/intHashCode.pass | 2 +-
.../1.8/interfaceMemberModifiersAndTypes.pass | 1 -
...ersAndTypesWithoutDefaultAbstractAndStatic.pass | 1 -
.../1.8/javaLangClasses.pass | 1 -
.../1.8/javaLangContentAndTestClass.pass | 1 -
.../1.8/javaLangInterfaces.pass | 1 -
.../1.8/javaLangThrowables.pass | 1 -
.../1.8/lambdaBodyContent.pass | 1 -
.../1.8/lambdaBodyContentWithLocalVar.pass | 1 -
.../1.8/lambdaExpression.pass | 1 -
.../1.8/lambdaParameterTypes.pass | 1 -
.../JavaCompletionTaskTest/1.8/lambdaSmartInt.pass | 1 -
.../1.8/lambdaSmartInt2.pass | 1 -
.../1.8/memberModifiersAndTypesWithoutPublic.pass | 1 -
.../1.8/memberModifiersAndTypesWithoutStatic.pass | 1 -
.../1.8/memberModifiersTypesAndGenElements.pass | 1 -
.../1.8/memberModifiersTypesAndGenElements2.pass | 1 -
.../1.8/memberModifiersTypesAndGenElements3.pass | 1 -
.../1.8/memberModifiersTypesAndGenElements4.pass | 1 -
.../1.8/methodBodyContent.pass | 1 -
.../1.8/methodBodyContentAfterCase.pass | 1 -
.../1.8/methodBodyContentAfterCaseAndVar.pass | 1 -
.../1.8/methodBodyContentAfterDefault.pass | 1 -
.../1.8/methodBodyContentAfterFor.pass | 1 -
.../1.8/methodBodyContentAfterForEach.pass | 1 -
.../1.8/methodBodyContentAndLocalVar.pass | 1 -
.../JavaCompletionTaskTest/1.8/parameterTypes.pass | 1 -
.../JavaCompletionTaskTest/1.8/resourceInit.pass | 1 -
.../1.8/resourcesAndAutoCloseables.pass | 1 -
.../JavaCompletionTaskTest/1.8/returnTypes.pass | 1 -
.../1.8/staticBlockContent.pass | 1 -
.../1.8/staticBlockTypesAndLocalMembers.pass | 1 -
.../1.8/staticKeywordAndAllPackages.pass | 1 -
.../1.8/typesAndLocalMembers.pass | 1 -
.../1.8/typesAndLocalMembers1.pass | 1 -
.../1.8/typesAndStaticLocalMembers.pass | 1 -
.../1.8/typesInterfaceMembersAndVars.pass | 1 -
.../1.8/typesInterfaceMembersAndVars1.pass | 1 -
.../1.8/typesLocalFieldsAndVars.pass | 1 -
.../1.8/typesLocalMembersAndSmartInt.pass | 1 -
.../1.8/typesLocalMembersAndSmartNumber.pass | 1 -
.../1.8/typesLocalMembersAndSmartPrimitives.pass | 1 -
.../1.8/typesLocalMembersAndVars.pass | 1 -
.../1.8/typesLocalMembersAndVars1.pass | 1 -
.../1.8/typesLocalMembersAndVars2.pass | 1 -
.../1.8/typesLocalMembersVarsAndSmartBoolean.pass | 1 -
.../typesLocalMembersVarsAndSmartEnumAndInt.pass | 1 -
.../1.8/typesLocalMembersVarsAndSmartInt.pass | 1 -
.../1.8/typesLocalMembersVarsAndSmartString.pass | 1 -
.../1.8/typesLocalMembersVarsAndSmarts.pass | 1 -
.../1.8/typesStaticInterfaceMembersAndVars.pass | 1 -
.../CreateConstructorNonDefaultConstructor.pass | 7 +-
...ConstructorNonDefaultConstructorInnerClass.pass | 7 +-
.../{1.8 => 10}/CreateConstructorTest.pass | 7 +-
.../CreateConstructorTestInnerClass.pass | 7 +-
.../CreateConstructorWithConstructors.pass | 7 +-
...reateConstructorWithConstructorsInnerClass.pass | 7 +-
.../CreateConstructorWithDefaultConstructor.pass | 7 +-
...onstructorWithDefaultConstructorInnerClass.pass | 7 +-
.../{1.8 => 10}/OverrideAbstractList.pass | 7 +-
.../{1.8 => 10}/OverrideAbstractListAbstract.pass | 7 +-
.../10/OverridePrivateMethod.pass | 2 +
.../{1.8 => 10}/UnimplementedMethod.pass | 7 +-
.../{1.8 => 10}/blockContentAfterFor.pass | 7 +-
.../{1.8 => 10}/blockContentAfterForEach.pass | 7 +-
.../{1.8 => 10}/declaredTypes.pass | 7 +-
.../{1.8 => 10}/declaredTypesAndSmartInt.pass | 7 +-
.../JavaCompletionTaskTest/10/emptyVar.pass | 5 +-
.../{1.8 => 10}/initBlockContent.pass | 7 +-
.../{1.8 => 10}/initBlockTypesAndLocalMembers.pass | 7 +-
.../interfaceMemberModifiersAndTypes.pass | 7 +-
...ersAndTypesWithoutDefaultAbstractAndStatic.pass | 7 +-
.../{1.8 => 10}/javaLangClasses.pass | 5 +-
.../{1.8 => 10}/javaLangContentAndTestClass.pass | 7 +-
.../10/javaLangContentStartingWithI.pass | 16 ++
.../{1.8 => 10}/javaLangInterfaces.pass | 4 +-
.../{1.8 => 10}/javaLangThrowables.pass | 3 +-
.../10/javaLangThrowablesStartingWithI.pass | 13 ++
.../{1.8 => 10}/lambdaBodyContent.pass | 7 +-
.../{1.8 => 10}/lambdaBodyContentWithLocalVar.pass | 7 +-
.../{1.8 => 10}/lambdaExpression.pass | 7 +-
.../{1.8 => 10}/lambdaParameterTypes.pass | 7 +-
.../{1.8 => 10}/lambdaSmartInt.pass | 9 +-
.../{1.8 => 10}/lambdaSmartInt2.pass | 9 +-
.../memberModifiersAndTypesWithoutPublic.pass | 7 +-
.../memberModifiersAndTypesWithoutStatic.pass | 7 +-
.../memberModifiersTypesAndGenElements.pass | 7 +-
.../memberModifiersTypesAndGenElements2.pass | 7 +-
.../memberModifiersTypesAndGenElements3.pass | 7 +-
.../memberModifiersTypesAndGenElements4.pass | 7 +-
.../{1.8 => 10}/methodBodyContent.pass | 7 +-
.../{1.8 => 10}/methodBodyContentAfterCase.pass | 7 +-
.../methodBodyContentAfterCaseAndVar.pass | 7 +-
.../{1.8 => 10}/methodBodyContentAfterDefault.pass | 7 +-
.../{1.8 => 10}/methodBodyContentAfterFor.pass | 7 +-
.../{1.8 => 10}/methodBodyContentAfterForEach.pass | 7 +-
.../{1.8 => 10}/methodBodyContentAndLocalVar.pass | 7 +-
.../{1.8 => 10}/parameterTypes.pass | 7 +-
.../{1.8 => 10}/resourceInit.pass | 7 +-
.../resourcesAndAutoCloseablesFWVar.pass} | 2 +-
.../{1.8 => 10}/returnTypes.pass | 7 +-
.../{1.8 => 10}/staticBlockContent.pass | 7 +-
.../staticBlockTypesAndLocalMembers.pass | 9 +-
.../JavaCompletionTaskTest/10/stringContent.pass | 60 +++++
.../JavaCompletionTaskTest/10/systemContent.pass | 35 +++
.../{1.8 => 10}/typesAndLocalMembers.pass | 7 +-
.../{1.8 => 10}/typesAndLocalMembers1.pass | 7 +-
.../{1.8 => 10}/typesAndStaticLocalMembers.pass | 9 +-
.../{1.8 => 10}/typesInterfaceMembersAndVars.pass | 7 +-
.../{1.8 => 10}/typesInterfaceMembersAndVars1.pass | 7 +-
.../{1.8 => 10}/typesLocalFieldsAndVars.pass | 7 +-
.../{1.8 => 10}/typesLocalMembersAndSmartInt.pass | 9 +-
.../typesLocalMembersAndSmartNumber.pass | 7 +-
.../typesLocalMembersAndSmartPrimitives.pass | 18 +-
.../{1.8 => 10}/typesLocalMembersAndVars.pass | 7 +-
.../{1.8 => 10}/typesLocalMembersAndVars1.pass | 7 +-
.../{1.8 => 10}/typesLocalMembersAndVars2.pass | 7 +-
.../typesLocalMembersVarsAndSmartBoolean.pass | 7 +-
.../typesLocalMembersVarsAndSmartEnumAndInt.pass | 9 +-
.../typesLocalMembersVarsAndSmartInt.pass | 9 +-
.../typesLocalMembersVarsAndSmartString.pass | 7 +-
.../typesLocalMembersVarsAndSmarts.pass | 16 +-
.../typesStaticInterfaceMembersAndVars.pass | 7 +-
.../{1.8 => 11}/OverrideAbstractList.pass | 8 +-
.../{1.8 => 11}/OverrideAbstractListAbstract.pass | 8 +-
.../11/OverrideAbstractListWithPrefix.pass | 4 +
.../JavaCompletionTaskTest/11/stringContent.pass | 66 ++++++
.../JavaCompletionTaskTest/11/systemContent.pass | 34 +++
.../typesLocalMembersVarsAndSmarts.pass | 17 +-
.../java/completion/CompletionTestBase.java | 242 +--------------------
.../java/completion/CompletionTestBaseBase.java | 212 +++++++-----------
java.editor/nbproject/project.xml | 6 +
.../1.8/testAnnotation.pass2 | 10 +
.../1.8/testFieldInitializer.pass2 | 10 +
.../java/editor/completion/data/Annotation.java | 8 +
.../java/editor/completion/data/FieldSet.java | 9 +
.../java/editor/completion/CompletionTestBase.java | 234 +-------------------
.../completion/JavaCompletionItemPerformTest.java | 39 ++++
.../org/netbeans/api/java/source/SourceUtils.java | 12 +-
.../netbeans/api/java/source/TreeUtilities.java | 43 +++-
.../modules/java/source/parsing/JavacParser.java | 7 +-
.../api/java/source/TreeUtilitiesTest.java | 34 +++
lib.nbjavac/manifest.mf | 2 +-
.../org/netbeans/lib/nbjavac/services/NBAttr.java | 38 ++++
.../lib/nbjavac/services/NBJavacTrees.java | 8 +
.../lib/nbjavac/services/NBJavadocMemberEnter.java | 4 +
167 files changed, 998 insertions(+), 747 deletions(-)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/CreateConstructorNonDefaultConstructor.pass (96%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/CreateConstructorNonDefaultConstructorInnerClass.pass (95%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/CreateConstructorTest.pass (96%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/CreateConstructorTestInnerClass.pass (96%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/CreateConstructorWithConstructors.pass (96%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/CreateConstructorWithConstructorsInnerClass.pass (95%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/CreateConstructorWithDefaultConstructor.pass (96%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/CreateConstructorWithDefaultConstructorInnerClass.pass (96%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/OverrideAbstractList.pass (97%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/OverrideAbstractListAbstract.pass (97%)
create mode 100644 java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/OverridePrivateMethod.pass
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/UnimplementedMethod.pass (95%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/blockContentAfterFor.pass (95%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/blockContentAfterForEach.pass (95%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/declaredTypes.pass (94%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/declaredTypesAndSmartInt.pass (94%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/initBlockContent.pass (95%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/initBlockTypesAndLocalMembers.pass (96%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/interfaceMemberModifiersAndTypes.pass (95%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/interfaceMemberModifiersAndTypesWithoutDefaultAbstractAndStatic.pass (94%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/javaLangClasses.pass (94%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/javaLangContentAndTestClass.pass (94%)
create mode 100644 java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/javaLangContentStartingWithI.pass
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/javaLangInterfaces.pass (84%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/javaLangThrowables.pass (95%)
create mode 100644 java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/javaLangThrowablesStartingWithI.pass
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/lambdaBodyContent.pass (94%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/lambdaBodyContentWithLocalVar.pass (94%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/lambdaExpression.pass (94%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/lambdaParameterTypes.pass (94%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/lambdaSmartInt.pass (92%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/lambdaSmartInt2.pass (92%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/memberModifiersAndTypesWithoutPublic.pass (94%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/memberModifiersAndTypesWithoutStatic.pass (94%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/memberModifiersTypesAndGenElements.pass (95%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/memberModifiersTypesAndGenElements2.pass (95%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/memberModifiersTypesAndGenElements3.pass (95%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/memberModifiersTypesAndGenElements4.pass (95%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/methodBodyContent.pass (95%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/methodBodyContentAfterCase.pass (95%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/methodBodyContentAfterCaseAndVar.pass (95%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/methodBodyContentAfterDefault.pass (95%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/methodBodyContentAfterFor.pass (95%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/methodBodyContentAfterForEach.pass (95%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/methodBodyContentAndLocalVar.pass (95%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/parameterTypes.pass (94%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/resourceInit.pass (95%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8/resourcesAndAutoCloseables.pass => 10/resourcesAndAutoCloseablesFWVar.pass} (83%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/returnTypes.pass (94%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/staticBlockContent.pass (94%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/staticBlockTypesAndLocalMembers.pass (92%)
create mode 100644 java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/stringContent.pass
create mode 100644 java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/systemContent.pass
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/typesAndLocalMembers.pass (95%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/typesAndLocalMembers1.pass (95%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/typesAndStaticLocalMembers.pass (92%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/typesInterfaceMembersAndVars.pass (95%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/typesInterfaceMembersAndVars1.pass (95%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/typesLocalFieldsAndVars.pass (94%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/typesLocalMembersAndSmartInt.pass (93%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/typesLocalMembersAndSmartNumber.pass (95%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/typesLocalMembersAndSmartPrimitives.pass (94%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/typesLocalMembersAndVars.pass (95%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/typesLocalMembersAndVars1.pass (95%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/typesLocalMembersAndVars2.pass (95%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/typesLocalMembersVarsAndSmartBoolean.pass (96%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/typesLocalMembersVarsAndSmartEnumAndInt.pass (93%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/typesLocalMembersVarsAndSmartInt.pass (93%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/typesLocalMembersVarsAndSmartString.pass (97%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/typesLocalMembersVarsAndSmarts.pass (96%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 10}/typesStaticInterfaceMembersAndVars.pass (94%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 11}/OverrideAbstractList.pass (95%)
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 11}/OverrideAbstractListAbstract.pass (95%)
create mode 100644 java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/11/OverrideAbstractListWithPrefix.pass
create mode 100644 java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/11/stringContent.pass
create mode 100644 java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/11/systemContent.pass
copy java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/{1.8 => 11}/typesLocalMembersVarsAndSmarts.pass (95%)
copy java.editor/test/unit/src/org/netbeans/modules/java/editor/completion/CompletionTestBase.java => java.completion/test/unit/src/org/netbeans/modules/java/completion/CompletionTestBaseBase.java (56%)
create mode 100644 java.editor/test/unit/data/goldenfiles/org/netbeans/modules/java/editor/completion/JavaCompletionProviderTest/1.8/testAnnotation.pass2
create mode 100644 java.editor/test/unit/data/goldenfiles/org/netbeans/modules/java/editor/completion/JavaCompletionProviderTest/1.8/testFieldInitializer.pass2
create mode 100644 java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/Annotation.java
create mode 100644 java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/FieldSet.java
create mode 100644 java.editor/test/unit/src/org/netbeans/modules/java/editor/completion/JavaCompletionItemPerformTest.java
---------------------------------------------------------------------
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
[incubator-netbeans] 02/05: Changes to help java.completion to pass
on JDK 11.
Posted by jl...@apache.org.
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/incubator-netbeans.git
commit 849532e5c18d091c15eda86ed60189ac1788a1c0
Author: Jan Lahoda <jl...@netbeans.org>
AuthorDate: Tue Jun 19 20:17:42 2018 +0200
Changes to help java.completion to pass on JDK 11.
---
.../src/org/netbeans/modules/java/completion/JavaCompletionTask.java | 3 ++-
.../src/org/netbeans/lib/nbjavac/services/NBJavadocMemberEnter.java | 4 ++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/java.completion/src/org/netbeans/modules/java/completion/JavaCompletionTask.java b/java.completion/src/org/netbeans/modules/java/completion/JavaCompletionTask.java
index ccd90c8..24c1223 100644
--- a/java.completion/src/org/netbeans/modules/java/completion/JavaCompletionTask.java
+++ b/java.completion/src/org/netbeans/modules/java/completion/JavaCompletionTask.java
@@ -20,6 +20,7 @@
package org.netbeans.modules.java.completion;
import com.sun.source.tree.*;
+import com.sun.source.tree.Tree.Kind;
import com.sun.source.util.*;
import java.io.IOException;
@@ -4839,7 +4840,7 @@ public final class JavaCompletionTask<T> extends BaseTask {
}
}
}
- return false;
+ return tree.getKind() == Kind.COMPILATION_UNIT;
}
private static boolean isAnnonInner(ElementHandle<TypeElement> elem) {
diff --git a/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBJavadocMemberEnter.java b/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBJavadocMemberEnter.java
index c15d91c..258059c 100644
--- a/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBJavadocMemberEnter.java
+++ b/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBJavadocMemberEnter.java
@@ -20,6 +20,7 @@ package org.netbeans.lib.nbjavac.services;
import com.sun.source.util.TreePath;
import com.sun.tools.javac.api.JavacTrees;
+import com.sun.tools.javac.code.Flags;
import com.sun.tools.javac.comp.MemberEnter;
import com.sun.tools.javac.tree.JCTree.JCBlock;
import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
@@ -92,6 +93,9 @@ public class NBJavadocMemberEnter extends JavadocMemberEnter {
} finally {
//reinstall init:
tree.init = init;
+ if (init != null) {
+ tree.sym.flags_field |= Flags.HASINIT; //XXX: hack
+ }
}
}
---------------------------------------------------------------------
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
[incubator-netbeans] 01/05: Fixing code completion tests on JDK 10
and 11 with nb-javac.
Posted by jl...@apache.org.
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/incubator-netbeans.git
commit 9151fac31b6187c80e3cf11061d5bae67de2ec59
Author: Jan Lahoda <jl...@netbeans.org>
AuthorDate: Sun Jun 17 09:35:01 2018 +0200
Fixing code completion tests on JDK 10 and 11 with nb-javac.
---
.../CreateConstructorNonDefaultConstructor.pass | 1 -
...ConstructorNonDefaultConstructorInnerClass.pass | 1 -
.../1.8/CreateConstructorTest.pass | 1 -
.../1.8/CreateConstructorTestInnerClass.pass | 1 -
.../1.8/CreateConstructorWithConstructors.pass | 1 -
...reateConstructorWithConstructorsInnerClass.pass | 1 -
.../CreateConstructorWithDefaultConstructor.pass | 1 -
...onstructorWithDefaultConstructorInnerClass.pass | 1 -
.../1.8/OverrideAbstractList.pass | 1 -
.../1.8/OverrideAbstractListAbstract.pass | 1 -
.../1.8/UnimplementedMethod.pass | 1 -
.../JavaCompletionTaskTest/1.8/allPackages.pass | 1 -
.../JavaCompletionTaskTest/1.8/autoCloseables.pass | 1 -
.../1.8/blockContentAfterFor.pass | 1 -
.../1.8/blockContentAfterForEach.pass | 1 -
.../JavaCompletionTaskTest/1.8/declaredTypes.pass | 1 -
.../1.8/declaredTypesAndSmartInt.pass | 1 -
.../1.8/finalAndAutoCloseables.pass | 1 -
.../1.8/initBlockContent.pass | 1 -
.../1.8/initBlockTypesAndLocalMembers.pass | 1 -
.../JavaCompletionTaskTest/1.8/intHashCode.pass | 2 +-
.../1.8/interfaceMemberModifiersAndTypes.pass | 1 -
...ersAndTypesWithoutDefaultAbstractAndStatic.pass | 1 -
.../1.8/javaLangClasses.pass | 1 -
.../1.8/javaLangContentAndTestClass.pass | 1 -
.../1.8/javaLangInterfaces.pass | 1 -
.../1.8/javaLangThrowables.pass | 1 -
.../1.8/lambdaBodyContent.pass | 1 -
.../1.8/lambdaBodyContentWithLocalVar.pass | 1 -
.../1.8/lambdaExpression.pass | 1 -
.../1.8/lambdaParameterTypes.pass | 1 -
.../JavaCompletionTaskTest/1.8/lambdaSmartInt.pass | 1 -
.../1.8/lambdaSmartInt2.pass | 1 -
.../1.8/memberModifiersAndTypesWithoutPublic.pass | 1 -
.../1.8/memberModifiersAndTypesWithoutStatic.pass | 1 -
.../1.8/memberModifiersTypesAndGenElements.pass | 1 -
.../1.8/memberModifiersTypesAndGenElements2.pass | 1 -
.../1.8/memberModifiersTypesAndGenElements3.pass | 1 -
.../1.8/memberModifiersTypesAndGenElements4.pass | 1 -
.../1.8/methodBodyContent.pass | 1 -
.../1.8/methodBodyContentAfterCase.pass | 1 -
.../1.8/methodBodyContentAfterCaseAndVar.pass | 1 -
.../1.8/methodBodyContentAfterDefault.pass | 1 -
.../1.8/methodBodyContentAfterFor.pass | 1 -
.../1.8/methodBodyContentAfterForEach.pass | 1 -
.../1.8/methodBodyContentAndLocalVar.pass | 1 -
.../JavaCompletionTaskTest/1.8/parameterTypes.pass | 1 -
.../JavaCompletionTaskTest/1.8/resourceInit.pass | 1 -
.../1.8/resourcesAndAutoCloseables.pass | 1 -
.../JavaCompletionTaskTest/1.8/returnTypes.pass | 1 -
.../1.8/staticBlockContent.pass | 1 -
.../1.8/staticBlockTypesAndLocalMembers.pass | 1 -
.../1.8/staticKeywordAndAllPackages.pass | 1 -
.../1.8/typesAndLocalMembers.pass | 1 -
.../1.8/typesAndLocalMembers1.pass | 1 -
.../1.8/typesAndStaticLocalMembers.pass | 1 -
.../1.8/typesInterfaceMembersAndVars.pass | 1 -
.../1.8/typesInterfaceMembersAndVars1.pass | 1 -
.../1.8/typesLocalFieldsAndVars.pass | 1 -
.../1.8/typesLocalMembersAndSmartInt.pass | 1 -
.../1.8/typesLocalMembersAndSmartNumber.pass | 1 -
.../1.8/typesLocalMembersAndSmartPrimitives.pass | 1 -
.../1.8/typesLocalMembersAndVars.pass | 1 -
.../1.8/typesLocalMembersAndVars1.pass | 1 -
.../1.8/typesLocalMembersAndVars2.pass | 1 -
.../1.8/typesLocalMembersVarsAndSmartBoolean.pass | 1 -
.../typesLocalMembersVarsAndSmartEnumAndInt.pass | 1 -
.../1.8/typesLocalMembersVarsAndSmartInt.pass | 1 -
.../1.8/typesLocalMembersVarsAndSmartString.pass | 1 -
.../1.8/typesLocalMembersVarsAndSmarts.pass | 1 -
.../1.8/typesStaticInterfaceMembersAndVars.pass | 1 -
.../CreateConstructorNonDefaultConstructor.pass | 7 ++-
...ConstructorNonDefaultConstructorInnerClass.pass | 7 ++-
.../{1.8 => 10}/CreateConstructorTest.pass | 7 ++-
.../CreateConstructorTestInnerClass.pass | 7 ++-
.../CreateConstructorWithConstructors.pass | 7 ++-
...reateConstructorWithConstructorsInnerClass.pass | 7 ++-
.../CreateConstructorWithDefaultConstructor.pass | 7 ++-
...onstructorWithDefaultConstructorInnerClass.pass | 7 ++-
.../{1.8 => 10}/OverrideAbstractList.pass | 7 ++-
.../{1.8 => 10}/OverrideAbstractListAbstract.pass | 7 ++-
.../10/OverridePrivateMethod.pass | 2 +
.../{1.8 => 10}/UnimplementedMethod.pass | 7 ++-
.../{1.8 => 10}/blockContentAfterFor.pass | 7 ++-
.../{1.8 => 10}/blockContentAfterForEach.pass | 7 ++-
.../{1.8 => 10}/declaredTypes.pass | 7 ++-
.../{1.8 => 10}/declaredTypesAndSmartInt.pass | 7 ++-
.../JavaCompletionTaskTest/10/emptyVar.pass | 5 +-
.../{1.8 => 10}/initBlockContent.pass | 7 ++-
.../{1.8 => 10}/initBlockTypesAndLocalMembers.pass | 7 ++-
.../interfaceMemberModifiersAndTypes.pass | 7 ++-
...ersAndTypesWithoutDefaultAbstractAndStatic.pass | 7 ++-
.../{1.8 => 10}/javaLangClasses.pass | 5 +-
.../{1.8 => 10}/javaLangContentAndTestClass.pass | 7 ++-
.../10/javaLangContentStartingWithI.pass | 16 ++++++
.../{1.8 => 10}/javaLangInterfaces.pass | 4 +-
.../{1.8 => 10}/javaLangThrowables.pass | 3 +-
.../10/javaLangThrowablesStartingWithI.pass | 13 +++++
.../{1.8 => 10}/lambdaBodyContent.pass | 7 ++-
.../{1.8 => 10}/lambdaBodyContentWithLocalVar.pass | 7 ++-
.../{1.8 => 10}/lambdaExpression.pass | 7 ++-
.../{1.8 => 10}/lambdaParameterTypes.pass | 7 ++-
.../{1.8 => 10}/lambdaSmartInt.pass | 9 ++-
.../{1.8 => 10}/lambdaSmartInt2.pass | 9 ++-
.../memberModifiersAndTypesWithoutPublic.pass | 7 ++-
.../memberModifiersAndTypesWithoutStatic.pass | 7 ++-
.../memberModifiersTypesAndGenElements.pass | 7 ++-
.../memberModifiersTypesAndGenElements2.pass | 7 ++-
.../memberModifiersTypesAndGenElements3.pass | 7 ++-
.../memberModifiersTypesAndGenElements4.pass | 7 ++-
.../{1.8 => 10}/methodBodyContent.pass | 7 ++-
.../{1.8 => 10}/methodBodyContentAfterCase.pass | 7 ++-
.../methodBodyContentAfterCaseAndVar.pass | 7 ++-
.../{1.8 => 10}/methodBodyContentAfterDefault.pass | 7 ++-
.../{1.8 => 10}/methodBodyContentAfterFor.pass | 7 ++-
.../{1.8 => 10}/methodBodyContentAfterForEach.pass | 7 ++-
.../{1.8 => 10}/methodBodyContentAndLocalVar.pass | 7 ++-
.../{1.8 => 10}/parameterTypes.pass | 7 ++-
.../{1.8 => 10}/resourceInit.pass | 7 ++-
.../resourcesAndAutoCloseablesFWVar.pass} | 2 +-
.../{1.8 => 10}/returnTypes.pass | 7 ++-
.../{1.8 => 10}/staticBlockContent.pass | 7 ++-
.../staticBlockTypesAndLocalMembers.pass | 9 ++-
.../JavaCompletionTaskTest/10/stringContent.pass | 60 ++++++++++++++++++++
.../JavaCompletionTaskTest/10/systemContent.pass | 35 ++++++++++++
.../{1.8 => 10}/typesAndLocalMembers.pass | 7 ++-
.../{1.8 => 10}/typesAndLocalMembers1.pass | 7 ++-
.../{1.8 => 10}/typesAndStaticLocalMembers.pass | 9 ++-
.../{1.8 => 10}/typesInterfaceMembersAndVars.pass | 7 ++-
.../{1.8 => 10}/typesInterfaceMembersAndVars1.pass | 7 ++-
.../{1.8 => 10}/typesLocalFieldsAndVars.pass | 7 ++-
.../{1.8 => 10}/typesLocalMembersAndSmartInt.pass | 9 ++-
.../typesLocalMembersAndSmartNumber.pass | 7 ++-
.../typesLocalMembersAndSmartPrimitives.pass | 18 +++++-
.../{1.8 => 10}/typesLocalMembersAndVars.pass | 7 ++-
.../{1.8 => 10}/typesLocalMembersAndVars1.pass | 7 ++-
.../{1.8 => 10}/typesLocalMembersAndVars2.pass | 7 ++-
.../typesLocalMembersVarsAndSmartBoolean.pass | 7 ++-
.../typesLocalMembersVarsAndSmartEnumAndInt.pass | 9 ++-
.../typesLocalMembersVarsAndSmartInt.pass | 9 ++-
.../typesLocalMembersVarsAndSmartString.pass | 7 ++-
.../typesLocalMembersVarsAndSmarts.pass | 16 +++++-
.../typesStaticInterfaceMembersAndVars.pass | 7 ++-
.../JavaCompletionTaskTest/11/stringContent.pass | 66 ++++++++++++++++++++++
.../JavaCompletionTaskTest/11/systemContent.pass | 34 +++++++++++
.../typesLocalMembersVarsAndSmarts.pass | 17 +++++-
.../java/completion/CompletionTestBase.java | 5 +-
.../modules/java/source/parsing/JavacParser.java | 7 ++-
148 files changed, 670 insertions(+), 144 deletions(-)
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorNonDefaultConstructor.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorNonDefaultConstructor.pass
index 6e30550..a84ceb6 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorNonDefaultConstructor.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorNonDefaultConstructor.pass
@@ -141,6 +141,5 @@ X
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorNonDefaultConstructorInnerClass.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorNonDefaultConstructorInnerClass.pass
index 47b443d..59c21fb 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorNonDefaultConstructorInnerClass.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorNonDefaultConstructorInnerClass.pass
@@ -139,6 +139,5 @@ X
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorTest.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorTest.pass
index ec334a8..b014ce5 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorTest.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorTest.pass
@@ -142,6 +142,5 @@ X
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorTestInnerClass.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorTestInnerClass.pass
index f035ff7..bfeb62f 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorTestInnerClass.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorTestInnerClass.pass
@@ -140,6 +140,5 @@ X
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorWithConstructors.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorWithConstructors.pass
index 6c8768e..2a2420c 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorWithConstructors.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorWithConstructors.pass
@@ -140,6 +140,5 @@ X
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorWithConstructorsInnerClass.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorWithConstructorsInnerClass.pass
index fbc43e6..3f66ce4 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorWithConstructorsInnerClass.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorWithConstructorsInnerClass.pass
@@ -138,6 +138,5 @@ X
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorWithDefaultConstructor.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorWithDefaultConstructor.pass
index 3930848..69f0e76 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorWithDefaultConstructor.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorWithDefaultConstructor.pass
@@ -141,6 +141,5 @@ X
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorWithDefaultConstructorInnerClass.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorWithDefaultConstructorInnerClass.pass
index 2fa7e81..c72c7bf 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorWithDefaultConstructorInnerClass.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorWithDefaultConstructorInnerClass.pass
@@ -139,6 +139,5 @@ X
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/OverrideAbstractList.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/OverrideAbstractList.pass
index 6b4e318..3c4d013 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/OverrideAbstractList.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/OverrideAbstractList.pass
@@ -161,6 +161,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/OverrideAbstractListAbstract.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/OverrideAbstractListAbstract.pass
index 140b300..3eb0240 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/OverrideAbstractListAbstract.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/OverrideAbstractListAbstract.pass
@@ -163,6 +163,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/UnimplementedMethod.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/UnimplementedMethod.pass
index 130fc2b..4f0296a 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/UnimplementedMethod.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/UnimplementedMethod.pass
@@ -128,6 +128,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/allPackages.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/allPackages.pass
index 9134b16..7191968 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/allPackages.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/allPackages.pass
@@ -1,6 +1,5 @@
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/autoCloseables.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/autoCloseables.pass
index 6d8c66f..bd53838 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/autoCloseables.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/autoCloseables.pass
@@ -3,6 +3,5 @@ FileWriter
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/blockContentAfterFor.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/blockContentAfterFor.pass
index 4b3d51f..33327f4 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/blockContentAfterFor.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/blockContentAfterFor.pass
@@ -141,6 +141,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/blockContentAfterForEach.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/blockContentAfterForEach.pass
index 810a87b..d07b262 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/blockContentAfterForEach.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/blockContentAfterForEach.pass
@@ -141,6 +141,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/declaredTypes.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/declaredTypes.pass
index 0418331..7839d61 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/declaredTypes.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/declaredTypes.pass
@@ -99,6 +99,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/declaredTypesAndSmartInt.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/declaredTypesAndSmartInt.pass
index 85d0d93..2b4f083 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/declaredTypesAndSmartInt.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/declaredTypesAndSmartInt.pass
@@ -103,6 +103,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/finalAndAutoCloseables.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/finalAndAutoCloseables.pass
index 9373841..cd1233b 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/finalAndAutoCloseables.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/finalAndAutoCloseables.pass
@@ -4,6 +4,5 @@ FileWriter
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/initBlockContent.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/initBlockContent.pass
index 46fbd72..3f695a5 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/initBlockContent.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/initBlockContent.pass
@@ -139,6 +139,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/initBlockTypesAndLocalMembers.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/initBlockTypesAndLocalMembers.pass
index 50585b9..ef8c961 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/initBlockTypesAndLocalMembers.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/initBlockTypesAndLocalMembers.pass
@@ -137,6 +137,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/intHashCode.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/intHashCode.pass
index cf15bce..300fe4d 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/intHashCode.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/intHashCode.pass
@@ -1,2 +1,2 @@
public native int hashCode()
-public static int Integer.hashCode(int arg0)
\ No newline at end of file
+public static int Integer.hashCode(int arg0)
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/interfaceMemberModifiersAndTypes.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/interfaceMemberModifiersAndTypes.pass
index 31257aa..fd7e836 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/interfaceMemberModifiersAndTypes.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/interfaceMemberModifiersAndTypes.pass
@@ -126,6 +126,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/interfaceMemberModifiersAndTypesWithoutDefaultAbstractAndStatic.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/interfaceMemberModifiersAndTypesWithoutDefaultAbstractAndStatic.pass
index e2a9a5e..c24ac82 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/interfaceMemberModifiersAndTypesWithoutDefaultAbstractAndStatic.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/interfaceMemberModifiersAndTypesWithoutDefaultAbstractAndStatic.pass
@@ -120,6 +120,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/javaLangClasses.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/javaLangClasses.pass
index ce9d8c3..44d625f 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/javaLangClasses.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/javaLangClasses.pass
@@ -67,6 +67,5 @@ VirtualMachineError
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/javaLangContentAndTestClass.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/javaLangContentAndTestClass.pass
index 0418331..7839d61 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/javaLangContentAndTestClass.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/javaLangContentAndTestClass.pass
@@ -99,6 +99,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/javaLangInterfaces.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/javaLangInterfaces.pass
index 2aea224..ae74143 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/javaLangInterfaces.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/javaLangInterfaces.pass
@@ -15,6 +15,5 @@ Thread
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/javaLangThrowables.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/javaLangThrowables.pass
index 730f724..8c2bdfa 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/javaLangThrowables.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/javaLangThrowables.pass
@@ -52,6 +52,5 @@ VirtualMachineError
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaBodyContent.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaBodyContent.pass
index a02502f..1320403 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaBodyContent.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaBodyContent.pass
@@ -127,6 +127,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaBodyContentWithLocalVar.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaBodyContentWithLocalVar.pass
index e4cfca5..78ae964 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaBodyContentWithLocalVar.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaBodyContentWithLocalVar.pass
@@ -128,6 +128,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaExpression.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaExpression.pass
index 18dbe58..cca57cb 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaExpression.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaExpression.pass
@@ -117,6 +117,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaParameterTypes.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaParameterTypes.pass
index 911a076..eaae708 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaParameterTypes.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaParameterTypes.pass
@@ -109,6 +109,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaSmartInt.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaSmartInt.pass
index d28a012..1c079da 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaSmartInt.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaSmartInt.pass
@@ -149,6 +149,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaSmartInt2.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaSmartInt2.pass
index 5319f49..201445d 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaSmartInt2.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaSmartInt2.pass
@@ -150,6 +150,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersAndTypesWithoutPublic.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersAndTypesWithoutPublic.pass
index 476535e..0255460 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersAndTypesWithoutPublic.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersAndTypesWithoutPublic.pass
@@ -119,6 +119,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersAndTypesWithoutStatic.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersAndTypesWithoutStatic.pass
index 1f8135d..480b74b 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersAndTypesWithoutStatic.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersAndTypesWithoutStatic.pass
@@ -121,6 +121,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersTypesAndGenElements.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersTypesAndGenElements.pass
index e045aca..c5797fb 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersTypesAndGenElements.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersTypesAndGenElements.pass
@@ -128,6 +128,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersTypesAndGenElements2.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersTypesAndGenElements2.pass
index 86fa932..a68bb51 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersTypesAndGenElements2.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersTypesAndGenElements2.pass
@@ -129,6 +129,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersTypesAndGenElements3.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersTypesAndGenElements3.pass
index 6b07dba..5463edd 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersTypesAndGenElements3.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersTypesAndGenElements3.pass
@@ -130,6 +130,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersTypesAndGenElements4.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersTypesAndGenElements4.pass
index fadced0..28067e2 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersTypesAndGenElements4.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersTypesAndGenElements4.pass
@@ -136,6 +136,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContent.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContent.pass
index 0cd0d44..1204147 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContent.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContent.pass
@@ -138,6 +138,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterCase.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterCase.pass
index 6275442..064fc68 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterCase.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterCase.pass
@@ -141,6 +141,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterCaseAndVar.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterCaseAndVar.pass
index 952062b..779a427 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterCaseAndVar.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterCaseAndVar.pass
@@ -142,6 +142,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterDefault.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterDefault.pass
index 90ae63b..55c79ad 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterDefault.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterDefault.pass
@@ -139,6 +139,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterFor.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterFor.pass
index 7d46e9b..e14b919 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterFor.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterFor.pass
@@ -138,6 +138,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterForEach.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterForEach.pass
index fd0a78c..3d52b49 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterForEach.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterForEach.pass
@@ -138,6 +138,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAndLocalVar.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAndLocalVar.pass
index 333cc34..e057603 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAndLocalVar.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAndLocalVar.pass
@@ -139,6 +139,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/parameterTypes.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/parameterTypes.pass
index d7f05a3..3102189 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/parameterTypes.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/parameterTypes.pass
@@ -108,6 +108,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/resourceInit.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/resourceInit.pass
index be3f58c..d46cd40 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/resourceInit.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/resourceInit.pass
@@ -128,6 +128,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/resourcesAndAutoCloseables.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/resourcesAndAutoCloseables.pass
index ecd7034..f7f7481 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/resourcesAndAutoCloseables.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/resourcesAndAutoCloseables.pass
@@ -5,6 +5,5 @@ FileWriter
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/returnTypes.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/returnTypes.pass
index a44444c..bf0a4d5 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/returnTypes.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/returnTypes.pass
@@ -110,6 +110,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/staticBlockContent.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/staticBlockContent.pass
index 70f62a5..a1f010f 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/staticBlockContent.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/staticBlockContent.pass
@@ -123,6 +123,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/staticBlockTypesAndLocalMembers.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/staticBlockTypesAndLocalMembers.pass
index d927ffe..ace381a 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/staticBlockTypesAndLocalMembers.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/staticBlockTypesAndLocalMembers.pass
@@ -145,6 +145,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/staticKeywordAndAllPackages.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/staticKeywordAndAllPackages.pass
index 09de0bc..6e3e257 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/staticKeywordAndAllPackages.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/staticKeywordAndAllPackages.pass
@@ -2,6 +2,5 @@ static
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesAndLocalMembers.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesAndLocalMembers.pass
index 81c2c9f..673391d 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesAndLocalMembers.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesAndLocalMembers.pass
@@ -126,6 +126,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesAndLocalMembers1.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesAndLocalMembers1.pass
index 20be0bd..511db10 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesAndLocalMembers1.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesAndLocalMembers1.pass
@@ -126,6 +126,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesAndStaticLocalMembers.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesAndStaticLocalMembers.pass
index 2aa1990..1a72fa5 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesAndStaticLocalMembers.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesAndStaticLocalMembers.pass
@@ -144,6 +144,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesInterfaceMembersAndVars.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesInterfaceMembersAndVars.pass
index 66717b1..ada79dd 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesInterfaceMembersAndVars.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesInterfaceMembersAndVars.pass
@@ -134,6 +134,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesInterfaceMembersAndVars1.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesInterfaceMembersAndVars1.pass
index db8da7d..f4537e6 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesInterfaceMembersAndVars1.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesInterfaceMembersAndVars1.pass
@@ -133,6 +133,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalFieldsAndVars.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalFieldsAndVars.pass
index 30a796a..59e7b00 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalFieldsAndVars.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalFieldsAndVars.pass
@@ -111,6 +111,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndSmartInt.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndSmartInt.pass
index 056442e..6de347c 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndSmartInt.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndSmartInt.pass
@@ -158,6 +158,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndSmartNumber.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndSmartNumber.pass
index 731e750..b2487b3 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndSmartNumber.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndSmartNumber.pass
@@ -130,6 +130,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndSmartPrimitives.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndSmartPrimitives.pass
index d58051e..e8ac6c5 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndSmartPrimitives.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndSmartPrimitives.pass
@@ -362,6 +362,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndVars.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndVars.pass
index e20c019..2ff556c 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndVars.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndVars.pass
@@ -128,6 +128,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndVars1.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndVars1.pass
index b2eb578..65e3210 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndVars1.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndVars1.pass
@@ -124,6 +124,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndVars2.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndVars2.pass
index 57d1b2b..5da0792 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndVars2.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndVars2.pass
@@ -128,6 +128,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmartBoolean.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmartBoolean.pass
index 8eeed7b..464a39d 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmartBoolean.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmartBoolean.pass
@@ -137,6 +137,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmartEnumAndInt.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmartEnumAndInt.pass
index ce257b7..6f95a3c 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmartEnumAndInt.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmartEnumAndInt.pass
@@ -161,6 +161,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmartInt.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmartInt.pass
index ea7d8f9..b9cd33f 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmartInt.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmartInt.pass
@@ -160,6 +160,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmartString.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmartString.pass
index 7358c9a..88f8f5e 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmartString.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmartString.pass
@@ -158,6 +158,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmarts.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmarts.pass
index 93d0f46..2952a1b 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmarts.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmarts.pass
@@ -451,6 +451,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesStaticInterfaceMembersAndVars.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesStaticInterfaceMembersAndVars.pass
index 6171197..a817a77 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesStaticInterfaceMembersAndVars.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesStaticInterfaceMembersAndVars.pass
@@ -124,6 +124,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorNonDefaultConstructor.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/CreateConstructorNonDefaultConstructor.pass
similarity index 96%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorNonDefaultConstructor.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/CreateConstructorNonDefaultConstructor.pass
index 6e30550..237e4e3 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorNonDefaultConstructor.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/CreateConstructorNonDefaultConstructor.pass
@@ -71,6 +71,7 @@ HashMap
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -83,11 +84,14 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
List
Long
Map
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -103,6 +107,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -116,6 +121,7 @@ Set
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -141,6 +147,5 @@ X
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorNonDefaultConstructorInnerClass.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/CreateConstructorNonDefaultConstructorInnerClass.pass
similarity index 95%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorNonDefaultConstructorInnerClass.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/CreateConstructorNonDefaultConstructorInnerClass.pass
index 47b443d..a7c5c6e 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorNonDefaultConstructorInnerClass.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/CreateConstructorNonDefaultConstructorInnerClass.pass
@@ -69,6 +69,7 @@ HashMap
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -81,11 +82,14 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
List
Long
Map
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -101,6 +105,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -114,6 +119,7 @@ Set
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -139,6 +145,5 @@ X
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorTest.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/CreateConstructorTest.pass
similarity index 96%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorTest.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/CreateConstructorTest.pass
index ec334a8..d159d78 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorTest.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/CreateConstructorTest.pass
@@ -72,6 +72,7 @@ HashMap
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -84,11 +85,14 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
List
Long
Map
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -104,6 +108,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -117,6 +122,7 @@ Set
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -142,6 +148,5 @@ X
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorTestInnerClass.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/CreateConstructorTestInnerClass.pass
similarity index 96%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorTestInnerClass.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/CreateConstructorTestInnerClass.pass
index f035ff7..8998336 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorTestInnerClass.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/CreateConstructorTestInnerClass.pass
@@ -70,6 +70,7 @@ HashMap
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -82,11 +83,14 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
List
Long
Map
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -102,6 +106,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -115,6 +120,7 @@ Set
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -140,6 +146,5 @@ X
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorWithConstructors.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/CreateConstructorWithConstructors.pass
similarity index 96%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorWithConstructors.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/CreateConstructorWithConstructors.pass
index 6c8768e..564465f 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorWithConstructors.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/CreateConstructorWithConstructors.pass
@@ -70,6 +70,7 @@ HashMap
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -82,11 +83,14 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
List
Long
Map
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -102,6 +106,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -115,6 +120,7 @@ Set
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -140,6 +146,5 @@ X
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorWithConstructorsInnerClass.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/CreateConstructorWithConstructorsInnerClass.pass
similarity index 95%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorWithConstructorsInnerClass.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/CreateConstructorWithConstructorsInnerClass.pass
index fbc43e6..c9e5591 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorWithConstructorsInnerClass.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/CreateConstructorWithConstructorsInnerClass.pass
@@ -68,6 +68,7 @@ HashMap
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -80,11 +81,14 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
List
Long
Map
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -100,6 +104,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -113,6 +118,7 @@ Set
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -138,6 +144,5 @@ X
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorWithDefaultConstructor.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/CreateConstructorWithDefaultConstructor.pass
similarity index 96%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorWithDefaultConstructor.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/CreateConstructorWithDefaultConstructor.pass
index 3930848..41edd6b 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorWithDefaultConstructor.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/CreateConstructorWithDefaultConstructor.pass
@@ -71,6 +71,7 @@ HashMap
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -83,11 +84,14 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
List
Long
Map
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -103,6 +107,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -116,6 +121,7 @@ Set
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -141,6 +147,5 @@ X
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorWithDefaultConstructorInnerClass.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/CreateConstructorWithDefaultConstructorInnerClass.pass
similarity index 96%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorWithDefaultConstructorInnerClass.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/CreateConstructorWithDefaultConstructorInnerClass.pass
index 2fa7e81..c938b22 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/CreateConstructorWithDefaultConstructorInnerClass.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/CreateConstructorWithDefaultConstructorInnerClass.pass
@@ -69,6 +69,7 @@ HashMap
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -81,11 +82,14 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
List
Long
Map
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -101,6 +105,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -114,6 +119,7 @@ Set
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -139,6 +145,5 @@ X
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/OverrideAbstractList.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/OverrideAbstractList.pass
similarity index 97%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/OverrideAbstractList.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/OverrideAbstractList.pass
index 6b4e318..911a4fb 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/OverrideAbstractList.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/OverrideAbstractList.pass
@@ -95,6 +95,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -107,9 +108,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -125,6 +129,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -137,6 +142,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -161,6 +167,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/OverrideAbstractListAbstract.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/OverrideAbstractListAbstract.pass
similarity index 97%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/OverrideAbstractListAbstract.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/OverrideAbstractListAbstract.pass
index 140b300..24e8764 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/OverrideAbstractListAbstract.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/OverrideAbstractListAbstract.pass
@@ -97,6 +97,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -109,9 +110,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -127,6 +131,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -139,6 +144,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -163,6 +169,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/OverridePrivateMethod.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/OverridePrivateMethod.pass
new file mode 100644
index 0000000..0ac69f8
--- /dev/null
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/OverridePrivateMethod.pass
@@ -0,0 +1,2 @@
+protected native Object clone() - override
+class
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/UnimplementedMethod.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/UnimplementedMethod.pass
similarity index 95%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/UnimplementedMethod.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/UnimplementedMethod.pass
index 130fc2b..c49b428 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/UnimplementedMethod.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/UnimplementedMethod.pass
@@ -62,6 +62,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -74,9 +75,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -92,6 +96,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -104,6 +109,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -128,6 +134,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/blockContentAfterFor.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/blockContentAfterFor.pass
similarity index 95%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/blockContentAfterFor.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/blockContentAfterFor.pass
index 4b3d51f..905c3b8 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/blockContentAfterFor.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/blockContentAfterFor.pass
@@ -75,6 +75,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -87,9 +88,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -105,6 +109,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -117,6 +122,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -141,6 +147,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/blockContentAfterForEach.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/blockContentAfterForEach.pass
similarity index 95%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/blockContentAfterForEach.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/blockContentAfterForEach.pass
index 810a87b..12eaf3c 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/blockContentAfterForEach.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/blockContentAfterForEach.pass
@@ -75,6 +75,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -87,9 +88,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -105,6 +109,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -117,6 +122,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -141,6 +147,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/declaredTypes.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/declaredTypes.pass
similarity index 94%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/declaredTypes.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/declaredTypes.pass
index 0418331..908742a 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/declaredTypes.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/declaredTypes.pass
@@ -33,6 +33,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -45,9 +46,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -63,6 +67,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -75,6 +80,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -99,6 +105,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/declaredTypesAndSmartInt.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/declaredTypesAndSmartInt.pass
similarity index 94%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/declaredTypesAndSmartInt.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/declaredTypesAndSmartInt.pass
index 85d0d93..5d2db9d 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/declaredTypesAndSmartInt.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/declaredTypesAndSmartInt.pass
@@ -37,6 +37,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -49,9 +50,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -67,6 +71,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -79,6 +84,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -103,6 +109,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/emptyVar.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/emptyVar.pass
index 99c0d25..20bbc07 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/emptyVar.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/emptyVar.pass
@@ -1,7 +1,7 @@
int a
boolean b
protected native Object clone()
-public boolean equals(Object obj)
+public boolean equals(Object arg0)
protected void finalize()
public final native Class<?> getClass()
public native int hashCode()
@@ -11,7 +11,7 @@ public void op(int a, boolean b)
public String toString()
public final void wait()
public final native void wait(long arg0)
-public final void wait(long timeout, int nanos)
+public final void wait(long arg0, int arg1)
boolean
byte
char
@@ -132,6 +132,5 @@ Void
com
java
javax
-netscape
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/initBlockContent.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/initBlockContent.pass
similarity index 95%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/initBlockContent.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/initBlockContent.pass
index 46fbd72..e4fc3f3 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/initBlockContent.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/initBlockContent.pass
@@ -73,6 +73,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -85,9 +86,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -103,6 +107,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -115,6 +120,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -139,6 +145,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/initBlockTypesAndLocalMembers.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/initBlockTypesAndLocalMembers.pass
similarity index 96%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/initBlockTypesAndLocalMembers.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/initBlockTypesAndLocalMembers.pass
index 50585b9..de710df 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/initBlockTypesAndLocalMembers.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/initBlockTypesAndLocalMembers.pass
@@ -71,6 +71,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -83,9 +84,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -101,6 +105,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -113,6 +118,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -137,6 +143,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/interfaceMemberModifiersAndTypes.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/interfaceMemberModifiersAndTypes.pass
similarity index 95%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/interfaceMemberModifiersAndTypes.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/interfaceMemberModifiersAndTypes.pass
index 31257aa..8e589d5 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/interfaceMemberModifiersAndTypes.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/interfaceMemberModifiersAndTypes.pass
@@ -60,6 +60,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -72,9 +73,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -90,6 +94,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -102,6 +107,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -126,6 +132,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/interfaceMemberModifiersAndTypesWithoutDefaultAbstractAndStatic.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/interfaceMemberModifiersAndTypesWithoutDefaultAbstractAndStatic.pass
similarity index 94%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/interfaceMemberModifiersAndTypesWithoutDefaultAbstractAndStatic.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/interfaceMemberModifiersAndTypesWithoutDefaultAbstractAndStatic.pass
index e2a9a5e..0724ac6 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/interfaceMemberModifiersAndTypesWithoutDefaultAbstractAndStatic.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/interfaceMemberModifiersAndTypesWithoutDefaultAbstractAndStatic.pass
@@ -54,6 +54,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -66,9 +67,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -84,6 +88,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -96,6 +101,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -120,6 +126,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/javaLangClasses.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/javaLangClasses.pass
similarity index 94%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/javaLangClasses.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/javaLangClasses.pass
index ce9d8c3..b022c32 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/javaLangClasses.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/javaLangClasses.pass
@@ -20,6 +20,7 @@ ExceptionInInitializerError
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -30,6 +31,7 @@ InstantiationError
InstantiationException
InternalError
InterruptedException
+LayerInstantiationException
LinkageError
NegativeArraySizeException
NoClassDefFoundError
@@ -51,7 +53,9 @@ RuntimeException
SecurityException
SecurityManager
StackOverflowError
+StackWalker
StringIndexOutOfBoundsException
+System
Thread
ThreadDeath
ThreadGroup
@@ -67,6 +71,5 @@ VirtualMachineError
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/javaLangContentAndTestClass.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/javaLangContentAndTestClass.pass
similarity index 94%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/javaLangContentAndTestClass.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/javaLangContentAndTestClass.pass
index 0418331..908742a 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/javaLangContentAndTestClass.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/javaLangContentAndTestClass.pass
@@ -33,6 +33,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -45,9 +46,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -63,6 +67,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -75,6 +80,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -99,6 +105,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/javaLangContentStartingWithI.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/javaLangContentStartingWithI.pass
new file mode 100644
index 0000000..3c514c8
--- /dev/null
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/javaLangContentStartingWithI.pass
@@ -0,0 +1,16 @@
+IllegalAccessError
+IllegalAccessException
+IllegalArgumentException
+IllegalCallerException
+IllegalMonitorStateException
+IllegalStateException
+IllegalThreadStateException
+IncompatibleClassChangeError
+IndexOutOfBoundsException
+InheritableThreadLocal
+InstantiationError
+InstantiationException
+Integer
+InternalError
+InterruptedException
+Iterable
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/javaLangInterfaces.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/javaLangInterfaces.pass
similarity index 84%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/javaLangInterfaces.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/javaLangInterfaces.pass
index 2aea224..3e638a4 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/javaLangInterfaces.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/javaLangInterfaces.pass
@@ -7,14 +7,16 @@ Deprecated
FunctionalInterface
Iterable
Override
+ProcessHandle
Readable
Runnable
SafeVarargs
+StackWalker
SuppressWarnings
+System
Thread
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/javaLangThrowables.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/javaLangThrowables.pass
similarity index 95%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/javaLangThrowables.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/javaLangThrowables.pass
index 730f724..d1a0ea6 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/javaLangThrowables.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/javaLangThrowables.pass
@@ -16,6 +16,7 @@ ExceptionInInitializerError
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -25,6 +26,7 @@ InstantiationError
InstantiationException
InternalError
InterruptedException
+LayerInstantiationException
LinkageError
NegativeArraySizeException
NoClassDefFoundError
@@ -52,6 +54,5 @@ VirtualMachineError
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/javaLangThrowablesStartingWithI.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/javaLangThrowablesStartingWithI.pass
new file mode 100644
index 0000000..2e4ae4a
--- /dev/null
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/javaLangThrowablesStartingWithI.pass
@@ -0,0 +1,13 @@
+IllegalAccessError
+IllegalAccessException
+IllegalArgumentException
+IllegalCallerException
+IllegalMonitorStateException
+IllegalStateException
+IllegalThreadStateException
+IncompatibleClassChangeError
+IndexOutOfBoundsException
+InstantiationError
+InstantiationException
+InternalError
+InterruptedException
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaBodyContent.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/lambdaBodyContent.pass
similarity index 94%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaBodyContent.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/lambdaBodyContent.pass
index a02502f..81e9dd7 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaBodyContent.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/lambdaBodyContent.pass
@@ -61,6 +61,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -73,9 +74,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -91,6 +95,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -103,6 +108,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -127,6 +133,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaBodyContentWithLocalVar.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/lambdaBodyContentWithLocalVar.pass
similarity index 94%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaBodyContentWithLocalVar.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/lambdaBodyContentWithLocalVar.pass
index e4cfca5..52acf37 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaBodyContentWithLocalVar.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/lambdaBodyContentWithLocalVar.pass
@@ -62,6 +62,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -74,9 +75,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -92,6 +96,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -104,6 +109,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -128,6 +134,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaExpression.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/lambdaExpression.pass
similarity index 94%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaExpression.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/lambdaExpression.pass
index 18dbe58..cf8aa11 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaExpression.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/lambdaExpression.pass
@@ -51,6 +51,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -63,9 +64,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -81,6 +85,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -93,6 +98,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -117,6 +123,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaParameterTypes.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/lambdaParameterTypes.pass
similarity index 94%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaParameterTypes.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/lambdaParameterTypes.pass
index 911a076..0230b6f 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaParameterTypes.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/lambdaParameterTypes.pass
@@ -43,6 +43,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -55,9 +56,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -73,6 +77,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -85,6 +90,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -109,6 +115,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaSmartInt.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/lambdaSmartInt.pass
similarity index 92%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaSmartInt.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/lambdaSmartInt.pass
index d28a012..8ca9594 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaSmartInt.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/lambdaSmartInt.pass
@@ -19,8 +19,10 @@ public static int Integer.numberOfLeadingZeros(int arg0)
public static int Integer.numberOfTrailingZeros(int arg0)
public static int Integer.parseInt(String arg0)
public static int Integer.parseInt(String arg0, int arg1)
+public static int Integer.parseInt(CharSequence arg0, int arg1, int arg2, int arg3)
public static int Integer.parseUnsignedInt(String arg0)
public static int Integer.parseUnsignedInt(String arg0, int arg1)
+public static int Integer.parseUnsignedInt(CharSequence arg0, int arg1, int arg2, int arg3)
public static int Integer.remainderUnsigned(int arg0, int arg1)
public static int Integer.reverse(int arg0)
public static int Integer.reverseBytes(int arg0)
@@ -83,6 +85,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -95,9 +98,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -113,6 +119,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -125,6 +132,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -149,6 +157,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaSmartInt2.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/lambdaSmartInt2.pass
similarity index 92%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaSmartInt2.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/lambdaSmartInt2.pass
index 5319f49..c3e49de 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/lambdaSmartInt2.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/lambdaSmartInt2.pass
@@ -19,8 +19,10 @@ public static int Integer.numberOfLeadingZeros(int arg0)
public static int Integer.numberOfTrailingZeros(int arg0)
public static int Integer.parseInt(String arg0)
public static int Integer.parseInt(String arg0, int arg1)
+public static int Integer.parseInt(CharSequence arg0, int arg1, int arg2, int arg3)
public static int Integer.parseUnsignedInt(String arg0)
public static int Integer.parseUnsignedInt(String arg0, int arg1)
+public static int Integer.parseUnsignedInt(CharSequence arg0, int arg1, int arg2, int arg3)
public static int Integer.remainderUnsigned(int arg0, int arg1)
public static int Integer.reverse(int arg0)
public static int Integer.reverseBytes(int arg0)
@@ -84,6 +86,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -96,9 +99,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -114,6 +120,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -126,6 +133,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -150,6 +158,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersAndTypesWithoutPublic.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/memberModifiersAndTypesWithoutPublic.pass
similarity index 94%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersAndTypesWithoutPublic.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/memberModifiersAndTypesWithoutPublic.pass
index 476535e..4cfcfb5 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersAndTypesWithoutPublic.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/memberModifiersAndTypesWithoutPublic.pass
@@ -53,6 +53,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -65,9 +66,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -83,6 +87,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -95,6 +100,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -119,6 +125,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersAndTypesWithoutStatic.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/memberModifiersAndTypesWithoutStatic.pass
similarity index 94%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersAndTypesWithoutStatic.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/memberModifiersAndTypesWithoutStatic.pass
index 1f8135d..7547313 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersAndTypesWithoutStatic.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/memberModifiersAndTypesWithoutStatic.pass
@@ -55,6 +55,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -67,9 +68,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -85,6 +89,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -97,6 +102,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -121,6 +127,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersTypesAndGenElements.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/memberModifiersTypesAndGenElements.pass
similarity index 95%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersTypesAndGenElements.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/memberModifiersTypesAndGenElements.pass
index e045aca..ba8cea1 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersTypesAndGenElements.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/memberModifiersTypesAndGenElements.pass
@@ -62,6 +62,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -74,9 +75,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -92,6 +96,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -104,6 +109,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -128,6 +134,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersTypesAndGenElements2.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/memberModifiersTypesAndGenElements2.pass
similarity index 95%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersTypesAndGenElements2.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/memberModifiersTypesAndGenElements2.pass
index 86fa932..8d05950 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersTypesAndGenElements2.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/memberModifiersTypesAndGenElements2.pass
@@ -63,6 +63,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -75,9 +76,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -93,6 +97,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -105,6 +110,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -129,6 +135,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersTypesAndGenElements3.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/memberModifiersTypesAndGenElements3.pass
similarity index 95%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersTypesAndGenElements3.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/memberModifiersTypesAndGenElements3.pass
index 6b07dba..706ca6f 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersTypesAndGenElements3.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/memberModifiersTypesAndGenElements3.pass
@@ -64,6 +64,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -76,9 +77,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -94,6 +98,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -106,6 +111,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -130,6 +136,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersTypesAndGenElements4.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/memberModifiersTypesAndGenElements4.pass
similarity index 95%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersTypesAndGenElements4.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/memberModifiersTypesAndGenElements4.pass
index fadced0..63757a2 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/memberModifiersTypesAndGenElements4.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/memberModifiersTypesAndGenElements4.pass
@@ -70,6 +70,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -82,9 +83,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -100,6 +104,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -112,6 +117,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -136,6 +142,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContent.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/methodBodyContent.pass
similarity index 95%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContent.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/methodBodyContent.pass
index 0cd0d44..c88b060 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContent.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/methodBodyContent.pass
@@ -72,6 +72,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -84,9 +85,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -102,6 +106,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -114,6 +119,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -138,6 +144,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterCase.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/methodBodyContentAfterCase.pass
similarity index 95%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterCase.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/methodBodyContentAfterCase.pass
index 6275442..2615865 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterCase.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/methodBodyContentAfterCase.pass
@@ -75,6 +75,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -87,9 +88,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -105,6 +109,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -117,6 +122,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -141,6 +147,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterCaseAndVar.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/methodBodyContentAfterCaseAndVar.pass
similarity index 95%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterCaseAndVar.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/methodBodyContentAfterCaseAndVar.pass
index 952062b..042223f 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterCaseAndVar.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/methodBodyContentAfterCaseAndVar.pass
@@ -76,6 +76,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -88,9 +89,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -106,6 +110,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -118,6 +123,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -142,6 +148,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterDefault.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/methodBodyContentAfterDefault.pass
similarity index 95%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterDefault.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/methodBodyContentAfterDefault.pass
index 90ae63b..d272891 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterDefault.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/methodBodyContentAfterDefault.pass
@@ -73,6 +73,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -85,9 +86,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -103,6 +107,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -115,6 +120,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -139,6 +145,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterFor.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/methodBodyContentAfterFor.pass
similarity index 95%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterFor.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/methodBodyContentAfterFor.pass
index 7d46e9b..cf60a13 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterFor.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/methodBodyContentAfterFor.pass
@@ -72,6 +72,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -84,9 +85,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -102,6 +106,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -114,6 +119,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -138,6 +144,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterForEach.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/methodBodyContentAfterForEach.pass
similarity index 95%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterForEach.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/methodBodyContentAfterForEach.pass
index fd0a78c..6c51744 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAfterForEach.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/methodBodyContentAfterForEach.pass
@@ -72,6 +72,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -84,9 +85,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -102,6 +106,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -114,6 +119,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -138,6 +144,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAndLocalVar.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/methodBodyContentAndLocalVar.pass
similarity index 95%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAndLocalVar.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/methodBodyContentAndLocalVar.pass
index 333cc34..0e88d89 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/methodBodyContentAndLocalVar.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/methodBodyContentAndLocalVar.pass
@@ -73,6 +73,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -85,9 +86,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -103,6 +107,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -115,6 +120,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -139,6 +145,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/parameterTypes.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/parameterTypes.pass
similarity index 94%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/parameterTypes.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/parameterTypes.pass
index d7f05a3..3a78f08 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/parameterTypes.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/parameterTypes.pass
@@ -42,6 +42,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -54,9 +55,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -72,6 +76,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -84,6 +89,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -108,6 +114,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/resourceInit.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/resourceInit.pass
similarity index 95%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/resourceInit.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/resourceInit.pass
index be3f58c..7ccf662 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/resourceInit.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/resourceInit.pass
@@ -62,6 +62,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -74,9 +75,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -92,6 +96,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -104,6 +109,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -128,6 +134,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/resourcesAndAutoCloseables.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/resourcesAndAutoCloseablesFWVar.pass
similarity index 83%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/resourcesAndAutoCloseables.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/resourcesAndAutoCloseablesFWVar.pass
index ecd7034..a81f65c 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/resourcesAndAutoCloseables.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/resourcesAndAutoCloseablesFWVar.pass
@@ -1,3 +1,4 @@
+FileWriter fw
final
AutoCloseable
BufferedWriter
@@ -5,6 +6,5 @@ FileWriter
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/returnTypes.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/returnTypes.pass
similarity index 94%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/returnTypes.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/returnTypes.pass
index a44444c..ffac992 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/returnTypes.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/returnTypes.pass
@@ -44,6 +44,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -56,9 +57,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -74,6 +78,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -86,6 +91,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -110,6 +116,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/staticBlockContent.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/staticBlockContent.pass
similarity index 94%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/staticBlockContent.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/staticBlockContent.pass
index 70f62a5..6d0bd41 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/staticBlockContent.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/staticBlockContent.pass
@@ -57,6 +57,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -69,9 +70,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -87,6 +91,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -99,6 +104,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -123,6 +129,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/staticBlockTypesAndLocalMembers.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/staticBlockTypesAndLocalMembers.pass
similarity index 92%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/staticBlockTypesAndLocalMembers.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/staticBlockTypesAndLocalMembers.pass
index d927ffe..d754f35 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/staticBlockTypesAndLocalMembers.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/staticBlockTypesAndLocalMembers.pass
@@ -20,8 +20,10 @@ public static int Integer.numberOfLeadingZeros(int arg0)
public static int Integer.numberOfTrailingZeros(int arg0)
public static int Integer.parseInt(String arg0)
public static int Integer.parseInt(String arg0, int arg1)
+public static int Integer.parseInt(CharSequence arg0, int arg1, int arg2, int arg3)
public static int Integer.parseUnsignedInt(String arg0)
public static int Integer.parseUnsignedInt(String arg0, int arg1)
+public static int Integer.parseUnsignedInt(CharSequence arg0, int arg1, int arg2, int arg3)
public static int Integer.remainderUnsigned(int arg0, int arg1)
public static int Integer.reverse(int arg0)
public static int Integer.reverseBytes(int arg0)
@@ -79,6 +81,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -91,9 +94,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -109,6 +115,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -121,6 +128,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -145,6 +153,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/stringContent.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/stringContent.pass
new file mode 100644
index 0000000..8988150
--- /dev/null
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/stringContent.pass
@@ -0,0 +1,60 @@
+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 boolean endsWith(String arg0)
+public boolean equals(Object arg0)
+public boolean equalsIgnoreCase(String 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 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 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 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 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[] split(String arg0)
+public String[] split(String arg0, int arg1)
+public boolean startsWith(String arg0)
+public boolean startsWith(String arg0, int arg1)
+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 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.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/systemContent.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/systemContent.pass
new file mode 100644
index 0000000..2982020
--- /dev/null
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/systemContent.pass
@@ -0,0 +1,35 @@
+public static final PrintStream err
+public static final InputStream in
+public static final PrintStream out
+public static native void arraycopy(Object arg0, int arg1, Object arg2, int arg3, int arg4)
+public static String clearProperty(String arg0)
+public static Console console()
+public static native long currentTimeMillis()
+public static void exit(int arg0)
+public static void gc()
+public static Logger getLogger(String arg0)
+public static Logger getLogger(String arg0, ResourceBundle arg1)
+public static Properties getProperties()
+public static String getProperty(String arg0)
+public static String getProperty(String arg0, String arg1)
+public static SecurityManager getSecurityManager()
+public static Map<String, String> getenv()
+public static String getenv(String arg0)
+public static native int identityHashCode(Object arg0)
+public static Channel inheritedChannel()
+public static String lineSeparator()
+public static void load(String arg0)
+public static void loadLibrary(String arg0)
+public static native String mapLibraryName(String arg0)
+public static native long nanoTime()
+public static void runFinalization()
+public static void runFinalizersOnExit(boolean arg0)
+public static void setErr(PrintStream arg0)
+public static void setIn(InputStream arg0)
+public static void setOut(PrintStream arg0)
+public static void setProperties(Properties arg0)
+public static String setProperty(String arg0, String arg1)
+public static void setSecurityManager(SecurityManager arg0)
+class
+Logger
+LoggerFinder
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesAndLocalMembers.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesAndLocalMembers.pass
similarity index 95%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesAndLocalMembers.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesAndLocalMembers.pass
index 81c2c9f..f0ee375 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesAndLocalMembers.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesAndLocalMembers.pass
@@ -60,6 +60,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -72,9 +73,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -90,6 +94,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -102,6 +107,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -126,6 +132,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesAndLocalMembers1.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesAndLocalMembers1.pass
similarity index 95%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesAndLocalMembers1.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesAndLocalMembers1.pass
index 20be0bd..49c5372 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesAndLocalMembers1.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesAndLocalMembers1.pass
@@ -60,6 +60,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -72,9 +73,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -90,6 +94,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -102,6 +107,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -126,6 +132,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesAndStaticLocalMembers.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesAndStaticLocalMembers.pass
similarity index 92%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesAndStaticLocalMembers.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesAndStaticLocalMembers.pass
index 2aa1990..87aaab3 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesAndStaticLocalMembers.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesAndStaticLocalMembers.pass
@@ -19,8 +19,10 @@ public static int Integer.numberOfLeadingZeros(int arg0)
public static int Integer.numberOfTrailingZeros(int arg0)
public static int Integer.parseInt(String arg0)
public static int Integer.parseInt(String arg0, int arg1)
+public static int Integer.parseInt(CharSequence arg0, int arg1, int arg2, int arg3)
public static int Integer.parseUnsignedInt(String arg0)
public static int Integer.parseUnsignedInt(String arg0, int arg1)
+public static int Integer.parseUnsignedInt(CharSequence arg0, int arg1, int arg2, int arg3)
public static int Integer.remainderUnsigned(int arg0, int arg1)
public static int Integer.reverse(int arg0)
public static int Integer.reverseBytes(int arg0)
@@ -78,6 +80,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -90,9 +93,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -108,6 +114,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -120,6 +127,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -144,6 +152,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesInterfaceMembersAndVars.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesInterfaceMembersAndVars.pass
similarity index 95%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesInterfaceMembersAndVars.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesInterfaceMembersAndVars.pass
index 66717b1..feaca37 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesInterfaceMembersAndVars.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesInterfaceMembersAndVars.pass
@@ -68,6 +68,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -80,9 +81,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -98,6 +102,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -110,6 +115,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -134,6 +140,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesInterfaceMembersAndVars1.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesInterfaceMembersAndVars1.pass
similarity index 95%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesInterfaceMembersAndVars1.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesInterfaceMembersAndVars1.pass
index db8da7d..0722c6a 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesInterfaceMembersAndVars1.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesInterfaceMembersAndVars1.pass
@@ -67,6 +67,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -79,9 +80,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -97,6 +101,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -109,6 +114,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -133,6 +139,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalFieldsAndVars.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalFieldsAndVars.pass
similarity index 94%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalFieldsAndVars.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalFieldsAndVars.pass
index 30a796a..e1ba7b1 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalFieldsAndVars.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalFieldsAndVars.pass
@@ -45,6 +45,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -57,9 +58,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -75,6 +79,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -87,6 +92,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -111,6 +117,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndSmartInt.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersAndSmartInt.pass
similarity index 93%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndSmartInt.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersAndSmartInt.pass
index 056442e..45810be 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndSmartInt.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersAndSmartInt.pass
@@ -21,8 +21,10 @@ public static int Integer.numberOfLeadingZeros(int arg0)
public static int Integer.numberOfTrailingZeros(int arg0)
public static int Integer.parseInt(String arg0)
public static int Integer.parseInt(String arg0, int arg1)
+public static int Integer.parseInt(CharSequence arg0, int arg1, int arg2, int arg3)
public static int Integer.parseUnsignedInt(String arg0)
public static int Integer.parseUnsignedInt(String arg0, int arg1)
+public static int Integer.parseUnsignedInt(CharSequence arg0, int arg1, int arg2, int arg3)
public static int Integer.remainderUnsigned(int arg0, int arg1)
public static int Integer.reverse(int arg0)
public static int Integer.reverseBytes(int arg0)
@@ -92,6 +94,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -104,9 +107,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -122,6 +128,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -134,6 +141,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -158,6 +166,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndSmartNumber.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersAndSmartNumber.pass
similarity index 95%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndSmartNumber.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersAndSmartNumber.pass
index 731e750..7138a34 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndSmartNumber.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersAndSmartNumber.pass
@@ -68,6 +68,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -79,8 +80,11 @@ InstantiationException
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -95,6 +99,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -106,6 +111,7 @@ SecurityException
SecurityManager
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -130,6 +136,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndSmartPrimitives.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersAndSmartPrimitives.pass
similarity index 94%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndSmartPrimitives.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersAndSmartPrimitives.pass
index d58051e..6a1160f 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndSmartPrimitives.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersAndSmartPrimitives.pass
@@ -19,16 +19,20 @@ public static final byte Character.DIRECTIONALITY_COMMON_NUMBER_SEPARATOR
public static final byte Character.DIRECTIONALITY_EUROPEAN_NUMBER
public static final byte Character.DIRECTIONALITY_EUROPEAN_NUMBER_SEPARATOR
public static final byte Character.DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATOR
+public static final byte Character.DIRECTIONALITY_FIRST_STRONG_ISOLATE
public static final byte Character.DIRECTIONALITY_LEFT_TO_RIGHT
public static final byte Character.DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDING
+public static final byte Character.DIRECTIONALITY_LEFT_TO_RIGHT_ISOLATE
public static final byte Character.DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDE
public static final byte Character.DIRECTIONALITY_NONSPACING_MARK
public static final byte Character.DIRECTIONALITY_OTHER_NEUTRALS
public static final byte Character.DIRECTIONALITY_PARAGRAPH_SEPARATOR
public static final byte Character.DIRECTIONALITY_POP_DIRECTIONAL_FORMAT
+public static final byte Character.DIRECTIONALITY_POP_DIRECTIONAL_ISOLATE
public static final byte Character.DIRECTIONALITY_RIGHT_TO_LEFT
public static final byte Character.DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC
public static final byte Character.DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING
+public static final byte Character.DIRECTIONALITY_RIGHT_TO_LEFT_ISOLATE
public static final byte Character.DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE
public static final byte Character.DIRECTIONALITY_SEGMENT_SEPARATOR
public static final byte Character.DIRECTIONALITY_UNDEFINED
@@ -112,6 +116,7 @@ public static int Character.codePointBefore(char[] arg0, int arg1)
public static int Character.codePointBefore(char[] arg0, int arg1, int arg2)
public static int Character.codePointCount(CharSequence arg0, int arg1, int arg2)
public static int Character.codePointCount(char[] arg0, int arg1, int arg2)
+public static int Character.codePointOf(String arg0)
public static int Byte.compare(byte arg0, byte arg1)
public static int Character.compare(char arg0, char arg1)
public static int Double.compare(double arg0, double arg1)
@@ -119,8 +124,10 @@ public static int Float.compare(float arg0, float arg1)
public static int Integer.compare(int arg0, int arg1)
public static int Long.compare(long arg0, long arg1)
public static int Short.compare(short arg0, short arg1)
+public static int Byte.compareUnsigned(byte arg0, byte arg1)
public static int Integer.compareUnsigned(int arg0, int arg1)
public static int Long.compareUnsigned(long arg0, long arg1)
+public static int Short.compareUnsigned(short arg0, short arg1)
public static Byte Byte.decode(String arg0)
public static Integer Integer.decode(String arg0)
public static Long Long.decode(String arg0)
@@ -181,14 +188,18 @@ public static double Double.parseDouble(String arg0)
public static float Float.parseFloat(String arg0)
public static int Integer.parseInt(String arg0)
public static int Integer.parseInt(String arg0, int arg1)
+public static int Integer.parseInt(CharSequence arg0, int arg1, int arg2, int arg3)
public static long Long.parseLong(String arg0)
public static long Long.parseLong(String arg0, int arg1)
+public static long Long.parseLong(CharSequence arg0, int arg1, int arg2, int arg3)
public static short Short.parseShort(String arg0)
public static short Short.parseShort(String arg0, int arg1)
public static int Integer.parseUnsignedInt(String arg0)
public static int Integer.parseUnsignedInt(String arg0, int arg1)
+public static int Integer.parseUnsignedInt(CharSequence arg0, int arg1, int arg2, int arg3)
public static long Long.parseUnsignedLong(String arg0)
public static long Long.parseUnsignedLong(String arg0, int arg1)
+public static long Long.parseUnsignedLong(CharSequence arg0, int arg1, int arg2, int arg3)
public static int Integer.remainderUnsigned(int arg0, int arg1)
public static long Long.remainderUnsigned(long arg0, long arg1)
public static int Integer.reverse(int arg0)
@@ -296,6 +307,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -308,9 +320,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -326,6 +341,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -338,6 +354,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -362,6 +379,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndVars.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersAndVars.pass
similarity index 95%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndVars.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersAndVars.pass
index e20c019..4664586 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndVars.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersAndVars.pass
@@ -62,6 +62,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -74,9 +75,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -92,6 +96,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -104,6 +109,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -128,6 +134,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndVars1.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersAndVars1.pass
similarity index 95%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndVars1.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersAndVars1.pass
index b2eb578..f69313d 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndVars1.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersAndVars1.pass
@@ -58,6 +58,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -70,9 +71,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -88,6 +92,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -100,6 +105,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -124,6 +130,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndVars2.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersAndVars2.pass
similarity index 95%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndVars2.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersAndVars2.pass
index 57d1b2b..0478a4c 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersAndVars2.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersAndVars2.pass
@@ -62,6 +62,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -74,9 +75,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -92,6 +96,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -104,6 +109,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -128,6 +134,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmartBoolean.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersVarsAndSmartBoolean.pass
similarity index 96%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmartBoolean.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersVarsAndSmartBoolean.pass
index 8eeed7b..e21a8d5 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmartBoolean.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersVarsAndSmartBoolean.pass
@@ -71,6 +71,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -83,9 +84,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -101,6 +105,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -113,6 +118,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -137,6 +143,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmartEnumAndInt.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersVarsAndSmartEnumAndInt.pass
similarity index 93%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmartEnumAndInt.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersVarsAndSmartEnumAndInt.pass
index ce257b7..c17f16f 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmartEnumAndInt.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersVarsAndSmartEnumAndInt.pass
@@ -21,8 +21,10 @@ public static int Integer.numberOfLeadingZeros(int arg0)
public static int Integer.numberOfTrailingZeros(int arg0)
public static int Integer.parseInt(String arg0)
public static int Integer.parseInt(String arg0, int arg1)
+public static int Integer.parseInt(CharSequence arg0, int arg1, int arg2, int arg3)
public static int Integer.parseUnsignedInt(String arg0)
public static int Integer.parseUnsignedInt(String arg0, int arg1)
+public static int Integer.parseUnsignedInt(CharSequence arg0, int arg1, int arg2, int arg3)
public static int Integer.remainderUnsigned(int arg0, int arg1)
public static int Integer.reverse(int arg0)
public static int Integer.reverseBytes(int arg0)
@@ -95,6 +97,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -107,9 +110,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -125,6 +131,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -137,6 +144,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -161,6 +169,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmartInt.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersVarsAndSmartInt.pass
similarity index 93%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmartInt.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersVarsAndSmartInt.pass
index ea7d8f9..778bfa2 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmartInt.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersVarsAndSmartInt.pass
@@ -21,8 +21,10 @@ public static int Integer.numberOfLeadingZeros(int arg0)
public static int Integer.numberOfTrailingZeros(int arg0)
public static int Integer.parseInt(String arg0)
public static int Integer.parseInt(String arg0, int arg1)
+public static int Integer.parseInt(CharSequence arg0, int arg1, int arg2, int arg3)
public static int Integer.parseUnsignedInt(String arg0)
public static int Integer.parseUnsignedInt(String arg0, int arg1)
+public static int Integer.parseUnsignedInt(CharSequence arg0, int arg1, int arg2, int arg3)
public static int Integer.remainderUnsigned(int arg0, int arg1)
public static int Integer.reverse(int arg0)
public static int Integer.reverseBytes(int arg0)
@@ -94,6 +96,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -106,9 +109,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -124,6 +130,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -136,6 +143,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -160,6 +168,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmartString.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersVarsAndSmartString.pass
similarity index 97%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmartString.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersVarsAndSmartString.pass
index 7358c9a..1c07d6c 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmartString.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersVarsAndSmartString.pass
@@ -92,6 +92,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -104,9 +105,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -122,6 +126,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -134,6 +139,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -158,6 +164,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmarts.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersVarsAndSmarts.pass
similarity index 96%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmarts.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersVarsAndSmarts.pass
index 93d0f46..95659f4 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmarts.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesLocalMembersVarsAndSmarts.pass
@@ -38,16 +38,20 @@ public static final byte Character.DIRECTIONALITY_COMMON_NUMBER_SEPARATOR
public static final byte Character.DIRECTIONALITY_EUROPEAN_NUMBER
public static final byte Character.DIRECTIONALITY_EUROPEAN_NUMBER_SEPARATOR
public static final byte Character.DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATOR
+public static final byte Character.DIRECTIONALITY_FIRST_STRONG_ISOLATE
public static final byte Character.DIRECTIONALITY_LEFT_TO_RIGHT
public static final byte Character.DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDING
+public static final byte Character.DIRECTIONALITY_LEFT_TO_RIGHT_ISOLATE
public static final byte Character.DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDE
public static final byte Character.DIRECTIONALITY_NONSPACING_MARK
public static final byte Character.DIRECTIONALITY_OTHER_NEUTRALS
public static final byte Character.DIRECTIONALITY_PARAGRAPH_SEPARATOR
public static final byte Character.DIRECTIONALITY_POP_DIRECTIONAL_FORMAT
+public static final byte Character.DIRECTIONALITY_POP_DIRECTIONAL_ISOLATE
public static final byte Character.DIRECTIONALITY_RIGHT_TO_LEFT
public static final byte Character.DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC
public static final byte Character.DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING
+public static final byte Character.DIRECTIONALITY_RIGHT_TO_LEFT_ISOLATE
public static final byte Character.DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE
public static final byte Character.DIRECTIONALITY_SEGMENT_SEPARATOR
public static final byte Character.DIRECTIONALITY_UNDEFINED
@@ -133,6 +137,7 @@ public static int Character.codePointBefore(char[] arg0, int arg1)
public static int Character.codePointBefore(char[] arg0, int arg1, int arg2)
public static int Character.codePointCount(CharSequence arg0, int arg1, int arg2)
public static int Character.codePointCount(char[] arg0, int arg1, int arg2)
+public static int Character.codePointOf(String arg0)
public static int Boolean.compare(boolean arg0, boolean arg1)
public static int Character.compare(char arg0, char arg1)
public static int Double.compare(double arg0, double arg1)
@@ -258,12 +263,16 @@ public static double Double.parseDouble(String arg0)
public static float Float.parseFloat(String arg0)
public static int Integer.parseInt(String arg0)
public static int Integer.parseInt(String arg0, int arg1)
+public static int Integer.parseInt(CharSequence arg0, int arg1, int arg2, int arg3)
public static long Long.parseLong(String arg0)
public static long Long.parseLong(String arg0, int arg1)
+public static long Long.parseLong(CharSequence arg0, int arg1, int arg2, int arg3)
public static int Integer.parseUnsignedInt(String arg0)
public static int Integer.parseUnsignedInt(String arg0, int arg1)
+public static int Integer.parseUnsignedInt(CharSequence arg0, int arg1, int arg2, int arg3)
public static long Long.parseUnsignedLong(String arg0)
public static long Long.parseUnsignedLong(String arg0, int arg1)
+public static long Long.parseUnsignedLong(CharSequence arg0, int arg1, int arg2, int arg3)
public static int Integer.remainderUnsigned(int arg0, int arg1)
public static long Long.remainderUnsigned(long arg0, long arg1)
public static int Integer.reverse(int arg0)
@@ -385,6 +394,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -397,9 +407,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -415,6 +428,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -427,6 +441,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -451,6 +466,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesStaticInterfaceMembersAndVars.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesStaticInterfaceMembersAndVars.pass
similarity index 94%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesStaticInterfaceMembersAndVars.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesStaticInterfaceMembersAndVars.pass
index 6171197..78f049f 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesStaticInterfaceMembersAndVars.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/10/typesStaticInterfaceMembersAndVars.pass
@@ -58,6 +58,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -70,9 +71,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -88,6 +92,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -100,6 +105,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -124,6 +130,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/11/stringContent.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/11/stringContent.pass
new file mode 100644
index 0000000..3ab653a
--- /dev/null
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/11/stringContent.pass
@@ -0,0 +1,66 @@
+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 boolean endsWith(String arg0)
+public boolean equals(Object arg0)
+public boolean equalsIgnoreCase(String 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 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[] 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 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 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.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/11/systemContent.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/11/systemContent.pass
new file mode 100644
index 0000000..6a7d375
--- /dev/null
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/11/systemContent.pass
@@ -0,0 +1,34 @@
+public static final PrintStream err
+public static final InputStream in
+public static final PrintStream out
+public static native void arraycopy(Object arg0, int arg1, Object arg2, int arg3, int arg4)
+public static String clearProperty(String arg0)
+public static Console console()
+public static native long currentTimeMillis()
+public static void exit(int arg0)
+public static void gc()
+public static Logger getLogger(String arg0)
+public static Logger getLogger(String arg0, ResourceBundle arg1)
+public static Properties getProperties()
+public static String getProperty(String arg0)
+public static String getProperty(String arg0, String arg1)
+public static SecurityManager getSecurityManager()
+public static Map<String, String> getenv()
+public static String getenv(String arg0)
+public static native int identityHashCode(Object arg0)
+public static Channel inheritedChannel()
+public static String lineSeparator()
+public static void load(String arg0)
+public static void loadLibrary(String arg0)
+public static native String mapLibraryName(String arg0)
+public static native long nanoTime()
+public static void runFinalization()
+public static void setErr(PrintStream arg0)
+public static void setIn(InputStream arg0)
+public static void setOut(PrintStream arg0)
+public static void setProperties(Properties arg0)
+public static String setProperty(String arg0, String arg1)
+public static void setSecurityManager(SecurityManager arg0)
+class
+Logger
+LoggerFinder
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmarts.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/11/typesLocalMembersVarsAndSmarts.pass
similarity index 95%
copy from java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmarts.pass
copy to java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/11/typesLocalMembersVarsAndSmarts.pass
index 93d0f46..6fa6181 100644
--- a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/typesLocalMembersVarsAndSmarts.pass
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/11/typesLocalMembersVarsAndSmarts.pass
@@ -38,16 +38,20 @@ public static final byte Character.DIRECTIONALITY_COMMON_NUMBER_SEPARATOR
public static final byte Character.DIRECTIONALITY_EUROPEAN_NUMBER
public static final byte Character.DIRECTIONALITY_EUROPEAN_NUMBER_SEPARATOR
public static final byte Character.DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATOR
+public static final byte Character.DIRECTIONALITY_FIRST_STRONG_ISOLATE
public static final byte Character.DIRECTIONALITY_LEFT_TO_RIGHT
public static final byte Character.DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDING
+public static final byte Character.DIRECTIONALITY_LEFT_TO_RIGHT_ISOLATE
public static final byte Character.DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDE
public static final byte Character.DIRECTIONALITY_NONSPACING_MARK
public static final byte Character.DIRECTIONALITY_OTHER_NEUTRALS
public static final byte Character.DIRECTIONALITY_PARAGRAPH_SEPARATOR
public static final byte Character.DIRECTIONALITY_POP_DIRECTIONAL_FORMAT
+public static final byte Character.DIRECTIONALITY_POP_DIRECTIONAL_ISOLATE
public static final byte Character.DIRECTIONALITY_RIGHT_TO_LEFT
public static final byte Character.DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC
public static final byte Character.DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING
+public static final byte Character.DIRECTIONALITY_RIGHT_TO_LEFT_ISOLATE
public static final byte Character.DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE
public static final byte Character.DIRECTIONALITY_SEGMENT_SEPARATOR
public static final byte Character.DIRECTIONALITY_UNDEFINED
@@ -133,6 +137,7 @@ public static int Character.codePointBefore(char[] arg0, int arg1)
public static int Character.codePointBefore(char[] arg0, int arg1, int arg2)
public static int Character.codePointCount(CharSequence arg0, int arg1, int arg2)
public static int Character.codePointCount(char[] arg0, int arg1, int arg2)
+public static int Character.codePointOf(String arg0)
public static int Boolean.compare(boolean arg0, boolean arg1)
public static int Character.compare(char arg0, char arg1)
public static int Double.compare(double arg0, double arg1)
@@ -258,12 +263,16 @@ public static double Double.parseDouble(String arg0)
public static float Float.parseFloat(String arg0)
public static int Integer.parseInt(String arg0)
public static int Integer.parseInt(String arg0, int arg1)
+public static int Integer.parseInt(CharSequence arg0, int arg1, int arg2, int arg3)
public static long Long.parseLong(String arg0)
public static long Long.parseLong(String arg0, int arg1)
+public static long Long.parseLong(CharSequence arg0, int arg1, int arg2, int arg3)
public static int Integer.parseUnsignedInt(String arg0)
public static int Integer.parseUnsignedInt(String arg0, int arg1)
+public static int Integer.parseUnsignedInt(CharSequence arg0, int arg1, int arg2, int arg3)
public static long Long.parseUnsignedLong(String arg0)
public static long Long.parseUnsignedLong(String arg0, int arg1)
+public static long Long.parseUnsignedLong(CharSequence arg0, int arg1, int arg2, int arg3)
public static int Integer.remainderUnsigned(int arg0, int arg1)
public static long Long.remainderUnsigned(long arg0, long arg1)
public static int Integer.reverse(int arg0)
@@ -298,6 +307,7 @@ public static String Boolean.toString(boolean arg0)
public static String Character.toString(char arg0)
public static String Double.toString(double arg0)
public static String Float.toString(float arg0)
+public static String Character.toString(int arg0)
public static String Integer.toString(int arg0)
public static String Long.toString(long arg0)
public static String Integer.toString(int arg0, int arg1)
@@ -385,6 +395,7 @@ FunctionalInterface
IllegalAccessError
IllegalAccessException
IllegalArgumentException
+IllegalCallerException
IllegalMonitorStateException
IllegalStateException
IllegalThreadStateException
@@ -397,9 +408,12 @@ Integer
InternalError
InterruptedException
Iterable
+LayerInstantiationException
LinkageError
Long
Math
+Module
+ModuleLayer
NegativeArraySizeException
NoClassDefFoundError
NoSuchFieldError
@@ -415,6 +429,7 @@ Override
Package
Process
ProcessBuilder
+ProcessHandle
Readable
ReflectiveOperationException
Runnable
@@ -427,6 +442,7 @@ SecurityManager
Short
StackOverflowError
StackTraceElement
+StackWalker
StrictMath
String
StringBuffer
@@ -451,6 +467,5 @@ Void
com
java
javax
-oracle
org
sun
diff --git a/java.completion/test/unit/src/org/netbeans/modules/java/completion/CompletionTestBase.java b/java.completion/test/unit/src/org/netbeans/modules/java/completion/CompletionTestBase.java
index a4dc62a..428ce16 100644
--- a/java.completion/test/unit/src/org/netbeans/modules/java/completion/CompletionTestBase.java
+++ b/java.completion/test/unit/src/org/netbeans/modules/java/completion/CompletionTestBase.java
@@ -86,6 +86,7 @@ public class CompletionTestBase extends NbTestCase {
static {
JavaCompletionTaskBasicTest.class.getClassLoader().setDefaultAssertionStatus(true);
SourceUtilsTestUtil2.disableArtificalParameterNames();
+ System.setProperty("org.netbeans.modules.java.source.parsing.JavacParser.no_parameter_names", "true");
}
static final int FINISH_OUTTIME = 5 * 60 * 1000;
@@ -253,7 +254,9 @@ public class CompletionTestBase extends NbTestCase {
for (Object item : items) {
String itemString = item.toString();
if (!(org.openide.util.Utilities.isMac() && itemString.equals("apple") //ignoring 'apple' package
- || itemString.equals("jdk"))) { //ignoring 'jdk' package introduced by jdk1.7.0_40
+ || itemString.equals("jdk") //ignoring 'jdk' package introduced by jdk1.7.0_40
+ || itemString.equals("netscape") //ignoring 'netscape' package present in some JDK builds
+ || itemString.equals("oracle"))) { //ignoring 'oracle' package present in some JDK builds
out.write(itemString);
out.write("\n");
}
diff --git a/java.source.base/src/org/netbeans/modules/java/source/parsing/JavacParser.java b/java.source.base/src/org/netbeans/modules/java/source/parsing/JavacParser.java
index c237d57..670f566 100644
--- a/java.source.base/src/org/netbeans/modules/java/source/parsing/JavacParser.java
+++ b/java.source.base/src/org/netbeans/modules/java/source/parsing/JavacParser.java
@@ -146,6 +146,7 @@ public class JavacParser extends Parser {
private static final int MAX_DUMPS = Integer.getInteger("org.netbeans.modules.java.source.parsing.JavacParser.maxDumps", 255); //NOI18N
//Command line switch disabling partial reparse
private static final boolean DISABLE_PARTIAL_REPARSE = Boolean.getBoolean("org.netbeans.modules.java.source.parsing.JavacParser.no_reparse"); //NOI18N
+ private static final boolean DISABLE_PARAMETER_NAMES_READING = Boolean.getBoolean("org.netbeans.modules.java.source.parsing.JavacParser.no_parameter_names"); //NOI18N
public static final String LOMBOK_DETECTED = "lombokDetected";
/**
@@ -823,8 +824,10 @@ public class JavacParser extends Parser {
options.add(validatedSourceLevel.requiredTarget().name);
}
options.add("-XDide"); // NOI18N, javac runs inside the IDE
- options.add("-XDsave-parameter-names"); // NOI18N, javac runs inside the IDE
- options.add("-parameters"); // NOI18N, save and read parameter names
+ if (!DISABLE_PARAMETER_NAMES_READING) {
+ options.add("-XDsave-parameter-names"); // NOI18N, javac runs inside the IDE
+ options.add("-parameters"); // NOI18N, save and read parameter names
+ }
options.add("-XDsuppressAbortOnBadClassFile"); // NOI18N, when a class file cannot be read, produce an error type instead of failing with an exception
options.add("-XDshould-stop.at=GENERATE"); // NOI18N, parsing should not stop in phase where an error is found
options.add("-g:source"); // NOI18N, Make the compiler to maintian source file info
---------------------------------------------------------------------
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
[incubator-netbeans] 05/05: [NETBEANS-895] Fixing adding imports
when completing field initializer.
Posted by jl...@apache.org.
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/incubator-netbeans.git
commit 90c92b2e2b63d498ae220b49ec59316d5a93ac7f
Author: Jan Lahoda <jl...@netbeans.org>
AuthorDate: Sat Jun 30 22:01:19 2018 +0200
[NETBEANS-895] Fixing adding imports when completing field initializer.
---
.../java/completion/JavaCompletionTask.java | 2 +-
.../java/completion/CompletionTestBase.java | 240 +--------------------
.../java/completion/CompletionTestBaseBase.java | 212 +++++++-----------
java.editor/nbproject/project.xml | 6 +
.../1.8/testAnnotation.pass2 | 10 +
.../1.8/testFieldInitializer.pass2 | 10 +
.../java/editor/completion/data/Annotation.java | 8 +
.../java/editor/completion/data/FieldSet.java | 9 +
.../java/editor/completion/CompletionTestBase.java | 234 +-------------------
.../completion/JavaCompletionItemPerformTest.java | 39 ++++
.../org/netbeans/api/java/source/SourceUtils.java | 12 +-
.../netbeans/api/java/source/TreeUtilities.java | 3 +
.../api/java/source/TreeUtilitiesTest.java | 34 +++
13 files changed, 224 insertions(+), 595 deletions(-)
diff --git a/java.completion/src/org/netbeans/modules/java/completion/JavaCompletionTask.java b/java.completion/src/org/netbeans/modules/java/completion/JavaCompletionTask.java
index 24c1223..0805251 100644
--- a/java.completion/src/org/netbeans/modules/java/completion/JavaCompletionTask.java
+++ b/java.completion/src/org/netbeans/modules/java/completion/JavaCompletionTask.java
@@ -1205,7 +1205,7 @@ public final class JavaCompletionTask<T> extends BaseTask {
if (annTypeElement != null && annTypeElement.getKind() == ANNOTATION_TYPE) {
HashSet<String> names = new HashSet<>();
for (ExpressionTree arg : ann.getArguments()) {
- if (arg.getKind() == Tree.Kind.ASSIGNMENT && sourcePositions.getEndPosition(root, arg) < offset) {
+ if (arg.getKind() == Tree.Kind.ASSIGNMENT && sourcePositions.getEndPosition(root, ((AssignmentTree) arg).getExpression()) < offset) {
ExpressionTree var = ((AssignmentTree) arg).getVariable();
if (var.getKind() == Tree.Kind.IDENTIFIER) {
names.add(((IdentifierTree) var).getName().toString());
diff --git a/java.completion/test/unit/src/org/netbeans/modules/java/completion/CompletionTestBase.java b/java.completion/test/unit/src/org/netbeans/modules/java/completion/CompletionTestBase.java
index 47a095f..9ba6021 100644
--- a/java.completion/test/unit/src/org/netbeans/modules/java/completion/CompletionTestBase.java
+++ b/java.completion/test/unit/src/org/netbeans/modules/java/completion/CompletionTestBase.java
@@ -20,18 +20,10 @@
package org.netbeans.modules.java.completion;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
import java.io.Writer;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.util.*;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.prefs.Preferences;
import javax.lang.model.element.*;
import javax.lang.model.type.ArrayType;
@@ -40,184 +32,28 @@ import javax.lang.model.type.ExecutableType;
import javax.lang.model.type.TypeKind;
import javax.lang.model.type.TypeMirror;
import javax.lang.model.util.Elements;
-import javax.swing.JEditorPane;
import javax.swing.text.Document;
-import junit.framework.Assert;
-
-import org.netbeans.api.editor.mimelookup.MimeLookup;
-import org.netbeans.api.java.classpath.ClassPath;
-import org.netbeans.api.java.classpath.JavaClassPathConstants;
import org.netbeans.api.java.lexer.JavaTokenId;
import org.netbeans.api.java.source.*;
import org.netbeans.api.java.source.support.ReferencesCount;
import org.netbeans.api.lexer.Language;
-import org.netbeans.core.startup.Main;
-import org.netbeans.junit.NbTestCase;
-import org.netbeans.modules.java.JavaDataLoader;
-import org.netbeans.modules.java.source.BootClassPathUtil;
-import org.netbeans.modules.java.source.TestUtil;
-import org.netbeans.modules.java.source.indexing.TransactionContext;
-import org.netbeans.modules.java.source.usages.BinaryAnalyser;
-import org.netbeans.modules.java.source.usages.ClassIndexImpl;
-import org.netbeans.modules.java.source.usages.ClassIndexManager;
-import org.netbeans.modules.java.source.usages.IndexUtil;
import org.netbeans.modules.parsing.api.ParserManager;
import org.netbeans.modules.parsing.api.Source;
-import org.netbeans.spi.java.classpath.ClassPathProvider;
-import org.netbeans.spi.java.classpath.support.ClassPathSupport;
-import org.netbeans.spi.java.queries.SourceLevelQueryImplementation;
import org.openide.LifecycleManager;
import org.openide.cookies.EditorCookie;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.loaders.DataObject;
-import org.openide.util.Lookup;
-import org.openide.util.SharedClassObject;
-import org.openide.util.lookup.Lookups;
-import org.openide.util.lookup.ProxyLookup;
/**
*
* @author Dusan Balek, Jan Lahoda
*/
-public class CompletionTestBase extends NbTestCase {
-
- static {
- JavaCompletionTaskBasicTest.class.getClassLoader().setDefaultAssertionStatus(true);
- SourceUtilsTestUtil2.disableArtificalParameterNames();
- System.setProperty("org.netbeans.modules.java.source.parsing.JavacParser.no_parameter_names", "true");
- }
-
- static final int FINISH_OUTTIME = 5 * 60 * 1000;
-
- public static class Lkp extends ProxyLookup {
-
- private static Lkp DEFAULT;
-
- public Lkp() {
- Assert.assertNull(DEFAULT);
- DEFAULT = this;
- }
-
- public static void initLookups(Object[] objs) throws Exception {
- ClassLoader l = Lkp.class.getClassLoader();
- DEFAULT.setLookups(new Lookup [] {
- Lookups.fixed(objs),
- Lookups.metaInfServices(l),
- Lookups.singleton(l)
- });
- }
- }
+public class CompletionTestBase extends CompletionTestBaseBase {
public CompletionTestBase(String testName) {
- super(testName);
- }
-
- private final AtomicReference<String> sourceLevel = new AtomicReference<>();
-
- @Override
- protected void setUp() throws Exception {
- ClassPathProvider cpp = new ClassPathProvider() {
- volatile ClassPath bootCache;
- volatile ClassPath moduleBootCache;
- @Override
- public ClassPath findClassPath(FileObject file, String type) {
- try {
- if (type.equals(ClassPath.SOURCE)) {
- return ClassPathSupport.createClassPath(new FileObject[]{FileUtil.toFileObject(getWorkDir())});
- }
- if (type.equals(ClassPath.COMPILE)) {
- return ClassPathSupport.createClassPath(new FileObject[0]);
- }
- if (type.equals(ClassPath.BOOT)) {
- ClassPath cp = bootCache;
- if (cp == null) {
- bootCache = cp = BootClassPathUtil.getBootClassPath();
- }
- return cp;
- }
- if (type.equals(JavaClassPathConstants.MODULE_BOOT_PATH)) {
- ClassPath cp = moduleBootCache;
- if (cp == null) {
- moduleBootCache = cp = BootClassPathUtil.getModuleBootPath();
- }
- return cp;
- }
- } catch (IOException ex) {}
- return null;
- }
- };
- SharedClassObject loader = JavaDataLoader.findObject(JavaDataLoader.class, true);
- SourceLevelQueryImplementation slq = new SourceLevelQueryImplementation() {
- @Override public String getSourceLevel(FileObject javaFile) {
- return sourceLevel.get();
- }
- };
- SourceUtilsTestUtil.prepareTest(new String[] {
- "META-INF/generated-layer.xml",
- "org/netbeans/modules/java/editor/resources/layer.xml",
- "org/netbeans/modules/defaults/mf-layer.xml"
- }, new Object[] {loader, cpp, slq});
- File cacheFolder = new File(getWorkDir(), "var/cache/index");
- cacheFolder.mkdirs();
- IndexUtil.setCacheFolder(cacheFolder);
- JEditorPane.registerEditorKitForContentType("text/x-java", "org.netbeans.modules.editor.java.JavaKit");
- final ClassPath sourcePath = ClassPathSupport.createClassPath(new FileObject[] {FileUtil.toFileObject(getDataDir())});
- final ClassIndexManager mgr = ClassIndexManager.getDefault();
- for (ClassPath.Entry entry : sourcePath.entries()) {
- TransactionContext tx = TransactionContext.beginStandardTransaction(entry.getURL(), true, ()->true, false);
- try {
- mgr.createUsagesQuery(entry.getURL(), true);
- } finally {
- tx.commit();
- }
- }
- final ClassPath bootPath = cpp.findClassPath(FileUtil.toFileObject(getWorkDir()), ClassPath.BOOT);
- final ClasspathInfo cpInfo = ClasspathInfo.create(bootPath, ClassPathSupport.createClassPath(new URL[0]), sourcePath);
- assertNotNull(cpInfo);
- final JavaSource js = JavaSource.create(cpInfo);
- assertNotNull(js);
- js.runUserActionTask(new Task<CompilationController>() {
- @Override
- public void run(CompilationController parameter) throws Exception {
- for (ClassPath.Entry entry : bootPath.entries()) {
- final URL url = entry.getURL();
- TransactionContext.beginStandardTransaction(entry.getURL(), false, ()->true, false);
- try {
- final ClassIndexImpl cii = mgr.createUsagesQuery(url, false);
- BinaryAnalyser ba = cii.getBinaryAnalyser();
- ba.analyse(url);
- } finally {
- TransactionContext.get().commit();
- }
- }
- }
- }, true);
- Main.initializeURLFactory();
- Preferences preferences = MimeLookup.getLookup(JavaTokenId.language().mimeType()).lookup(Preferences.class);
- preferences.putBoolean("completion-case-sensitive", true);
- }
-
- private URL[] prepareLayers(String... paths) throws IOException {
- List<URL> layers = new LinkedList<>();
-
- for (int cntr = 0; cntr < paths.length; cntr++) {
- boolean found = false;
-
- for (Enumeration<URL> en = Thread.currentThread().getContextClassLoader().getResources(paths[cntr]); en.hasMoreElements(); ) {
- found = true;
- layers.add(en.nextElement());
- }
-
- Assert.assertTrue(paths[cntr], found);
- }
-
- return layers.toArray(new URL[0]);
- }
-
- @Override
- protected void tearDown() throws Exception {
+ super(testName, "org/netbeans/modules/java/completion/JavaCompletionTaskTest");
}
protected void performTest(String source, int caretPos, String textToInsert, String goldenFileName) throws Exception {
@@ -264,83 +100,13 @@ public class CompletionTestBase extends NbTestCase {
}
- File goldenFile = null;
- String version = System.getProperty("java.specification.version");
- for (String variant : computeVersionVariantsFor(version)) {
- goldenFile = new File(getDataDir(), "/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/" + variant + "/" + goldenFileName);
- if (goldenFile.exists())
- break;
- }
- assertNotNull(goldenFile);
+ File goldenFile = getGoldenFile(goldenFileName);
File diffFile = new File(getWorkDir(), getName() + ".diff");
assertFile(output, goldenFile, diffFile);
LifecycleManager.getDefault().saveAll();
}
- private List<String> computeVersionVariantsFor(String version) {
- int dot = version.indexOf('.');
- version = version.substring(dot + 1);
- int versionNum = Integer.parseInt(version);
- List<String> versions = new ArrayList<>();
-
- for (int v = versionNum; v >= 8; v--) {
- versions.add(v != 8 ? "" + v : "1." + v);
- }
-
- return versions;
- }
-
- private void copyToWorkDir(File resource, File toFile) throws IOException {
- InputStream is = new FileInputStream(resource);
- OutputStream outs = new FileOutputStream(toFile);
- int read;
- while ((read = is.read()) != (-1)) {
- outs.write(read);
- }
- outs.close();
- is.close();
- }
-
- private static ClassPath createClassPath(String classpath) {
- StringTokenizer tokenizer = new StringTokenizer(classpath, File.pathSeparator);
- List list = new ArrayList();
- while (tokenizer.hasMoreTokens()) {
- String item = tokenizer.nextToken();
- File f = FileUtil.normalizeFile(new File(item));
- URL url = getRootURL(f);
- if (url!=null) {
- list.add(ClassPathSupport.createResource(url));
- }
- }
- return ClassPathSupport.createClassPath(list);
- }
-
- // XXX this method could probably be removed... use standard FileUtil stuff
- private static URL getRootURL (File f) {
- URL url = null;
- try {
- if (isArchiveFile(f)) {
- url = FileUtil.getArchiveRoot(f.toURI().toURL());
- } else {
- url = f.toURI().toURL();
- String surl = url.toExternalForm();
- if (!surl.endsWith("/")) {
- url = new URL(surl+"/");
- }
- }
- } catch (MalformedURLException e) {
- throw new AssertionError(e);
- }
- return url;
- }
-
- private static boolean isArchiveFile(File f) {
- // the f might not exist and so you cannot use e.g. f.isFile() here
- String fileName = f.getName().toLowerCase();
- return fileName.endsWith(".jar") || fileName.endsWith(".zip"); //NOI18N
- }
-
private static class CIFactory implements JavaCompletionTask.ModuleItemFactory<CI> {
private static final int SMART_TYPE = 1000;
diff --git a/java.editor/test/unit/src/org/netbeans/modules/java/editor/completion/CompletionTestBase.java b/java.completion/test/unit/src/org/netbeans/modules/java/completion/CompletionTestBaseBase.java
similarity index 56%
copy from java.editor/test/unit/src/org/netbeans/modules/java/editor/completion/CompletionTestBase.java
copy to java.completion/test/unit/src/org/netbeans/modules/java/completion/CompletionTestBaseBase.java
index 2f788d7..3e71573 100644
--- a/java.editor/test/unit/src/org/netbeans/modules/java/editor/completion/CompletionTestBase.java
+++ b/java.completion/test/unit/src/org/netbeans/modules/java/completion/CompletionTestBaseBase.java
@@ -17,73 +17,43 @@
* under the License.
*/
-package org.netbeans.modules.java.editor.completion;
+package org.netbeans.modules.java.completion;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
-import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.Writer;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.StringTokenizer;
+import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
import java.util.prefs.Preferences;
-import java.util.regex.Pattern;
import javax.swing.JEditorPane;
-import javax.swing.text.Document;
import junit.framework.Assert;
import org.netbeans.api.editor.mimelookup.MimeLookup;
-import org.netbeans.api.editor.mimelookup.MimePath;
import org.netbeans.api.java.classpath.ClassPath;
+import org.netbeans.api.java.classpath.JavaClassPathConstants;
import org.netbeans.api.java.lexer.JavaTokenId;
-import org.netbeans.api.java.source.ClasspathInfo;
-import org.netbeans.api.java.source.CompilationController;
-import org.netbeans.api.java.source.JavaSource;
-import org.netbeans.api.java.source.SourceUtilsTestUtil2;
-import org.netbeans.api.java.source.Task;
-import org.netbeans.api.java.source.gen.WhitespaceIgnoringDiff;
-import org.netbeans.api.lexer.Language;
+import org.netbeans.api.java.source.*;
import org.netbeans.core.startup.Main;
import org.netbeans.junit.NbTestCase;
-import org.netbeans.modules.editor.completion.CompletionItemComparator;
-import org.netbeans.modules.editor.java.JavaCompletionProvider;
-import org.netbeans.modules.editor.java.JavaKit;
import org.netbeans.modules.java.JavaDataLoader;
+import org.netbeans.modules.java.source.BootClassPathUtil;
import org.netbeans.modules.java.source.indexing.TransactionContext;
-import org.netbeans.modules.java.source.parsing.JavacParserFactory;
import org.netbeans.modules.java.source.usages.BinaryAnalyser;
import org.netbeans.modules.java.source.usages.ClassIndexImpl;
import org.netbeans.modules.java.source.usages.ClassIndexManager;
import org.netbeans.modules.java.source.usages.IndexUtil;
-import org.netbeans.modules.parsing.api.Source;
-import org.netbeans.spi.editor.completion.CompletionItem;
-import org.netbeans.spi.editor.completion.CompletionProvider;
-import org.netbeans.spi.editor.mimelookup.MimeDataProvider;
import org.netbeans.spi.java.classpath.ClassPathProvider;
import org.netbeans.spi.java.classpath.support.ClassPathSupport;
import org.netbeans.spi.java.queries.SourceLevelQueryImplementation;
-import org.openide.LifecycleManager;
-
-import org.openide.cookies.EditorCookie;
import org.openide.filesystems.FileObject;
-import org.openide.filesystems.FileSystem;
import org.openide.filesystems.FileUtil;
-import org.openide.filesystems.MultiFileSystem;
-import org.openide.filesystems.Repository;
-import org.openide.filesystems.XMLFileSystem;
-import org.openide.loaders.DataObject;
import org.openide.util.Lookup;
import org.openide.util.SharedClassObject;
import org.openide.util.lookup.Lookups;
@@ -93,27 +63,25 @@ import org.openide.util.lookup.ProxyLookup;
*
* @author Dusan Balek, Jan Lahoda
*/
-public class CompletionTestBase extends NbTestCase {
-
- static {
- JavaCompletionItemElementCreatingTest.class.getClassLoader().setDefaultAssertionStatus(true);
- System.setProperty("org.openide.util.Lookup", Lkp.class.getName());
- Assert.assertEquals(Lkp.class, Lookup.getDefault().getClass());
+public class CompletionTestBaseBase extends NbTestCase {
+ static {
+ JavaCompletionTaskBasicTest.class.getClassLoader().setDefaultAssertionStatus(true);
SourceUtilsTestUtil2.disableArtificalParameterNames();
+ System.setProperty("org.netbeans.modules.java.source.parsing.JavacParser.no_parameter_names", "true");
}
static final int FINISH_OUTTIME = 5 * 60 * 1000;
-
+
public static class Lkp extends ProxyLookup {
-
+
private static Lkp DEFAULT;
-
+
public Lkp() {
Assert.assertNull(DEFAULT);
DEFAULT = this;
}
-
+
public static void initLookups(Object[] objs) throws Exception {
ClassLoader l = Lkp.class.getClassLoader();
DEFAULT.setLookups(new Lookup [] {
@@ -123,50 +91,59 @@ public class CompletionTestBase extends NbTestCase {
});
}
}
-
- public CompletionTestBase(String testName) {
+
+ protected final AtomicReference<String> sourceLevel = new AtomicReference<>();
+ private final String goldenFilePath;
+
+ public CompletionTestBaseBase(String testName, String goldenFilePath) {
super(testName);
+ this.goldenFilePath = goldenFilePath;
}
-
- private final AtomicReference<String> sourceLevel = new AtomicReference<String>();
-
+
+
+ @Override
protected void setUp() throws Exception {
-// this call did not do anything
-// GlobalSourcePathTestUtil.setUseLibraries (false);
- XMLFileSystem system = new XMLFileSystem();
- system.setXmlUrls(prepareLayers("META-INF/generated-layer.xml",
- "org/netbeans/modules/java/editor/resources/layer.xml",
- "org/netbeans/modules/defaults/mf-layer.xml"));
- Repository repository = new Repository(new MultiFileSystem(new FileSystem[] {FileUtil.createMemoryFileSystem(), system}));
- final ClassPath bootPath = createClassPath(System.getProperty("sun.boot.class.path"));
ClassPathProvider cpp = new ClassPathProvider() {
+ volatile ClassPath bootCache;
+ volatile ClassPath moduleBootCache;
+ @Override
public ClassPath findClassPath(FileObject file, String type) {
try {
- if (type == ClassPath.SOURCE) {
+ if (type.equals(ClassPath.SOURCE)) {
return ClassPathSupport.createClassPath(new FileObject[]{FileUtil.toFileObject(getWorkDir())});
}
- if (type == ClassPath.COMPILE) {
+ if (type.equals(ClassPath.COMPILE)) {
return ClassPathSupport.createClassPath(new FileObject[0]);
}
- if (type == ClassPath.BOOT) {
- return bootPath;
+ if (type.equals(ClassPath.BOOT)) {
+ ClassPath cp = bootCache;
+ if (cp == null) {
+ bootCache = cp = BootClassPathUtil.getBootClassPath();
+ }
+ return cp;
+ }
+ if (type.equals(JavaClassPathConstants.MODULE_BOOT_PATH)) {
+ ClassPath cp = moduleBootCache;
+ if (cp == null) {
+ moduleBootCache = cp = BootClassPathUtil.getModuleBootPath();
+ }
+ return cp;
}
} catch (IOException ex) {}
return null;
}
};
SharedClassObject loader = JavaDataLoader.findObject(JavaDataLoader.class, true);
- MimeDataProvider mdp = new MimeDataProvider() {
- public Lookup getLookup(MimePath mimePath) {
- return Lookups.fixed(new JavaKit(), new JavacParserFactory());
- }
- };
SourceLevelQueryImplementation slq = new SourceLevelQueryImplementation() {
@Override public String getSourceLevel(FileObject javaFile) {
return sourceLevel.get();
}
};
- Lkp.initLookups(new Object[] {repository, loader, cpp, mdp, slq});
+ SourceUtilsTestUtil.prepareTest(new String[] {
+ "META-INF/generated-layer.xml",
+ "org/netbeans/modules/java/editor/resources/layer.xml",
+ "org/netbeans/modules/defaults/mf-layer.xml"
+ }, new Object[] {loader, cpp, slq});
File cacheFolder = new File(getWorkDir(), "var/cache/index");
cacheFolder.mkdirs();
IndexUtil.setCacheFolder(cacheFolder);
@@ -181,11 +158,13 @@ public class CompletionTestBase extends NbTestCase {
tx.commit();
}
}
+ final ClassPath bootPath = cpp.findClassPath(FileUtil.toFileObject(getWorkDir()), ClassPath.BOOT);
final ClasspathInfo cpInfo = ClasspathInfo.create(bootPath, ClassPathSupport.createClassPath(new URL[0]), sourcePath);
assertNotNull(cpInfo);
final JavaSource js = JavaSource.create(cpInfo);
assertNotNull(js);
js.runUserActionTask(new Task<CompilationController>() {
+ @Override
public void run(CompilationController parameter) throws Exception {
for (ClassPath.Entry entry : bootPath.entries()) {
final URL url = entry.getURL();
@@ -204,10 +183,10 @@ public class CompletionTestBase extends NbTestCase {
Preferences preferences = MimeLookup.getLookup(JavaTokenId.language().mimeType()).lookup(Preferences.class);
preferences.putBoolean("completion-case-sensitive", true);
}
-
+
private URL[] prepareLayers(String... paths) throws IOException {
- List<URL> layers = new LinkedList<URL>();
-
+ List<URL> layers = new LinkedList<>();
+
for (int cntr = 0; cntr < paths.length; cntr++) {
boolean found = false;
@@ -218,72 +197,40 @@ public class CompletionTestBase extends NbTestCase {
Assert.assertTrue(paths[cntr], found);
}
-
+
return layers.toArray(new URL[0]);
}
-
+
+ @Override
protected void tearDown() throws Exception {
}
-
- protected void performTest(String source, int caretPos, String textToInsert, String toPerformItemRE, String goldenFileName) throws Exception {
- performTest(source, caretPos, textToInsert, toPerformItemRE, goldenFileName, null);
- }
-
- protected void performTest(String source, int caretPos, String textToInsert, String toPerformItemRE, String goldenFileName, String sourceLevel) throws Exception {
- this.sourceLevel.set(sourceLevel);
- File testSource = new File(getWorkDir(), "test/Test.java");
- testSource.getParentFile().mkdirs();
- copyToWorkDir(new File(getDataDir(), "org/netbeans/modules/java/editor/completion/data/" + source + ".java"), testSource);
- FileObject testSourceFO = FileUtil.toFileObject(testSource);
- assertNotNull(testSourceFO);
- DataObject testSourceDO = DataObject.find(testSourceFO);
- assertNotNull(testSourceDO);
- EditorCookie ec = (EditorCookie) testSourceDO.getCookie(EditorCookie.class);
- assertNotNull(ec);
- final Document doc = ec.openDocument();
- assertNotNull(doc);
- doc.putProperty(Language.class, JavaTokenId.language());
- doc.putProperty("mimeType", "text/x-java");
- int textToInsertLength = textToInsert != null ? textToInsert.length() : 0;
- if (textToInsertLength > 0)
- doc.insertString(caretPos, textToInsert, null);
- Source s = Source.create(doc);
- List<? extends CompletionItem> items = JavaCompletionProvider.query(s, CompletionProvider.COMPLETION_QUERY_TYPE, caretPos + textToInsertLength, caretPos + textToInsertLength);
- Collections.sort(items, CompletionItemComparator.BY_PRIORITY);
-
- String version = System.getProperty("java.specification.version") + "/";
-
- assertNotNull(goldenFileName);
- Pattern p = Pattern.compile(toPerformItemRE);
- CompletionItem item = null;
- for (CompletionItem i : items) {
- if (p.matcher(i.toString()).find()) {
- item = i;
+ public File getGoldenFile(String goldenFileName) {
+ File goldenFile = null;
+ String version = System.getProperty("java.specification.version");
+ for (String variant : computeVersionVariantsFor(version)) {
+ goldenFile = new File(getDataDir(), "/goldenfiles/" + goldenFilePath + "/" + variant + "/" + goldenFileName);
+ if (goldenFile.exists())
break;
- }
- }
- assertNotNull(item);
-
- JEditorPane editor = new JEditorPane();
- editor.setDocument(doc);
- editor.setCaretPosition(caretPos + textToInsertLength);
- item.defaultAction(editor);
+ }
+ assertNotNull(goldenFile);
+ return goldenFile;
+ }
- File output = new File(getWorkDir(), getName() + ".out2");
- Writer out = new FileWriter(output);
- out.write(doc.getText(0, doc.getLength()));
- out.close();
+ private List<String> computeVersionVariantsFor(String version) {
+ int dot = version.indexOf('.');
+ version = version.substring(dot + 1);
+ int versionNum = Integer.parseInt(version);
+ List<String> versions = new ArrayList<>();
- File goldenFile = new File(getDataDir(), "/goldenfiles/org/netbeans/modules/java/editor/completion/JavaCompletionProviderTest/" + version + goldenFileName);
- File diffFile = new File(getWorkDir(), getName() + ".diff");
+ for (int v = versionNum; v >= 8; v--) {
+ versions.add(v != 8 ? "" + v : "1." + v);
+ }
- assertFile(output, goldenFile, diffFile, new WhitespaceIgnoringDiff());
-
- LifecycleManager.getDefault().saveAll();
+ return versions;
}
- private void copyToWorkDir(File resource, File toFile) throws IOException {
+ protected void copyToWorkDir(File resource, File toFile) throws IOException {
InputStream is = new FileInputStream(resource);
OutputStream outs = new FileOutputStream(toFile);
int read;
@@ -293,10 +240,10 @@ public class CompletionTestBase extends NbTestCase {
outs.close();
is.close();
}
-
- private static ClassPath createClassPath(String classpath) {
+
+ protected static ClassPath createClassPath(String classpath) {
StringTokenizer tokenizer = new StringTokenizer(classpath, File.pathSeparator);
- List/*<PathResourceImplementation>*/ list = new ArrayList();
+ List list = new ArrayList();
while (tokenizer.hasMoreTokens()) {
String item = tokenizer.nextToken();
File f = FileUtil.normalizeFile(new File(item));
@@ -307,7 +254,7 @@ public class CompletionTestBase extends NbTestCase {
}
return ClassPathSupport.createClassPath(list);
}
-
+
// XXX this method could probably be removed... use standard FileUtil stuff
private static URL getRootURL (File f) {
URL url = null;
@@ -326,10 +273,11 @@ public class CompletionTestBase extends NbTestCase {
}
return url;
}
-
+
private static boolean isArchiveFile(File f) {
// the f might not exist and so you cannot use e.g. f.isFile() here
String fileName = f.getName().toLowerCase();
return fileName.endsWith(".jar") || fileName.endsWith(".zip"); //NOI18N
- }
+ }
+
}
diff --git a/java.editor/nbproject/project.xml b/java.editor/nbproject/project.xml
index 98e7858..427bf0d 100644
--- a/java.editor/nbproject/project.xml
+++ b/java.editor/nbproject/project.xml
@@ -525,6 +525,11 @@
<test/>
</test-dependency>
<test-dependency>
+ <code-name-base>org.netbeans.modules.java.completion</code-name-base>
+ <compile-dependency/>
+ <test/>
+ </test-dependency>
+ <test-dependency>
<code-name-base>org.netbeans.modules.java.editor</code-name-base>
<recursive/>
<compile-dependency/>
@@ -536,6 +541,7 @@
</test-dependency>
<test-dependency>
<code-name-base>org.netbeans.modules.java.j2seplatform</code-name-base>
+ <recursive/>
<compile-dependency/>
</test-dependency>
<test-dependency>
diff --git a/java.editor/test/unit/data/goldenfiles/org/netbeans/modules/java/editor/completion/JavaCompletionProviderTest/1.8/testAnnotation.pass2 b/java.editor/test/unit/data/goldenfiles/org/netbeans/modules/java/editor/completion/JavaCompletionProviderTest/1.8/testAnnotation.pass2
new file mode 100644
index 0000000..0d63d9d
--- /dev/null
+++ b/java.editor/test/unit/data/goldenfiles/org/netbeans/modules/java/editor/completion/JavaCompletionProviderTest/1.8/testAnnotation.pass2
@@ -0,0 +1,10 @@
+package test;
+
+import java.util.Set;
+
+@Annotation(Set.class)
+public @interface Annotation {
+
+ public Class<java.util.Set> value();
+
+}
diff --git a/java.editor/test/unit/data/goldenfiles/org/netbeans/modules/java/editor/completion/JavaCompletionProviderTest/1.8/testFieldInitializer.pass2 b/java.editor/test/unit/data/goldenfiles/org/netbeans/modules/java/editor/completion/JavaCompletionProviderTest/1.8/testFieldInitializer.pass2
new file mode 100644
index 0000000..8ad5577
--- /dev/null
+++ b/java.editor/test/unit/data/goldenfiles/org/netbeans/modules/java/editor/completion/JavaCompletionProviderTest/1.8/testFieldInitializer.pass2
@@ -0,0 +1,10 @@
+package test;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class FieldSet {
+
+ public Set<String> field = new HashSet<String>;
+
+}
diff --git a/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/Annotation.java b/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/Annotation.java
new file mode 100644
index 0000000..afd0330
--- /dev/null
+++ b/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/Annotation.java
@@ -0,0 +1,8 @@
+package test;
+
+@Annotation()
+public @interface Annotation {
+
+ public Class<java.util.Set> value();
+
+}
diff --git a/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/FieldSet.java b/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/FieldSet.java
new file mode 100644
index 0000000..559abf2
--- /dev/null
+++ b/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/FieldSet.java
@@ -0,0 +1,9 @@
+package test;
+
+import java.util.Set;
+
+public class FieldSet {
+
+ public Set<String> field;
+
+}
diff --git a/java.editor/test/unit/src/org/netbeans/modules/java/editor/completion/CompletionTestBase.java b/java.editor/test/unit/src/org/netbeans/modules/java/editor/completion/CompletionTestBase.java
index 2f788d7..1505d18 100644
--- a/java.editor/test/unit/src/org/netbeans/modules/java/editor/completion/CompletionTestBase.java
+++ b/java.editor/test/unit/src/org/netbeans/modules/java/editor/completion/CompletionTestBase.java
@@ -20,209 +20,41 @@
package org.netbeans.modules.java.editor.completion;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
import java.io.Writer;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
import java.util.Collections;
-import java.util.Enumeration;
-import java.util.LinkedList;
import java.util.List;
-import java.util.StringTokenizer;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.prefs.Preferences;
import java.util.regex.Pattern;
import javax.swing.JEditorPane;
+import javax.swing.SwingUtilities;
import javax.swing.text.Document;
-import junit.framework.Assert;
-
-import org.netbeans.api.editor.mimelookup.MimeLookup;
-import org.netbeans.api.editor.mimelookup.MimePath;
-import org.netbeans.api.java.classpath.ClassPath;
import org.netbeans.api.java.lexer.JavaTokenId;
-import org.netbeans.api.java.source.ClasspathInfo;
-import org.netbeans.api.java.source.CompilationController;
-import org.netbeans.api.java.source.JavaSource;
-import org.netbeans.api.java.source.SourceUtilsTestUtil2;
-import org.netbeans.api.java.source.Task;
import org.netbeans.api.java.source.gen.WhitespaceIgnoringDiff;
import org.netbeans.api.lexer.Language;
-import org.netbeans.core.startup.Main;
-import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.editor.completion.CompletionItemComparator;
import org.netbeans.modules.editor.java.JavaCompletionProvider;
import org.netbeans.modules.editor.java.JavaKit;
-import org.netbeans.modules.java.JavaDataLoader;
-import org.netbeans.modules.java.source.indexing.TransactionContext;
-import org.netbeans.modules.java.source.parsing.JavacParserFactory;
-import org.netbeans.modules.java.source.usages.BinaryAnalyser;
-import org.netbeans.modules.java.source.usages.ClassIndexImpl;
-import org.netbeans.modules.java.source.usages.ClassIndexManager;
-import org.netbeans.modules.java.source.usages.IndexUtil;
+import org.netbeans.modules.java.completion.CompletionTestBaseBase;
import org.netbeans.modules.parsing.api.Source;
import org.netbeans.spi.editor.completion.CompletionItem;
import org.netbeans.spi.editor.completion.CompletionProvider;
-import org.netbeans.spi.editor.mimelookup.MimeDataProvider;
-import org.netbeans.spi.java.classpath.ClassPathProvider;
-import org.netbeans.spi.java.classpath.support.ClassPathSupport;
-import org.netbeans.spi.java.queries.SourceLevelQueryImplementation;
import org.openide.LifecycleManager;
import org.openide.cookies.EditorCookie;
import org.openide.filesystems.FileObject;
-import org.openide.filesystems.FileSystem;
import org.openide.filesystems.FileUtil;
-import org.openide.filesystems.MultiFileSystem;
-import org.openide.filesystems.Repository;
-import org.openide.filesystems.XMLFileSystem;
import org.openide.loaders.DataObject;
-import org.openide.util.Lookup;
-import org.openide.util.SharedClassObject;
-import org.openide.util.lookup.Lookups;
-import org.openide.util.lookup.ProxyLookup;
/**
*
* @author Dusan Balek, Jan Lahoda
*/
-public class CompletionTestBase extends NbTestCase {
-
- static {
- JavaCompletionItemElementCreatingTest.class.getClassLoader().setDefaultAssertionStatus(true);
- System.setProperty("org.openide.util.Lookup", Lkp.class.getName());
- Assert.assertEquals(Lkp.class, Lookup.getDefault().getClass());
-
- SourceUtilsTestUtil2.disableArtificalParameterNames();
- }
-
- static final int FINISH_OUTTIME = 5 * 60 * 1000;
-
- public static class Lkp extends ProxyLookup {
-
- private static Lkp DEFAULT;
-
- public Lkp() {
- Assert.assertNull(DEFAULT);
- DEFAULT = this;
- }
-
- public static void initLookups(Object[] objs) throws Exception {
- ClassLoader l = Lkp.class.getClassLoader();
- DEFAULT.setLookups(new Lookup [] {
- Lookups.fixed(objs),
- Lookups.metaInfServices(l),
- Lookups.singleton(l)
- });
- }
- }
+public class CompletionTestBase extends CompletionTestBaseBase {
public CompletionTestBase(String testName) {
- super(testName);
- }
-
- private final AtomicReference<String> sourceLevel = new AtomicReference<String>();
-
- protected void setUp() throws Exception {
-// this call did not do anything
-// GlobalSourcePathTestUtil.setUseLibraries (false);
- XMLFileSystem system = new XMLFileSystem();
- system.setXmlUrls(prepareLayers("META-INF/generated-layer.xml",
- "org/netbeans/modules/java/editor/resources/layer.xml",
- "org/netbeans/modules/defaults/mf-layer.xml"));
- Repository repository = new Repository(new MultiFileSystem(new FileSystem[] {FileUtil.createMemoryFileSystem(), system}));
- final ClassPath bootPath = createClassPath(System.getProperty("sun.boot.class.path"));
- ClassPathProvider cpp = new ClassPathProvider() {
- public ClassPath findClassPath(FileObject file, String type) {
- try {
- if (type == ClassPath.SOURCE) {
- return ClassPathSupport.createClassPath(new FileObject[]{FileUtil.toFileObject(getWorkDir())});
- }
- if (type == ClassPath.COMPILE) {
- return ClassPathSupport.createClassPath(new FileObject[0]);
- }
- if (type == ClassPath.BOOT) {
- return bootPath;
- }
- } catch (IOException ex) {}
- return null;
- }
- };
- SharedClassObject loader = JavaDataLoader.findObject(JavaDataLoader.class, true);
- MimeDataProvider mdp = new MimeDataProvider() {
- public Lookup getLookup(MimePath mimePath) {
- return Lookups.fixed(new JavaKit(), new JavacParserFactory());
- }
- };
- SourceLevelQueryImplementation slq = new SourceLevelQueryImplementation() {
- @Override public String getSourceLevel(FileObject javaFile) {
- return sourceLevel.get();
- }
- };
- Lkp.initLookups(new Object[] {repository, loader, cpp, mdp, slq});
- File cacheFolder = new File(getWorkDir(), "var/cache/index");
- cacheFolder.mkdirs();
- IndexUtil.setCacheFolder(cacheFolder);
- JEditorPane.registerEditorKitForContentType("text/x-java", "org.netbeans.modules.editor.java.JavaKit");
- final ClassPath sourcePath = ClassPathSupport.createClassPath(new FileObject[] {FileUtil.toFileObject(getDataDir())});
- final ClassIndexManager mgr = ClassIndexManager.getDefault();
- for (ClassPath.Entry entry : sourcePath.entries()) {
- TransactionContext tx = TransactionContext.beginStandardTransaction(entry.getURL(), true, ()->true, false);
- try {
- mgr.createUsagesQuery(entry.getURL(), true);
- } finally {
- tx.commit();
- }
- }
- final ClasspathInfo cpInfo = ClasspathInfo.create(bootPath, ClassPathSupport.createClassPath(new URL[0]), sourcePath);
- assertNotNull(cpInfo);
- final JavaSource js = JavaSource.create(cpInfo);
- assertNotNull(js);
- js.runUserActionTask(new Task<CompilationController>() {
- public void run(CompilationController parameter) throws Exception {
- for (ClassPath.Entry entry : bootPath.entries()) {
- final URL url = entry.getURL();
- TransactionContext.beginStandardTransaction(entry.getURL(), false, ()->true, false);
- try {
- final ClassIndexImpl cii = mgr.createUsagesQuery(url, false);
- BinaryAnalyser ba = cii.getBinaryAnalyser();
- ba.analyse(url);
- } finally {
- TransactionContext.get().commit();
- }
- }
- }
- }, true);
- Main.initializeURLFactory();
- Preferences preferences = MimeLookup.getLookup(JavaTokenId.language().mimeType()).lookup(Preferences.class);
- preferences.putBoolean("completion-case-sensitive", true);
- }
-
- private URL[] prepareLayers(String... paths) throws IOException {
- List<URL> layers = new LinkedList<URL>();
-
- for (int cntr = 0; cntr < paths.length; cntr++) {
- boolean found = false;
-
- for (Enumeration<URL> en = Thread.currentThread().getContextClassLoader().getResources(paths[cntr]); en.hasMoreElements(); ) {
- found = true;
- layers.add(en.nextElement());
- }
-
- Assert.assertTrue(paths[cntr], found);
- }
-
- return layers.toArray(new URL[0]);
- }
-
- protected void tearDown() throws Exception {
+ super(testName, "org/netbeans/modules/java/editor/completion/JavaCompletionProviderTest");
}
protected void performTest(String source, int caretPos, String textToInsert, String toPerformItemRE, String goldenFileName) throws Exception {
@@ -251,8 +83,6 @@ public class CompletionTestBase extends NbTestCase {
List<? extends CompletionItem> items = JavaCompletionProvider.query(s, CompletionProvider.COMPLETION_QUERY_TYPE, caretPos + textToInsertLength, caretPos + textToInsertLength);
Collections.sort(items, CompletionItemComparator.BY_PRIORITY);
- String version = System.getProperty("java.specification.version") + "/";
-
assertNotNull(goldenFileName);
Pattern p = Pattern.compile(toPerformItemRE);
@@ -266,16 +96,21 @@ public class CompletionTestBase extends NbTestCase {
assertNotNull(item);
JEditorPane editor = new JEditorPane();
+ SwingUtilities.invokeAndWait(() -> {
+ editor.setEditorKit(new JavaKit());
+ });
editor.setDocument(doc);
editor.setCaretPosition(caretPos + textToInsertLength);
item.defaultAction(editor);
+ SwingUtilities.invokeAndWait(() -> {});
+
File output = new File(getWorkDir(), getName() + ".out2");
Writer out = new FileWriter(output);
out.write(doc.getText(0, doc.getLength()));
out.close();
- File goldenFile = new File(getDataDir(), "/goldenfiles/org/netbeans/modules/java/editor/completion/JavaCompletionProviderTest/" + version + goldenFileName);
+ File goldenFile = getGoldenFile(goldenFileName);
File diffFile = new File(getWorkDir(), getName() + ".diff");
assertFile(output, goldenFile, diffFile, new WhitespaceIgnoringDiff());
@@ -283,53 +118,4 @@ public class CompletionTestBase extends NbTestCase {
LifecycleManager.getDefault().saveAll();
}
- private void copyToWorkDir(File resource, File toFile) throws IOException {
- InputStream is = new FileInputStream(resource);
- OutputStream outs = new FileOutputStream(toFile);
- int read;
- while ((read = is.read()) != (-1)) {
- outs.write(read);
- }
- outs.close();
- is.close();
- }
-
- private static ClassPath createClassPath(String classpath) {
- StringTokenizer tokenizer = new StringTokenizer(classpath, File.pathSeparator);
- List/*<PathResourceImplementation>*/ list = new ArrayList();
- while (tokenizer.hasMoreTokens()) {
- String item = tokenizer.nextToken();
- File f = FileUtil.normalizeFile(new File(item));
- URL url = getRootURL(f);
- if (url!=null) {
- list.add(ClassPathSupport.createResource(url));
- }
- }
- return ClassPathSupport.createClassPath(list);
- }
-
- // XXX this method could probably be removed... use standard FileUtil stuff
- private static URL getRootURL (File f) {
- URL url = null;
- try {
- if (isArchiveFile(f)) {
- url = FileUtil.getArchiveRoot(f.toURI().toURL());
- } else {
- url = f.toURI().toURL();
- String surl = url.toExternalForm();
- if (!surl.endsWith("/")) {
- url = new URL(surl+"/");
- }
- }
- } catch (MalformedURLException e) {
- throw new AssertionError(e);
- }
- return url;
- }
-
- private static boolean isArchiveFile(File f) {
- // the f might not exist and so you cannot use e.g. f.isFile() here
- String fileName = f.getName().toLowerCase();
- return fileName.endsWith(".jar") || fileName.endsWith(".zip"); //NOI18N
- }
}
diff --git a/java.editor/test/unit/src/org/netbeans/modules/java/editor/completion/JavaCompletionItemPerformTest.java b/java.editor/test/unit/src/org/netbeans/modules/java/editor/completion/JavaCompletionItemPerformTest.java
new file mode 100644
index 0000000..778d4b0
--- /dev/null
+++ b/java.editor/test/unit/src/org/netbeans/modules/java/editor/completion/JavaCompletionItemPerformTest.java
@@ -0,0 +1,39 @@
+/*
+ * 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.editor.completion;
+
+/**
+ *
+ * @author Jan Lahoda, Dusan Balek
+ */
+public class JavaCompletionItemPerformTest extends CompletionTestBase {
+
+ public JavaCompletionItemPerformTest(String testName) {
+ super(testName);
+ }
+
+ public void testFieldInitializer() throws Exception {
+ performTest("FieldSet", 91, " = new HashS", "HashSet", "testFieldInitializer.pass2");
+ }
+
+ public void testAnnotation() throws Exception {
+ performTest("Annotation", 27, "Se", "Set", "testAnnotation.pass2");
+ }
+}
\ No newline at end of file
diff --git a/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java b/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java
index 9ff0e2c..2e82805 100644
--- a/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java
+++ b/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java
@@ -424,7 +424,17 @@ public class SourceUtils {
importScope.prependSubScope(((PackageSymbol)toImport).members());
unit.starImportScope = importScope;
} else {
- NamedImportScope importScope = new NamedImportScope(unit.packge, unit.toplevelScope);
+ Class<NamedImportScope> nisClazz = NamedImportScope.class;
+ NamedImportScope importScope;
+ try {
+ importScope = nisClazz.getConstructor(Symbol.class, com.sun.tools.javac.code.Scope.class).newInstance(unit.packge, unit.toplevelScope);
+ } catch (ReflectiveOperationException ex) {
+ try {
+ importScope = nisClazz.getConstructor(Symbol.class).newInstance(unit.packge);
+ } catch (ReflectiveOperationException ex2) {
+ throw new IllegalStateException(ex2);
+ }
+ }
for (Symbol symbol : unit.namedImportScope.getSymbols()) {
importScope.importType(symbol.owner.members(), symbol.owner.members(), symbol);
}
diff --git a/java.source.base/src/org/netbeans/api/java/source/TreeUtilities.java b/java.source.base/src/org/netbeans/api/java/source/TreeUtilities.java
index 3fe8b71..804ddf3 100644
--- a/java.source.base/src/org/netbeans/api/java/source/TreeUtilities.java
+++ b/java.source.base/src/org/netbeans/api/java/source/TreeUtilities.java
@@ -872,6 +872,9 @@ public final class TreeUtilities {
Env<AttrContext> env = getEnv(scope);
if (tree instanceof JCExpression)
return attr.attribExpr((JCTree) tree,env, Type.noType);
+ if (env.tree != null && env.tree.getKind() == Kind.VARIABLE) {
+ env = env.next;
+ }
return attr.attribStat((JCTree) tree,env);
} finally {
// cacheContext.leave();
diff --git a/java.source.base/test/unit/src/org/netbeans/api/java/source/TreeUtilitiesTest.java b/java.source.base/test/unit/src/org/netbeans/api/java/source/TreeUtilitiesTest.java
index 7bbbf5e..f555807 100644
--- a/java.source.base/test/unit/src/org/netbeans/api/java/source/TreeUtilitiesTest.java
+++ b/java.source.base/test/unit/src/org/netbeans/api/java/source/TreeUtilitiesTest.java
@@ -25,6 +25,7 @@ import com.sun.source.tree.ExpressionTree;
import com.sun.source.tree.MemberSelectTree;
import com.sun.source.tree.MethodTree;
import com.sun.source.tree.Scope;
+import com.sun.source.tree.StatementTree;
import com.sun.source.tree.Tree;
import com.sun.source.tree.Tree.Kind;
import com.sun.source.tree.VariableTree;
@@ -41,6 +42,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.regex.Pattern;
+import javax.lang.model.element.Element;
import javax.lang.model.type.TypeMirror;
import org.netbeans.api.java.classpath.ClassPath;
import org.netbeans.api.java.source.Comment.Style;
@@ -585,6 +587,38 @@ public class TreeUtilitiesTest extends NbTestCase {
}, true);
}
+ public void testAttributingVar() throws Exception {
+ ClassPath boot = ClassPathSupport.createClassPath(SourceUtilsTestUtil.getBootClassPath().toArray(new URL[0]));
+ FileObject testFile = FileUtil.createData(FileUtil.createMemoryFileSystem().getRoot(), "Test.java");
+ try (Writer w = new OutputStreamWriter(testFile.getOutputStream())) {
+ w.append("public class Test { private static int I; }");
+ }
+ JavaSource js = JavaSource.create(ClasspathInfo.create(boot, ClassPath.EMPTY, ClassPath.EMPTY), testFile);
+ js.runUserActionTask(new Task<CompilationController>() {
+ @Override
+ public void run(CompilationController parameter) throws Exception {
+ parameter.toPhase(Phase.RESOLVED);
+ TreePath clazzPath = new TreePath(new TreePath(new TreePath(parameter.getCompilationUnit()),
+ parameter.getCompilationUnit().getTypeDecls().get(0)),
+ ((ClassTree) parameter.getCompilationUnit().getTypeDecls().get(0)).getMembers().get(1));
+ Scope scope = parameter.getTrees().getScope(clazzPath);
+ StatementTree st = parameter.getTreeUtilities().parseStatement("{ String s; }", new SourcePositions[1]);
+ assertEquals(Kind.BLOCK, st.getKind());
+ StatementTree var = st.getKind() == Kind.BLOCK ? ((BlockTree) st).getStatements().get(0) : st;
+ parameter.getTreeUtilities().attributeTree(st, scope);
+ checkType(parameter, clazzPath, var);
+ }
+ }, true);
+ }
+
+ private void checkType(CompilationInfo info, TreePath base, StatementTree st) {
+ TreePath tp = new TreePath(base, st);
+ Element el = info.getTrees().getElement(tp);
+
+ assertNotNull(el);
+ assertEquals("s", el.toString());
+ }
+
public void testIsEndOfCompoundVariableDeclaration() throws Exception {
prepareTest("Test", "package test; public class Test {public Test(){int i = 10, j = 11;}}");
TreePath tp = info.getTreeUtilities().pathFor(47);
---------------------------------------------------------------------
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
[incubator-netbeans] 04/05: Generalizing golden file lookup.
Posted by jl...@apache.org.
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/incubator-netbeans.git
commit 7b6fd7540b4b7c829b881d24ba61a9d16567b990
Author: Jan Lahoda <jl...@netbeans.org>
AuthorDate: Sat Jun 30 12:27:36 2018 +0200
Generalizing golden file lookup.
---
.../java/completion/CompletionTestBase.java | 23 +++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/java.completion/test/unit/src/org/netbeans/modules/java/completion/CompletionTestBase.java b/java.completion/test/unit/src/org/netbeans/modules/java/completion/CompletionTestBase.java
index 428ce16..47a095f 100644
--- a/java.completion/test/unit/src/org/netbeans/modules/java/completion/CompletionTestBase.java
+++ b/java.completion/test/unit/src/org/netbeans/modules/java/completion/CompletionTestBase.java
@@ -266,7 +266,7 @@ public class CompletionTestBase extends NbTestCase {
File goldenFile = null;
String version = System.getProperty("java.specification.version");
- for (String variant : VERSION_VARIANTS.get(version)) {
+ for (String variant : computeVersionVariantsFor(version)) {
goldenFile = new File(getDataDir(), "/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/" + variant + "/" + goldenFileName);
if (goldenFile.exists())
break;
@@ -278,16 +278,17 @@ public class CompletionTestBase extends NbTestCase {
LifecycleManager.getDefault().saveAll();
}
- private static final Map<String, List<String>> VERSION_VARIANTS = new HashMap<>();
-
- static {
- VERSION_VARIANTS.put("1.8", Arrays.asList("1.8"));
- VERSION_VARIANTS.put("9", Arrays.asList("9", "1.8"));
- VERSION_VARIANTS.put("1.9", Arrays.asList("9", "1.8"));
- VERSION_VARIANTS.put("10", Arrays.asList("10", "9", "1.8"));
- VERSION_VARIANTS.put("1.10", Arrays.asList("10", "9", "1.8"));
- VERSION_VARIANTS.put("11", Arrays.asList("11", "10", "9", "1.8"));
- VERSION_VARIANTS.put("1.11", Arrays.asList("11", "10", "9", "1.8"));
+ private List<String> computeVersionVariantsFor(String version) {
+ int dot = version.indexOf('.');
+ version = version.substring(dot + 1);
+ int versionNum = Integer.parseInt(version);
+ List<String> versions = new ArrayList<>();
+
+ for (int v = versionNum; v >= 8; v--) {
+ versions.add(v != 8 ? "" + v : "1." + v);
+ }
+
+ return versions;
}
private void copyToWorkDir(File resource, File toFile) throws IOException {
---------------------------------------------------------------------
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
[incubator-netbeans] 03/05: A few completion fixes.
Posted by jl...@apache.org.
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/incubator-netbeans.git
commit 78a5e0a915dca39b9f5fdfc497f5527ae3c27583
Author: Jan Lahoda <jl...@netbeans.org>
AuthorDate: Mon Jun 25 22:51:42 2018 +0200
A few completion fixes.
---
.../11/OverrideAbstractList.pass | 172 ++++++++++++++++++++
.../11/OverrideAbstractListAbstract.pass | 174 +++++++++++++++++++++
.../11/OverrideAbstractListWithPrefix.pass | 4 +
.../netbeans/api/java/source/TreeUtilities.java | 40 ++++-
lib.nbjavac/manifest.mf | 2 +-
.../org/netbeans/lib/nbjavac/services/NBAttr.java | 38 +++++
.../lib/nbjavac/services/NBJavacTrees.java | 8 +
7 files changed, 431 insertions(+), 7 deletions(-)
diff --git a/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/11/OverrideAbstractList.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/11/OverrideAbstractList.pass
new file mode 100644
index 0000000..0636e28
--- /dev/null
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/11/OverrideAbstractList.pass
@@ -0,0 +1,172 @@
+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
+private
+protected
+public
+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
+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.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/11/OverrideAbstractListAbstract.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/11/OverrideAbstractListAbstract.pass
new file mode 100644
index 0000000..a99f3ec
--- /dev/null
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/11/OverrideAbstractListAbstract.pass
@@ -0,0 +1,174 @@
+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
+private
+protected
+public
+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
+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.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/11/OverrideAbstractListWithPrefix.pass b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/11/OverrideAbstractListWithPrefix.pass
new file mode 100644
index 0000000..777d50c
--- /dev/null
+++ b/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/11/OverrideAbstractListWithPrefix.pass
@@ -0,0 +1,4 @@
+public Object[] toArray() - override
+public default Object[] toArray(IntFunction arg0) - override
+public Object[] toArray(Object[] arg0) - override
+public String toString() - override
diff --git a/java.source.base/src/org/netbeans/api/java/source/TreeUtilities.java b/java.source.base/src/org/netbeans/api/java/source/TreeUtilities.java
index b6b8d51..3fe8b71 100644
--- a/java.source.base/src/org/netbeans/api/java/source/TreeUtilities.java
+++ b/java.source.base/src/org/netbeans/api/java/source/TreeUtilities.java
@@ -92,6 +92,7 @@ import org.netbeans.api.java.lexer.JavadocTokenId;
import org.netbeans.api.java.source.JavaSource.Phase;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.lib.nbjavac.services.CancelService;
+import org.netbeans.lib.nbjavac.services.NBAttr;
import org.netbeans.lib.nbjavac.services.NBParserFactory;
import org.netbeans.lib.nbjavac.services.NBResolve;
import org.netbeans.lib.nbjavac.services.NBTreeMaker.IndexedClassDecl;
@@ -377,6 +378,21 @@ public final class TreeUtilities {
return super.visitMethod(node, p);
}
+ @Override
+ public Void visitEnhancedForLoop(EnhancedForLoopTree node, Void p) {
+ int exprEndPos = (int) sourcePositions.getEndPosition(getCurrentPath().getCompilationUnit(), node.getExpression());
+ TokenSequence<JavaTokenId> ts = info.getTokenHierarchy().tokenSequence(JavaTokenId.language()).subSequence(exprEndPos, pos);
+ boolean hasNonWhiteSpace;
+ while (hasNonWhiteSpace = ts.moveNext()) {
+ if (!IGNORE_TOKENS.contains(ts.token().id()))
+ break;
+ }
+ if (!hasNonWhiteSpace) {
+ pos = exprEndPos;
+ }
+ return super.visitEnhancedForLoop(node, p);
+ }
+
}
try {
@@ -388,7 +404,7 @@ public final class TreeUtilities {
if (path.getLeaf() == path.getCompilationUnit())
return path;
- TokenSequence<JavaTokenId> tokenList = tokensFor(path.getLeaf(), sourcePositions);
+ TokenSequence<JavaTokenId> tokenList = tokensFor(path.getLeaf(), sourcePositions, pos);
tokenList.moveEnd();
if (tokenList.movePrevious() && tokenList.offset() < pos) {
switch (tokenList.token().id()) {
@@ -413,6 +429,11 @@ public final class TreeUtilities {
(path.getLeaf().getKind() == Tree.Kind.FOR_LOOP &&
tokenList.offset() <= sourcePositions.getStartPosition(path.getCompilationUnit(), ((ForLoopTree)path.getLeaf()).getUpdate().get(0))))
break;
+ if (path.getParentPath().getLeaf().getKind() == Tree.Kind.TRY &&
+ ((TryTree) path.getParentPath().getLeaf()).getResources().contains(path.getLeaf())) {
+ path = path.getParentPath();
+ break;
+ }
case RBRACE:
path = path.getParentPath();
switch (path.getLeaf().getKind()) {
@@ -438,6 +459,11 @@ public final class TreeUtilities {
return path;
}
+ private static final Set<JavaTokenId> IGNORE_TOKENS = EnumSet.of(
+ JavaTokenId.BLOCK_COMMENT, JavaTokenId.JAVADOC_COMMENT,
+ JavaTokenId.LINE_COMMENT, JavaTokenId.WHITESPACE
+ );
+
/**Return the deepest DocTreePath at the given position.
*
* @param treepath for which the {@code doc} comment was determined
@@ -872,11 +898,9 @@ public final class TreeUtilities {
// ArgumentAttr argumentAttr = ArgumentAttr.instance(jti.getContext());
// ArgumentAttr.LocalCacheContext cacheContext = argumentAttr.withLocalCacheContext();
try {
- Attr attr = Attr.instance(jti.getContext());
+ NBAttr attr = (NBAttr) NBAttr.instance(jti.getContext());
Env<AttrContext> env = getEnv(scope);
- Env<AttrContext> result = tree instanceof JCExpression ?
- attr.attribExprToTree((JCExpression) tree, env, (JCTree) to) :
- attr.attribStatToTree((JCTree) tree, env, (JCTree) to);
+ Env<AttrContext> result = attr.attributeAndCapture((JCTree) tree, env, (JCTree) to);
try {
Constructor<JavacScope> c = JavacScope.class.getDeclaredConstructor(Env.class);
c.setAccessible(true);
@@ -902,10 +926,14 @@ public final class TreeUtilities {
/**Returns tokens for a given tree. Uses specified {@link SourcePositions}.
*/
public TokenSequence<JavaTokenId> tokensFor(Tree tree, SourcePositions sourcePositions) {
+ return tokensFor(tree, sourcePositions, -1);
+ }
+
+ private TokenSequence<JavaTokenId> tokensFor(Tree tree, SourcePositions sourcePositions, int farEnd) {
int start = (int)sourcePositions.getStartPosition(info.getCompilationUnit(), tree);
int end = (int)sourcePositions.getEndPosition(info.getCompilationUnit(), tree);
- return info.getTokenHierarchy().tokenSequence(JavaTokenId.language()).subSequence(start, end);
+ return info.getTokenHierarchy().tokenSequence(JavaTokenId.language()).subSequence(start, Math.max(end, farEnd));
}
/**
diff --git a/lib.nbjavac/manifest.mf b/lib.nbjavac/manifest.mf
index 34b826a..2138359 100644
--- a/lib.nbjavac/manifest.mf
+++ b/lib.nbjavac/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.lib.nbjavac
-OpenIDE-Module-Implementation-Version: 2
+OpenIDE-Module-Implementation-Version: 3
OpenIDE-Module-Localizing-Bundle: org/netbeans/lib/nbjavac/Bundle.properties
diff --git a/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBAttr.java b/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBAttr.java
index fae511d..f693de8 100644
--- a/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBAttr.java
+++ b/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBAttr.java
@@ -21,11 +21,15 @@ package org.netbeans.lib.nbjavac.services;
import com.sun.tools.javac.comp.Attr;
import com.sun.tools.javac.comp.AttrContext;
import com.sun.tools.javac.comp.Env;
+import com.sun.tools.javac.tree.JCTree;
import com.sun.tools.javac.tree.JCTree.JCBlock;
import com.sun.tools.javac.tree.JCTree.JCClassDecl;
+import com.sun.tools.javac.tree.JCTree.JCExpression;
import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
import com.sun.tools.javac.tree.JCTree.JCNewClass;
import com.sun.tools.javac.util.Context;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
import java.lang.reflect.Field;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -85,4 +89,38 @@ public class NBAttr extends Attr {
}
}
+ private boolean fullyAttribute;
+ private Env<AttrContext> fullyAttributeResult;
+
+ protected void breakTreeFound(Env<AttrContext> env) {
+ if (fullyAttribute) {
+ fullyAttributeResult = env;
+ } else {
+ try {
+ MethodHandles.lookup()
+ .findSpecial(Attr.class, "breakTreeFound", MethodType.methodType(void.class, Env.class), NBAttr.class)
+ .invokeExact(this, env);
+ } catch (Throwable ex) {
+ sneakyThrows(ex);
+ }
+ }
+ }
+
+ private <T extends Throwable> void sneakyThrows(Throwable t) throws T {
+ throw (T) t;
+ }
+
+ public Env<AttrContext> attributeAndCapture(JCTree tree, Env<AttrContext> env, JCTree to) {
+ try {
+ fullyAttribute = true;
+
+ Env<AttrContext> result = tree instanceof JCExpression ?
+ attribExprToTree((JCExpression) tree, env, (JCTree) to) :
+ attribStatToTree((JCTree) tree, env, (JCTree) to);
+
+ return fullyAttributeResult != null ? fullyAttributeResult : result;
+ } finally {
+ fullyAttribute = false;
+ }
+ }
}
diff --git a/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBJavacTrees.java b/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBJavacTrees.java
index b13abc7..aa50942 100644
--- a/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBJavacTrees.java
+++ b/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBJavacTrees.java
@@ -22,7 +22,9 @@ import com.sun.source.doctree.DocCommentTree;
import com.sun.source.tree.ClassTree;
import com.sun.source.util.TreePath;
import com.sun.tools.javac.api.JavacTrees;
+import com.sun.tools.javac.code.Symbol;
import com.sun.tools.javac.tree.JCTree;
+import com.sun.tools.javac.tree.TreeInfo;
import com.sun.tools.javac.tree.TreeMaker;
import com.sun.tools.javac.util.Context;
import java.util.HashMap;
@@ -73,4 +75,10 @@ public class NBJavacTrees extends JavacTrees {
void addPathForElement(Element elem, TreePath path) {
element2paths.put(elem, path);
}
+
+ @Override
+ public Symbol getElement(TreePath path) {
+ return TreeInfo.symbolFor((JCTree) path.getLeaf());
+ }
+
}
---------------------------------------------------------------------
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