This is an automated email from the ASF dual-hosted git repository. lkishalmi pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 3a2cad159a2a60665653ce83a67547f6744449ec Merge: 427251a 2ae34a2 Author: Laszlo Kishalmi <[email protected]> AuthorDate: Thu Oct 22 18:16:17 2020 -0700 Merge NetBeans 12.2-beta1 -> NetBeans 12.2-beta2 changes to master form the delivery branch. extide/gradle/external/binaries-list | 2 +- ...-bin-license.txt => gradle-6.7-bin-license.txt} | 2 +- ....2-bin-notice.txt => gradle-6.7-bin-notice.txt} | 0 extide/gradle/netbeans-gradle-tooling/build.gradle | 6 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../modules/gradle/ActionProviderImpl.java | 13 +- .../modules/gradle/NbGradleProjectImpl.java | 4 +- .../api/execute/GradleDistributionManager.java | 1 + .../modules/gradle/api/execute/RunUtils.java | 4 +- .../gradle/execute/GradleDaemonExecutor.java | 44 +++ extide/libs.gradle/external/binaries-list | 2 +- ...ense.txt => gradle-tooling-api-6.7-license.txt} | 4 +- ...otice.txt => gradle-tooling-api-6.7-notice.txt} | 0 extide/libs.gradle/nbproject/project.properties | 2 +- extide/libs.gradle/nbproject/project.xml | 2 +- .../org/netbeans/api/editor/EditorRegistry.java | 5 + .../editor/lib2/EditorApiPackageAccessor.java | 3 + ide/html.editor.lib/nbproject/project.xml | 1 + .../lsp/client/bindings/BreadcrumbsImpl.java | 3 + .../TextDocumentSyncServerCapabilityHandler.java | 141 ++++++--- ...extDocumentSyncServerCapabilityHandlerTest.java | 349 +++++++++++++++++++++ .../classpath/AbstractGradleClassPathImpl.java | 18 +- .../editor/java/JavaCodeTemplateFilter.java | 175 ++++++----- .../editor/java/JavaCodeTemplateProcessor.java | 40 ++- .../editor/java/JavaCodeTemplateProcessorTest.java | 122 ++++++- java/java.hints/nbproject/project.xml | 4 + .../netbeans/modules/java/hints/bugs/NPECheck.java | 97 +++++- .../modules/java/hints/introduce/Flow.java | 79 ++++- .../java/hints/project/IncompleteClassPath.java | 3 +- .../modules/java/hints/HideFieldByVarTest.java | 15 +- .../modules/java/hints/bugs/NPECheckTest.java | 38 +++ .../modules/java/hints/introduce/FlowTest.java | 49 +++ java/java.lsp.server/script/etc/nbcode.conf | 2 +- .../server/debugging/launch/NbLaunchDelegate.java | 155 ++++++--- .../server/protocol/NbCodeClientCapabilities.java | 87 +++++ .../lsp/server/protocol/NbCodeClientWrapper.java | 120 +++++++ .../lsp/server/protocol/NbCodeLanguageClient.java | 49 +++ .../modules/java/lsp/server/protocol/Server.java | 83 ++++- .../server/protocol/ShowStatusMessageParams.java | 78 +++++ .../server/protocol/TextDocumentServiceImpl.java | 59 +++- .../lsp/server/protocol/WorkspaceServiceImpl.java | 33 +- .../lsp/server/protocol/WorkspaceUIContext.java | 62 ++++ .../lsp/server/ui/AbstractLspStatusDisplayer.java | 5 +- .../modules/java/lsp/server/ui/UIContext.java | 15 + .../java/lsp/server/protocol/ServerTest.java | 236 +++++++++++--- java/java.lsp.server/vscode/package.json | 7 +- java/java.lsp.server/vscode/src/extension.ts | 51 ++- java/java.lsp.server/vscode/src/nbcode.ts | 4 + .../java.lsp.server/vscode/src/protocol.ts | 47 +-- .../java/stackanalyzer/StackLineAnalyser.java | 21 +- .../java/stackanalyzer/StackLineAnalyserTest.java | 8 + .../netbeans/api/java/source/TreeUtilities.java | 5 +- .../netbeans/modules/java/source/TreeShims.java | 25 ++ .../java/source/parsing/CompilationInfoImpl.java | 8 +- .../java/source/parsing/OutputFileManager.java | 48 ++- .../parsing/WriteArbitraryClassFileAPTest.java | 269 ++++++++++++++++ java/javadoc/nbproject/project.xml | 47 +-- .../netbeans/modules/javadoc/hints/Analyzer.java | 46 ++- .../netbeans/modules/maven/ActionProviderImpl.java | 6 +- .../netbeans/modules/maven/NbMavenProjectImpl.java | 7 +- .../netbeans/modules/maven/api/NbMavenProject.java | 5 +- .../maven/execute/MavenCommandLineExecutor.java | 19 +- .../modules/maven/runjar/RunJarPrereqChecker.java | 60 +++- .../maven/runjar/RunJarPrereqCheckerTest.java | 134 ++++++++ .../org/netbeans/nbbuild/extlibs/ignored-overlaps | 24 +- .../src/org/openide/text/DataEditorSupport.java | 18 +- 66 files changed, 2621 insertions(+), 452 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
