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 9d6b92085dfefc102da7239bdaccd8472222fd13 Merge: efe78c6 50cc574 Author: Laszlo Kishalmi <[email protected]> AuthorDate: Thu Oct 29 19:10:48 2020 -0700 Merge Apache NetBeans 12.2-beta3 changes to master extide/gradle/arch.xml | 9 +- .../gradle/tooling/NbProjectInfoBuilder.groovy | 1 + .../src/test/data/simple-with-tests/build.gradle | 40 +-- .../test/data/simple-with-tests/settings.gradle | 19 ++ .../src/test/data/simple/settings.gradle | 19 ++ .../src/test/data/unresolvable/settings.gradle | 19 ++ .../modules/gradle/GradleModuleFileCache21.java | 254 ++++++++++++++++ .../modules/gradle/GradleProjectCache.java | 7 +- .../gradle/api/GradleBaseProjectBuilder.java | 49 +++- .../modules/gradle/api/GradleProjects.java | 12 +- .../modules/gradle/cache/ProjectInfoDiskCache.java | 9 +- .../modules/gradle/execute/TrustProjectPanel.java | 6 +- .../newproject/ProjectAttributesPanelVisual.java | 2 +- .../modules/gradle/nodes/ConfigurationsNode.java | 32 +- .../lsp/client/bindings/HyperlinkProviderImpl.java | 12 +- .../TextDocumentSyncServerCapabilityHandler.java | 33 ++- .../modules/project/ui/problems/Bundle.properties | 2 +- .../jpda/backend/truffle/JPDATruffleAccessor.java | 14 +- java/gradle.htmlui/nbproject/project.xml | 9 + .../modules/gradle/htmlui/GradleArchetype.java | 75 +++-- .../htmlui/HtmlJavaApplicationProjectWizard.java | 51 +--- .../modules/gradle/htmlui/resources/layer.xml | 3 + .../modules/gradle/htmlui/CreateArchetypeTest.java | 11 +- .../gradle/java/customizer/Bundle.properties | 2 - .../java/customizer/CompileOptionsPanel.form | 38 +-- .../java/customizer/CompileOptionsPanel.java | 32 +- .../nbcode/integration/nbproject/project.xml | 8 + .../nbcode/integration/LspDialogDisplayer.java | 31 ++ java/java.lsp.server/nbproject/project.xml | 8 + .../modules/java/lsp/server/LspServerUtils.java | 91 ++++++ .../lsp/server/protocol/NbCodeLanguageClient.java | 4 + .../modules/java/lsp/server/protocol/Server.java | 229 +++++++++++---- .../lsp/server/protocol/WorkspaceUIContext.java | 9 +- .../lsp/server/ui/AbstractDialogDisplayer.java | 68 +++++ .../lsp/server/ui/NotifyDescriptorAdapter.java | 325 +++++++++++++++++++++ .../modules/java/lsp/server/ui/UIContext.java | 39 ++- .../lsp/server/ui/AbstractDialogDisplayerTest.java | 156 ++++++++++ java/java.lsp.server/vscode/README.md | 20 ++ java/java.lsp.server/vscode/package.json | 24 +- java/java.lsp.server/vscode/src/extension.ts | 198 ++++++++----- java/java.lsp.server/vscode/src/nbcode.ts | 9 +- 41 files changed, 1634 insertions(+), 345 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
