This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch release121 in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 95e4be413811ba9206721bb39c97523022a0180c Merge: 08d65f1 de911d2 Author: Neil C Smith <neilcsm...@apache.org> AuthorDate: Tue Aug 11 13:00:29 2020 +0100 Merge pull request #2276 from apache/master Sync master to release121 for 12.1-beta2 README.md | 4 +- .../modules/cpplite/editor/UnconfiguredHint.java | 10 +- .../org/netbeans/modules/cpplite/editor/Utils.java | 94 +++ .../cpplite/editor/lsp/LanguageServerImpl.java | 118 ++- .../cpplite/editor/lsp/options/Bundle.properties | 6 +- .../cpplite/editor/lsp/options/CPPLitePanel.form | 87 +- .../cpplite/editor/lsp/options/CPPLitePanel.java | 101 ++- .../editor/spi/CProjectConfigurationProvider.java | 3 + .../CPPLiteCProjectConfigurationProvider.java | 27 +- enterprise/jakartaee8.api/external/binaries-list | 14 +- .../external/jakarta.batch-api-1.0.2-license.txt | 93 --- ...rta.enterprise.concurrent-api-1.1.2-license.txt | 93 --- ...jakarta.enterprise.deploy-api-1.7.2-license.txt | 94 --- .../external/jakarta.faces-api-2.3.2-license.txt | 93 --- .../external/jakarta.jms-api-2.0.3-license.txt | 93 --- .../jakarta.management.j2ee-api-1.1.4-license.txt | 93 --- .../jakarta.resource-api-1.7.4-license.txt | 93 --- .../jakarta.security.jacc-api-1.6.1-license.txt | 93 --- .../jakarta.xml.registry-api-1.0.10-license.txt | 93 --- .../external/jakarta.xml.rpc-api-1.1.4-license.txt | 93 --- .../modules/jakartaee8/api/jakartaee-api-8.0.xml | 6 +- .../jakartaee8/api/jakartaee-web-api-8.0.xml | 6 +- enterprise/jakartaee8.platform/arch.xml | 909 +++++++++++++++++++++ enterprise/jakartaee8.platform/build.xml | 47 ++ .../jakartaee8.platform}/external/binaries-list | 3 +- ...akarta.jakartaee-api-8.0.0-javadoc-license.txt} | 10 +- ...akarta.jakartaee-api-8.0.0-javadoc-license.txt} | 9 +- enterprise/jakartaee8.platform/manifest.mf | 5 + .../nbproject/project.properties | 8 +- .../jakartaee8.platform/nbproject/project.xml | 21 +- .../modules/jakartaee8/platform}/Bundle.properties | 8 +- .../modules/editor/resources/completion/record.png | Bin 0 -> 785 bytes .../org/netbeans/api/html/lexer/HTMLTokenId.java | 11 +- .../netbeans/modules/lsp/client/LSPBindings.java | 31 +- .../client/bindings/CompletionProviderImpl.java | 7 +- .../lsp/client/bindings/NavigatorPanelImpl.java | 2 +- .../TextDocumentSyncServerCapabilityHandler.java | 93 ++- .../gradle/java/customizer/Bundle.properties | 1 + .../gradle/java/customizer/SourceSetPanel.form | 30 +- .../gradle/java/customizer/SourceSetPanel.java | 39 +- .../gradle/java/queries/FileBuiltQueryImpl.java | 19 +- .../gradle/java/queries/GradleSourceForBinary.java | 27 +- .../java/completion/JavaCompletionTask.java | 273 ++++++- .../JavaCompletionTaskTest/1.8/override.pass | 1 + .../JavaCompletionTaskTest/1.8/record.pass | 1 + .../1.8/typesRecordLocalMembersAndVars.pass | 8 + .../1.8/typesRecordStaticMembersAndVars.pass | 8 + .../14/typesRecordLocalMembersAndVars.pass | 7 + .../14/typesRecordStaticMembersAndVars.pass | 7 + .../modules/java/completion/data/Records.java} | 20 +- .../JavaCompletionTask114FeaturesTest.java | 29 + .../netbeans/modules/editor/java/GoToSupport.java | 15 +- .../modules/editor/java/JavaCompletionItem.java | 22 +- .../modules/editor/java/TypingCompletion.java | 2 +- .../editor/java/TypingCompletionUnitTest.java | 12 + .../java/hints/errors/AddParameterOrLocalFix.java | 136 ++- .../modules/java/hints/errors/CreateElement.java | 6 +- .../modules/java/hints/errors/ImportClass.java | 7 +- .../hints/suggestions/ExpectedTypeResolver.java | 15 + .../hints/errors/AddParameterOrLocalFixTest.java | 5 +- .../java/hints/errors/CreateElementTest.java | 5 +- .../hints/infrastructure/ErrorHintsTestBase.java | 1 + .../hints/jdk/ConvertToPatternInstanceOfTest.java | 21 +- java/java.lsp.server/build.xml | 6 +- java/java.lsp.server/nbproject/project.xml | 5 + .../netbeans/modules/java/lsp/server/Server.java | 11 +- .../lsp/server/text/TextDocumentServiceImpl.java | 192 ++++- .../modules/java/lsp/server/ServerTest.java | 320 +++++++- java/java.lsp.server/vscode/package-lock.json | 2 +- java/java.lsp.server/vscode/package.json | 2 +- .../src/{VerifyJDK11.java => VerifyJDK14.java} | 6 +- java/java.lsp.server/vscode/src/extension.ts | 4 +- .../netbeans/modules/java/source/TreeShims.java | 9 + .../api/java/source/ElementHandleTest.java | 11 + java/java.sourceui/manifest.mf | 2 +- .../netbeans/api/java/source/ui/ElementOpen.java | 19 +- java/libs.javacapi/external/binaries-list | 2 +- ...api-license.txt => nb-javac-14-api-license.txt} | 2 +- java/libs.javacapi/manifest.mf | 1 - java/libs.javacapi/nbproject/project.xml | 2 +- .../org/netbeans/libs/javacapi/Bundle.properties | 4 - .../org/netbeans/libs/javacapi/javac-library.xml | 32 - java/libs.javacimpl/external/binaries-list | 2 +- ...pl-license.txt => nb-javac-14-impl-license.txt} | 2 +- java/libs.javacimpl/nbproject/project.xml | 2 +- .../nbproject/project.properties | 2 - .../libs/springframework/spring-framework300.xml | 2 - .../refactoring/java/ui/WhereUsedPanel.java | 5 +- .../modules/java/hints/spiimpl/Utilities.java | 57 ++ nb/updatecenters/extras/nbjavac.api/manifest.mf | 2 +- .../extras/nbjavac.api/nbproject/project.xml | 4 +- .../modules/ext/nb-javac-13-api.jar.external | 6 - .../modules/ext/nb-javac-14-api.jar.external | 6 + nb/updatecenters/extras/nbjavac.impl/manifest.mf | 2 +- .../extras/nbjavac.impl/nbproject/project.xml | 4 +- .../modules/ext/nb-javac-13-impl.jar.external | 6 - .../modules/ext/nb-javac-14-impl.jar.external | 6 + .../org/netbeans/modules/nbjavac/Bundle.properties | 2 +- nb/updatecenters/licenseinfo.xml | 4 +- nbbuild/cluster.properties | 1 + nbbuild/templates/projectized.xml | 2 +- .../modules/php/editor/csl/InstantRenamerImpl.java | 7 + .../netbeans/modules/htmlui/jfx/NbBrowsers.java | 1 + platform/openide.util.lookup/apichanges.xml | 27 + platform/openide.util.lookup/manifest.mf | 2 +- .../src/org/openide/util/lookup/ProxyLookup.java | 184 +++-- .../util/lookup/ProxyLookupFactoryMethodsTest.java | 196 +++++ 107 files changed, 3018 insertions(+), 1436 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists