(netbeans) branch master updated (d6867427fc -> 0374e1f4e7)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from d6867427fc Merge pull request #7756 from sdedic/micronaut/graalvm-native-typo add f9c97f1e13 Extensive logging added. add 9db75815c6 Improving re-loading support if the project keeps changing. Added tests. new 0374e1f4e7 Merge pull request #7748 from sdedic/sdedic/project-internal-reload The 1 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: .../modules/project/dependency/ProjectReload.java | 32 +- .../dependency/reload/ProjectReloadInternal.java | 121 +++-- .../project/dependency/reload/Reloader.java| 540 ++--- .../dependency/reload/StateDataListener.java | 49 +- .../spi/ProjectReloadImplementation.java | 79 ++- .../reload/MockProjectReloadImplementation.java| 4 + .../dependency/reload/ProjectReloadImplTest.java | 90 +++- .../gradle/reload/GradleReloadImplementation.java | 13 +- .../reload/GradleReloadImplementationTest.java | 197 .../server/protocol/TextDocumentServiceImpl.java | 12 +- .../netbeans/modules/maven/NbMavenProjectImpl.java | 5 +- .../queries/MavenPrimingReloadImplementation.java | 1 - .../maven/queries/MavenReloadImplementation.java | 32 +- .../queries/MavenReloadImplementationTest.java | 250 ++ 14 files changed, 1153 insertions(+), 272 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
(netbeans) 01/01: Merge pull request #7748 from sdedic/sdedic/project-internal-reload
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 0374e1f4e791393cdcebeba4580177aee3154332 Merge: d6867427fc 9db75815c6 Author: Svatopluk Dedic AuthorDate: Wed Sep 18 22:17:11 2024 +0200 Merge pull request #7748 from sdedic/sdedic/project-internal-reload Improving "internal reload" during project reload .../modules/project/dependency/ProjectReload.java | 32 +- .../dependency/reload/ProjectReloadInternal.java | 121 +++-- .../project/dependency/reload/Reloader.java| 540 ++--- .../dependency/reload/StateDataListener.java | 49 +- .../spi/ProjectReloadImplementation.java | 79 ++- .../reload/MockProjectReloadImplementation.java| 4 + .../dependency/reload/ProjectReloadImplTest.java | 90 +++- .../gradle/reload/GradleReloadImplementation.java | 13 +- .../reload/GradleReloadImplementationTest.java | 197 .../server/protocol/TextDocumentServiceImpl.java | 12 +- .../netbeans/modules/maven/NbMavenProjectImpl.java | 5 +- .../queries/MavenPrimingReloadImplementation.java | 1 - .../maven/queries/MavenReloadImplementation.java | 32 +- .../queries/MavenReloadImplementationTest.java | 250 ++ 14 files changed, 1153 insertions(+), 272 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
(netbeans) 01/01: Merge pull request #7756 from sdedic/micronaut/graalvm-native-typo
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit d6867427fc7f539a07a1a641d7e0e55211488753 Merge: 0b56bd54ca 007975363c Author: Svatopluk Dedic AuthorDate: Tue Sep 17 09:55:07 2024 +0200 Merge pull request #7756 from sdedic/micronaut/graalvm-native-typo The id of the graalvmNative extension contains a typo. .../netbeans/modules/micronaut/gradle/MicronautGradleArtifactsImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - 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
(netbeans) branch master updated (0b56bd54ca -> d6867427fc)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 0b56bd54ca Merge pull request #7622 from petrovic-d/add-tenency-id-and-region-to-cloud-assets add 007975363c The id of the graalvmNative extension contains a typo. new d6867427fc Merge pull request #7756 from sdedic/micronaut/graalvm-native-typo The 1 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: .../netbeans/modules/micronaut/gradle/MicronautGradleArtifactsImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - 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
(netbeans) branch master updated (51dea0cf12 -> 93ccaa550c)
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from 51dea0cf12 Merge pull request #7729 from sdedic/lsp/refresh-after-save
add 827cda6aae Proper registration/usage of LSP client ApplyEdits
implementation.
new 93ccaa550c Merge pull request #7749 from sdedic/lsp/client-save-fixes
The 1 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:
.../DefaultApplyEditsImplementation.java | 3 +-
.../dependency/impl/WorkspaceEditAdapter.java | 34 ++
.../integration/LspApplyEditsImplementation.java | 3 +-
3 files changed, 5 insertions(+), 35 deletions(-)
rename ide/project.dependency/src/org/netbeans/modules/project/dependency/{ =>
impl}/DefaultApplyEditsImplementation.java (98%)
-
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
(netbeans) branch master updated (06a2d998f7 -> 51dea0cf12)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 06a2d998f7 Merge pull request #7730 from sdedic/vscode/save-just-locals add 5a4d719b97 Forces refresh of a FileObject after the LSP client reports the file has been saved. new 51dea0cf12 Merge pull request #7729 from sdedic/lsp/refresh-after-save The 1 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: .../modules/java/lsp/server/protocol/Server.java | 4 +++ .../server/protocol/TextDocumentServiceImpl.java | 34 -- 2 files changed, 35 insertions(+), 3 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
(netbeans) 01/01: Merge pull request #7729 from sdedic/lsp/refresh-after-save
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 51dea0cf12b3d2d99725b30915d883b3faf98858 Merge: 06a2d998f7 5a4d719b97 Author: Svatopluk Dedic AuthorDate: Fri Sep 13 12:36:12 2024 +0200 Merge pull request #7729 from sdedic/lsp/refresh-after-save Forces refresh of a FileObject after the LSP client reports the file has been saved. .../modules/java/lsp/server/protocol/Server.java | 4 +++ .../server/protocol/TextDocumentServiceImpl.java | 34 -- 2 files changed, 35 insertions(+), 3 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
(netbeans) branch master updated (7bdf651190 -> 06a2d998f7)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 7bdf651190 Merge pull request #7741 from sdedic/sdedic/fix-stuck-nblogger add a4c31f19d6 Save just documents that are local files reachable by NBLS new 06a2d998f7 Merge pull request #7730 from sdedic/vscode/save-just-locals The 1 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/java.lsp.server/vscode/src/extension.ts | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) - 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
(netbeans) 01/01: Merge pull request #7730 from sdedic/vscode/save-just-locals
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 06a2d998f7db8162bad000816340c8904052fe57 Merge: 7bdf651190 a4c31f19d6 Author: Svatopluk Dedic AuthorDate: Fri Sep 13 09:32:40 2024 +0200 Merge pull request #7730 from sdedic/vscode/save-just-locals Save just documents that are local files reachable by NBLS java/java.lsp.server/vscode/src/extension.ts | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) - 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
(netbeans) 01/01: Merge pull request #7741 from sdedic/sdedic/fix-stuck-nblogger
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 7bdf651190ca68670a6ef902006cf837f6f55f5b Merge: 1f0737603b 8aef7e4509 Author: Svatopluk Dedic AuthorDate: Thu Sep 12 12:10:24 2024 +0200 Merge pull request #7741 from sdedic/sdedic/fix-stuck-nblogger Prevent nblogger from dying on errors during format. .../org/netbeans/core/startup/logging/NbFormatter.java | 16 +++- 1 file changed, 15 insertions(+), 1 deletion(-) - 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
(netbeans) branch master updated (1f0737603b -> 7bdf651190)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 1f0737603b Merge pull request #7709 from Achal1607/fix-vscode-extension-build add 8aef7e4509 Prevent nblogger from dying on errors during format. new 7bdf651190 Merge pull request #7741 from sdedic/sdedic/fix-stuck-nblogger The 1 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: .../org/netbeans/core/startup/logging/NbFormatter.java | 16 +++- 1 file changed, 15 insertions(+), 1 deletion(-) - 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
(netbeans) 01/01: Merge pull request #7740 from sdedic/lsp/protocol-tracing
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 29306ab5eab265c1e6125be82ebd72b9e40a8b56 Merge: 4c81ffe301 27ac704c6e Author: Svatopluk Dedic AuthorDate: Tue Sep 10 13:55:38 2024 +0200 Merge pull request #7740 from sdedic/lsp/protocol-tracing Perform LSP tracing server-side. .../modules/java/lsp/server/protocol/Server.java | 20 +++- java/java.lsp.server/vscode/BUILD.md | 6 +- 2 files changed, 24 insertions(+), 2 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
(netbeans) branch master updated (4c81ffe301 -> 29306ab5ea)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 4c81ffe301 Merge pull request #7728 from mbien/mvn-submodule-testwindow-fix add 27ac704c6e Perform LSP tracing server-side. new 29306ab5ea Merge pull request #7740 from sdedic/lsp/protocol-tracing The 1 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: .../modules/java/lsp/server/protocol/Server.java | 20 +++- java/java.lsp.server/vscode/BUILD.md | 6 +- 2 files changed, 24 insertions(+), 2 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
(netbeans) 01/01: Merge pull request #7705 from sdedic/project/fix-tests-endoperation
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 68010b0ec72d7e9118ddbe727ff2ea12160a6c7f Merge: 33d11303269 9dcefae3446 Author: Svatopluk Dedic AuthorDate: Tue Sep 3 08:33:32 2024 +0200 Merge pull request #7705 from sdedic/project/fix-tests-endoperation Fixing race condition between end-operation and future completion. .../dependency/reload/ProjectReloadInternal.java | 153 + 1 file changed, 99 insertions(+), 54 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
(netbeans) branch master updated (33d11303269 -> 68010b0ec72)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 33d11303269 Merge pull request #7665 from sdedic/gradle/reload-impl2 add 9dcefae3446 Fixing race condition between end-operation and future completion. new 68010b0ec72 Merge pull request #7705 from sdedic/project/fix-tests-endoperation The 1 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: .../dependency/reload/ProjectReloadInternal.java | 153 + 1 file changed, 99 insertions(+), 54 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
(netbeans) branch master updated (c0ef01472f0 -> 33d11303269)
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from c0ef01472f0 Merge pull request #7715 from
lahodaj/achal-talati-as-collaborator
add 885112e731f Project (re)load implementation for Gradle with trust
grant.
add d2b67695971 Stabilize project queries after open
new 33d11303269 Merge pull request #7665 from sdedic/gradle/reload-impl2
The 1 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:
extide/gradle/manifest.mf | 2 +-
extide/gradle/nbproject/project.properties | 1 +
extide/gradle/nbproject/project.xml| 1 +
.../gradle/AbstractGradleProjectTestCase.java | 24 +-
.../modules/project/dependency/ProjectReload.java | 4 +-
ide/projectapi.nb/nbproject/project.xml| 4 +
.../api/project/test/ProjectTestUtils.java | 78 +++
.../nbproject/project.properties | 2 +
java/gradle.dependencies/nbproject/project.xml | 2 +-
.../gradle/reload/GradleReloadImplementation.java | 269 +
.../app/src/main/java/com/example/Application.java | 0
.../app/src/main/java/com/example/Something.java | 0
.../multi/app/src/main/resources/logback.xml | 0
.../app/src/test/java/com/example/DemoTest.java| 0
.../unit/data/projects}/multi/gradle.properties| 0
.../multi/gradle/wrapper/gradle-wrapper.properties | 0
.../unit/data/projects}/multi/oci/build.gradle | 0
.../src/main/java/com/example/Application.java | 0
.../test/unit/data/projects}/multi/settings.gradle | 0
.../reload/GradleReloadImplementationTest.java | 599 +
java/gradle.java/nbproject/project.xml | 1 +
21 files changed, 982 insertions(+), 5 deletions(-)
create mode 100644
ide/projectapi.nb/test/unit/src/org/netbeans/api/project/test/ProjectTestUtils.java
create mode 100644
java/gradle.dependencies/src/org/netbeans/modules/gradle/reload/GradleReloadImplementation.java
copy {enterprise/micronaut/test/unit/data/gradle/artifacts =>
java/gradle.dependencies/test/unit/data/projects}/multi/app/src/main/java/com/example/Application.java
(100%)
copy {enterprise/micronaut/test/unit/data/gradle/artifacts =>
java/gradle.dependencies/test/unit/data/projects}/multi/app/src/main/java/com/example/Something.java
(100%)
copy {enterprise/micronaut/test/unit/data/gradle/artifacts =>
java/gradle.dependencies/test/unit/data/projects}/multi/app/src/main/resources/logback.xml
(100%)
copy {enterprise/micronaut/test/unit/data/gradle/artifacts =>
java/gradle.dependencies/test/unit/data/projects}/multi/app/src/test/java/com/example/DemoTest.java
(100%)
copy {enterprise/micronaut/test/unit/data/gradle/artifacts =>
java/gradle.dependencies/test/unit/data/projects}/multi/gradle.properties (100%)
copy {enterprise/micronaut/test/unit/data/gradle/artifacts =>
java/gradle.dependencies/test/unit/data/projects}/multi/gradle/wrapper/gradle-wrapper.properties
(100%)
copy {enterprise/micronaut/test/unit/data/gradle/artifacts =>
java/gradle.dependencies/test/unit/data/projects}/multi/oci/build.gradle (100%)
copy {enterprise/micronaut/test/unit/data/gradle/artifacts/multi/app =>
java/gradle.dependencies/test/unit/data/projects/multi/oci}/src/main/java/com/example/Application.java
(100%)
copy {enterprise/micronaut/test/unit/data/gradle/artifacts =>
java/gradle.dependencies/test/unit/data/projects}/multi/settings.gradle (100%)
create mode 100644
java/gradle.dependencies/test/unit/src/org/netbeans/modules/gradle/reload/GradleReloadImplementationTest.java
-
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
(netbeans) 01/01: Merge pull request #7665 from sdedic/gradle/reload-impl2
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 33d11303269b338a95e47681e3a1f66d704fd09d Merge: c0ef01472f0 d2b67695971 Author: Svatopluk Dedic AuthorDate: Mon Sep 2 15:13:12 2024 +0200 Merge pull request #7665 from sdedic/gradle/reload-impl2 Gradle implementation of Project (re)load API extide/gradle/manifest.mf | 2 +- extide/gradle/nbproject/project.properties | 1 + extide/gradle/nbproject/project.xml| 1 + .../gradle/AbstractGradleProjectTestCase.java | 24 +- .../modules/project/dependency/ProjectReload.java | 4 +- ide/projectapi.nb/nbproject/project.xml| 4 + .../api/project/test/ProjectTestUtils.java | 78 +++ .../nbproject/project.properties | 2 + java/gradle.dependencies/nbproject/project.xml | 2 +- .../gradle/reload/GradleReloadImplementation.java | 269 + .../app/src/main/java/com/example/Application.java | 9 + .../app/src/main/java/com/example/Something.java | 1 + .../multi/app/src/main/resources/logback.xml | 15 + .../app/src/test/java/com/example/DemoTest.java| 21 + .../unit/data/projects/multi/gradle.properties | 1 + .../multi/gradle/wrapper/gradle-wrapper.properties | 5 + .../test/unit/data/projects/multi/oci/build.gradle | 49 ++ .../oci/src/main/java/com/example/Application.java | 9 + .../test/unit/data/projects/multi/settings.gradle | 6 + .../reload/GradleReloadImplementationTest.java | 599 + java/gradle.java/nbproject/project.xml | 1 + 21 files changed, 1098 insertions(+), 5 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
(netbeans) branch master updated (f76bd965670 -> f59beaf988c)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from f76bd965670 Merge pull request #7641 from naren2605/nb-bug-7640 add dcf0ffa3e1d Support for string[] vmArgs new f59beaf988c Merge pull request #7697 from sdedic/debug/vmargs-array-support The 1 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/lsp/server/debugging/launch/NbLaunchDelegate.java | 5 ++--- .../java/lsp/server/debugging/launch/NbLaunchRequestHandler.java | 7 +-- java/java.lsp.server/vscode/package.json | 9 +++-- java/java.lsp.server/vscode/src/runConfiguration.ts | 6 +- 4 files changed, 19 insertions(+), 8 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
(netbeans) 01/01: Merge pull request #7697 from sdedic/debug/vmargs-array-support
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit f59beaf988c9f6ab11a9bb5786363db6c7b54120 Merge: f76bd965670 dcf0ffa3e1d Author: Svatopluk Dedic AuthorDate: Wed Aug 28 13:34:05 2024 +0200 Merge pull request #7697 from sdedic/debug/vmargs-array-support Support for string[] vmArgs .../java/lsp/server/debugging/launch/NbLaunchDelegate.java | 5 ++--- .../java/lsp/server/debugging/launch/NbLaunchRequestHandler.java | 7 +-- java/java.lsp.server/vscode/package.json | 9 +++-- java/java.lsp.server/vscode/src/runConfiguration.ts | 6 +- 4 files changed, 19 insertions(+), 8 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
(netbeans) 01/01: Merge pull request #7646 from sdedic/gradle/loadOptions
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 3182e8ed5487bfb1d76f3e9efb4b4efde8e2d725 Merge: 99d110cf5db de5412c1aeb Author: Svatopluk Dedic AuthorDate: Tue Aug 27 09:06:02 2024 +0200 Merge pull request #7646 from sdedic/gradle/loadOptions LoadOptions introduced to control project loading. extide/gradle/apichanges.xml | 23 +++ extide/gradle/manifest.mf | 2 +- .../modules/gradle/GradleProjectLoader.java| 5 +- .../modules/gradle/NbGradleProjectImpl.java| 123 +++ .../modules/gradle/api/NbGradleProject.java| 173 - .../modules/gradle/cache/ProjectInfoDiskCache.java | 8 +- .../gradle/loaders/AbstractProjectLoader.java | 20 ++- .../gradle/loaders/DiskCacheProjectLoader.java | 2 +- .../gradle/loaders/GradleProjectLoaderImpl.java| 16 +- .../gradle/loaders/LegacyProjectLoader.java| 25 ++- .../loaders/NbProjectInfoCachingDescriptor.java| 2 +- .../gradle/spi/newproject/TemplateOperation.java | 4 +- 12 files changed, 345 insertions(+), 58 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
(netbeans) branch master updated (99d110cf5db -> 3182e8ed548)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 99d110cf5db Merge pull request #7655 from sdedic/meven/reload-impl add de5412c1aeb LoadOptions introduced to control project loading. new 3182e8ed548 Merge pull request #7646 from sdedic/gradle/loadOptions The 1 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: extide/gradle/apichanges.xml | 23 +++ extide/gradle/manifest.mf | 2 +- .../modules/gradle/GradleProjectLoader.java| 5 +- .../modules/gradle/NbGradleProjectImpl.java| 123 +++ .../modules/gradle/api/NbGradleProject.java| 173 - .../modules/gradle/cache/ProjectInfoDiskCache.java | 8 +- .../gradle/loaders/AbstractProjectLoader.java | 20 ++- .../gradle/loaders/DiskCacheProjectLoader.java | 2 +- .../gradle/loaders/GradleProjectLoaderImpl.java| 16 +- .../gradle/loaders/LegacyProjectLoader.java| 25 ++- .../loaders/NbProjectInfoCachingDescriptor.java| 2 +- .../gradle/spi/newproject/TemplateOperation.java | 4 +- 12 files changed, 345 insertions(+), 58 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
(netbeans) branch master updated (effcb4f8883 -> 99d110cf5db)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from effcb4f8883 Merge pull request #7679 from sdedic/projects/deps-annotation-processors add 0fee3f48504 Maven implementation of Project (re)load API add b8518bce06c Fake artifacts renamed to Placeholders add 70d8da9567f Accepted unchanged data is still recorded into the result state. add 4149b28d792 Reload Project action reimplemented. new 99d110cf5db Merge pull request #7655 from sdedic/meven/reload-impl The 1 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: .../project/dependency/reload/Reloader.java| 7 +- java/maven/nbproject/project.xml | 4 + .../netbeans/modules/maven/NbArtifactFixer.java| 16 +- .../netbeans/modules/maven/NbMavenProjectImpl.java | 46 +- .../modules/maven/actions/RefreshAction.java | 23 +- .../netbeans/modules/maven/api/NbMavenProject.java | 8 + .../maven/execute/MavenCommandLineExecutor.java| 3 +- .../maven/modelcache/MavenProjectCache.java| 55 +- .../maven/problems/MavenModelProblemsProvider.java | 56 +- .../modules/maven/problems/SanityBuildAction.java | 37 +- .../maven/queries/MavenFileOwnerQueryImpl.java | 20 +- .../queries/MavenPrimingReloadImplementation.java | 265 + .../maven/queries/MavenReloadImplementation.java | 280 ++ .../queries/MavenReloadImplementationTest.java | 601 + 14 files changed, 1361 insertions(+), 60 deletions(-) create mode 100644 java/maven/src/org/netbeans/modules/maven/queries/MavenPrimingReloadImplementation.java create mode 100644 java/maven/src/org/netbeans/modules/maven/queries/MavenReloadImplementation.java create mode 100644 java/maven/test/unit/src/org/netbeans/modules/maven/queries/MavenReloadImplementationTest.java - 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
(netbeans) 01/01: Merge pull request #7655 from sdedic/meven/reload-impl
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 99d110cf5dbd809b0766d58ec93c9905787617b5 Merge: effcb4f8883 4149b28d792 Author: Svatopluk Dedic AuthorDate: Tue Aug 27 08:56:12 2024 +0200 Merge pull request #7655 from sdedic/meven/reload-impl Maven project reload implementation .../project/dependency/reload/Reloader.java| 7 +- java/maven/nbproject/project.xml | 4 + .../netbeans/modules/maven/NbArtifactFixer.java| 16 +- .../netbeans/modules/maven/NbMavenProjectImpl.java | 46 +- .../modules/maven/actions/RefreshAction.java | 23 +- .../netbeans/modules/maven/api/NbMavenProject.java | 8 + .../maven/execute/MavenCommandLineExecutor.java| 3 +- .../maven/modelcache/MavenProjectCache.java| 55 +- .../maven/problems/MavenModelProblemsProvider.java | 56 +- .../modules/maven/problems/SanityBuildAction.java | 37 +- .../maven/queries/MavenFileOwnerQueryImpl.java | 20 +- .../queries/MavenPrimingReloadImplementation.java | 265 + .../maven/queries/MavenReloadImplementation.java | 280 ++ .../queries/MavenReloadImplementationTest.java | 601 + 14 files changed, 1361 insertions(+), 60 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
(netbeans) branch master updated (1e1f53c9f50 -> effcb4f8883)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 1e1f53c9f50 Merge pull request #7651 from apache/sdedic/project/reload add 799dcc53c62 Honour transitive dependencies parameter add 54ae9f32213 Better handle version errors add d631c438a52 Implemented annotation processor query+modification new effcb4f8883 Merge pull request #7679 from sdedic/projects/deps-annotation-processors The 1 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: .../dependencies/DependencyModifierImplTest.java | 12 ++ .../refactoring/dependency/DependencyAdder.java| 153 ++--- .../simpleProject/pom-with-processor-broken.xml| 77 --- .../simpleProject/pom-with-separateProcessors.xml | 111 --- .../MavenDependencyModifierImplTest.java | 47 +-- .../MavenDependencyModifierImplTest2.java | 115 .../MavenDependencyModifierImplTestBase.java | 90 .../modules/maven/api/PluginPropertyUtils.java | 64 + .../queries/MavenDependenciesImplementation.java | 52 ++- 9 files changed, 434 insertions(+), 287 deletions(-) delete mode 100644 java/maven.refactoring/test/unit/data/simpleProject/pom-with-processor-broken.xml delete mode 100644 java/maven.refactoring/test/unit/data/simpleProject/pom-with-separateProcessors.xml create mode 100644 java/maven.refactoring/test/unit/src/org/netbeans/modules/maven/refactoring/dependency/MavenDependencyModifierImplTest2.java create mode 100644 java/maven.refactoring/test/unit/src/org/netbeans/modules/maven/refactoring/dependency/MavenDependencyModifierImplTestBase.java - 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
(netbeans) 01/01: Merge pull request #7679 from sdedic/projects/deps-annotation-processors
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit effcb4f888300c4d7bfed4a7b733039f9bddb038 Merge: 1e1f53c9f50 d631c438a52 Author: Svatopluk Dedic AuthorDate: Mon Aug 26 17:42:26 2024 +0200 Merge pull request #7679 from sdedic/projects/deps-annotation-processors Support annotation processor dependencies .../dependencies/DependencyModifierImplTest.java | 12 ++ .../refactoring/dependency/DependencyAdder.java| 153 ++--- .../simpleProject/pom-with-processor-broken.xml| 77 --- .../simpleProject/pom-with-separateProcessors.xml | 111 --- .../MavenDependencyModifierImplTest.java | 47 +-- .../MavenDependencyModifierImplTest2.java | 115 .../MavenDependencyModifierImplTestBase.java | 90 .../modules/maven/api/PluginPropertyUtils.java | 64 + .../queries/MavenDependenciesImplementation.java | 52 ++- 9 files changed, 434 insertions(+), 287 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
(netbeans) branch master updated (db489d118ae -> 1e1f53c9f50)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from db489d118ae Merge pull request #7691 from dbalek/dbalek/micronaut-config-error-provider add 6ea5e5e70d8 Project (re)load API, initial implementation new 1e1f53c9f50 Merge pull request #7651 from apache/sdedic/project/reload The 1 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: .../nbproject/project.properties |6 +- ide/project.dependency/nbproject/project.xml |8 + .../dependency/ProjectOperationException.java | 47 +- .../modules/project/dependency/ProjectReload.java | 1241 +++ .../netbeans/modules/project/dependency/Scope.java |4 +- .../modules/project/dependency/SourceLocation.java |6 +- .../project/dependency/reload/Forwarder.java | 95 ++ .../dependency/reload/ProjectReloadInternal.java | 955 .../dependency/reload/ProjectStateListener.java| 31 + .../dependency/reload/ReloadApiAccessor.java | 51 + .../dependency/reload/ReloadSpiAccessor.java | 57 + .../project/dependency/reload/Reloader.java| 749 + .../dependency/reload/StateDataListener.java | 284 .../project/dependency/reload/WeakIdentityMap.java | 253 +++ .../spi/ProjectReloadImplementation.java | 789 +- .../dependency/spi/ReloadSpiAccessorImpl.java | 70 + .../unit/data/reload/Simple1._test/project.txt |0 .../data/reload/Simple1._test/settings.properties |0 .../reload/MockProjectReloadImplementation.java| 157 ++ .../dependency/reload/ProjectReloadExamples.java | 110 ++ .../dependency/reload/ProjectReloadImplTest.java | 1604 .../dependency/reload/TestProjectFactory.java | 133 ++ nbbuild/javadoctools/links.xml |1 + nbbuild/javadoctools/properties.xml|1 + nbbuild/javadoctools/replaces.xml |2 +- 25 files changed, 6613 insertions(+), 41 deletions(-) create mode 100644 ide/project.dependency/src/org/netbeans/modules/project/dependency/ProjectReload.java create mode 100644 ide/project.dependency/src/org/netbeans/modules/project/dependency/reload/Forwarder.java create mode 100644 ide/project.dependency/src/org/netbeans/modules/project/dependency/reload/ProjectReloadInternal.java create mode 100644 ide/project.dependency/src/org/netbeans/modules/project/dependency/reload/ProjectStateListener.java create mode 100644 ide/project.dependency/src/org/netbeans/modules/project/dependency/reload/ReloadApiAccessor.java create mode 100644 ide/project.dependency/src/org/netbeans/modules/project/dependency/reload/ReloadSpiAccessor.java create mode 100644 ide/project.dependency/src/org/netbeans/modules/project/dependency/reload/Reloader.java create mode 100644 ide/project.dependency/src/org/netbeans/modules/project/dependency/reload/StateDataListener.java create mode 100644 ide/project.dependency/src/org/netbeans/modules/project/dependency/reload/WeakIdentityMap.java create mode 100644 ide/project.dependency/src/org/netbeans/modules/project/dependency/spi/ReloadSpiAccessorImpl.java copy enterprise/web.jspparser/test/unit/data/jspparser-data/wmroot/subdir/Page1.jsp => ide/project.dependency/test/unit/data/reload/Simple1._test/project.txt (100%) copy enterprise/web.jspparser/test/unit/data/jspparser-data/wmroot/subdir/Page1.jsp => ide/project.dependency/test/unit/data/reload/Simple1._test/settings.properties (100%) create mode 100644 ide/project.dependency/test/unit/src/org/netbeans/modules/project/dependency/reload/MockProjectReloadImplementation.java create mode 100644 ide/project.dependency/test/unit/src/org/netbeans/modules/project/dependency/reload/ProjectReloadExamples.java create mode 100644 ide/project.dependency/test/unit/src/org/netbeans/modules/project/dependency/reload/ProjectReloadImplTest.java create mode 100644 ide/project.dependency/test/unit/src/org/netbeans/modules/project/dependency/reload/TestProjectFactory.java - 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
(netbeans) 01/01: Merge pull request #7651 from apache/sdedic/project/reload
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 1e1f53c9f50f73040b8fe8d80c6306acafae04da Merge: db489d118ae 6ea5e5e70d8 Author: Svatopluk Dedic AuthorDate: Mon Aug 26 17:41:10 2024 +0200 Merge pull request #7651 from apache/sdedic/project/reload Project (re)load API, initial implementation .../nbproject/project.properties |6 +- ide/project.dependency/nbproject/project.xml |8 + .../dependency/ProjectOperationException.java | 47 +- .../modules/project/dependency/ProjectReload.java | 1241 +++ .../netbeans/modules/project/dependency/Scope.java |4 +- .../modules/project/dependency/SourceLocation.java |6 +- .../project/dependency/reload/Forwarder.java | 95 ++ .../dependency/reload/ProjectReloadInternal.java | 955 .../dependency/reload/ProjectStateListener.java| 31 + .../dependency/reload/ReloadApiAccessor.java | 51 + .../dependency/reload/ReloadSpiAccessor.java | 57 + .../project/dependency/reload/Reloader.java| 749 + .../dependency/reload/StateDataListener.java | 284 .../project/dependency/reload/WeakIdentityMap.java | 253 +++ .../spi/ProjectReloadImplementation.java | 789 +- .../dependency/spi/ReloadSpiAccessorImpl.java | 70 + .../unit/data/reload/Simple1._test/project.txt |1 + .../data/reload/Simple1._test/settings.properties |1 + .../reload/MockProjectReloadImplementation.java| 157 ++ .../dependency/reload/ProjectReloadExamples.java | 110 ++ .../dependency/reload/ProjectReloadImplTest.java | 1604 .../dependency/reload/TestProjectFactory.java | 133 ++ nbbuild/javadoctools/links.xml |1 + nbbuild/javadoctools/properties.xml|1 + nbbuild/javadoctools/replaces.xml |2 +- 25 files changed, 6615 insertions(+), 41 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
(netbeans) branch sdedic/project/reload updated (88d86d31f73 -> 6ea5e5e70d8)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch sdedic/project/reload in repository https://gitbox.apache.org/repos/asf/netbeans.git omit 88d86d31f73 Update ide/project.dependency/nbproject/project.properties omit 43469057ad7 Still not publishing this package... omit ad0a37c6baa Project (re)load API, initial implementation add 45055467e7f LSP: Fixing broken 'nbls.addEventListener' command. add f6e767325d4 Merge pull request #7648 from dbalek/dbalek/lps-fix-broken-add-event-listener-command add b0a5ea27953 Group application properties by type for Create External Config Properties command add 14d5cbce810 Merge pull request #7614 from petrovic-d/group-application-properties-lines-by-type add 7a027af4f07 binaries-list dependency checker workflow updates add 8b65891bd9e Merge pull request #7644 from mbien/update-dep-checker add 83e201c63c8 Instuctions to install Docker and to change key file permissions add 17f7152781f Merge pull request #7656 from petrovic-d/vscode-guides-additional-instructions add 42d86921c10 [NETBEANS-5729] MacOS: Support HiDPI scaling in TreeView's long file name tooltip (e.g. in Projects pane) add 26af3c72ab0 binaries-list dependency checker needs to set up the env for maven add 72d62a30a21 Merge pull request #7674 from mbien/setup-java-for-dep-checker add 086ad44673f Delete action for Container Repository Images and Vault Secrets add ee236f05d8e Merge pull request #7649 from petrovic-d/delete-cloud-assets-command add 653fddf1c42 Create container repository command add 2c01004a5e5 Cloud Assets build docker command add 36171a7e45f Merge pull request #7642 from jhorvath/build-docker-oci add 15d4044df64 Suggest OCI resource creation when showing existing resources add ce1faa0f60e Merge pull request #7678 from petrovic-d/refactor-create-oci-resouce add ea7dd867b66 Adding option to register a new database in a list of available db connections add c1ee059fa57 Merge pull request #7687 from jhorvath/add-db-connection add ffcc6469a61 ProcessImplementation module cleanup add 6c6beed97e3 Merge pull request #7677 from mbien/proc-module-cleanup add 6ea5e5e70d8 Project (re)load API, initial implementation This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (88d86d31f73) \ N -- N -- N refs/heads/sdedic/project/reload (6ea5e5e70d8) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .github/scripts/BinariesListUpdates.java | 13 +- .github/workflows/dependency-checks.yml| 14 +- enterprise/cloud.oracle/nbproject/project.xml | 52 + .../modules/cloud/oracle/NotificationUtils.java| 44 + .../org/netbeans/modules/cloud/oracle/OCINode.java | 15 +- .../modules/cloud/oracle/actions/AddADBAction.java | 6 +- .../oracle/actions/CreateContainerRepository.java | 98 ++ .../actions/CreateContainerRepositoryCommand.java | 54 ++ .../oracle/actions/CreateResourceCommand.java | 56 ++ .../OCIItemCreator.java} | 35 ++-- .../cloud/oracle/assets/AddNewAssetCommand.java| 24 ++- .../oracle/assets/AddSuggestedItemAction.java | 21 +- .../assets/ApplicationPropertiesGenerator.java | 105 ++ .../modules/cloud/oracle/assets/CloudAssets.java | 9 + .../CreateNewResourceItem.java}| 22 +-- .../cloud/oracle/assets/CreatePoliciesCommand.java | 18 +- .../cloud/oracle/assets/ImageBuilderCommand.java | 216 + .../modules/cloud/oracle/assets/RootNode.java | 9 +- .../cloud/oracle/developer/ContainerTagNode.java | 68 ++- .../requests/ContainerRepositoryRequest.java | 48 + .../OCIItemCreationDetails.java} | 32 +-- .../cloud/oracle/steps/DatabaseConnectionStep.java | 19 +- .../modules/cloud/oracle/steps/SuggestedStep.java | 8 +- .../modules/cloud/oracle/vault/SecretItem.java | 29 ++- .../modules/cloud/oracle/vault/SecretNode.java | 146 +- enterprise/websvc.restlib/external/binaries-list | 1 - .../websvc.restlib/external/hk2-2.6.1-license.txt | 2 +- .../websvc.restlib/nbproject/project.properties| 2 - enterprise/websvc.restlib/nbproject/project.xml|
(netbeans) branch sdedic/project/reload updated (43469057ad7 -> 88d86d31f73)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch sdedic/project/reload in repository https://gitbox.apache.org/repos/asf/netbeans.git from 43469057ad7 Still not publishing this package... add 88d86d31f73 Update ide/project.dependency/nbproject/project.properties No new revisions were added by this update. Summary of changes: ide/project.dependency/nbproject/project.properties | 3 +-- 1 file changed, 1 insertion(+), 2 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
(netbeans) 01/01: Merge pull request #7614 from petrovic-d/group-application-properties-lines-by-type
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 14d5cbce8107d9fdaeea7e87af8f73796f10c936 Merge: f6e767325d b0a5ea2795 Author: Svatopluk Dedic AuthorDate: Mon Aug 12 14:09:03 2024 +0200 Merge pull request #7614 from petrovic-d/group-application-properties-lines-by-type Group application properties by type for Create External Config Properties command .../assets/ApplicationPropertiesGenerator.java | 105 + .../cloud/oracle/assets/CreatePoliciesCommand.java | 18 +--- 2 files changed, 108 insertions(+), 15 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
(netbeans) branch master updated (f6e767325d -> 14d5cbce81)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from f6e767325d Merge pull request #7648 from dbalek/dbalek/lps-fix-broken-add-event-listener-command add b0a5ea2795 Group application properties by type for Create External Config Properties command new 14d5cbce81 Merge pull request #7614 from petrovic-d/group-application-properties-lines-by-type The 1 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: .../assets/ApplicationPropertiesGenerator.java | 105 + .../cloud/oracle/assets/CreatePoliciesCommand.java | 18 +--- 2 files changed, 108 insertions(+), 15 deletions(-) create mode 100644 enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/assets/ApplicationPropertiesGenerator.java - 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
(netbeans) branch sdedic/project/reload updated (ad0a37c6ba -> 43469057ad)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch sdedic/project/reload in repository https://gitbox.apache.org/repos/asf/netbeans.git from ad0a37c6ba Project (re)load API, initial implementation add 43469057ad Still not publishing this package... No new revisions were added by this update. Summary of changes: ide/project.dependency/nbproject/project.xml | 4 +--- 1 file changed, 1 insertion(+), 3 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
(netbeans) branch sdedic/project/reload created (now ad0a37c6ba)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch sdedic/project/reload in repository https://gitbox.apache.org/repos/asf/netbeans.git at ad0a37c6ba Project (re)load API, initial implementation This branch includes the following new commits: new ad0a37c6ba Project (re)load API, initial implementation The 1 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. - 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
(netbeans) branch master updated (91c23e08db -> fcd5972d9c)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 91c23e08db Merge pull request #7537 from mbien/global-goal-presets add ad0e8c11ba telemetry added for LSP new fcd5972d9c Merge pull request #7435 from Achal1607/telemetry The 1 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: .../server/protocol/LspServerTelemetryManager.java | 201 + .../modules/java/lsp/server/protocol/Server.java | 50 ++--- .../java/lsp/server/protocol/TelemetryEvent.java | 55 ++ 3 files changed, 270 insertions(+), 36 deletions(-) create mode 100644 java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/LspServerTelemetryManager.java create mode 100644 java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TelemetryEvent.java - 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
(netbeans) 01/01: Merge pull request #7435 from Achal1607/telemetry
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit fcd5972d9cd6b220619a1656c18d027cfbc09293 Merge: 91c23e08db ad0e8c11ba Author: Svatopluk Dedic AuthorDate: Wed Jul 24 22:02:35 2024 +0200 Merge pull request #7435 from Achal1607/telemetry Telemetry updated in Java LSP module .../server/protocol/LspServerTelemetryManager.java | 201 + .../modules/java/lsp/server/protocol/Server.java | 50 ++--- .../java/lsp/server/protocol/TelemetryEvent.java | 55 ++ 3 files changed, 270 insertions(+), 36 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
(netbeans) branch master updated (a4cdfccfd6 -> 9b7ce89ea1)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from a4cdfccfd6 Merge pull request #7592 from pepness/tomcat-se-24 add 1c980f710f Support for project JDK settings. new 9b7ce89ea1 Merge pull request #7497 from sdedic/sdedic/project-platform-setting The 1 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: .../nbcode/integration/nbproject/project.xml | 9 ++ .../LspJavaPlatformProviderOverride.java | 31 ++ java/java.lsp.server/nbproject/project.xml | 15 ++- .../modules/java/lsp/server/protocol/Server.java | 13 +++ .../server/protocol/TextDocumentServiceImpl.java | 10 ++ .../lsp/server/protocol/WorkspaceServiceImpl.java | 2 + .../ui/AbstractJavaPlatformProviderOverride.java | 122 + java/java.lsp.server/vscode/package.json | 13 ++- java/java.lsp.server/vscode/src/extension.ts | 12 +- java/java.lsp.server/vscode/src/jdk/settings.ts| 14 ++- .../vscode/src/jdk/validation/validation.ts| 20 +++- 11 files changed, 245 insertions(+), 16 deletions(-) create mode 100644 java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/LspJavaPlatformProviderOverride.java create mode 100644 java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ui/AbstractJavaPlatformProviderOverride.java - 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
(netbeans) 01/01: Merge pull request #7497 from sdedic/sdedic/project-platform-setting
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 9b7ce89ea18fd56267e6661dad2bd25f32cc7845 Merge: a4cdfccfd6 1c980f710f Author: Svatopluk Dedic AuthorDate: Fri Jul 19 09:24:20 2024 +0200 Merge pull request #7497 from sdedic/sdedic/project-platform-setting Support for project JDK settings. .../nbcode/integration/nbproject/project.xml | 9 ++ .../LspJavaPlatformProviderOverride.java | 31 ++ java/java.lsp.server/nbproject/project.xml | 15 ++- .../modules/java/lsp/server/protocol/Server.java | 13 +++ .../server/protocol/TextDocumentServiceImpl.java | 10 ++ .../lsp/server/protocol/WorkspaceServiceImpl.java | 2 + .../ui/AbstractJavaPlatformProviderOverride.java | 122 + java/java.lsp.server/vscode/package.json | 13 ++- java/java.lsp.server/vscode/src/extension.ts | 12 +- java/java.lsp.server/vscode/src/jdk/settings.ts| 14 ++- .../vscode/src/jdk/validation/validation.ts| 20 +++- 11 files changed, 245 insertions(+), 16 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
(netbeans) 01/01: Merge pull request #7555 from petrovic-d/GCN-4643-java-source-level-check
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 2b8517543385a4848d72183f243ed8d28211f69f Merge: fcb864fc4d5 8b31dac5759 Author: Svatopluk Dedic AuthorDate: Wed Jul 10 22:57:43 2024 +0200 Merge pull request #7555 from petrovic-d/GCN-4643-java-source-level-check VSNetBeans: Check for source level java compatibility java/java.lsp.server/vscode/package-lock.json | 66 ++- java/java.lsp.server/vscode/package.json | 4 +- java/java.lsp.server/vscode/src/extension.ts | 4 +- .../vscode/src/jdk/validation/extensionUtils.ts| 32 .../vscode/src/jdk/validation/javaUtil.ts | 78 + .../vscode/src/jdk/validation/project.ts | 193 + .../vscode/src/jdk/validation/validation.ts| 65 +++ 7 files changed, 439 insertions(+), 3 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
(netbeans) branch master updated (fcb864fc4d5 -> 2b851754338)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from fcb864fc4d5 Merge pull request #7484 from lahodaj/javac23-upgrade add 8b31dac5759 Check for source level java compatibility new 2b851754338 Merge pull request #7555 from petrovic-d/GCN-4643-java-source-level-check The 1 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/java.lsp.server/vscode/package-lock.json | 66 ++- java/java.lsp.server/vscode/package.json | 4 +- java/java.lsp.server/vscode/src/extension.ts | 4 +- .../vscode/src/jdk/validation/extensionUtils.ts| 32 .../vscode/src/jdk/validation/javaUtil.ts | 78 + .../vscode/src/jdk/validation/project.ts | 193 + .../vscode/src/jdk/validation/validation.ts| 65 +++ 7 files changed, 439 insertions(+), 3 deletions(-) create mode 100644 java/java.lsp.server/vscode/src/jdk/validation/extensionUtils.ts create mode 100644 java/java.lsp.server/vscode/src/jdk/validation/javaUtil.ts create mode 100644 java/java.lsp.server/vscode/src/jdk/validation/project.ts create mode 100644 java/java.lsp.server/vscode/src/jdk/validation/validation.ts - 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
(netbeans) branch vsnetbeans_2299 updated: Use relative wrapper paths to prevent space-in-path bugs
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch vsnetbeans_2299
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/vsnetbeans_2299 by this push:
new 76532bfeb30 Use relative wrapper paths to prevent space-in-path bugs
76532bfeb30 is described below
commit 76532bfeb307486d434fb05b125da01710d29b95
Author: Svata Dedic
AuthorDate: Wed Jul 10 10:28:36 2024 +0200
Use relative wrapper paths to prevent space-in-path bugs
---
.../maven/execute/MavenCommandLineExecutor.java| 57 +++---
1 file changed, 50 insertions(+), 7 deletions(-)
diff --git
a/java/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java
b/java/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java
index 2419314862b..df4de54c504 100644
---
a/java/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java
+++
b/java/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java
@@ -25,6 +25,7 @@ import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.nio.charset.Charset;
+import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
@@ -663,7 +664,8 @@ public class MavenCommandLineExecutor extends
AbstractMavenExecutor {
File mavenHome = null;
File wrapper = null;
if (MavenSettings.getDefault().isPreferMavenWrapper()) {
-wrapper = searchMavenWrapper(config);
+// wrapper will be an absolute or relative path, do not
"absolutize" after searchMavenWrapper
+wrapper = searchMavenWrapper(clonedConfig);
}
if (wrapper != null) {
constructeur = new WrapperShellConstructor(wrapper);
@@ -754,11 +756,11 @@ public class MavenCommandLineExecutor extends
AbstractMavenExecutor {
return builder;
}
-
-private static void printGray(InputOutput io, String text) {
+
+private static void printColor(InputOutput io, String text,
IOColors.OutputType style) {
if (IOColorLines.isSupported(io)) {
try {
-IOColorLines.println(io, text, IOColors.getColor(io,
IOColors.OutputType.LOG_DEBUG));
+IOColorLines.println(io, text, IOColors.getColor(io, style));
} catch (IOException ex) {
Exceptions.printStackTrace(ex);
}
@@ -767,6 +769,10 @@ public class MavenCommandLineExecutor extends
AbstractMavenExecutor {
}
}
+private static void printGray(InputOutput io, String text) {
+printColor(io, text, IOColors.OutputType.LOG_DEBUG);
+}
+
private void processIssue153101(IOException x, InputOutput ioput) {
//#153101
if (x.getMessage() != null && x.getMessage().contains("CreateProcess
error=5")) {
@@ -893,6 +899,43 @@ public class MavenCommandLineExecutor extends
AbstractMavenExecutor {
}
return false;
}
+
+/**
+ * Tries to relativize wrapper path. The execution starts in a {@link
RunConfig#getExecutionDirectory() },
+ * assuming one of the project or parent project directories. If wrapper
is present, it should be inside
+ * project, so relative paths between project modules should work. This is
how "normal humans" run and use
+ * mvnw wrapper. In addition, it avoids issues with the wrapper script
when the project has a space
+ * in its path - there's most probably no spaces in module names - but it
is NOT forbidden !!
+ *
+ * @param wrapper wrapper file
+ * @param config execution config
+ * @return relativized path, if possible.
+ */
+@NbBundle.Messages({
+"WARN_SpaceInPath=Warning: A space in project path or module name may
prevent mvnw wrapper to function properly."
+})
+private File resolveWrapperPath(File wrapper, RunConfig config) {
+File absWrapper = wrapper.getAbsoluteFile();
+File executionDir = config.getExecutionDirectory();
+Path absWrapperDir = absWrapper.toPath().getParent();
+Path absDir = executionDir.getAbsoluteFile().toPath();
+
+if (absWrapperDir.startsWith(absDir) ||
absDir.startsWith(absWrapperDir)) {
+Path relative =
absDir.relativize(wrapper.getAbsoluteFile().toPath());
+if (!relative.toString().contains(" ")) { // NOI18N
+if (relative.getNameCount() == 1) {
+// prevent searching on PATH
+return Paths.get(".").resolve(relative).toFile(); //
NOI18N
+} else {
+return relative.toFile();
+}
+}
+}
+if (absWrapper.toString().contains(" ")) {
+printColor(io, Bundle.WARN_SpaceInPath(),
IOColors.Output
(netbeans) 01/01: Merge pull request #7558 from sdedic/maven/relative-wrapper-path
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 846d426562c3d10a2e356d7580953e33f05613c3 Merge: 50be12a334b 5eaf3e5dd61 Author: Svatopluk Dedic AuthorDate: Wed Jul 10 14:31:14 2024 +0200 Merge pull request #7558 from sdedic/maven/relative-wrapper-path Use relative wrapper paths to prevent space-in-path bugs .../maven/execute/MavenCommandLineExecutor.java| 57 +++--- 1 file changed, 50 insertions(+), 7 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
(netbeans) branch master updated (50be12a334b -> 846d426562c)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 50be12a334b Merge pull request #7540 from jhorvath/cloud-assets-to-configmap add 5eaf3e5dd61 Use relative wrapper paths to prevent space-in-path bugs new 846d426562c Merge pull request #7558 from sdedic/maven/relative-wrapper-path The 1 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: .../maven/execute/MavenCommandLineExecutor.java| 57 +++--- 1 file changed, 50 insertions(+), 7 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
(netbeans) 01/01: Merge pull request #7401 from sdedic/lsp/apply-workspace-edit
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 47c2df77c127c4a79caa1e042e907508548eb95f Merge: 9212424b97 54779f9df7 Author: Svatopluk Dedic AuthorDate: Tue May 28 09:35:39 2024 +0200 Merge pull request #7401 from sdedic/lsp/apply-workspace-edit API/SPI to apply WorkspaceEdit ide/api.lsp/apichanges.xml | 17 +- ide/api.lsp/manifest.mf| 2 +- ide/api.lsp/nbproject/project.properties | 2 +- .../api/lsp/ResourceModificationException.java | 149 ++ .../src/org/netbeans/api/lsp/WorkspaceEdit.java| 30 ++ .../netbeans/spi/lsp/ApplyEditsImplementation.java | 54 .../nbproject/project.properties | 3 +- ide/project.dependency/nbproject/project.xml | 41 ++- .../DefaultApplyEditsImplementation.java | 161 +++ .../dependency/impl/TextDocumentEditProcessor.java | 20 +- .../unit/data/ProjectArtifactImplementation.java | 88 ++ .../DefaultApplyEditsImplementationTest.java | 291 +++ .../integration/LspApplyEditsImplementation.java | 31 ++ java/java.lsp.server/nbproject/project.xml | 2 +- .../netbeans/modules/java/lsp/server/Utils.java| 17 +- .../ui/AbstractApplyEditsImplementation.java | 171 +++ .../test/unit/data/ResourceTestingData.java| 102 +++ .../ui/AbstractApplyEditsImplementationTest.java | 313 + 18 files changed, 1485 insertions(+), 9 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
(netbeans) branch master updated (9212424b97 -> 47c2df77c1)
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from 9212424b97 Merge pull request #7201 from
lahodaj/java-modules-using-jdk9-plus
add 54779f9df7 API/SPI to apply WorkspaceEdit
new 47c2df77c1 Merge pull request #7401 from
sdedic/lsp/apply-workspace-edit
The 1 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:
ide/api.lsp/apichanges.xml | 17 +-
ide/api.lsp/manifest.mf| 2 +-
ide/api.lsp/nbproject/project.properties | 2 +-
.../api/lsp/ResourceModificationException.java | 149 ++
.../src/org/netbeans/api/lsp/WorkspaceEdit.java| 30 ++
.../netbeans/spi/lsp/ApplyEditsImplementation.java | 54
.../nbproject/project.properties | 3 +-
ide/project.dependency/nbproject/project.xml | 41 ++-
.../DefaultApplyEditsImplementation.java | 161 +++
.../dependency/impl/TextDocumentEditProcessor.java | 20 +-
.../unit/data/ProjectArtifactImplementation.java | 88 ++
.../DefaultApplyEditsImplementationTest.java | 291 +++
.../integration/LspApplyEditsImplementation.java | 31 ++
java/java.lsp.server/nbproject/project.xml | 2 +-
.../netbeans/modules/java/lsp/server/Utils.java| 17 +-
.../ui/AbstractApplyEditsImplementation.java | 171 +++
.../unit/data/ResourceTestingData.java}| 0
.../ui/AbstractApplyEditsImplementationTest.java | 313 +
18 files changed, 1383 insertions(+), 9 deletions(-)
create mode 100644
ide/api.lsp/src/org/netbeans/api/lsp/ResourceModificationException.java
create mode 100644
ide/api.lsp/src/org/netbeans/spi/lsp/ApplyEditsImplementation.java
create mode 100644
ide/project.dependency/src/org/netbeans/modules/project/dependency/DefaultApplyEditsImplementation.java
create mode 100644
ide/project.dependency/test/unit/data/ProjectArtifactImplementation.java
create mode 100644
ide/project.dependency/test/unit/src/org/netbeans/modules/project/dependency/DefaultApplyEditsImplementationTest.java
create mode 100644
java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/LspApplyEditsImplementation.java
create mode 100644
java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ui/AbstractApplyEditsImplementation.java
copy
java/java.lsp.server/{src/org/netbeans/modules/java/lsp/server/ui/AbstractGlobalActionContext.java
=> test/unit/data/ResourceTestingData.java} (100%)
create mode 100644
java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/ui/AbstractApplyEditsImplementationTest.java
-
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
(netbeans) 01/01: Merge pull request #7268 from sdedic/sdedic/update_truffle_240
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 88d93955c7c683b9b658e6b8986e1a5c789975fc Merge: 55587de29e 05febf11a5 Author: Svatopluk Dedic AuthorDate: Wed Apr 17 00:10:18 2024 -0700 Merge pull request #7268 from sdedic/sdedic/update_truffle_240 Update libs.graaljs, libs.graalsdk and libs.truffleapi to 24.0.0 .github/workflows/main.yml | 13 +- ide/libs.graalsdk.system/external/binaries-list|9 +- .../external/graal-sdk-24.0.0-license.txt} |8 +- .../external/jline-24.0.0-license.txt | 40 + ide/libs.graalsdk.system/manifest.mf |3 +- ide/libs.graalsdk.system/nbproject/project.xml | 28 +- ide/libs.graalsdk/external/binaries-list |9 +- .../external/graal-sdk-24.0.0-license.txt} |8 +- .../external/jline-24.0.0-license.txt | 40 + ide/libs.graalsdk/manifest.mf |6 +- .../nbproject/org-netbeans-libs-graalsdk.sig | 1325 +-- ide/libs.graalsdk/nbproject/project.properties | 14 +- ide/libs.graalsdk/nbproject/project.xml| 46 +- .../libs/graalsdk/impl/GraalEnginesProvider.java |2 +- .../org/netbeans/libs/graalsdk/impl/Installer.java | 42 + ide/libs.truffleapi/external/binaries-list |4 +- .../external/truffle-api-24.0.0-license.txt| 37 +- ide/libs.truffleapi/manifest.mf|7 +- .../nbproject/org-netbeans-libs-truffleapi.sig | 3631 ide/libs.truffleapi/nbproject/project.properties |8 +- ide/libs.truffleapi/nbproject/project.xml | 21 +- .../modules/nashorn/execution/JSExecutorTest.java |2 +- .../org/netbeans/nbbuild/extlibs/ignored-overlaps |8 + nbbuild/licenses/BSD-jline3| 34 + .../licenses/MIT-icu4j-74 | 211 +- .../licenses/UPL-MIT-jcodings | 30 +- platform/core.network/nbproject/project.xml| 12 +- .../network/proxy/ProxyAutoConfigDirectTest.java | 10 + .../core/network/proxy/pac/PacEngineTest.java |9 + .../proxy/pac/impl/NbPacScriptEvaluatorTest.java | 26 +- webcommon/libs.graaljs/external/binaries-list |9 +- ...j-67.1-license.txt => icu4j-24.0.0-license.txt} | 212 +- .../libs.graaljs/external/js-24.0.0-license.txt|4 +- webcommon/libs.graaljs/manifest.mf |3 +- .../libs.graaljs/nbproject/project.properties | 13 +- webcommon/libs.graaljs/nbproject/project.xml | 25 +- .../src/org/netbeans/libs/graaljs/graaljs.xml | 28 +- 37 files changed, 4822 insertions(+), 1115 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
(netbeans) branch master updated (55587de29e -> 88d93955c7)
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from 55587de29e Merge pull request #6834 from Achal1607/javavscode-56
add 9931c1567e Truffle, GraalSDK and Polyglot libraries upgrade.
add fd8fee0630 Fixed endless loop searching for dependent graalvms.
add fa2a8eeb44 Suppress Truffle warnings; do not require jvmci
add 05febf11a5 Test updates for Graaljs 24.0.0
new 88d93955c7 Merge pull request #7268 from
sdedic/sdedic/update_truffle_240
The 1 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:
.github/workflows/main.yml | 13 +-
ide/libs.graalsdk.system/external/binaries-list|9 +-
.../external/graal-sdk-24.0.0-license.txt} |8 +-
.../external/jline-24.0.0-license.txt | 40 +
ide/libs.graalsdk.system/manifest.mf |3 +-
ide/libs.graalsdk.system/nbproject/project.xml | 28 +-
ide/libs.graalsdk/external/binaries-list |9 +-
.../external/graal-sdk-24.0.0-license.txt} |8 +-
.../external/jline-24.0.0-license.txt | 40 +
ide/libs.graalsdk/manifest.mf |6 +-
.../nbproject/org-netbeans-libs-graalsdk.sig | 1325 +--
ide/libs.graalsdk/nbproject/project.properties | 14 +-
ide/libs.graalsdk/nbproject/project.xml| 46 +-
.../libs/graalsdk/impl/GraalEnginesProvider.java |2 +-
.../org/netbeans/libs/graalsdk/impl/Installer.java | 42 +
ide/libs.truffleapi/external/binaries-list |4 +-
.../external/truffle-api-24.0.0-license.txt| 37 +-
ide/libs.truffleapi/manifest.mf|7 +-
.../nbproject/org-netbeans-libs-truffleapi.sig | 3631
ide/libs.truffleapi/nbproject/project.properties |8 +-
ide/libs.truffleapi/nbproject/project.xml | 21 +-
.../modules/nashorn/execution/JSExecutorTest.java |2 +-
.../org/netbeans/nbbuild/extlibs/ignored-overlaps |8 +
nbbuild/licenses/BSD-jline3| 34 +
.../licenses/MIT-icu4j-74 | 211 +-
.../licenses/UPL-MIT-jcodings | 30 +-
platform/core.network/nbproject/project.xml| 12 +-
.../network/proxy/ProxyAutoConfigDirectTest.java | 10 +
.../core/network/proxy/pac/PacEngineTest.java |9 +
.../proxy/pac/impl/NbPacScriptEvaluatorTest.java | 26 +-
webcommon/libs.graaljs/external/binaries-list |9 +-
...j-67.1-license.txt => icu4j-24.0.0-license.txt} | 212 +-
.../libs.graaljs/external/js-24.0.0-license.txt|4 +-
webcommon/libs.graaljs/manifest.mf |3 +-
.../libs.graaljs/nbproject/project.properties | 13 +-
webcommon/libs.graaljs/nbproject/project.xml | 25 +-
.../src/org/netbeans/libs/graaljs/graaljs.xml | 28 +-
37 files changed, 4822 insertions(+), 1115 deletions(-)
rename ide/{libs.truffleapi/external/truffle-api-20.3.0-license.txt =>
libs.graalsdk.system/external/graal-sdk-24.0.0-license.txt} (89%)
create mode 100644 ide/libs.graalsdk.system/external/jline-24.0.0-license.txt
rename ide/{libs.graalsdk.system/external/graal-sdk-20.3.0-license.txt =>
libs.graalsdk/external/graal-sdk-24.0.0-license.txt} (89%)
create mode 100644 ide/libs.graalsdk/external/jline-24.0.0-license.txt
create mode 100644
ide/libs.graalsdk/src/org/netbeans/libs/graalsdk/impl/Installer.java
copy webcommon/libs.graaljs/external/js-20.3.0-license.txt =>
ide/libs.truffleapi/external/truffle-api-24.0.0-license.txt (54%)
create mode 100644 nbbuild/licenses/BSD-jline3
copy webcommon/libs.graaljs/external/icu4j-67.1-license.txt =>
nbbuild/licenses/MIT-icu4j-74 (73%)
rename webcommon/libs.graaljs/external/js-20.3.0-license.txt =>
nbbuild/licenses/UPL-MIT-jcodings (60%)
rename webcommon/libs.graaljs/external/{icu4j-67.1-license.txt =>
icu4j-24.0.0-license.txt} (73%)
rename ide/libs.graalsdk/external/graal-sdk-20.3.0-license.txt =>
webcommon/libs.graaljs/external/js-24.0.0-license.txt (94%)
-
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
(netbeans) branch master updated (7a099a6dc5 -> 88d95db5c9)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 7a099a6dc5 Merge pull request #7272 from neilcsmith-net/dashboard-api-docs add 0389c3497e First GraalSDK init may result in ServiceConfigurationError, should be caught add d60ea0cb89 Catch errors during script engine init, report once per registration. add 88d95db5c9 Merge pull request #7250 from sdedic/scripting/init-error-recovery No new revisions were added by this update. Summary of changes: .../libs/graalsdk/impl/GraalEnginesProvider.java | 11 - .../src/org/netbeans/api/scripting/Scripting.java | 26 +++--- 2 files changed, 33 insertions(+), 4 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
(netbeans) 01/01: Merge pull request #7227 from sdedic/sdedic/micronaut-test-fixes
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 15393b7fb0c306f15b6ffc9392d5f3ebf948b75a Merge: 905ff7ef83 e694be007b Author: Svatopluk Dedic AuthorDate: Wed Apr 3 02:00:27 2024 -0700 Merge pull request #7227 from sdedic/sdedic/micronaut-test-fixes Set up locator services to fix NPE during Maven priming .../modules/micronaut/NbSuiteTestBase.java | 94 ++ ...ronautExpressionLanguageCompletionTestBase.java | 6 +- .../maven/MicronautPackagingArtifactImplTest.java | 36 + 3 files changed, 99 insertions(+), 37 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
(netbeans) branch master updated (905ff7ef83 -> 15393b7fb0)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 905ff7ef83 Merge pull request #7198 from mbien/versioning-kenai-cleanup add e694be007b Set up locator services to fix NPE during Maven priming new 15393b7fb0 Merge pull request #7227 from sdedic/sdedic/micronaut-test-fixes The 1 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: .../modules/micronaut/NbSuiteTestBase.java | 94 ++ ...ronautExpressionLanguageCompletionTestBase.java | 6 +- .../maven/MicronautPackagingArtifactImplTest.java | 36 + 3 files changed, 99 insertions(+), 37 deletions(-) create mode 100644 enterprise/micronaut/test/unit/src/org/netbeans/modules/micronaut/NbSuiteTestBase.java - 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
(netbeans) branch master updated (dbb8050744 -> 13e62d7269)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from dbb8050744 Merge pull request #7178 from sdedic/sdedic/native-image-helidon add 990dbc32bc Increased logging. Missing indirect dependencies will report a project problem add 5d2f2258fb Check priming on each subproject. add 10992b9485 Intercept artifact resolution, report the artifact during its POM processing. add 55e0c677d0 Match fake artifact to artifacts from other checks. add 301fc75c90 Test adjusted. add 13e62d7269 Merge pull request #7063 from sdedic/maven/lsp-priming No new revisions were added by this update. Summary of changes: .../modules/java/lsp/server/protocol/Server.java | 128 +++--- .../modules/maven/embedder/MavenEmbedder.java | 14 +- .../maven/embedder/impl/ExtensionModule.java | 10 ++ .../maven/embedder/impl/NbVersionResolver2.java| 146 + .../maven/embedder/impl/NbWorkspaceReader.java | 43 +- .../netbeans/modules/maven/NbArtifactFixer.java| 33 - .../maven/modelcache/MavenProjectCache.java| 3 +- .../maven/problems/MavenModelProblemsProvider.java | 49 ++- .../modules/maven/problems/PrimingActionTest.java | 3 +- 9 files changed, 371 insertions(+), 58 deletions(-) create mode 100644 java/maven.embedder/src/org/netbeans/modules/maven/embedder/impl/NbVersionResolver2.java - 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
(netbeans) branch master updated (77f2c4ae74 -> dbb8050744)
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from 77f2c4ae74 Merge pull request #7162 from
ebarboni/visuallibsiteconnection
add 44c8d395e0 Very simple support for native-image build for Helidon
projects.
add dbb8050744 Merge pull request #7178 from
sdedic/sdedic/native-image-helidon
No new revisions were added by this update.
Summary of changes:
...actions-maven.xml => helidon-actions-maven.xml} | 5 ++--
.../netbeans/modules/micronaut/resources/layer.xml | 15 ++
.../netbeans/modules/maven/NbMavenProjectImpl.java | 35 --
.../maven/src/org/netbeans/modules/maven/layer.xml | 3 ++
4 files changed, 53 insertions(+), 5 deletions(-)
copy
enterprise/micronaut/src/org/netbeans/modules/micronaut/resources/{spring-actions-maven.xml
=> helidon-actions-maven.xml} (92%)
-
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
(netbeans) branch master updated (5e7b14f0eb -> 34deb25b8b)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 5e7b14f0eb Merge pull request #6968 from lahodaj/upgrade-javac-22 add 50fdbe4552 Override conflicting dependencies with the finally used ones. new 34deb25b8b Merge pull request #7028 from sdedic/maven/conflicting-dependencies The 1 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: .../queries/MavenDependenciesImplementation.java | 155 + 1 file changed, 94 insertions(+), 61 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
(netbeans) 01/01: Merge pull request #7028 from sdedic/maven/conflicting-dependencies
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 34deb25b8bb1cd8281985d4b3240b80f58e37e09 Merge: 5e7b14f0eb 50fdbe4552 Author: Svatopluk Dedic AuthorDate: Fri Feb 16 00:15:22 2024 -0800 Merge pull request #7028 from sdedic/maven/conflicting-dependencies Override conflicting dependencies with the finally used ones. .../queries/MavenDependenciesImplementation.java | 155 + 1 file changed, 94 insertions(+), 61 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
(netbeans) 01/01: Merge pull request #7037 from sdedic/gradle/multiproperty-getter-npe
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit d30134f8f7d34f29a0c418f49015cbd1f9f7e71a Merge: 26997b2020 ebd45056da Author: Svatopluk Dedic AuthorDate: Tue Feb 13 04:25:41 2024 -0800 Merge pull request #7037 from sdedic/gradle/multiproperty-getter-npe Skip unreadable multiproperties. .../org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java | 4 1 file changed, 4 insertions(+) - 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
(netbeans) branch master updated (26997b2020 -> d30134f8f7)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 26997b2020 Merge pull request #7061 from apache/revert-7011-jtulach/MultiLineTextsInMx add ebd45056da Skip unreadable multiproperties. new d30134f8f7 Merge pull request #7037 from sdedic/gradle/multiproperty-getter-npe The 1 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: .../org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java | 4 1 file changed, 4 insertions(+) - 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
(netbeans) branch vsnetbeans_2003 updated: Work on documents, not on editors. Translate filenames on Windows
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch vsnetbeans_2003
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/vsnetbeans_2003 by this push:
new 2fb03d6ccf Work on documents, not on editors. Translate filenames on
Windows
2fb03d6ccf is described below
commit 2fb03d6ccf775da515fd128f05d252a5e434d3eb
Author: Svata Dedic
AuthorDate: Wed Jan 10 10:09:51 2024 +0100
Work on documents, not on editors. Translate filenames on Windows
---
java/java.lsp.server/vscode/src/extension.ts | 16
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/java/java.lsp.server/vscode/src/extension.ts
b/java/java.lsp.server/vscode/src/extension.ts
index 841a95c070..d743950e54 100644
--- a/java/java.lsp.server/vscode/src/extension.ts
+++ b/java/java.lsp.server/vscode/src/extension.ts
@@ -1063,12 +1063,20 @@ function doActivateWithJDK(specifiedJDK: string | null,
context: ExtensionContex
runConfigurationUpdateAll();
});
c.onRequest(SaveDocumentsRequest.type, async (request :
SaveDocumentRequestParams) => {
-for (let ed of window.visibleTextEditors) {
-if
(request.documents.includes(ed.document.uri.toString())) {
-await
vscode.commands.executeCommand('workbench.action.files.save', ed.document.uri);
+const uriList = request.documents.map(s => {
+let re = /^file:\/(?:\/\/)?([A-Za-z]):\/(.*)$/.exec(s);
+if (!re) {
+return s;
+}
+// don't ask why vscode mangles URIs this way; in
addition, it uses lowercase drive letter ???
+return `file:///${re[1].toLowerCase()}%3A/${re[2]}`;
+});
+for (let ed of workspace.textDocuments) {
+if (uriList.includes(ed.uri.toString())) {
+return ed.save();
}
}
-return true;
+return false;
});
c.onRequest(InputBoxRequest.type, async param => {
return await window.showInputBox({ title: param.title, prompt:
param.prompt, value: param.value, password: param.password });
-
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
(netbeans) 03/03: Fixed potential race condition betweeen LSP requests and reportController.
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch vsnetbeans_2003
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 53e632e7e3068683519d985fc33f40647c3dcd8e
Author: Svata Dedic
AuthorDate: Tue Jan 9 10:15:22 2024 +0100
Fixed potential race condition betweeen LSP requests and reportController.
---
.../server/protocol/TextDocumentServiceImpl.java | 38 --
1 file changed, 21 insertions(+), 17 deletions(-)
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java
index 115f717dd2..0dd12e5ea1 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java
@@ -1914,23 +1914,27 @@ public class TextDocumentServiceImpl implements
TextDocumentService, LanguageCli
new Exception("no NbCodeLanguageClient!").printStackTrace();
}
-diagnosticTasks.computeIfAbsent(uri, u -> {
-return BACKGROUND_TASKS.create(() -> {
-Document originalDoc =
server.getOpenedDocuments().getDocument(uri);
-long originalVersion = documentVersion(originalDoc);
-List errorDiags = computeDiags(u, -1,
ErrorProvider.Kind.ERRORS, originalVersion);
-if (documentVersion(originalDoc) == originalVersion) {
-publishDiagnostics(uri, errorDiags);
-BACKGROUND_TASKS.create(() -> {
-List hintDiags = computeDiags(u, -1,
ErrorProvider.Kind.HINTS, originalVersion);
-Document doc =
server.getOpenedDocuments().getDocument(uri);
-if (documentVersion(doc) == originalVersion) {
-publishDiagnostics(uri, hintDiags);
-}
-}).schedule(DELAY);
-}
-});
-}).schedule(DELAY);
+// sync needed - this can be called also from reporterControl, from
other that LSP request thread. The factory function just cretaes a stopped
+// Task that is executed later.
+synchronized (diagnosticTasks) {
+diagnosticTasks.computeIfAbsent(uri, u -> {
+return BACKGROUND_TASKS.create(() -> {
+Document originalDoc =
server.getOpenedDocuments().getDocument(uri);
+long originalVersion = documentVersion(originalDoc);
+List errorDiags = computeDiags(u, -1,
ErrorProvider.Kind.ERRORS, originalVersion);
+if (documentVersion(originalDoc) == originalVersion) {
+publishDiagnostics(uri, errorDiags);
+BACKGROUND_TASKS.create(() -> {
+List hintDiags = computeDiags(u, -1,
ErrorProvider.Kind.HINTS, originalVersion);
+Document doc =
server.getOpenedDocuments().getDocument(uri);
+if (documentVersion(doc) == originalVersion) {
+publishDiagnostics(uri, hintDiags);
+}
+}).schedule(DELAY);
+}
+});
+}).schedule(DELAY);
+}
}
CompletableFuture> computeDiagnostics(String uri,
EnumSet types) {
-
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
(netbeans) 01/03: Check that configuration inherited to a Scope actually exists in the project.
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch vsnetbeans_2003
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 53a30363de2102ab94f784c60334fee10a30e33a
Author: Svata Dedic
AuthorDate: Tue Jan 9 10:14:25 2024 +0100
Check that configuration inherited to a Scope actually exists in the
project.
---
.../netbeans/modules/gradle/java/queries/GradleScopesBuilder.java| 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleScopesBuilder.java
b/java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleScopesBuilder.java
index 8cc6ae70e9..a04e0c0705 100644
---
a/java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleScopesBuilder.java
+++
b/java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleScopesBuilder.java
@@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import org.netbeans.api.project.Project;
import org.netbeans.modules.gradle.api.GradleBaseProject;
@@ -118,10 +119,10 @@ public final class GradleScopesBuilder {
extendsFrom.getOrDefault(gs.name(), Collections.emptyList()).
stream().
-map(scopes::get).forEach(data.extendsFrom::add);
+
map(scopes::get).filter(Objects::nonNull).forEach(data.extendsFrom::add);
inheritedInto.getOrDefault(gs.name(), Collections.emptyList()).
stream().
-map(scopes::get).forEach(data.inheritedInto::add);
+
map(scopes::get).filter(Objects::nonNull).forEach(data.inheritedInto::add);
}
return new GradleScopes(project, scopes);
-
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
(netbeans) 02/03: Aded diagnostic logging
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch vsnetbeans_2003
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 68f99478e7fe84943757180d1340eb1cdd4ad3ac
Author: Svata Dedic
AuthorDate: Tue Jan 9 10:14:54 2024 +0100
Aded diagnostic logging
---
.../queries/GradleDependenciesImplementation.java | 22 ++
1 file changed, 22 insertions(+)
diff --git
a/java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleDependenciesImplementation.java
b/java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleDependenciesImplementation.java
index 49f09e8521..bc95b3d2d0 100644
---
a/java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleDependenciesImplementation.java
+++
b/java/gradle.java/src/org/netbeans/modules/gradle/java/queries/GradleDependenciesImplementation.java
@@ -30,12 +30,14 @@ import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Queue;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.logging.Level;
import java.util.logging.Logger;
+import java.util.stream.Collectors;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.modules.gradle.api.GradleBaseProject;
@@ -276,6 +278,7 @@ public class GradleDependenciesImplementation implements
ProjectDependenciesImpl
}
List rootDeps = new ArrayList<>();
+LOG.log(Level.FINE, "** Computing dependencies for project {0}",
project);
for (Scope s : allScopes) {
String cfgName = toGradleConfigName(s);
if (cfgName == null) {
@@ -415,7 +418,18 @@ public class GradleDependenciesImplementation implements
ProjectDependenciesImpl
return ret;
}
+private int level = 0;
+
List processLevel(GradleConfiguration c, GradleDependency
d, Set allParents) {
+level++;
+try {
+return processLevel0(c, d, allParents);
+} finally {
+level--;
+}
+}
+
+List processLevel0(GradleConfiguration c, GradleDependency
d, Set allParents) {
if (counter > DEPENDENCIES_MAX_COUNT) {
LOG.log(Level.WARNING, "Potential dependency cycle for {0}
(parents: {1}), abort!", new Object[] { d, allParents });
return Collections.emptyList();
@@ -425,6 +439,14 @@ public class GradleDependenciesImplementation implements
ProjectDependenciesImpl
if (deps == null) {
return Collections.emptyList();
}
+if (LOG.isLoggable(Level.FINER)) {
+StringBuilder indent = new StringBuilder();
+for (int i = 0; i < level; i++) {
+indent.append(" ");
+}
+String chIds =
deps.stream().sequential().filter(Objects::nonNull).map(GradleDependency::getId).collect(Collectors.joining(",
"));
+LOG.log(Level.FINER, "Children: {0} {1} -> {2}", new Object[]
{ indent, d.getId(), chIds });
+}
List res = new ArrayList<>();
if (!allParents.add(d)) {
return res;
-
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
(netbeans) branch vsnetbeans_2003 updated (fda40c1b8c -> 53e632e7e3)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch vsnetbeans_2003 in repository https://gitbox.apache.org/repos/asf/netbeans.git from fda40c1b8c Remove debugging debris preventing extension start. new 53a30363de Check that configuration inherited to a Scope actually exists in the project. new 68f99478e7 Aded diagnostic logging new 53e632e7e3 Fixed potential race condition betweeen LSP requests and reportController. The 3 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: .../queries/GradleDependenciesImplementation.java | 22 + .../gradle/java/queries/GradleScopesBuilder.java | 5 +-- .../server/protocol/TextDocumentServiceImpl.java | 38 -- 3 files changed, 46 insertions(+), 19 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
(netbeans) branch master updated (94a19f0512 -> cac40a3030)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 94a19f0512 Merge pull request #6930 from neilcsmith-net/omg-its-2024 new 3eeb364767 Check that configuration inherited to a Scope actually exists in the project. new b8d76d9291 Aded diagnostic logging new ec7d3d0db1 Fixed potential race condition betweeen LSP requests and reportController. new cac40a3030 Merge pull request #6936 from sdedic/gradle/dependency-scope-fix The 9585 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: .../queries/GradleDependenciesImplementation.java | 22 + .../gradle/java/queries/GradleScopesBuilder.java | 5 +-- .../server/protocol/TextDocumentServiceImpl.java | 38 -- 3 files changed, 46 insertions(+), 19 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
(netbeans) branch vsnetbeans_2003 updated: Remove debugging debris preventing extension start.
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch vsnetbeans_2003
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/vsnetbeans_2003 by this push:
new fda40c1b8c Remove debugging debris preventing extension start.
fda40c1b8c is described below
commit fda40c1b8c471e76140aab020fd2503bab8cdd4d
Author: Svata Dedic
AuthorDate: Mon Jan 8 11:55:08 2024 +0100
Remove debugging debris preventing extension start.
---
java/java.lsp.server/vscode/src/extension.ts | 2 --
1 file changed, 2 deletions(-)
diff --git a/java/java.lsp.server/vscode/src/extension.ts
b/java/java.lsp.server/vscode/src/extension.ts
index 0ac04c0f89..841a95c070 100644
--- a/java/java.lsp.server/vscode/src/extension.ts
+++ b/java/java.lsp.server/vscode/src/extension.ts
@@ -61,7 +61,6 @@ import { TLSSocket } from 'tls';
import { InputStep, MultiStepInput } from './utils';
import { env } from 'process';
import { PropertiesView } from './propertiesView/propertiesView';
-import { dumpJava } from './test/suite/testutils';
const API_VERSION : string = "1.0";
export const COMMAND_PREFIX : string = "nbls";
@@ -291,7 +290,6 @@ function wrapCommandWithProgress(lsCommand : string, title
: string, log? : vsco
if (res) {
resolve(res);
} else {
-dumpJava();
if (log) {
handleLog(log, `Command ${lsCommand} takes too
long to start`);
}
-
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
(netbeans) branch master updated: Remove debugging debris preventing extension start.
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new a903b0c734 Remove debugging debris preventing extension start.
new 323db3eea4 Merge pull request #6928 from
sdedic/nbcode/hotfix-debug-leftover
a903b0c734 is described below
commit a903b0c734d0a8025e3fe3c0d4a03cc1f9353c69
Author: Svata Dedic
AuthorDate: Mon Jan 8 11:55:08 2024 +0100
Remove debugging debris preventing extension start.
---
java/java.lsp.server/vscode/src/extension.ts | 2 --
1 file changed, 2 deletions(-)
diff --git a/java/java.lsp.server/vscode/src/extension.ts
b/java/java.lsp.server/vscode/src/extension.ts
index 0ac04c0f89..841a95c070 100644
--- a/java/java.lsp.server/vscode/src/extension.ts
+++ b/java/java.lsp.server/vscode/src/extension.ts
@@ -61,7 +61,6 @@ import { TLSSocket } from 'tls';
import { InputStep, MultiStepInput } from './utils';
import { env } from 'process';
import { PropertiesView } from './propertiesView/propertiesView';
-import { dumpJava } from './test/suite/testutils';
const API_VERSION : string = "1.0";
export const COMMAND_PREFIX : string = "nbls";
@@ -291,7 +290,6 @@ function wrapCommandWithProgress(lsCommand : string, title
: string, log? : vsco
if (res) {
resolve(res);
} else {
-dumpJava();
if (log) {
handleLog(log, `Command ${lsCommand} takes too
long to start`);
}
-
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
(netbeans) branch master updated (041c2c88a8 -> 0375f4a815)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 041c2c88a8 Merge pull request #6868 from apache/sdedic/feature/project-dependency-add_base2 new d25a4c2ba2 asyncOpenSelectedProjects will return project that correspond to the passed candidates. new 414fac965c Finally expand the env var to support multiple parameters new 0375f4a815 Merge pull request #6852 from sdedic/lsp/openprojects-just-opened The 9554 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: .github/workflows/main.yml | 2 +- .../modules/java/lsp/server/LspServerState.java| 9 +++-- .../modules/java/lsp/server/protocol/Server.java | 26 +++--- .../lsp/server/protocol/WorkspaceServiceImpl.java | 18 +++--- java/java.lsp.server/vscode/src/extension.ts | 41 ++ java/java.lsp.server/vscode/src/nbcode.ts | 3 +- java/java.lsp.server/vscode/src/test/runTest.ts| 2 +- 7 files changed, 70 insertions(+), 31 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
(netbeans) branch master updated (b951c317d2 -> 041c2c88a8)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from b951c317d2 Merge pull request #6908 from mbien/java-lang-default-static-import-fixes add 831c1f6b84 Scope redefinition, private API break. add 162a0352d8 Dependency manipulation API concept. add e40b0c90e5 Gradle + Maven implementation of project add add c8683b9873 Prototype of dependencies.find command add 570d53178f LSP change dependency command added. add f58c830f87 Paperwork: Added proper licenses instead of placeholders. add ced9541c7a Add gradle.dependencies and maven.refactoring to the BuildTools testsuite add 390fac8f3b Adding necessary test dependencies for XDM. add 861a9ae379 Fixed filtering of artifacts add baf6abd1a4 Be tolerant on input casing; output enums with the exact case add 381bcb562f Compensate Lsp4j bad EnumSet deserialization. add 48db7e7ab0 Added more logging add 626097bc64 Missing guava breaks LSP structures toString add a5b7e7f339 Fixed missing .complete on the returned future add 6c1afb71ae Adapted to getFreshProject changes add 041c2c88a8 Merge pull request #6868 from apache/sdedic/feature/project-dependency-add_base2 No new revisions were added by this update. Summary of changes: .github/workflows/main.yml | 6 + .../modules/gradle/api/GradleConfiguration.java| 11 +- .../nbproject/project.properties | 2 +- ide/project.dependency/nbproject/project.xml | 49 +++ .../modules/project/dependency/ArtifactSpec.java | 41 ++- .../modules/project/dependency/Dependency.java | 11 + .../project/dependency/DependencyChange.java | 197 ++ .../dependency/DependencyChangeException.java | 98 + .../dependency/DependencyChangeRequest.java| 38 ++ .../project/dependency/DependencyResult.java | 10 +- .../project/dependency/ProjectDependencies.java| 109 +- .../dependency/ProjectModificationResult.java | 122 +++ .../dependency/ProjectOperationException.java | 34 +- .../modules/project/dependency/ProjectScopes.java | 49 +++ .../netbeans/modules/project/dependency/Scope.java | 49 ++- .../modules/project/dependency/Scopes.java | 88 ++--- .../impl/CompoundModificationResult.java | 78 .../impl/ProjectModificationResultImpl.java| 277 ++ .../dependency/impl/TextDocumentEditProcessor.java | 179 + .../dependency/impl/WorkspaceEditAdapter.java | 129 +++ .../dependency/spi/ProjectDependencyModifier.java | 87 + .../spi/ProjectReloadImplementation.java | 65 java/gradle.dependencies/build.xml | 25 ++ java/gradle.dependencies/manifest.mf | 5 + .../nbproject/project.properties | 6 +- .../nbproject/project.xml | 151 +++- .../gradle/dependencies/AbstractWorker.java| 120 +++ .../modules/gradle/dependencies/Bundle.properties | 9 +- .../gradle/dependencies/DependencyAdder.java | 288 +++ .../dependencies/DependencyModifierImpl.java | 115 ++ .../gradle/dependencies/RewriteContext.java| 119 ++ .../unit/data/projects}/micronaut/build.gradle | 0 .../unit/data/projects/micronaut/build2.gradle}| 7 +- .../unit/data/projects/micronaut/build3.gradle}| 12 - .../data/projects}/micronaut/gradle.properties | 0 .../gradle/wrapper/gradle-wrapper.properties | 0 .../unit/data/projects}/micronaut/settings.gradle | 0 .../src/main/java/com/example/Application.java | 0 .../micronaut/src/main/resources/application.yml | 0 .../micronaut}/src/main/resources/logback.xml | 0 .../src/test/java/com/example/MicrodemoTest.java | 0 .../dependencies/DependencyModifierImplTest.java | 400 + java/gradle.java/manifest.mf | 1 + java/gradle.java/nbproject/project.xml | 7 + .../gradle/java/queries/DependencyText.java| 63 +++- .../queries/GradleDependenciesImplementation.java | 191 -- .../java/queries/GradleDependencyResult.java | 59 +-- .../modules/gradle/java/queries/GradleScope.java | 81 + .../modules/gradle/java/queries/GradleScopes.java | 66 .../gradle/java/queries/GradleScopesBuilder.java | 129 +++ .../gradle/java/queries/TextDependencyScanner.java | 50 ++- .../unit/data/dependencies/micronaut/build.gradle | 10 +- .../data/dependencies/parse/variousSyntax.gradle | 12 +- .../GradleDependenciesImplementationTest.java | 123 ++- .../java/queries/RegexpGradleScannerTest.java | 77 +++- .../nbcode/integration/nbproject/project.xml | 8 + .../modules/nbcode/integration/ExtraGsonSetup.java | 198
(netbeans) branch sdedic/feature/project-dependency-add_base2 updated (a5b7e7f339 -> 6c1afb71ae)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch sdedic/feature/project-dependency-add_base2 in repository https://gitbox.apache.org/repos/asf/netbeans.git from a5b7e7f339 Fixed missing .complete on the returned future add 6c1afb71ae Adapted to getFreshProject changes No new revisions were added by this update. Summary of changes: .../maven/queries/MavenDependenciesImplementation.java| 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) - 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
(netbeans) branch master updated: Verify tool proxy setting before adjusting or asking.
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new f5a071fbbd Verify tool proxy setting before adjusting or asking.
new f2d7d00e3a Merge pull request #6764 from
sdedic/sdedic/network-proxy-probe
f5a071fbbd is described below
commit f5a071fbbd2cd274eb247e8780b89092cbe6bf08
Author: Svata Dedic
AuthorDate: Wed Nov 29 17:45:26 2023 +0100
Verify tool proxy setting before adjusting or asking.
---
.../gradle/execute/GradleNetworkProxySupport.java | 51 ++
.../modules/maven/execute/MavenProxySupport.java | 51 ++
2 files changed, 102 insertions(+)
diff --git
a/extide/gradle/src/org/netbeans/modules/gradle/execute/GradleNetworkProxySupport.java
b/extide/gradle/src/org/netbeans/modules/gradle/execute/GradleNetworkProxySupport.java
index e1acb94718..9113b61d50 100644
---
a/extide/gradle/src/org/netbeans/modules/gradle/execute/GradleNetworkProxySupport.java
+++
b/extide/gradle/src/org/netbeans/modules/gradle/execute/GradleNetworkProxySupport.java
@@ -22,12 +22,15 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.net.HttpURLConnection;
import java.net.InetSocketAddress;
+import java.net.MalformedURLException;
import java.net.Proxy;
import java.net.ProxySelector;
import java.net.SocketAddress;
import java.net.URI;
import java.net.URISyntaxException;
+import java.net.URL;
import java.text.DateFormat;
import java.util.Date;
import java.util.HashMap;
@@ -93,6 +96,12 @@ public class GradleNetworkProxySupport {
private static final int PORT_DEFAULT_HTTPS = 1080;
private static final int PORT_DEFAULT_HTTP = 80;
+/**
+ * Timeout for the network probe. The probe is done in case project
settings mismatch with the autodetected ones.
+ * If set to 0 or negative number, the project proxy configuration will
not be probed.
+ */
+private static final int PROXY_PROBE_TIMEOUT =
Integer.getInteger("netbeans.networkProxy.timeout", 1000);
+
private final Project project;
/**
@@ -295,6 +304,48 @@ public class GradleNetworkProxySupport {
action = NetworkProxySettings.NOTICE;
}
}
+if (action != NetworkProxySettings.IGNORE && PROXY_PROBE_TIMEOUT >
0) {
+// last check: make an outbound connection to a public site
+URL probeUrl;
+P: try {
+Proxy probeProxy;
+
+if (proxyHost != null) {
+LOG.log(Level.FINE, "Trying to probe with proxy {0}",
proxyAuthority);
+InetSocketAddress sa = new
InetSocketAddress(proxyHost, proxyPort);
+if (!sa.isUnresolved()) {
+probeProxy = new Proxy(Proxy.Type.HTTP, sa);
+} else {
+LOG.log(Level.FINE, "Tool proxy {0} probe not
resolvable", proxyAuthority);
+break P;
+}
+} else {
+probeProxy = Proxy.NO_PROXY;
+}
+probeUrl = new URL(PROBE_URI_STRING);
+HttpURLConnection c = null;
+try {
+c =
(HttpURLConnection)probeUrl.openConnection(probeProxy);
+c.setReadTimeout(PROXY_PROBE_TIMEOUT);
+c.setConnectTimeout(PROXY_PROBE_TIMEOUT);
+c.setRequestMethod("HEAD");
+c.connect();
+// force something through
+c.getLastModified();
+return CompletableFuture.completedFuture(new
ProxyResult(Status.CONTINUE, probeProxy, proxyAuthority, publicProxySpec,
publicProxyHost, publicProxyPort));
+} catch (IOException ex) {
+// the probe has failed
+LOG.log(Level.FINE, "Tool proxy {0} probe failed",
proxyAuthority);
+} finally {
+if (c != null) {
+c.disconnect();
+}
+}
+} catch (MalformedURLException ex) {
+// this is competely unexpected
+Exceptions.printStackTrace(ex);
+}
+}
switch (action) {
case IGNORE:
return
CompletableFuture.completedFuture(createResult(Status.CONTINUE));
diff --git
a/java/maven/src/org/netbeans/modules/maven/execute/MavenProxySupport.java
b/java/maven/
(netbeans) branch sdedic/feature/project-dependency-add_base2 updated (19372deb90 -> a5b7e7f339)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch sdedic/feature/project-dependency-add_base2 in repository https://gitbox.apache.org/repos/asf/netbeans.git omit 19372deb90 Adapted to getFreshProject changes omit 575448b6e1 Mangle windows URIs to vscode style. Work with documents rather than editors. omit 85f30acf76 Fixed missing .complete on the returned future omit d6eb7324ef Missing guava breaks LSP structures toString omit d340c6e6d4 Added more logging omit 7a5e8eddd4 Compensate Lsp4j bad EnumSet deserialization. omit a9f0322010 Be tolerant on input casing; output enums with the exact case omit 52eaf416ba Fixed filtering of artifacts omit 5106f89ba9 Adding necessary test dependencies for XDM. omit 41876d8898 Add gradle.dependencies and maven.refactoring to the BuildTools testsuite omit 53456971bf Paperwork: Added proper licenses instead of placeholders. omit f54e78c395 LSP change dependency command added. omit d94c722813 Prototype of dependencies.find command omit 89e54a6bc7 Gradle + Maven implementation of project add omit 13bc6c570a Dependency manipulation API concept. omit 1580cad211 Scope redefinition, private API break. omit 1b73a19f71 Merge pull request #6915 from junichi11/php-gh-6909-incorrect-cc-with-type-method omit d81235cc25 Merge pull request #6911 from junichi11/php-named-argument-cc-for-constructor omit 326cef41f4 Fix incorrect code completion with the same member names as semi-type prefixes #6909 omit 24ba6df45f Fix the named argument code completion for constructors omit 561522ebad Merge pull request #6910 from MartinBalin/master omit bd150719b9 Merge pull request #6883 from matthiasblaesing/javascript_config omit 011c1cc518 Merge pull request #6869 from neilcsmith-net/windows-launchers omit 1a3bafbbfa Changelog update for VSNetBeans 20.0.301 omit b391a63455 Drop special mimetype for karma test configuration omit b8e969aa0f Update paths and add workflow file to build native launchers. omit df96b9bdb4 Copy Windows launcher sources back from https://github.com/apache/netbeans-native-launchers add 831c1f6b84 Scope redefinition, private API break. add 162a0352d8 Dependency manipulation API concept. add e40b0c90e5 Gradle + Maven implementation of project add add c8683b9873 Prototype of dependencies.find command add 570d53178f LSP change dependency command added. add f58c830f87 Paperwork: Added proper licenses instead of placeholders. add ced9541c7a Add gradle.dependencies and maven.refactoring to the BuildTools testsuite add 390fac8f3b Adding necessary test dependencies for XDM. add 861a9ae379 Fixed filtering of artifacts add baf6abd1a4 Be tolerant on input casing; output enums with the exact case add 381bcb562f Compensate Lsp4j bad EnumSet deserialization. add 48db7e7ab0 Added more logging add 626097bc64 Missing guava breaks LSP structures toString add a5b7e7f339 Fixed missing .complete on the returned future This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (19372deb90) \ N -- N -- N refs/heads/sdedic/feature/project-dependency-add_base2 (a5b7e7f339) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .github/workflows/native-binary-build-launcher.yml | 210 --- .../windows-launcher-src/Makefile.mingw| 41 - .../windows-launcher-src/app.cpp | 29 - .../windows-launcher-src/app.exe.manifest | 75 - .../windows-launcher-src/app.ico | Bin 21174 -> 0 bytes .../apisupport.harness/windows-launcher-src/app.rc | 26 - .../windows-launcher-src/applauncher.cpp | 141 -- .../windows-launcher-src/applauncher.h | 67 - .../dependency/spi/ProjectDependencyModifier.java |7 +- java/java.lsp.server/vscode/CHANGELOG.md | 14 - java/java.lsp.server/vscode/src/extension.ts | 16 +- .../queries/MavenDependenciesImplementation.java | 11 +- nb/ide.launcher/windows/Makefile.mingw | 40 - nb/ide.launcher/windows/cmdargs.h | 119 -- nb/ide.launcher/windows/nblauncher.cpp | 554 -- nb/ide.launcher/windows/nblauncher.h | 107 -- nb/ide.launcher/windows/netbeans.cpp
(netbeans) branch sdedic/feature/project-dependency-add_base2 updated (575448b6e1 -> 19372deb90)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch sdedic/feature/project-dependency-add_base2 in repository https://gitbox.apache.org/repos/asf/netbeans.git from 575448b6e1 Mangle windows URIs to vscode style. Work with documents rather than editors. add 19372deb90 Adapted to getFreshProject changes No new revisions were added by this update. Summary of changes: .../maven/queries/MavenDependenciesImplementation.java| 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) - 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
(netbeans) branch sdedic/feature/project-dependency-add_base2 updated (cd86854647 -> 575448b6e1)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch sdedic/feature/project-dependency-add_base2 in repository https://gitbox.apache.org/repos/asf/netbeans.git discard cd86854647 Mangle windows URIs to vscode style. Work with documents rather than editors. discard 4ebe577060 Fixed missing .complete on the returned future discard 9e854ea5e1 Missing guava breaks LSP structures toString discard 041eb1e607 Added more logging discard d0e993bbac Compensate Lsp4j bad EnumSet deserialization. discard 890730e540 Be tolerant on input casing; output enums with the exact case discard 11be2e7fc6 Fixed filtering of artifacts discard 2752f1ac0c Adding necessary test dependencies for XDM. discard 27703bdefb Add gradle.dependencies and maven.refactoring to the BuildTools testsuite discard 661a8d7df0 Paperwork: Added proper licenses instead of placeholders. discard e72a5b8ee5 LSP change dependency command added. discard d6864666dd Prototype of dependencies.find command discard 43a1407b06 Gradle + Maven implementation of project add discard 3658262985 Dependency manipulation API concept. discard 1b8c5c656b Scope redefinition, private API break. add 5f29459e3a Don't create OCI Vault secrets with empty datasource name add a9f577647c Merge pull request #6870 from apache/emptyDatasourceName add 560777b21a Fix the Overriding Methods feature add 0a6df1e093 PHP 8.3 Support: Marking overridden methods (#[\Override]) (Part 1) add fd64377bed PHP 8.3 Support: Marking overridden methods (#[\Override]) (Part 2) add af05cd8aa6 Add the `getInterfaces()` method to the `TypeDeclaration` instead of the `getInterfaes()` add 2141d37d04 Merge pull request #6873 from junichi11/php83-marking-overridden-methods add 5572ad0dc0 Prevent NullPointerException if codeAction returns null (observed on rust-analyser 0.3.1756-standalone) add c36a8ad60d LSP-Client: After server initialization is done send initialized notification to server add babcc3d5c1 Merge pull request #6856 from matthiasblaesing/lsp_improvement add 5f687eb28c Fix the formatting for the method call arguments alignment option #6714 add f4da2b4df3 Merge pull request #6877 from junichi11/php-gh-6714-formatting-for-alignment add 1cda8a74bf PHP: mark a breakpoint as broken when an error is received when breakpoint_set is executed to set a breakpoint add e8b206ef64 Merge pull request #6876 from troizet/php_mark_breakpoint_as_broken add 0737cced68 Formatting for the group multiline alignment for match arm arrows #6074 add f8055bb485 Merge pull request #6884 from junichi11/php-gh-6074-match-arm-w-arrow-alignment add 0b9c24ff09 TaskList Model issues broken table model change events add 0291513733 Merge pull request #6882 from matthiasblaesing/tasklist-tablemodel-events add 729f4dcb75 Git client: Enable forced pushes for configured push and push to upstream add 296b2bff0a Merge pull request #6823 from matthiasblaesing/git add b006691903 PHP: New way to set the current breakpoint add a34e57050b Merge pull request #6891 from troizet/php_improve_set_current_breakpoint add ea28c84d29 Update to JGit 6.8 and Bouncy Castle 1.77 add f5719ec986 Merge pull request #6887 from mbien/jgit680 add 89555d4016 Improve magic methods generation add 73b894c09a Generate `__toString()` magic method with all fields #6783 add e458d63e89 Merge pull request #6896 from junichi11/php-gh-6783-tostring-method add aa919a41f0 Add the `IncorrectStaticContextHintError` as a new hint #6703 add 7c39099393 Merge pull request #6899 from junichi11/php-gh-6703-this-in-static-context add 9189d102cf Priming build and reload improvements. add 73ab3c2092 Use future and do not block if reloading. add df47821123 Merge pull request #6789 from sdedic/maven/priming-and-reloads2 add b081810632 LSP: Using labelDetails in CompletionItems for better rendering in VSCode. add 46477fc680 Merge pull request #6904 from dbalek/dbalek/lsp-completion-label-details add df96b9bdb4 Copy Windows launcher sources back from https://github.com/apache/netbeans-native-launchers add b8e969aa0f Update paths and add workflow file to build native launchers. add 011c1cc518 Merge pull request #6869 from neilcsmith-net/windows-launchers add b391a63455 Drop special mimetype for karma test configuration add bd150719b9 Merge pull request #6883 from matthiasblaesing/javascript_config add 1a3bafbbfa Changelog update for VSNetBeans 20.0.301 add 561522ebad Merge pull request #6910 from MartinBalin/master add 24ba6df45f Fix the named argument code completion for constructors add d81235cc25 Merge pull request #6911 from junichi11/php-named-argument-cc-for-constructor add 326cef41f4 Fix incorrect code completion with the same member names as semi-type prefixes
(netbeans) branch sdedic/feature/project-dependency-add_base2 updated (4ebe577060 -> cd86854647)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch sdedic/feature/project-dependency-add_base2 in repository https://gitbox.apache.org/repos/asf/netbeans.git from 4ebe577060 Fixed missing .complete on the returned future add cd86854647 Mangle windows URIs to vscode style. Work with documents rather than editors. No new revisions were added by this update. Summary of changes: java/java.lsp.server/vscode/src/extension.ts | 16 1 file changed, 12 insertions(+), 4 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
(netbeans) branch master updated (7c39099393 -> df47821123)
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from 7c39099393 Merge pull request #6899 from
junichi11/php-gh-6703-this-in-static-context
new 9189d102cf Priming build and reload improvements.
new 73ab3c2092 Use future and do not block if reloading.
new df47821123 Merge pull request #6789 from
sdedic/maven/priming-and-reloads2
The 9513 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:
.github/workflows/main.yml | 2 +-
.../modules/nbcode/integration/maven.properties| 1 +
java/maven/apichanges.xml | 14 +
java/maven/build.xml | 3 +-
java/maven/nbproject/project.properties| 2 +-
.../netbeans/modules/maven/NbArtifactFixer.java| 49 ++
.../netbeans/modules/maven/NbMavenProjectImpl.java | 195 ++-
.../netbeans/modules/maven/api/NbMavenProject.java | 54 +-
.../classpath/AbstractProjectClassPathImpl.java| 9 +
.../maven/classpath/ClassPathProviderImpl.java | 2 +
.../maven/classpath/CompileClassPathImpl.java | 7 +-
.../modules/maven/customizer/BasicInfoPanel.java | 4 +
.../maven/execute/MavenCommandLineExecutor.java| 17 +-
.../modules/maven/execute/ReactorChecker.java | 12 +-
.../maven/modelcache/MavenProjectCache.java| 223 +---
.../modules/maven/nodes/AddDependencyPanel.java| 3 +
.../maven/problems/MavenModelProblemsProvider.java | 68 ++-
.../maven/problems/ProblemReporterImpl.java| 2 +-
.../modules/maven/problems/SanityBuildAction.java | 17 +-
.../maven/spi/newproject/CreateProjectBuilder.java | 2 +-
.../data/projects/multiproject/democa}/.gitignore | 0
.../unit/data/projects/multiproject/democa/LICENSE | 201 +++
.../data/projects/multiproject/democa/lib/pom.xml | 198 +++
.../data/projects/multiproject/democa/oci/pom.xml | 253 +
.../unit/data/projects/multiproject/democa/pom.xml | 50 ++
.../modules/maven/NbMavenProjectImpl2Test.java | 597 +
.../{MockMavenExec.java => MavenExecMonitor.java} | 50 +-
.../modules/maven/execute/MockMavenExec.java | 23 +-
.../modules/maven/problems/PrimingActionTest.java | 14 +-
.../spi/actions/ProvidedConfigurationsTest.java| 7 +-
30 files changed, 1890 insertions(+), 189 deletions(-)
copy {enterprise/micronaut/test/unit/data/maven/micronaut4/simple =>
java/maven/test/unit/data/projects/multiproject/democa}/.gitignore (100%)
create mode 100644
java/maven/test/unit/data/projects/multiproject/democa/LICENSE
create mode 100644
java/maven/test/unit/data/projects/multiproject/democa/lib/pom.xml
create mode 100644
java/maven/test/unit/data/projects/multiproject/democa/oci/pom.xml
create mode 100644
java/maven/test/unit/data/projects/multiproject/democa/pom.xml
create mode 100644
java/maven/test/unit/src/org/netbeans/modules/maven/NbMavenProjectImpl2Test.java
copy
java/maven/test/unit/src/org/netbeans/modules/maven/execute/{MockMavenExec.java
=> MavenExecMonitor.java} (50%)
-
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
(netbeans) branch sdedic/feature/project-dependency-add_base2 updated (9e854ea5e1 -> 4ebe577060)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch sdedic/feature/project-dependency-add_base2 in repository https://gitbox.apache.org/repos/asf/netbeans.git from 9e854ea5e1 Missing guava breaks LSP structures toString add 4ebe577060 Fixed missing .complete on the returned future No new revisions were added by this update. Summary of changes: .../integration/commands/ProjectDependenciesCommand.java | 11 --- 1 file changed, 8 insertions(+), 3 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
(netbeans) 05/13: LSP change dependency command added.
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch sdedic/feature/project-dependency-add_base2
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit e72a5b8ee52166e2042082414f486fbe2cd74687
Author: Svata Dedic
AuthorDate: Thu Dec 14 20:17:15 2023 +0100
LSP change dependency command added.
---
.../dependency/ProjectModificationResult.java | 25 ++-
.../impl/ProjectModificationResultImpl.java| 21 ++-
.../dependency/impl/WorkspaceEditAdapter.java | 20 +++
.../dependency/spi/ProjectDependencyModifier.java | 13 ++
.../spi/ProjectReloadImplementation.java | 65
.../nbcode/integration/nbproject/project.xml | 8 +
.../modules/nbcode/integration/ExtraGsonSetup.java | 172 +++--
.../commands/LspDependencyChangeRequest.java | 61
.../commands/LspDependencyChangeResult.java| 36 +
.../commands/ProjectDependenciesCommand.java | 97 +++-
.../netbeans/modules/java/lsp/server/Utils.java| 43 ++
11 files changed, 539 insertions(+), 22 deletions(-)
diff --git
a/ide/project.dependency/src/org/netbeans/modules/project/dependency/ProjectModificationResult.java
b/ide/project.dependency/src/org/netbeans/modules/project/dependency/ProjectModificationResult.java
index 6f1197c529..32440e8bc4 100644
---
a/ide/project.dependency/src/org/netbeans/modules/project/dependency/ProjectModificationResult.java
+++
b/ide/project.dependency/src/org/netbeans/modules/project/dependency/ProjectModificationResult.java
@@ -20,9 +20,12 @@ package org.netbeans.modules.project.dependency;
import java.io.File;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedHashSet;
+import java.util.List;
import java.util.Set;
+import org.netbeans.api.actions.Savable;
import org.netbeans.api.lsp.WorkspaceEdit;
import
org.netbeans.modules.project.dependency.impl.ProjectModificationResultImpl;
import org.netbeans.modules.project.dependency.impl.WorkspaceEditAdapter;
@@ -42,6 +45,13 @@ public final class ProjectModificationResult implements
ModificationResult {
this.impl = impl;
}
+/**
+ * @return files that should be save in order so that build system can
recognize changes.
+ */
+public Collection getFilesToSave() {
+return impl.getFilesToSave();
+}
+
/**
* Describes the details of the workspace edit.
* @return details of the edit
@@ -62,9 +72,9 @@ public final class ProjectModificationResult implements
ModificationResult {
return wrapEdits().getResultingSource(file);
}
-private ModificationResult wrapEdits;
+private WorkspaceEditAdapter wrapEdits;
-ModificationResult wrapEdits() {
+WorkspaceEditAdapter wrapEdits() {
if (wrapEdits == null) {
wrapEdits = new WorkspaceEditAdapter(impl);
}
@@ -95,9 +105,18 @@ public final class ProjectModificationResult implements
ModificationResult {
@Override
public void commit() throws IOException {
-wrapEdits().commit();
+WorkspaceEditAdapter r = wrapEdits();
+r.commit();
if (impl.getCustomEdit() != null) {
impl.getCustomEdit().commit();
}
+// save the modified files, so project system will pick things up.
+// PENDING: make optional, at the discretion of
ProjectDependencyModifier.
+for (FileObject f : r.getFilesToSave()) {
+Savable s = f.getLookup().lookup(Savable.class);
+if (s != null) {
+s.save();
+}
+}
}
}
diff --git
a/ide/project.dependency/src/org/netbeans/modules/project/dependency/impl/ProjectModificationResultImpl.java
b/ide/project.dependency/src/org/netbeans/modules/project/dependency/impl/ProjectModificationResultImpl.java
index 7e762d9b47..09f231e943 100644
---
a/ide/project.dependency/src/org/netbeans/modules/project/dependency/impl/ProjectModificationResultImpl.java
+++
b/ide/project.dependency/src/org/netbeans/modules/project/dependency/impl/ProjectModificationResultImpl.java
@@ -23,12 +23,15 @@ import java.net.URL;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import org.netbeans.api.lsp.ResourceOperation;
import org.netbeans.api.lsp.TextDocumentEdit;
import org.netbeans.api.lsp.TextEdit;
@@ -50,6 +53,7 @@ import org.openide.util.Union2;
public class ProjectModificationResultImpl {
private final Project project;
+private Set toSave = new LinkedHashSet<>();
private ListcustomModifications = new
ArrayList<>();
(netbeans) 10/13: Be tolerant on input casing; output enums with the exact case
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch sdedic/feature/project-dependency-add_base2
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 890730e5408087364baa232913fd103079925251
Author: Svata Dedic
AuthorDate: Mon Dec 18 19:15:10 2023 +0100
Be tolerant on input casing; output enums with the exact case
---
.../org/netbeans/modules/nbcode/integration/ExtraGsonSetup.java | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git
a/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/ExtraGsonSetup.java
b/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/ExtraGsonSetup.java
index 04332e87f5..e65237d1b3 100644
---
a/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/ExtraGsonSetup.java
+++
b/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/ExtraGsonSetup.java
@@ -23,6 +23,7 @@ import com.google.gson.FieldAttributes;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.InstanceCreator;
+import com.google.gson.JsonArray;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
@@ -37,10 +38,12 @@ import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonToken;
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
+import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
+import java.util.EnumMap;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
@@ -103,7 +106,7 @@ public class ExtraGsonSetup implements LspGsonSetup {
b.registerTypeAdapter(DependencyChange.class, (InstanceCreator)(t) ->
DependencyChange.builder(DependencyChange.Kind.ADD).create());
b.registerTypeAdapterFactory(new LowercaseEnumTypeAdapterFactory());
}
-
+
class ArtifactDeserializer implements JsonDeserializer {
@Override
@@ -220,7 +223,7 @@ public class ExtraGsonSetup implements LspGsonSetup {
if (value == null) {
out.nullValue();
} else {
-out.value(toLowercase(value));
+out.value(value.toString());
}
}
@@ -229,7 +232,7 @@ public class ExtraGsonSetup implements LspGsonSetup {
reader.nextNull();
return null;
} else {
-return lowercaseToConstant.get(reader.nextString());
+return
lowercaseToConstant.get(toLowercase(reader.nextString()));
}
}
};
-
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
(netbeans) 13/13: Missing guava breaks LSP structures toString
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch sdedic/feature/project-dependency-add_base2 in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 9e854ea5e13643098438548635f79a07e16857e3 Author: Svata Dedic AuthorDate: Tue Dec 19 19:40:00 2023 +0100 Missing guava breaks LSP structures toString --- java/java.lsp.server/nbproject/project.xml | 6 ++ 1 file changed, 6 insertions(+) diff --git a/java/java.lsp.server/nbproject/project.xml b/java/java.lsp.server/nbproject/project.xml index 2994df98cf..f77fd9b28b 100644 --- a/java/java.lsp.server/nbproject/project.xml +++ b/java/java.lsp.server/nbproject/project.xml @@ -688,6 +688,12 @@ 9.24 + +com.google.guava + +27.16 + + - 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
(netbeans) 11/13: Compensate Lsp4j bad EnumSet deserialization.
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch sdedic/feature/project-dependency-add_base2
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit d0e993bbac047ad6944916a454f765c6c3b7a76b
Author: Svata Dedic
AuthorDate: Mon Dec 18 19:15:36 2023 +0100
Compensate Lsp4j bad EnumSet deserialization.
---
.../java/lsp/server/protocol/NbGsonAdapter.java| 40 ++
1 file changed, 40 insertions(+)
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/NbGsonAdapter.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/NbGsonAdapter.java
index 4054e60ae0..0dc958db2f 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/NbGsonAdapter.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/NbGsonAdapter.java
@@ -22,6 +22,11 @@ import com.google.gson.ExclusionStrategy;
import com.google.gson.FieldAttributes;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
import com.google.gson.TypeAdapter;
import com.google.gson.TypeAdapterFactory;
import com.google.gson.reflect.TypeToken;
@@ -29,10 +34,13 @@ import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonToken;
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
import java.net.MalformedURLException;
import java.nio.file.FileSystemNotFoundException;
import java.nio.file.Paths;
import java.util.Arrays;
+import java.util.EnumSet;
import java.util.HashSet;
import java.util.Set;
import java.util.logging.Level;
@@ -185,5 +193,37 @@ public class NbGsonAdapter implements LspGsonSetup {
}
}
});
+b.registerTypeAdapter(EnumSet.class, new EnumSetDeserializer());
}
+
+
+/**
+ * LSP4j obscures EnumSet handling by its Collection type adapter factory.
We need to register a type adapter
+ * that overrides the deserialization for enumsets. This adapter also
accepts a primitive as a (singleton) EnumSet.
+ */
+private static final class EnumSetDeserializer implements
JsonDeserializer {
+@Override
+public EnumSet deserialize(JsonElement je, Type type,
JsonDeserializationContext jdc) throws JsonParseException {
+ParameterizedType pt = (ParameterizedType)type;
+Type itemType = pt.getActualTypeArguments()[0];
+if (je.isJsonPrimitive()) {
+Enum e = (Enum)jdc.deserialize(je, itemType);
+if (e != null) {
+return EnumSet.of(e);
+}
+} else if (!je.isJsonArray()) {
+throw new JsonParseException("Primitive or array expected");
+}
+JsonArray arr = je.getAsJsonArray();
+EnumSet raw = EnumSet.noneOf((Class)itemType);
+for (JsonElement el : arr) {
+if (!el.isJsonPrimitive()) {
+throw new JsonParseException("Primitive item expected");
+}
+raw.add((Enum)jdc.deserialize(el, itemType));
+}
+return raw;
+}
+}
+
}
-
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
(netbeans) 08/13: Adding necessary test dependencies for XDM.
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch sdedic/feature/project-dependency-add_base2 in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 2752f1ac0cb3efbd82d25274cd5d09ab281daac7 Author: Svata Dedic AuthorDate: Fri Dec 15 10:00:40 2023 +0100 Adding necessary test dependencies for XDM. --- java/maven.refactoring/nbproject/project.xml | 8 1 file changed, 8 insertions(+) diff --git a/java/maven.refactoring/nbproject/project.xml b/java/maven.refactoring/nbproject/project.xml index e6edc20382..4e7b42e231 100644 --- a/java/maven.refactoring/nbproject/project.xml +++ b/java/maven.refactoring/nbproject/project.xml @@ -249,6 +249,14 @@ + + org.netbeans.modules.editor.lib + + + + org.netbeans.modules.editor.actions + + - 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
(netbeans) 06/13: Paperwork: Added proper licenses instead of placeholders.
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch sdedic/feature/project-dependency-add_base2 in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 661a8d7df072a53eae1b0cca0e2cdba31c3f8ecf Author: Svata Dedic AuthorDate: Thu Dec 14 23:14:32 2023 +0100 Paperwork: Added proper licenses instead of placeholders. --- java/gradle.dependencies/build.xml | 20 .../gradle.dependencies/nbproject/project.properties | 17 + java/gradle.dependencies/nbproject/project.xml | 20 .../modules/gradle/dependencies/Bundle.properties| 17 + .../commands/LspDependencyChangeRequest.java | 18 -- .../commands/LspDependencyChangeResult.java | 18 -- 6 files changed, 106 insertions(+), 4 deletions(-) diff --git a/java/gradle.dependencies/build.xml b/java/gradle.dependencies/build.xml index 2a04e77a74..39fc41b365 100644 --- a/java/gradle.dependencies/build.xml +++ b/java/gradle.dependencies/build.xml @@ -1,4 +1,24 @@ + Builds, tests, and runs the project org.netbeans.modules.gradle.dependencies diff --git a/java/gradle.dependencies/nbproject/project.properties b/java/gradle.dependencies/nbproject/project.properties index f9c36a8127..0165611012 100644 --- a/java/gradle.dependencies/nbproject/project.properties +++ b/java/gradle.dependencies/nbproject/project.properties @@ -1,3 +1,20 @@ +# 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. + javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial spec.version.base=1.0.0 diff --git a/java/gradle.dependencies/nbproject/project.xml b/java/gradle.dependencies/nbproject/project.xml index 4abedaaec8..fb5e44741b 100644 --- a/java/gradle.dependencies/nbproject/project.xml +++ b/java/gradle.dependencies/nbproject/project.xml @@ -1,4 +1,24 @@ + http://www.netbeans.org/ns/project/1";> org.netbeans.modules.apisupport.project diff --git a/java/gradle.dependencies/src/org/netbeans/modules/gradle/dependencies/Bundle.properties b/java/gradle.dependencies/src/org/netbeans/modules/gradle/dependencies/Bundle.properties index a815bce935..614b6a0c43 100644 --- a/java/gradle.dependencies/src/org/netbeans/modules/gradle/dependencies/Bundle.properties +++ b/java/gradle.dependencies/src/org/netbeans/modules/gradle/dependencies/Bundle.properties @@ -1,3 +1,20 @@ +# 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. + OpenIDE-Module-Display-Category=Gradle OpenIDE-Module-Long-Description=\ An experimental module that allows to manipulate dependencies in Gradle project. diff --git a/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/commands/LspDependencyChangeRequest.java b/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/commands/LspDependencyChangeRequest.java index 64f8e9e69a..e443d64ae2 100644 --- a/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/commands/LspDependencyChangeRequest.java +++ b/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/commands/LspDependencyChangeRequest.java @@ -1,6 +1,20 @@ /* - * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license - * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java t
(netbeans) 09/13: Fixed filtering of artifacts
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch sdedic/feature/project-dependency-add_base2
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 11be2e7fc65050c2fcb00878e22bc28bb4179f3d
Author: Svata Dedic
AuthorDate: Mon Dec 18 14:46:08 2023 +0100
Fixed filtering of artifacts
---
.../commands/ProjectDependenciesCommand.java | 25 +-
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git
a/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/commands/ProjectDependenciesCommand.java
b/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/commands/ProjectDependenciesCommand.java
index d1b12742fa..8b1eb93732 100644
---
a/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/commands/ProjectDependenciesCommand.java
+++
b/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/commands/ProjectDependenciesCommand.java
@@ -184,32 +184,37 @@ public class ProjectDependenciesCommand implements
CommandProvider {
continue;
}
toProcess.addAll(d.getChildren());
+boolean found = false;
if (matches != null && !matches.isEmpty()) {
for (ArtifactSpec test : matches) {
if (test.getGroupId() != null &&
!test.getGroupId().equals(a.getGroupId())) {
-continue NEXT;
+continue;
}
if (test.getArtifactId() != null &&
!test.getArtifactId().equals(a.getArtifactId())) {
-continue NEXT;
+continue;
}
if (test.getVersionSpec() != null &&
!test.getVersionSpec().equals(a.getVersionSpec())) {
-continue NEXT;
+continue;
}
if (test.getClassifier() != null &&
!test.getClassifier().equals(a.getClassifier())) {
-continue NEXT;
+continue;
}
if (test.getType()!= null &&
!test.getType().equals(a.getType())) {
-continue NEXT;
+continue;
}
// match found, OK
+found = true;
break;
}
-}
-
-if (request.isReturnContents()) {
-accepted.add(d);
} else {
-accepted.add(Dependency.create(a, d.getScope(),
Collections.emptyList(), null));
+found = true;
+}
+if (found) {
+if (request.isReturnContents()) {
+accepted.add(d);
+} else {
+accepted.add(Dependency.create(a,
d.getScope(), Collections.emptyList(), null));
+}
}
}
res.setMatches(accepted);
-
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
(netbeans) 02/13: Dependency manipulation API concept.
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch sdedic/feature/project-dependency-add_base2
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 36582629852d1f9c025a65d50a5b0dceac1bc6f5
Author: Svata Dedic
AuthorDate: Wed Dec 13 17:32:37 2023 +0100
Dependency manipulation API concept.
---
ide/project.dependency/nbproject/project.xml | 49
.../modules/project/dependency/ArtifactSpec.java | 41 +++-
.../modules/project/dependency/Dependency.java | 11 +
.../project/dependency/DependencyChange.java | 197
.../dependency/DependencyChangeException.java | 98
.../dependency/DependencyChangeRequest.java| 38 +++
.../project/dependency/ProjectDependencies.java| 109 -
.../dependency/ProjectModificationResult.java | 103
.../dependency/ProjectOperationException.java | 34 ++-
.../impl/CompoundModificationResult.java | 78 ++
.../impl/ProjectModificationResultImpl.java| 262 +
.../dependency/impl/TextDocumentEditProcessor.java | 179 ++
.../dependency/impl/WorkspaceEditAdapter.java | 109 +
.../dependency/spi/ProjectDependencyModifier.java | 69 ++
14 files changed, 1372 insertions(+), 5 deletions(-)
diff --git a/ide/project.dependency/nbproject/project.xml
b/ide/project.dependency/nbproject/project.xml
index 92f3e7ac9c..87f901c34a 100644
--- a/ide/project.dependency/nbproject/project.xml
+++ b/ide/project.dependency/nbproject/project.xml
@@ -34,6 +34,23 @@
1.45
+
+org.netbeans.api.lsp
+
+
+
+1
+1.21
+
+
+
+
org.netbeans.modules.editor.document
+
+
+
+1.32
+
+
org.netbeans.modules.projectapi
@@ -43,6 +60,22 @@
1.89
+
+
org.netbeans.modules.refactoring.api
+
+
+
+1.70
+
+
+
+org.openide.awt
+
+
+
+7.91
+
+
org.openide.filesystems
@@ -51,6 +84,22 @@
9.29
+
+org.openide.nodes
+
+
+
+7.68
+
+
+
+org.openide.text
+
+
+
+6.91
+
+
org.openide.util
diff --git
a/ide/project.dependency/src/org/netbeans/modules/project/dependency/ArtifactSpec.java
b/ide/project.dependency/src/org/netbeans/modules/project/dependency/ArtifactSpec.java
index 8bd80aaf1a..e0525f8eb8 100644
---
a/ide/project.dependency/src/org/netbeans/modules/project/dependency/ArtifactSpec.java
+++
b/ide/project.dependency/src/org/netbeans/modules/project/dependency/ArtifactSpec.java
@@ -316,6 +316,31 @@ public final class ArtifactSpec {
}
return new ArtifactSpec(VersionKind.REGULAR, groupId, artifactId,
versionSpec, type, classifier, optional, uri, localFile,
Collections.emptySet(), data);
}
+
+/**
+ * Creates a partial artifact specification, usable as a description. The
artifact does not contain all the metadata, but serves as a match
+ * for artifacts managed by the build system.
+ * @param groupId
+ * @param artifactId
+ * @return spec instance
+ * @since 1.7
+ */
+public static ArtifactSpec make(String groupId, String artifactId) {
+return createVersionSpec(groupId, artifactId, null, null, null, false,
null, null);
+}
+
+/**
+ * Creates a partial artifact specification, usable as a description. The
artifact does not contain all the metadata, but serves as a match
+ * for artifacts managed by the build system.
+ * @param groupId group ID
+ * @param artifactId artifact ID
+ * @param versionSpec version
+ * @return spec instance
+ * @since 1.7
+ */
+public static ArtifactSpec make(String groupId, String artifactId, String
versionSpec) {
+return createVersionSpec
(netbeans) 07/13: Add gradle.dependencies and maven.refactoring to the BuildTools testsuite
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch sdedic/feature/project-dependency-add_base2 in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 27703bdefb7ed82a72657fe87b6c155e8897cb06 Author: Svata Dedic AuthorDate: Fri Dec 15 07:46:05 2023 +0100 Add gradle.dependencies and maven.refactoring to the BuildTools testsuite --- .github/workflows/main.yml | 6 ++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 48f33b525d..94197c0c55 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -859,6 +859,9 @@ jobs: - name: java/maven.indexer run: ant $OPTS -f java/maven.indexer test + - name: java/maven.refactoring +run: ant $OPTS -f java/maven.refactoring test + - name: java/maven.junit run: ant $OPTS -f java/maven.junit test @@ -913,6 +916,9 @@ jobs: - name: extide/gradle run: ant $OPTS -f extide/gradle test + - name: java/gradle.dependencies +run: ant $OPTS -f java/gradle.dependencies test + - name: extide/o.apache.tools.ant.module run: ant $OPTS -f extide/o.apache.tools.ant.module test - 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
(netbeans) 12/13: Added more logging
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch sdedic/feature/project-dependency-add_base2
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 041eb1e607163a4a3dd9985dad3ddbdf881a1490
Author: Svata Dedic
AuthorDate: Tue Dec 19 19:39:33 2023 +0100
Added more logging
---
.../modules/java/lsp/server/protocol/TextDocumentServiceImpl.java| 5 +
1 file changed, 5 insertions(+)
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java
index 4a101d81ce..7cc97dd6c8 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java
@@ -1628,6 +1628,7 @@ public class TextDocumentServiceImpl implements
TextDocumentService, LanguageCli
@Override
public void didOpen(DidOpenTextDocumentParams params) {
+LOG.log(Level.FINER, "didOpen: {0}", params);
try {
FileObject file = fromURI(params.getTextDocument().getUri(), true);
if (file == null) {
@@ -1699,6 +1700,7 @@ public class TextDocumentServiceImpl implements
TextDocumentService, LanguageCli
@Override
public void didChange(DidChangeTextDocumentParams params) {
+LOG.log(Level.FINER, "didChange: {0}", params);
String uri = params.getTextDocument().getUri();
Document rawDoc = server.getOpenedDocuments().getDocument(uri);
if (rawDoc != null) {
@@ -1725,6 +1727,7 @@ public class TextDocumentServiceImpl implements
TextDocumentService, LanguageCli
@Override
public void didClose(DidCloseTextDocumentParams params) {
+LOG.log(Level.FINER, "didClose: {0}", params);
try {
String uri = params.getTextDocument().getUri();
// the order here is important ! As the file may cease to exist,
it's
@@ -1748,6 +1751,7 @@ public class TextDocumentServiceImpl implements
TextDocumentService, LanguageCli
@Override
public CompletableFuture>
willSaveWaitUntil(WillSaveTextDocumentParams params) {
+LOG.log(Level.FINER, "willSaveWaitUntil: {0}", params);
String uri = params.getTextDocument().getUri();
JavaSource js = getJavaSource(uri);
if (js == null) {
@@ -1775,6 +1779,7 @@ public class TextDocumentServiceImpl implements
TextDocumentService, LanguageCli
@Override
public void didSave(DidSaveTextDocumentParams arg0) {
//TODO: nothing for now?
+LOG.log(Level.FINER, "didSave: {0}", arg0);
}
CompletableFuture> superImplementations(String
uri, Position position) {
-
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
(netbeans) 04/13: Prototype of dependencies.find command
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch sdedic/feature/project-dependency-add_base2
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit d6864666dd5bda44039388f07c0d1bf0ba191b1a
Author: Svata Dedic
AuthorDate: Wed Dec 13 22:43:40 2023 +0100
Prototype of dependencies.find command
---
.../modules/nbcode/integration/ExtraGsonSetup.java | 49 -
.../commands/DependencyFindRequest.java| 87 +
.../integration/commands/DependencyFindResult.java | 67 +++
.../commands/ProjectDependenciesCommand.java | 200 +
4 files changed, 402 insertions(+), 1 deletion(-)
diff --git
a/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/ExtraGsonSetup.java
b/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/ExtraGsonSetup.java
index d63d16d59a..56ebb6e78a 100644
---
a/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/ExtraGsonSetup.java
+++
b/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/ExtraGsonSetup.java
@@ -21,11 +21,21 @@ package org.netbeans.modules.nbcode.integration;
import com.google.gson.ExclusionStrategy;
import com.google.gson.FieldAttributes;
import com.google.gson.GsonBuilder;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import java.lang.reflect.Type;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import org.netbeans.modules.java.lsp.server.LspGsonSetup;
import org.netbeans.modules.project.dependency.ArtifactSpec;
+import org.netbeans.modules.project.dependency.Dependency;
+import org.netbeans.modules.project.dependency.Scope;
import org.openide.util.lookup.ServiceProvider;
/**
@@ -40,6 +50,11 @@ public class ExtraGsonSetup implements LspGsonSetup{
"data" // NOI18N
));
+private static final Set DEPENDENCY_BLOCK_FIELDS = new
HashSet<>(Arrays.asList(
+"parent", // NOI18N
+"data" // NOI18N
+));
+
@Override
public void configureBuilder(GsonBuilder b) {
b.addSerializationExclusionStrategy(new ExclusionStrategy() {
@@ -50,7 +65,9 @@ public class ExtraGsonSetup implements LspGsonSetup{
if (fa.getDeclaringClass() == ArtifactSpec.class) {
return ARTIFACT_BLOCK_FIELDS.contains(fa.getName());
} else if
(Throwable.class.isAssignableFrom(fa.getDeclaredClass())) {
-
+return DEPENDENCY_BLOCK_FIELDS.contains(fa.getName());
+} else if (fa.getDeclaringClass() == Dependency.class) {
+
}
return false;
}
@@ -60,6 +77,36 @@ public class ExtraGsonSetup implements LspGsonSetup{
return false;
}
});
+b.registerTypeAdapter(ArtifactSpec.class, new ArtifactDeserializer());
+b.registerTypeAdapter(Scope.class, new ScopeSerializer());
}
+class ScopeSerializer implements JsonSerializer {
+
+@Override
+public JsonElement serialize(Scope t, Type type,
JsonSerializationContext jsc) {
+return jsc.serialize(t.name());
+}
+}
+
+
+class ArtifactDeserializer implements JsonDeserializer {
+
+@Override
+public ArtifactSpec deserialize(JsonElement je, Type type,
JsonDeserializationContext jdc) throws JsonParseException {
+JsonObject obj = je.getAsJsonObject();
+String g = obj.has("groupId") ?
obj.getAsJsonPrimitive("groupId").getAsString() : null;
+String a = obj.has("artifactId") ?
obj.getAsJsonPrimitive("artifactId").getAsString() : null;
+String v = obj.has("versionSpec") ?
obj.getAsJsonPrimitive("versionSpec").getAsString() : null;
+String c = obj.has("classifier") ?
obj.getAsJsonPrimitive("classifier").getAsString() : null;
+String t = obj.has("type") ?
obj.getAsJsonPrimitive("type").getAsString() : null;
+
+
+ArtifactSpec.Builder b = ArtifactSpec.builder(g, a, v,
null).classifier(c).type(t);
+if (v != null && v.contains("-SNAPSHOT")) {
+b.versionKind(ArtifactSpec.VersionKind.SNAPSHOT);
+}
+return b.build();
+}
+}
}
diff --git
a/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/commands/DependencyFindRequest.java
b/java/java.lsp.server/nbcode/integration/s
(netbeans) branch sdedic/feature/project-dependency-add_base2 created (now 9e854ea5e1)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch sdedic/feature/project-dependency-add_base2 in repository https://gitbox.apache.org/repos/asf/netbeans.git at 9e854ea5e1 Missing guava breaks LSP structures toString This branch includes the following new commits: new 1b8c5c656b Scope redefinition, private API break. new 3658262985 Dependency manipulation API concept. new 43a1407b06 Gradle + Maven implementation of project add new d6864666dd Prototype of dependencies.find command new e72a5b8ee5 LSP change dependency command added. new 661a8d7df0 Paperwork: Added proper licenses instead of placeholders. new 27703bdefb Add gradle.dependencies and maven.refactoring to the BuildTools testsuite new 2752f1ac0c Adding necessary test dependencies for XDM. new 11be2e7fc6 Fixed filtering of artifacts new 890730e540 Be tolerant on input casing; output enums with the exact case new d0e993bbac Compensate Lsp4j bad EnumSet deserialization. new 041eb1e607 Added more logging new 9e854ea5e1 Missing guava breaks LSP structures toString The 13 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. - 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
(netbeans) 01/13: Scope redefinition, private API break.
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch sdedic/feature/project-dependency-add_base2
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 1b8c5c656bd49ae07bb2441fe1c45e48e1cf47c9
Author: Svata Dedic
AuthorDate: Wed Dec 13 17:08:51 2023 +0100
Scope redefinition, private API break.
---
.../modules/gradle/api/GradleConfiguration.java| 11 +-
.../nbproject/project.properties | 2 +-
.../project/dependency/DependencyResult.java | 10 +-
.../modules/project/dependency/ProjectScopes.java | 49 ++
.../netbeans/modules/project/dependency/Scope.java | 49 +++---
.../modules/project/dependency/Scopes.java | 88 --
java/gradle.java/nbproject/project.xml | 7 +
.../gradle/java/queries/DependencyText.java| 63 ++-
.../queries/GradleDependenciesImplementation.java | 191 +
.../java/queries/GradleDependencyResult.java | 59 ---
.../modules/gradle/java/queries/GradleScope.java | 81 +
.../modules/gradle/java/queries/GradleScopes.java | 66 +++
.../gradle/java/queries/GradleScopesBuilder.java | 129 ++
.../gradle/java/queries/TextDependencyScanner.java | 50 --
.../unit/data/dependencies/micronaut/build.gradle | 10 +-
.../data/dependencies/parse/variousSyntax.gradle | 12 +-
.../GradleDependenciesImplementationTest.java | 123 -
.../java/queries/RegexpGradleScannerTest.java | 77 -
.../queries/MavenDependenciesImplementation.java | 134 +++
.../maven/queries/MavenDependencyResult.java | 19 +-
20 files changed, 1011 insertions(+), 219 deletions(-)
diff --git
a/extide/gradle/src/org/netbeans/modules/gradle/api/GradleConfiguration.java
b/extide/gradle/src/org/netbeans/modules/gradle/api/GradleConfiguration.java
index 3c21520b72..6b795428c1 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/api/GradleConfiguration.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/api/GradleConfiguration.java
@@ -85,7 +85,11 @@ public final class GradleConfiguration implements
Serializable, ModuleSearchSupp
* @return direct dependencies
*/
public Collection getConfiguredDependencies() {
-return directChildren;
+if (canBeResolved) {
+return directChildren;
+} else {
+return unresolved;
+}
}
/**
@@ -100,12 +104,13 @@ public final class GradleConfiguration implements
Serializable, ModuleSearchSupp
* @return configuration of origin or {@code null}.
*/
public GradleConfiguration getDependencyOrigin(GradleDependency d) {
-if (!getDependencies().contains(d)) {
+if (!getDependencies().contains(d) &&
!getConfiguredDependencies().contains(d)) {
return null;
}
// TODO: possibly create a dependency-to-config cache in this instance
to speed up further queries
Set done = new HashSet<>();
-Queue toProcess = new
ArrayDeque<>(getExtendsFrom());
+Queue toProcess = new ArrayDeque<>();
+toProcess.add(this);
GradleConfiguration conf;
while ((conf = toProcess.poll()) != null) {
diff --git a/ide/project.dependency/nbproject/project.properties
b/ide/project.dependency/nbproject/project.properties
index 209dfe92e4..264c46ce0c 100644
--- a/ide/project.dependency/nbproject/project.properties
+++ b/ide/project.dependency/nbproject/project.properties
@@ -18,4 +18,4 @@
is.autoload=true
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.6.0
+spec.version.base=1.7.0
diff --git
a/ide/project.dependency/src/org/netbeans/modules/project/dependency/DependencyResult.java
b/ide/project.dependency/src/org/netbeans/modules/project/dependency/DependencyResult.java
index e59c573805..7181e6b627 100644
---
a/ide/project.dependency/src/org/netbeans/modules/project/dependency/DependencyResult.java
+++
b/ide/project.dependency/src/org/netbeans/modules/project/dependency/DependencyResult.java
@@ -38,6 +38,8 @@ import org.openide.util.Lookup;
*
* The {@link #getLookup() lookup} can be used to search for project-specific
services that
* can provide further info on the artifacts or dependencies.
+ *
+ * PENDING: move to SPI, make API delegating wrapper.
* @author sdedic
*/
public interface DependencyResult extends Lookup.Provider {
@@ -119,7 +121,7 @@ public interface DependencyResult extends Lookup.Provider {
/**
* A special part that locates a location appropriate for the surrounding
* container. For example {@code dependencies} element in Maven or {@code
dependencies}
- * block in a gradle script. Use project root as the dependency
+ * block in a gradle script. Use project root or {@code null} as the
dependency
*/
public static final String PART_CONTAINE
(netbeans) branch master updated: Return root node even though everything is filtered.
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new f978710829 Return root node even though everything is filtered.
new 795e3a7750 Merge pull request #6846 from
sdedic/sdedic/dependency-filter-fix
f978710829 is described below
commit f978710829617c65bf5d50acd9e88a37e690a1fd
Author: Svata Dedic
AuthorDate: Wed Dec 13 22:42:06 2023 +0100
Return root node even though everything is filtered.
---
.../src/org/netbeans/modules/project/dependency/Scope.java| 2 +-
.../modules/maven/queries/MavenDependenciesImplementation.java| 8
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/ide/project.dependency/src/org/netbeans/modules/project/dependency/Scope.java
b/ide/project.dependency/src/org/netbeans/modules/project/dependency/Scope.java
index 92422dc076..85e9161c0d 100644
---
a/ide/project.dependency/src/org/netbeans/modules/project/dependency/Scope.java
+++
b/ide/project.dependency/src/org/netbeans/modules/project/dependency/Scope.java
@@ -86,7 +86,7 @@ public abstract class Scope {
if (obj == null) {
return false;
}
-if (getClass() != obj.getClass()) {
+if (!(obj instanceof Scope)) {
return false;
}
final Scope other = (Scope) obj;
diff --git
a/java/maven/src/org/netbeans/modules/maven/queries/MavenDependenciesImplementation.java
b/java/maven/src/org/netbeans/modules/maven/queries/MavenDependenciesImplementation.java
index 4ed75f7b15..b3a56b0bb2 100644
---
a/java/maven/src/org/netbeans/modules/maven/queries/MavenDependenciesImplementation.java
+++
b/java/maven/src/org/netbeans/modules/maven/queries/MavenDependenciesImplementation.java
@@ -264,10 +264,10 @@ public class MavenDependenciesImplementation implements
ProjectDependenciesImple
private Dependency
convertDependencies(org.apache.maven.shared.dependency.tree.DependencyNode n,
Dependency.Filter filter, Set broken) {
Map> realNodes = new
HashMap<>();
findRealNodes(n, realNodes);
-return convert2(n, filter, realNodes, broken);
+return convert2(true, n, filter, realNodes, broken);
}
-private Dependency
convert2(org.apache.maven.shared.dependency.tree.DependencyNode n,
Dependency.Filter filter, Map> realNodes,
Set broken) {
+private Dependency convert2(boolean root,
org.apache.maven.shared.dependency.tree.DependencyNode n, Dependency.Filter
filter, Map> realNodes,
Set broken) {
List ch = new ArrayList<>();
List children
= null;
@@ -286,7 +286,7 @@ public class MavenDependenciesImplementation implements
ProjectDependenciesImple
}
for (org.apache.maven.shared.dependency.tree.DependencyNode c :
children) {
-Dependency cd = convert2(c, filter, realNodes, broken);
+Dependency cd = convert2(false, c, filter, realNodes, broken);
if (cd != null) {
ch.add(cd);
}
@@ -303,7 +303,7 @@ public class MavenDependenciesImplementation implements
ProjectDependenciesImple
}
Scope s = scope(a);
-if (!filter.accept(s, aspec)) {
+if (!root && !filter.accept(s, aspec)) {
return null;
}
-
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
(netbeans) 02/02: Missing guava breaks LSP structures toString
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch sdedic/feature/project-dependency-add_base in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 615a7a94f6f16763c5147c285779fc2b0872ae13 Author: Svata Dedic AuthorDate: Tue Dec 19 19:40:00 2023 +0100 Missing guava breaks LSP structures toString --- java/java.lsp.server/nbproject/project.xml | 6 ++ 1 file changed, 6 insertions(+) diff --git a/java/java.lsp.server/nbproject/project.xml b/java/java.lsp.server/nbproject/project.xml index 2994df98cf..f77fd9b28b 100644 --- a/java/java.lsp.server/nbproject/project.xml +++ b/java/java.lsp.server/nbproject/project.xml @@ -688,6 +688,12 @@ 9.24 + +com.google.guava + +27.16 + + - 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
(netbeans) branch sdedic/feature/project-dependency-add_base updated (ccf6a0cdfb -> 615a7a94f6)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch sdedic/feature/project-dependency-add_base in repository https://gitbox.apache.org/repos/asf/netbeans.git from ccf6a0cdfb Compensate Lsp4j bad EnumSet deserialization. new 73a7f480df Added more logging new 615a7a94f6 Missing guava breaks LSP structures toString The 2 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/java.lsp.server/nbproject/project.xml | 6 ++ .../modules/java/lsp/server/protocol/TextDocumentServiceImpl.java | 5 + 2 files changed, 11 insertions(+) - 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
(netbeans) 01/02: Added more logging
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch sdedic/feature/project-dependency-add_base
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 73a7f480df5fdfaa3f6429c2adf75409e2b6db94
Author: Svata Dedic
AuthorDate: Tue Dec 19 19:39:33 2023 +0100
Added more logging
---
.../modules/java/lsp/server/protocol/TextDocumentServiceImpl.java| 5 +
1 file changed, 5 insertions(+)
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java
index 4a101d81ce..7cc97dd6c8 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImpl.java
@@ -1628,6 +1628,7 @@ public class TextDocumentServiceImpl implements
TextDocumentService, LanguageCli
@Override
public void didOpen(DidOpenTextDocumentParams params) {
+LOG.log(Level.FINER, "didOpen: {0}", params);
try {
FileObject file = fromURI(params.getTextDocument().getUri(), true);
if (file == null) {
@@ -1699,6 +1700,7 @@ public class TextDocumentServiceImpl implements
TextDocumentService, LanguageCli
@Override
public void didChange(DidChangeTextDocumentParams params) {
+LOG.log(Level.FINER, "didChange: {0}", params);
String uri = params.getTextDocument().getUri();
Document rawDoc = server.getOpenedDocuments().getDocument(uri);
if (rawDoc != null) {
@@ -1725,6 +1727,7 @@ public class TextDocumentServiceImpl implements
TextDocumentService, LanguageCli
@Override
public void didClose(DidCloseTextDocumentParams params) {
+LOG.log(Level.FINER, "didClose: {0}", params);
try {
String uri = params.getTextDocument().getUri();
// the order here is important ! As the file may cease to exist,
it's
@@ -1748,6 +1751,7 @@ public class TextDocumentServiceImpl implements
TextDocumentService, LanguageCli
@Override
public CompletableFuture>
willSaveWaitUntil(WillSaveTextDocumentParams params) {
+LOG.log(Level.FINER, "willSaveWaitUntil: {0}", params);
String uri = params.getTextDocument().getUri();
JavaSource js = getJavaSource(uri);
if (js == null) {
@@ -1775,6 +1779,7 @@ public class TextDocumentServiceImpl implements
TextDocumentService, LanguageCli
@Override
public void didSave(DidSaveTextDocumentParams arg0) {
//TODO: nothing for now?
+LOG.log(Level.FINER, "didSave: {0}", arg0);
}
CompletableFuture> superImplementations(String
uri, Position position) {
-
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
(netbeans) 02/02: Compensate Lsp4j bad EnumSet deserialization.
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch sdedic/feature/project-dependency-add_base
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit ccf6a0cdfb8e3a3d0c06f6c75881f48f0756e8ee
Author: Svata Dedic
AuthorDate: Mon Dec 18 19:15:36 2023 +0100
Compensate Lsp4j bad EnumSet deserialization.
---
.../java/lsp/server/protocol/NbGsonAdapter.java| 40 ++
1 file changed, 40 insertions(+)
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/NbGsonAdapter.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/NbGsonAdapter.java
index 4054e60ae0..0dc958db2f 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/NbGsonAdapter.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/NbGsonAdapter.java
@@ -22,6 +22,11 @@ import com.google.gson.ExclusionStrategy;
import com.google.gson.FieldAttributes;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
import com.google.gson.TypeAdapter;
import com.google.gson.TypeAdapterFactory;
import com.google.gson.reflect.TypeToken;
@@ -29,10 +34,13 @@ import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonToken;
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
import java.net.MalformedURLException;
import java.nio.file.FileSystemNotFoundException;
import java.nio.file.Paths;
import java.util.Arrays;
+import java.util.EnumSet;
import java.util.HashSet;
import java.util.Set;
import java.util.logging.Level;
@@ -185,5 +193,37 @@ public class NbGsonAdapter implements LspGsonSetup {
}
}
});
+b.registerTypeAdapter(EnumSet.class, new EnumSetDeserializer());
}
+
+
+/**
+ * LSP4j obscures EnumSet handling by its Collection type adapter factory.
We need to register a type adapter
+ * that overrides the deserialization for enumsets. This adapter also
accepts a primitive as a (singleton) EnumSet.
+ */
+private static final class EnumSetDeserializer implements
JsonDeserializer {
+@Override
+public EnumSet deserialize(JsonElement je, Type type,
JsonDeserializationContext jdc) throws JsonParseException {
+ParameterizedType pt = (ParameterizedType)type;
+Type itemType = pt.getActualTypeArguments()[0];
+if (je.isJsonPrimitive()) {
+Enum e = (Enum)jdc.deserialize(je, itemType);
+if (e != null) {
+return EnumSet.of(e);
+}
+} else if (!je.isJsonArray()) {
+throw new JsonParseException("Primitive or array expected");
+}
+JsonArray arr = je.getAsJsonArray();
+EnumSet raw = EnumSet.noneOf((Class)itemType);
+for (JsonElement el : arr) {
+if (!el.isJsonPrimitive()) {
+throw new JsonParseException("Primitive item expected");
+}
+raw.add((Enum)jdc.deserialize(el, itemType));
+}
+return raw;
+}
+}
+
}
-
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
(netbeans) branch sdedic/feature/project-dependency-add_base updated (620a25f6c1 -> ccf6a0cdfb)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch sdedic/feature/project-dependency-add_base in repository https://gitbox.apache.org/repos/asf/netbeans.git from 620a25f6c1 Fixed filtering of artifacts new fa7ae73c39 Be tolerant on input casing; output enums with the exact case new ccf6a0cdfb Compensate Lsp4j bad EnumSet deserialization. The 2 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: .../modules/nbcode/integration/ExtraGsonSetup.java | 9 +++-- .../java/lsp/server/protocol/NbGsonAdapter.java| 40 ++ 2 files changed, 46 insertions(+), 3 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
(netbeans) 01/02: Be tolerant on input casing; output enums with the exact case
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch sdedic/feature/project-dependency-add_base
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit fa7ae73c391de0ca21b816c8dcfc2524898a2381
Author: Svata Dedic
AuthorDate: Mon Dec 18 19:15:10 2023 +0100
Be tolerant on input casing; output enums with the exact case
---
.../org/netbeans/modules/nbcode/integration/ExtraGsonSetup.java | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git
a/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/ExtraGsonSetup.java
b/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/ExtraGsonSetup.java
index 04332e87f5..e65237d1b3 100644
---
a/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/ExtraGsonSetup.java
+++
b/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/ExtraGsonSetup.java
@@ -23,6 +23,7 @@ import com.google.gson.FieldAttributes;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.InstanceCreator;
+import com.google.gson.JsonArray;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
@@ -37,10 +38,12 @@ import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonToken;
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
+import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
+import java.util.EnumMap;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
@@ -103,7 +106,7 @@ public class ExtraGsonSetup implements LspGsonSetup {
b.registerTypeAdapter(DependencyChange.class, (InstanceCreator)(t) ->
DependencyChange.builder(DependencyChange.Kind.ADD).create());
b.registerTypeAdapterFactory(new LowercaseEnumTypeAdapterFactory());
}
-
+
class ArtifactDeserializer implements JsonDeserializer {
@Override
@@ -220,7 +223,7 @@ public class ExtraGsonSetup implements LspGsonSetup {
if (value == null) {
out.nullValue();
} else {
-out.value(toLowercase(value));
+out.value(value.toString());
}
}
@@ -229,7 +232,7 @@ public class ExtraGsonSetup implements LspGsonSetup {
reader.nextNull();
return null;
} else {
-return lowercaseToConstant.get(reader.nextString());
+return
lowercaseToConstant.get(toLowercase(reader.nextString()));
}
}
};
-
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
(netbeans) branch sdedic/feature/project-dependency-add_base updated: Fixed filtering of artifacts
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch sdedic/feature/project-dependency-add_base
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to
refs/heads/sdedic/feature/project-dependency-add_base by this push:
new 620a25f6c1 Fixed filtering of artifacts
620a25f6c1 is described below
commit 620a25f6c186123df6f8229fed245ab7506f71e6
Author: Svata Dedic
AuthorDate: Mon Dec 18 14:46:08 2023 +0100
Fixed filtering of artifacts
---
.../commands/ProjectDependenciesCommand.java | 25 +-
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git
a/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/commands/ProjectDependenciesCommand.java
b/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/commands/ProjectDependenciesCommand.java
index d1b12742fa..8b1eb93732 100644
---
a/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/commands/ProjectDependenciesCommand.java
+++
b/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/commands/ProjectDependenciesCommand.java
@@ -184,32 +184,37 @@ public class ProjectDependenciesCommand implements
CommandProvider {
continue;
}
toProcess.addAll(d.getChildren());
+boolean found = false;
if (matches != null && !matches.isEmpty()) {
for (ArtifactSpec test : matches) {
if (test.getGroupId() != null &&
!test.getGroupId().equals(a.getGroupId())) {
-continue NEXT;
+continue;
}
if (test.getArtifactId() != null &&
!test.getArtifactId().equals(a.getArtifactId())) {
-continue NEXT;
+continue;
}
if (test.getVersionSpec() != null &&
!test.getVersionSpec().equals(a.getVersionSpec())) {
-continue NEXT;
+continue;
}
if (test.getClassifier() != null &&
!test.getClassifier().equals(a.getClassifier())) {
-continue NEXT;
+continue;
}
if (test.getType()!= null &&
!test.getType().equals(a.getType())) {
-continue NEXT;
+continue;
}
// match found, OK
+found = true;
break;
}
-}
-
-if (request.isReturnContents()) {
-accepted.add(d);
} else {
-accepted.add(Dependency.create(a, d.getScope(),
Collections.emptyList(), null));
+found = true;
+}
+if (found) {
+if (request.isReturnContents()) {
+accepted.add(d);
+} else {
+accepted.add(Dependency.create(a,
d.getScope(), Collections.emptyList(), null));
+}
}
}
res.setMatches(accepted);
-
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
(netbeans) branch sdedic/feature/project-dependency-add_base updated (6629e83fa4 -> b10b1f848b)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch sdedic/feature/project-dependency-add_base in repository https://gitbox.apache.org/repos/asf/netbeans.git from 6629e83fa4 Merge branch 'master' into sdedic/feature/project-dependency-add_base new 5ad215e06e Scope redefinition, private API break. new 85d9681f1c Dependency manipulation API concept. new 68eeb8dbeb Gradle + Maven implementation of project add new ba9eb8c6f4 Prototype of dependencies.find command new 515b2146aa LSP change dependency command added. new bc22373d71 Paperwork: Added proper licenses instead of placeholders. new ff9b9d88d1 Add gradle.dependencies and maven.refactoring to the BuildTools testsuite new 8dc6ffe0f8 Adding necessary test dependencies for XDM. new b10b1f848b Merge pull request #6849 from sdedic/sdedic/feature/project-dependency-add The 9482 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: .github/workflows/main.yml | 6 + .../modules/gradle/api/GradleConfiguration.java| 11 +- .../nbproject/project.properties | 2 +- ide/project.dependency/nbproject/project.xml | 49 +++ .../modules/project/dependency/ArtifactSpec.java | 41 ++- .../modules/project/dependency/Dependency.java | 11 + .../project/dependency/DependencyChange.java | 197 ++ .../dependency/DependencyChangeException.java | 98 + .../dependency/DependencyChangeRequest.java| 38 ++ .../project/dependency/DependencyResult.java | 10 +- .../project/dependency/ProjectDependencies.java| 109 +- .../dependency/ProjectModificationResult.java | 122 +++ .../dependency/ProjectOperationException.java | 34 +- .../modules/project/dependency/ProjectScopes.java | 49 +++ .../netbeans/modules/project/dependency/Scope.java | 49 ++- .../modules/project/dependency/Scopes.java | 88 ++--- .../impl/CompoundModificationResult.java | 78 .../impl/ProjectModificationResultImpl.java| 277 ++ .../dependency/impl/TextDocumentEditProcessor.java | 179 + .../dependency/impl/WorkspaceEditAdapter.java | 129 +++ .../dependency/spi/ProjectDependencyModifier.java | 82 + .../spi/ProjectReloadImplementation.java | 65 java/gradle.dependencies/build.xml | 25 ++ java/gradle.dependencies/manifest.mf | 5 + .../nbproject/project.properties | 6 +- .../nbproject/project.xml | 151 +++- .../gradle/dependencies/AbstractWorker.java| 120 +++ .../modules/gradle/dependencies/Bundle.properties | 9 +- .../gradle/dependencies/DependencyAdder.java | 288 +++ .../dependencies/DependencyModifierImpl.java | 115 ++ .../gradle/dependencies/RewriteContext.java| 119 ++ .../unit/data/projects}/micronaut/build.gradle | 0 .../unit/data/projects/micronaut/build2.gradle}| 7 +- .../unit/data/projects/micronaut/build3.gradle}| 12 - .../data/projects}/micronaut/gradle.properties | 0 .../gradle/wrapper/gradle-wrapper.properties | 0 .../unit/data/projects}/micronaut/settings.gradle | 0 .../src/main/java/com/example/Application.java | 0 .../micronaut/src/main/resources/application.yml | 0 .../micronaut}/src/main/resources/logback.xml | 0 .../src/test/java/com/example/MicrodemoTest.java | 0 .../dependencies/DependencyModifierImplTest.java | 400 + java/gradle.java/manifest.mf | 1 + java/gradle.java/nbproject/project.xml | 7 + .../gradle/java/queries/DependencyText.java| 63 +++- .../queries/GradleDependenciesImplementation.java | 191 -- .../java/queries/GradleDependencyResult.java | 59 +-- .../modules/gradle/java/queries/GradleScope.java | 81 + .../modules/gradle/java/queries/GradleScopes.java | 66 .../gradle/java/queries/GradleScopesBuilder.java | 129 +++ .../gradle/java/queries/TextDependencyScanner.java | 50 ++- .../unit/data/dependencies/micronaut/build.gradle | 10 +- .../data/dependencies/parse/variousSyntax.gradle | 12 +- .../GradleDependenciesImplementationTest.java | 123 ++- .../java/queries/RegexpGradleScannerTest.java | 77 +++- .../nbcode/integration/nbproject/project.xml | 8 + .../modules/nbcode/integration/ExtraGsonSetup.java | 195 +- .../commands/DependencyFindRequest.java| 87 + .../integration/commands/DependencyFindResult.java | 67 .../commands/LspDependencyChangeRequest.java
(netbeans) 01/01: Merge branch 'master' into sdedic/feature/project-dependency-add_base
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a commit to branch sdedic/feature/project-dependency-add_base in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 6629e83fa426aee6010f597a611051b3dffae473 Merge: 53d7daeb46 5e3d77990f Author: Svata Dedic AuthorDate: Sun Dec 17 22:28:10 2023 +0100 Merge branch 'master' into sdedic/feature/project-dependency-add_base .../modules/glassfish/common/Bundle.properties | 1 + .../modules/glassfish/common/ServerDetails.java| 11 ++ .../glassfish/common/wizards/Bundle.properties | 1 + .../glassfish/tooling/data/GlassFishVersion.java | 10 +- .../server/config/ConfigBuilderProvider.java | 7 +- .../tooling/server/config/JavaSEPlatform.java | 4 +- .../glassfish/tooling/admin/AdminFactoryTest.java | 4 +- .../tooling/data/GlassFishVersionTest.java | 6 +- .../glassfish/tooling/utils/EnumUtilsTest.java | 26 ++--- .../gradle/tooling/GradleInternalAdapter.java | 7 +- .../gradle/tooling/NbProjectInfoBuilder.java | 13 ++- .../refactoring/CssRenameRefactoringPlugin.java| 38 --- .../lsp/server/project/BrokenReferencesModel.java | 7 +- java/java.navigation/manifest.mf | 2 +- .../java/navigation/BreadCrumbsScanningTask.java | 1 - .../java/navigation/ElementScanningTask.java | 1 - .../modules/java/navigation/HTMLDocView.java | 2 +- .../java/stackanalyzer/AnalyserCellRenderer.java | 28 +++-- .../java/stackanalyzer/AnalyzeStackAction.java | 1 + .../stackanalyzer/AnalyzeStackTopComponent.java| 3 +- .../java/stackanalyzer/StackLineAnalyser.java | 123 ++--- .../java/stackanalyzer/StackLineAnalyserTest.java | 30 - java/maven.embedder/nbproject/project.xml | 5 + java/maven.indexer/external/binaries-list | 16 +-- ...-license.txt => indexer-core-7.1.1-license.txt} | 4 +- 3-notice.txt => indexer-core-7.1.1-notice.txt} | 0 ...-9.8.0-license.txt => lucene-9.9.1-license.txt} | 4 +- ...ne-9.8.0-notice.txt => lucene-9.9.1-notice.txt} | 0 java/maven.indexer/nbproject/project.properties| 16 +-- java/maven.indexer/nbproject/project.xml | 32 +++--- .../maven/indexer/NexusRepositoryIndexerImpl.java | 14 +-- .../modules/maven/indexer/SMORequestResult.java| 4 +- nbbuild/binaries-default-properties.xml| 1 + .../IncorrectNonAbstractMethodHintError.java | 4 +- .../editor/verification/PHP72UnhandledError.java | 4 +- .../editor/verification/PHP73UnhandledError.java | 4 +- .../editor/verification/PHP80UnhandledError.java | 4 +- 37 files changed, 259 insertions(+), 179 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
(netbeans) branch sdedic/feature/project-dependency-add_base updated (53d7daeb46 -> 6629e83fa4)
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a change to branch sdedic/feature/project-dependency-add_base
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from 53d7daeb46 Allow to instruct the client to save a document.
add f1e40aeb02 Avoid null type, derive from provider type params or
fallback to Object.
add c9ae5f89a8 Merge pull request #6820 from
sdedic/gradle/npe-provider-novalue
add 4cc1931e18 CSS-Refactoring: Fix NullPointerException from folder/file
renaming
add 71fb2eda10 Merge pull request #6837 from
matthiasblaesing/css_refactoring_exception
add 4c3d826c8c -Add support for GlassFish 7.0.11 -Add Java SE 23 Enum
add a30ed67ba6 Merge pull request #6827 from pepness/glassfish-7.0.11
add 01ae879656 PHP: Fixing cancelability bugs by reverting from a for each
loop to a normal loop
add 589218b13c Merge pull request #6853 from
troizet/php_cancelability_bug_hints
add 429f109789 Publish configured GSON in request's Lookup
add baa0a23daf Merge pull request #6847 from sdedic/sdedic/gson-in-lookup
add fae07f934b Allow to instruct the client to save a document.
add f0d3c48f07 Merge pull request #6848 from
sdedic/lsp/client-save-document
add a4edd994da Prevent deadlock from firing events.
add 0b7a01dfe8 Merge pull request #6845 from
sdedic/sdedic/project-alert-deadlock
add 87bc133e22 Update to maven-indexer 7.1.1 and lucene 9.9.1.
add fe2aef2e44 Merge pull request #6791 from mbien/lucene-990
add 036d646003 Disable ANSI decorations for default (embedded) maven
logger.
add ce9ca1f0ae Merge pull request #6843 from mbien/mvn-embedder-no-ansi
add 5fc30b25d4 Stacktrace analyzer window fixes
add 5e3d77990f Merge pull request #6841 from
mbien/stacktrace-analyzer-fixes
new 6629e83fa4 Merge branch 'master' into
sdedic/feature/project-dependency-add_base
The 1 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:
.../modules/glassfish/common/Bundle.properties | 1 +
.../modules/glassfish/common/ServerDetails.java| 11 ++
.../glassfish/common/wizards/Bundle.properties | 1 +
.../glassfish/tooling/data/GlassFishVersion.java | 10 +-
.../server/config/ConfigBuilderProvider.java | 7 +-
.../tooling/server/config/JavaSEPlatform.java | 4 +-
.../glassfish/tooling/admin/AdminFactoryTest.java | 4 +-
.../tooling/data/GlassFishVersionTest.java | 6 +-
.../glassfish/tooling/utils/EnumUtilsTest.java | 26 ++---
.../gradle/tooling/GradleInternalAdapter.java | 7 +-
.../gradle/tooling/NbProjectInfoBuilder.java | 13 ++-
.../refactoring/CssRenameRefactoringPlugin.java| 38 ---
.../lsp/server/project/BrokenReferencesModel.java | 7 +-
java/java.navigation/manifest.mf | 2 +-
.../java/navigation/BreadCrumbsScanningTask.java | 1 -
.../java/navigation/ElementScanningTask.java | 1 -
.../modules/java/navigation/HTMLDocView.java | 2 +-
.../java/stackanalyzer/AnalyserCellRenderer.java | 28 +++--
.../java/stackanalyzer/AnalyzeStackAction.java | 1 +
.../stackanalyzer/AnalyzeStackTopComponent.java| 3 +-
.../java/stackanalyzer/StackLineAnalyser.java | 123 ++---
.../java/stackanalyzer/StackLineAnalyserTest.java | 30 -
java/maven.embedder/nbproject/project.xml | 5 +
java/maven.indexer/external/binaries-list | 16 +--
...-license.txt => indexer-core-7.1.1-license.txt} | 4 +-
3-notice.txt => indexer-core-7.1.1-notice.txt} | 0
...-9.8.0-license.txt => lucene-9.9.1-license.txt} | 4 +-
...ne-9.8.0-notice.txt => lucene-9.9.1-notice.txt} | 0
java/maven.indexer/nbproject/project.properties| 16 +--
java/maven.indexer/nbproject/project.xml | 32 +++---
.../maven/indexer/NexusRepositoryIndexerImpl.java | 14 +--
.../modules/maven/indexer/SMORequestResult.java| 4 +-
nbbuild/binaries-default-properties.xml| 1 +
.../IncorrectNonAbstractMethodHintError.java | 4 +-
.../editor/verification/PHP72UnhandledError.java | 4 +-
.../editor/verification/PHP73UnhandledError.java | 4 +-
.../editor/verification/PHP80UnhandledError.java | 4 +-
37 files changed, 259 insertions(+), 179 deletions(-)
rename java/maven.indexer/external/{indexer-core-7.0.4-license.txt =>
indexer-core-7.1.1-license.txt} (99%)
rename java/maven.indexer/external/{indexer-core-7.0.3-notice.txt =>
indexer-core-7.1.1-notice.txt} (100%)
rename java/maven.indexer/external/{lucene-9.8.0-license.txt =>
lucene-9.9.1-license.txt} (98%)
rename java/maven.indexer/external/{l
(netbeans) branch master updated: Prevent deadlock from firing events.
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new a4edd994da Prevent deadlock from firing events.
new 0b7a01dfe8 Merge pull request #6845 from
sdedic/sdedic/project-alert-deadlock
a4edd994da is described below
commit a4edd994da949b401eb00e58b5626e1d553d2714
Author: Svata Dedic
AuthorDate: Thu Dec 14 20:15:17 2023 +0100
Prevent deadlock from firing events.
---
.../lsp/server/project/BrokenReferencesModel.java | 76 +++---
1 file changed, 37 insertions(+), 39 deletions(-)
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/project/BrokenReferencesModel.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/project/BrokenReferencesModel.java
index b686c356a8..8959e91fb8 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/project/BrokenReferencesModel.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/project/BrokenReferencesModel.java
@@ -115,51 +115,49 @@ public final class BrokenReferencesModel extends
AbstractListModel implements Pr
* @param fire
*/
void refresh(boolean fire) {
-AtomicBoolean changed = new AtomicBoolean(false);
-final int size = ProjectManager.mutex().readAccess(new
Mutex.Action() {
-@Override
-public Integer run() {
-synchronized (lock) {
-final Map newProviders =
new LinkedHashMap();
-for (Project bprj : ctx.getBrokenProjects()) {
-final ProjectProblemsProvider provider =
bprj.getLookup().lookup(ProjectProblemsProvider.class);
-if (provider != null) {
-newProviders.put(provider, bprj);
-}
+ProjectManager.mutex().postReadRequest(() -> {
+int size;
+boolean changed = false;
+synchronized (lock) {
+final Map newProviders = new
LinkedHashMap();
+for (Project bprj : ctx.getBrokenProjects()) {
+final ProjectProblemsProvider provider =
bprj.getLookup().lookup(ProjectProblemsProvider.class);
+if (provider != null) {
+newProviders.put(provider, bprj);
}
-for
(Iterator> it =
providers.entrySet().iterator(); it.hasNext();) {
-final
Map.Entry e = it.next();
-if (!newProviders.containsKey(e.getKey())) {
-
e.getKey().removePropertyChangeListener(e.getValue());
-it.remove();
-}
+}
+for
(Iterator> it =
providers.entrySet().iterator(); it.hasNext();) {
+final
Map.Entry e = it.next();
+if (!newProviders.containsKey(e.getKey())) {
+e.getKey().removePropertyChangeListener(e.getValue());
+it.remove();
+}
+}
+final Set all = new
LinkedHashSet();
+for (Map.Entry ne :
newProviders.entrySet()) {
+final ProjectProblemsProvider ppp = ne.getKey();
+final Project bprj = ne.getValue();
+if (!providers.containsKey(ppp)) {
+final PropertyChangeListener l =
WeakListeners.propertyChange(BrokenReferencesModel.this, ppp);
+ppp.addPropertyChangeListener(l);
+providers.put(ppp, l);
}
-final Set all = new
LinkedHashSet();
-for (Map.Entry ne :
newProviders.entrySet()) {
-final ProjectProblemsProvider ppp = ne.getKey();
-final Project bprj = ne.getValue();
-if (!providers.containsKey(ppp)) {
-final PropertyChangeListener l =
WeakListeners.propertyChange(BrokenReferencesModel.this, ppp);
-ppp.addPropertyChangeListener(l);
-providers.put(ppp, l);
-}
-for (ProjectProblem problem : ppp.getProblems()) {
-all.add(new ProblemReference(problem, bprj,
global));
-}
+for (ProjectProblem problem : ppp.getProblems()) {
+all.add(new ProblemReference(problem, bprj, global));
}
-changed.set(updateReferencesList(problems, all));
-return getSize();
}
+changed = updateReferencesList(problems, all);
+size
(netbeans) branch master updated: Allow to instruct the client to save a document.
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new fae07f934b Allow to instruct the client to save a document.
new f0d3c48f07 Merge pull request #6848 from
sdedic/lsp/client-save-document
fae07f934b is described below
commit fae07f934bd064305fe58a6caa2bb6d58087411f
Author: Svata Dedic
AuthorDate: Thu Dec 14 20:13:35 2023 +0100
Allow to instruct the client to save a document.
---
.../lsp/server/protocol/NbCodeClientWrapper.java | 4 ++
.../lsp/server/protocol/NbCodeLanguageClient.java | 3 ++
.../server/protocol/SaveDocumentRequestParams.java | 46 ++
.../modules/java/lsp/server/protocol/Server.java | 6 +++
.../java/lsp/server/TestCodeLanguageClient.java| 5 +++
.../java/lsp/server/explorer/ProjectViewTest.java | 6 +++
.../server/progress/TestProgressHandlerTest.java | 2 +-
java/java.lsp.server/vscode/src/extension.ts | 10 -
java/java.lsp.server/vscode/src/protocol.ts| 8
9 files changed, 88 insertions(+), 2 deletions(-)
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/NbCodeClientWrapper.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/NbCodeClientWrapper.java
index 7cef6cec02..7f633df675 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/NbCodeClientWrapper.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/NbCodeClientWrapper.java
@@ -219,4 +219,8 @@ class NbCodeClientWrapper implements NbCodeLanguageClient {
return remote.configurationUpdate(params);
}
+@Override
+public CompletableFuture
requestDocumentSave(SaveDocumentRequestParams documentUris) {
+return remote.requestDocumentSave(documentUris);
+}
}
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/NbCodeLanguageClient.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/NbCodeLanguageClient.java
index 42fd4e5328..1c44d56fa5 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/NbCodeLanguageClient.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/NbCodeLanguageClient.java
@@ -151,4 +151,7 @@ public interface NbCodeLanguageClient extends
LanguageClient {
@JsonRequest("config/update")
public CompletableFuture configurationUpdate(@NonNull
UpdateConfigParams params);
+@JsonRequest("window/documentSave")
+public CompletableFuture requestDocumentSave(@NonNull
SaveDocumentRequestParams documentUri);
+
}
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/SaveDocumentRequestParams.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/SaveDocumentRequestParams.java
new file mode 100644
index 00..0941008616
--- /dev/null
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/SaveDocumentRequestParams.java
@@ -0,0 +1,46 @@
+/*
+ * 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.lsp.server.protocol;
+
+import java.util.List;
+import org.eclipse.xtext.xbase.lib.Pure;
+
+/**
+ *
+ * @author sdedic
+ */
+public class SaveDocumentRequestParams {
+private List documents;
+
+public SaveDocumentRequestParams() {
+}
+
+public SaveDocumentRequestParams(List documents) {
+this.documents = documents;
+}
+
+@Pure
+public List getDocuments() {
+return documents;
+}
+
+public void setDocuments(List documents) {
+this.documents = documents;
+}
+}
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java
index 1674055e8f..67686174ef 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java
+++
b/java/java.lsp.server/src/org/n
(netbeans) branch master updated: Publish configured GSON in request's Lookup
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 429f109789 Publish configured GSON in request's Lookup
new baa0a23daf Merge pull request #6847 from sdedic/sdedic/gson-in-lookup
429f109789 is described below
commit 429f109789530189224b1a65436b063b402ff5dc
Author: Svata Dedic
AuthorDate: Wed Dec 13 22:43:13 2023 +0100
Publish configured GSON in request's Lookup
---
.../modules/java/lsp/server/protocol/Server.java | 25 +++---
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java
index 1674055e8f..17147a04ab 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java
@@ -51,6 +51,7 @@ import java.util.WeakHashMap;
import java.util.concurrent.CompletionException;
import java.util.stream.Collectors;
import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Consumer;
import org.eclipse.lsp4j.CallHierarchyRegistrationOptions;
import org.eclipse.lsp4j.CodeActionKind;
import org.eclipse.lsp4j.CodeActionOptions;
@@ -89,6 +90,7 @@ import org.eclipse.lsp4j.jsonrpc.MessageConsumer;
import org.eclipse.lsp4j.jsonrpc.MessageIssueException;
import org.eclipse.lsp4j.jsonrpc.RemoteEndpoint;
import org.eclipse.lsp4j.jsonrpc.ResponseErrorException;
+import org.eclipse.lsp4j.jsonrpc.json.MessageJsonHandler;
import org.eclipse.lsp4j.jsonrpc.messages.Either;
import org.eclipse.lsp4j.jsonrpc.messages.Message;
import org.eclipse.lsp4j.jsonrpc.messages.NotificationMessage;
@@ -172,7 +174,7 @@ public final class Server {
public static NbLspServer launchServer(Pair io,
LspSession session) {
LanguageServerImpl server = new LanguageServerImpl(session);
ConsumeWithLookup msgProcessor = new
ConsumeWithLookup(server.getSessionLookup());
-Launcher serverLauncher = createLauncher(server,
io, msgProcessor::attachLookup);
+Launcher serverLauncher = createLauncher(server,
io, msgProcessor::attachLookup, msgProcessor::addService);
NbCodeLanguageClient remote = serverLauncher.getRemoteProxy();
((LanguageClientAware) server).connect(remote);
msgProcessor.attachClient(server.client);
@@ -182,8 +184,17 @@ public final class Server {
}
private static Launcher
createLauncher(LanguageServerImpl server, Pair io,
-Function processor) {
-return new LSPLauncher.Builder()
+Function processor,
Consumer addService) {
+return new LSPLauncher.Builder() {
+@Override
+protected MessageJsonHandler createJsonHandler() {
+MessageJsonHandler h = super.createJsonHandler();
+if (addService != null) {
+addService.accept(h.getGson());
+}
+return h;
+}
+}
.setLocalService(server)
.setRemoteInterface(NbCodeLanguageClient.class)
.setInput(io.first())
@@ -232,10 +243,15 @@ public final class Server {
private final Lookup sessionLookup;
private NbCodeLanguageClient client;
private OperationContext initialContext;
+private List additionalServices = new ArrayList<>();
public ConsumeWithLookup(Lookup sessionLookup) {
this.sessionLookup = sessionLookup;
}
+
+public void addService(Object o) {
+this.additionalServices.add(o);
+}
synchronized void attachClient(NbCodeLanguageClient client) {
this.client = client;
@@ -288,6 +304,9 @@ public final class Server {
if (ctx != null) {
ic.add(ctx);
}
+if (additionalServices != null) {
+additionalServices.forEach(ic::add);
+}
final InternalHandle ftoCancel = toCancel;
try {
DISPATCHERS.set(client);
-
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
