(netbeans) branch master updated (88d95db5c9 -> 55587de29e)
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 88d95db5c9 Merge pull request #7250 from sdedic/scripting/init-error-recovery add 211054bf92 added gototest ability in vscode extension new 55587de29e Merge pull request #6834 from Achal1607/javavscode-56 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/gototest/apichanges.xml| 97 ide/gototest/nbproject/project.xml | 21 +- .../api/gototest/TestOppositesLocator.java | 268 + .../modules/gototest/GotoOppositeAction.java | 159 +++- .../modules/gototest/OppositeCandidateChooser.java | 17 +- java/java.lsp.server/nbproject/project.xml | 9 + .../commands/TestOppositesCommandProvider.java | 68 ++ java/java.lsp.server/vscode/package.json | 19 ++ java/java.lsp.server/vscode/src/extension.ts | 54 + 9 files changed, 572 insertions(+), 140 deletions(-) create mode 100644 ide/gototest/apichanges.xml create mode 100644 ide/gototest/src/org/netbeans/api/gototest/TestOppositesLocator.java create mode 100644 java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/commands/TestOppositesCommandProvider.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 #6834 from Achal1607/javavscode-56
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 55587de29eb03829595cf959aae574e3872638be Merge: 88d95db5c9 211054bf92 Author: Jan Lahoda <51319204+laho...@users.noreply.github.com> AuthorDate: Wed Apr 17 08:54:33 2024 +0200 Merge pull request #6834 from Achal1607/javavscode-56 Added go to test ability for test/tested class in lsp server ide/gototest/apichanges.xml| 97 ide/gototest/nbproject/project.xml | 21 +- .../api/gototest/TestOppositesLocator.java | 268 + .../modules/gototest/GotoOppositeAction.java | 159 +++- .../modules/gototest/OppositeCandidateChooser.java | 17 +- java/java.lsp.server/nbproject/project.xml | 9 + .../commands/TestOppositesCommandProvider.java | 68 ++ java/java.lsp.server/vscode/package.json | 19 ++ java/java.lsp.server/vscode/src/extension.ts | 54 + 9 files changed, 572 insertions(+), 140 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 (8c75f2df42 -> e6f0f68c9b)
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 8c75f2df42 HCL added Scoped Function name support (Terraform 1.8) add 89d8dbb2d5 added hints preferences option in the vscode extension new e6f0f68c9b Merge pull request #7082 from Achal1607/vscode-warnings-integrate 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/TextDocumentServiceImpl.java| 2 +- java/java.lsp.server/vscode/package.json | 5 + java/java.lsp.server/vscode/src/extension.ts | 1 + 3 files changed, 7 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 #7082 from Achal1607/vscode-warnings-integrate
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit e6f0f68c9b111303c58019f6d8fe3921ee07e66b Merge: 8c75f2df42 89d8dbb2d5 Author: Jan Lahoda <51319204+laho...@users.noreply.github.com> AuthorDate: Tue Apr 16 10:21:20 2024 +0200 Merge pull request #7082 from Achal1607/vscode-warnings-integrate Integrate hints preferences option in the vscode extension .../modules/java/lsp/server/protocol/TextDocumentServiceImpl.java| 2 +- java/java.lsp.server/vscode/package.json | 5 + java/java.lsp.server/vscode/src/extension.ts | 1 + 3 files changed, 7 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 (8d6c4b8232 -> 67cc93027d)
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from 8d6c4b8232 Merge pull request #7121 from
dbalek/dbalek/micronaut-finder-methods-cc-update2
add 08b8b681d0 Adjusting some license texts.
new 67cc93027d Merge pull request #7034 from
lahodaj/license-fixes-6-2-2024b
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:
.../external/processtreekiller-2.0.1-license.txt | 2 +-
.../external/slf4j-api-1.7.36-license.txt | 4 +-
.../external/slf4j-jdk14-1.7.36-license.txt| 4 +-
.../external/simplevalidation-1.14.1-license.txt | 1 +
...che-maven-3.9.6-failureaccess-1.0.1-license.txt | 10 +-
...apache-maven-3.9.6-guava-32.0.1-jre-license.txt | 10 +-
...n-3.9.6-javax.annotation-api-1.3.2-license.txt} | 2 +-
...=> apache-maven-3.9.6-slf4j-1.7.36-license.txt} | 2 +-
.../licenses/Apache-2.0-ko4j | 34 +-
nbbuild/licenses/MIT-icu4j-58 | 414 +++
.../licenses/MIT-processtreekiller | 7 -
nbbuild/licenses/MIT-slf4j | 21 -
.../o.n.html.ko4j/external/ko4j-1.8.1-license.txt | 29 +-
.../libs.graaljs/external/icu4j-67.1-license.txt | 438 +++--
14 files changed, 897 insertions(+), 81 deletions(-)
copy ide/swing.validation/external/simplevalidation-swing-1.14.1-license.txt
=>
java/maven.embedder/external/apache-maven-3.9.6-failureaccess-1.0.1-license.txt
(98%)
copy ide/swing.validation/external/simplevalidation-swing-1.14.1-license.txt
=> java/maven.embedder/external/apache-maven-3.9.6-guava-32.0.1-jre-license.txt
(96%)
rename
java/maven.embedder/external/{apache-maven-3.9.6-javax.annotation-api-license.txt
=> apache-maven-3.9.6-javax.annotation-api-1.3.2-license.txt} (99%)
rename java/maven.embedder/external/{apache-maven-3.9.6-slf4j-license.txt =>
apache-maven-3.9.6-slf4j-1.7.36-license.txt} (98%)
rename ide/swing.validation/external/simplevalidation-swing-1.14.1-license.txt
=> nbbuild/licenses/Apache-2.0-ko4j (89%)
create mode 100644 nbbuild/licenses/MIT-icu4j-58
copy ide/extexecution.process/external/processtreekiller-2.0.1-license.txt =>
nbbuild/licenses/MIT-processtreekiller (80%)
delete mode 100644 nbbuild/licenses/MIT-slf4j
-
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 #7034 from lahodaj/license-fixes-6-2-2024b
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 67cc93027d9ebbb69bf5e00fd6e529f9bf960a4b Merge: 8d6c4b8232 08b8b681d0 Author: Jan Lahoda <51319204+laho...@users.noreply.github.com> AuthorDate: Fri Mar 1 18:03:39 2024 +0100 Merge pull request #7034 from lahodaj/license-fixes-6-2-2024b Adjusting some license texts. .../external/processtreekiller-2.0.1-license.txt | 2 +- .../external/slf4j-api-1.7.36-license.txt | 4 +- .../external/slf4j-jdk14-1.7.36-license.txt| 4 +- .../external/simplevalidation-1.14.1-license.txt | 1 + ...che-maven-3.9.6-failureaccess-1.0.1-license.txt | 10 +- ...apache-maven-3.9.6-guava-32.0.1-jre-license.txt | 10 +- ...n-3.9.6-javax.annotation-api-1.3.2-license.txt} | 2 +- ...=> apache-maven-3.9.6-slf4j-1.7.36-license.txt} | 2 +- .../licenses/Apache-2.0-ko4j | 34 +- nbbuild/licenses/MIT-icu4j-58 | 414 +++ .../licenses/MIT-processtreekiller | 7 - nbbuild/licenses/MIT-slf4j | 21 - .../o.n.html.ko4j/external/ko4j-1.8.1-license.txt | 29 +- .../libs.graaljs/external/icu4j-67.1-license.txt | 438 +++-- 14 files changed, 897 insertions(+), 81 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 (a52aa9ae3c -> 6a9d501fd8)
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from a52aa9ae3c Merge pull request #7068 from dbalek/dbalek/micronaut-put-post-data-endpoints add 94bd559d91 Allow invocation of annotation Processor's getCompletions even if process fails. new 6a9d501fd8 Merge pull request #6956 from lahodaj/annotation-processor-error-completions 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/source/indexing/APTUtils.java | 22 +-- .../java/source/indexing/CrashingAPTest.java | 154 +++-- 2 files changed, 121 insertions(+), 55 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 #6956 from lahodaj/annotation-processor-error-completions
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 6a9d501fd805541ed261fd371772ab772c294c7f Merge: a52aa9ae3c 94bd559d91 Author: Jan Lahoda <51319204+laho...@users.noreply.github.com> AuthorDate: Fri Feb 16 12:36:18 2024 +0100 Merge pull request #6956 from lahodaj/annotation-processor-error-completions Allow invocation of annotation Processor's getCompletions even if process fails. .../modules/java/source/indexing/APTUtils.java | 22 +-- .../java/source/indexing/CrashingAPTest.java | 154 +++-- 2 files changed, 121 insertions(+), 55 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 (e4b02bd8bd -> 5e7b14f0eb)
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from e4b02bd8bd Merge pull request #7060 from pedro-w/issue-7057
add 9a2bef5492 Upgrade to JDK 22 javac (build 33).
add 0928fc969f Adjusting GH Actions, as contributed by mbien.
new 5e7b14f0eb Merge pull request #6968 from lahodaj/upgrade-javac-22
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 | 4 +-
.../infrastructure/ErrorHintsProviderTest.java | 2 +-
.../modules/java/source/NoJavacHelper.java | 2 +-
.../modules/java/source/parsing/JavacParser.java | 2 +-
.../source/parsing/VanillaPartialReparser.java | 2 +-
.../modules/java/source/pretty/CharBuffer.java | 15 ---
.../modules/java/source/pretty/VeryPretty.java | 6 +--
.../modules/java/source/pretty/WidthEstimator.java | 2 +-
.../modules/java/source/save/CasualDiff.java | 8 ++--
.../modules/java/source/usages/ClassFileUtil.java | 19 -
.../org/netbeans/lib/nbjavac/services/NBAttr.java | 21 ++
.../lib/nbjavac/services/NBParserFactory.java | 2 +-
.../netbeans/lib/nbjavac/services/NBResolve.java | 23 +++
.../netbeans/lib/nbjavac/services/NBAttrTest.java | 6 +++
.../lib/nbjavac/services/NBJavacTreesTest.java | 1 +
.../{NBJavacTreesTest.java => NBResolveTest.java} | 47 +-
java/libs.javacapi/external/binaries-list | 4 +-
.../external/nb-javac-jdk-22+33-license.txt} | 8 ++--
.../nbproject/org-netbeans-libs-javacapi.sig | 27 -
java/libs.javacapi/nbproject/project.xml | 4 +-
java/libs.nbjavacapi/external/binaries-list| 4 +-
.../external/nb-javac-jdk-22+33-license.txt} | 8 ++--
java/libs.nbjavacapi/nbproject/project.properties | 4 +-
java/libs.nbjavacapi/nbproject/project.xml | 8 ++--
.../netbeans/modules/nbjavac/api/Bundle.properties | 2 +-
.../org/netbeans/nbbuild/extlibs/ignored-overlaps | 4 +-
26 files changed, 121 insertions(+), 114 deletions(-)
copy
java/lib.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/{NBJavacTreesTest.java
=> NBResolveTest.java} (59%)
rename java/{libs.nbjavacapi/external/nb-javac-jdk-21u-license.txt =>
libs.javacapi/external/nb-javac-jdk-22+33-license.txt} (99%)
rename java/{libs.javacapi/external/nb-javac-jdk-21u-license.txt =>
libs.nbjavacapi/external/nb-javac-jdk-22+33-license.txt} (99%)
-
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 #6968 from lahodaj/upgrade-javac-22
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 5e7b14f0eb78088e4187df932eeb9913e810b1b6
Merge: e4b02bd8bd 0928fc969f
Author: Jan Lahoda <51319204+laho...@users.noreply.github.com>
AuthorDate: Fri Feb 16 09:05:54 2024 +0100
Merge pull request #6968 from lahodaj/upgrade-javac-22
Upgrade to JDK 22 javac (build 33).
.github/workflows/main.yml | 4 +-
.../infrastructure/ErrorHintsProviderTest.java | 2 +-
.../modules/java/source/NoJavacHelper.java | 2 +-
.../modules/java/source/parsing/JavacParser.java | 2 +-
.../source/parsing/VanillaPartialReparser.java | 2 +-
.../modules/java/source/pretty/CharBuffer.java | 15 ---
.../modules/java/source/pretty/VeryPretty.java | 6 +--
.../modules/java/source/pretty/WidthEstimator.java | 2 +-
.../modules/java/source/save/CasualDiff.java | 8 ++--
.../modules/java/source/usages/ClassFileUtil.java | 19 -
.../org/netbeans/lib/nbjavac/services/NBAttr.java | 21 ++
.../lib/nbjavac/services/NBParserFactory.java | 2 +-
.../netbeans/lib/nbjavac/services/NBResolve.java | 23 +++
.../netbeans/lib/nbjavac/services/NBAttrTest.java | 6 +++
.../lib/nbjavac/services/NBJavacTreesTest.java | 1 +
.../{NBJavacTreesTest.java => NBResolveTest.java} | 47 +-
java/libs.javacapi/external/binaries-list | 4 +-
.../external/nb-javac-jdk-22+33-license.txt} | 8 ++--
.../nbproject/org-netbeans-libs-javacapi.sig | 27 -
java/libs.javacapi/nbproject/project.xml | 4 +-
java/libs.nbjavacapi/external/binaries-list| 4 +-
.../external/nb-javac-jdk-22+33-license.txt} | 8 ++--
java/libs.nbjavacapi/nbproject/project.properties | 4 +-
java/libs.nbjavacapi/nbproject/project.xml | 8 ++--
.../netbeans/modules/nbjavac/api/Bundle.properties | 2 +-
.../org/netbeans/nbbuild/extlibs/ignored-overlaps | 4 +-
26 files changed, 121 insertions(+), 114 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-jackpot30) 01/01: Merge pull request #35 from jlahoda/release20
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-jackpot30.git commit b197e3a9561a236854f938f01efab13fc4ea7ee2 Merge: 13e22c1 db7b360 Author: Jan Lahoda AuthorDate: Sun Jan 21 09:57:48 2024 +0100 Merge pull request #35 from jlahoda/release20 Upgrading to NetBeans 20 .github/workflows/main.yml | 68 ++ .travis.yml| 37 cmdline/README.md | 8 +-- cmdline/build.xml | 14 - .../jackpot30/cmdline/lib/CreateStandaloneJar.java | 21 ++- cmdline/maven/pom.xml | 4 +- .../modules/jackpot30/maven/RunJackpot30Test.java | 2 +- cmdline/maven/tests/fail-on-warnings/golden| 2 +- cmdline/maven/tests/sl-failure/golden | 2 +- cmdline/processor/build.xml| 4 +- cmdline/processor/nbproject/project.properties | 3 +- cmdline/tool/build.xml | 10 +--- cmdline/tool/nbproject/project.properties | 3 +- cmdline/tool/scripts/pom.xml | 2 +- .../netbeans/modules/jackpot30/cmdline/Main.java | 33 +-- .../modules/jackpot30/cmdline/CreateToolTest.java | 6 +- .../modules/jackpot30/cmdline/MainTest.java| 7 +++ 17 files changed, 157 insertions(+), 69 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-jackpot30) branch master updated (13e22c1 -> b197e3a)
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-jackpot30.git from 13e22c1 Fixing tests. add db7b360 Upgrading to NetBeans 20 new b197e3a Merge pull request #35 from jlahoda/release20 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 | 68 ++ .travis.yml| 37 cmdline/README.md | 8 +-- cmdline/build.xml | 14 - .../jackpot30/cmdline/lib/CreateStandaloneJar.java | 21 ++- cmdline/maven/pom.xml | 4 +- .../modules/jackpot30/maven/RunJackpot30Test.java | 2 +- cmdline/maven/tests/fail-on-warnings/golden| 2 +- cmdline/maven/tests/sl-failure/golden | 2 +- cmdline/processor/build.xml| 4 +- cmdline/processor/nbproject/project.properties | 3 +- cmdline/tool/build.xml | 10 +--- cmdline/tool/nbproject/project.properties | 3 +- cmdline/tool/scripts/pom.xml | 2 +- .../netbeans/modules/jackpot30/cmdline/Main.java | 33 +-- .../modules/jackpot30/cmdline/CreateToolTest.java | 6 +- .../modules/jackpot30/cmdline/MainTest.java| 7 +++ 17 files changed, 157 insertions(+), 69 deletions(-) create mode 100644 .github/workflows/main.yml delete mode 100644 .travis.yml - 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: Including org.netbeans.modules.editor.tools.storage, as it is a required dependency as of recently.
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git The following commit(s) were added to refs/heads/master by this push: new 6172923e64 Including org.netbeans.modules.editor.tools.storage, as it is a required dependency as of recently. new a745bc8f71 Merge pull request #6966 from lahodaj/fix-java-lsp-build 6172923e64 is described below commit 6172923e64b4be6782edf863aa09307a136c2514 Author: Jan Lahoda AuthorDate: Wed Jan 17 19:30:52 2024 +0100 Including org.netbeans.modules.editor.tools.storage, as it is a required dependency as of recently. --- java/java.lsp.server/nbcode/nbproject/platform.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/java/java.lsp.server/nbcode/nbproject/platform.properties b/java/java.lsp.server/nbcode/nbproject/platform.properties index f8884b30de..14956fc14e 100644 --- a/java/java.lsp.server/nbcode/nbproject/platform.properties +++ b/java/java.lsp.server/nbcode/nbproject/platform.properties @@ -131,7 +131,6 @@ disabled.modules=\ org.netbeans.modules.editor.plain,\ org.netbeans.modules.editor.plain.lib,\ org.netbeans.modules.editor.search,\ -org.netbeans.modules.editor.tools.storage,\ org.netbeans.modules.extbrowser.chrome,\ org.netbeans.modules.extexecution.impl,\ org.netbeans.modules.form,\ - 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: added support for reading custom hints preferences in lsp
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new ab0e8816c4 added support for reading custom hints preferences in lsp
new 5a459334cd Merge pull request #6760 from Achal1607/javavscode-9
ab0e8816c4 is described below
commit ab0e8816c4d8fc0f40ad32992edebc2eaf17477a
Author: Achal Talati
AuthorDate: Wed Nov 29 01:04:34 2023 +0530
added support for reading custom hints preferences in lsp
Signed-off-by: Achal Talati
---
ide/api.lsp/apichanges.xml | 13 +
.../src/org/netbeans/spi/lsp/ErrorProvider.java| 30
java/java.hints/nbproject/project.xml | 8 ++
.../hints/infrastructure/JavaErrorProvider.java| 16 +--
.../modules/java/lsp/server/protocol/Server.java | 13 -
.../server/protocol/TextDocumentServiceImpl.java | 33 --
.../lsp/server/protocol/WorkspaceServiceImpl.java | 4 ++-
.../java/lsp/server/protocol/ServerTest.java | 19 -
8 files changed, 129 insertions(+), 7 deletions(-)
diff --git a/ide/api.lsp/apichanges.xml b/ide/api.lsp/apichanges.xml
index d535b3a993..faa0a1b273 100644
--- a/ide/api.lsp/apichanges.xml
+++ b/ide/api.lsp/apichanges.xml
@@ -51,6 +51,19 @@
+
+
+Adding ErrorProvider.Context.getHintsConfigFile()
method
+
+
+
+
+
+An ErrorProvider.Context.getHintsConfigFile() method
introduced that allows to
+get hints preference file config.
+
+
+
Added Completion.getLabelDetail() and
Completion.getLabelDescription() methods.
diff --git a/ide/api.lsp/src/org/netbeans/spi/lsp/ErrorProvider.java
b/ide/api.lsp/src/org/netbeans/spi/lsp/ErrorProvider.java
index 577aee3e22..33de28df42 100644
--- a/ide/api.lsp/src/org/netbeans/spi/lsp/ErrorProvider.java
+++ b/ide/api.lsp/src/org/netbeans/spi/lsp/ErrorProvider.java
@@ -50,6 +50,7 @@ public interface ErrorProvider {
private final Kind errorKind;
private final AtomicBoolean cancel = new AtomicBoolean();
private final List cancelCallbacks = new ArrayList<>();
+private final FileObject hintsConfigFile;
/**
* Construct a new {@code Context}.
@@ -71,9 +72,38 @@ public interface ErrorProvider {
* @since 1.4
*/
public Context(FileObject file, int offset, Kind errorKind) {
+this(file, offset, errorKind, null);
+}
+
+/**
+ * Construct a new {@code Context}.
+ *
+ * @param file file for which the errors/warnings should be computed
+ * @param offset offset for which the errors/warnings should be
computed
+ * @param errorKind the type of errors/warnings that should be computed
+ * @param hintsConfigFile file which contains preferences for the the
errors/warnings to be computed
+ *
+ * @since 1.25
+ *
+ */
+public Context(FileObject file, int offset, Kind errorKind, FileObject
hintsConfigFile) {
this.file = file;
this.offset = offset;
this.errorKind = errorKind;
+this.hintsConfigFile = hintsConfigFile;
+}
+
+/**
+ *
+ * The file which contains preferences for the the errors/warnings to
be computed.
+ *
+ * @return the file which contains preferences for the the
errors/warnings to be computed
+ *
+ * @since 1.25
+ *
+ */
+public FileObject getHintsConfigFile() {
+return hintsConfigFile;
}
/**
diff --git a/java/java.hints/nbproject/project.xml
b/java/java.hints/nbproject/project.xml
index c5fa0eb0b2..5d467f2c2c 100644
--- a/java/java.hints/nbproject/project.xml
+++ b/java/java.hints/nbproject/project.xml
@@ -165,6 +165,14 @@
1.28
+
+
org.netbeans.modules.editor.tools.storage
+
+
+
+1.31
+
+
org.netbeans.modules.editor.util
diff --git
a/java/java.hints/src/org/netbeans/modules/java/hints/infrastructure/JavaErrorProvider.java
b/java/java.hints/src/org/netbeans/modules/java/hints/infrastructure/JavaErrorProvider.java
index a756a2e9bd..f332ca7c82 100644
---
a/java/java.hints/src/org/netbeans/modules/java/hints/infrastructure/JavaErrorProvider.java
+++
b/java/java.hints/src/org/netbeans/modules/java/hints/infrastructure/JavaErrorProvider.java
@@ -36,6 +36,7 @@ import java.util.Set;
(netbeans) branch master updated: Enabling libs.nbjavacapi for debugger.jpda.truffle tests.
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new c95399bd34 Enabling libs.nbjavacapi for debugger.jpda.truffle tests.
new 9762c8e948 Merge pull request #6953 from lahodaj/fix-enabled-modules
c95399bd34 is described below
commit c95399bd34ba308ddea4c6a7b5b0f0a6c5fcfee5
Author: Jan Lahoda
AuthorDate: Mon Jan 15 09:27:42 2024 +0100
Enabling libs.nbjavacapi for debugger.jpda.truffle tests.
---
.../src/org/netbeans/modules/debugger/jpda/truffle/JPDATestCase.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/java/debugger.jpda.truffle/test/unit/src/org/netbeans/modules/debugger/jpda/truffle/JPDATestCase.java
b/java/debugger.jpda.truffle/test/unit/src/org/netbeans/modules/debugger/jpda/truffle/JPDATestCase.java
index 587c16d285..8b2bed9761 100644
---
a/java/debugger.jpda.truffle/test/unit/src/org/netbeans/modules/debugger/jpda/truffle/JPDATestCase.java
+++
b/java/debugger.jpda.truffle/test/unit/src/org/netbeans/modules/debugger/jpda/truffle/JPDATestCase.java
@@ -47,6 +47,7 @@ public abstract class JPDATestCase extends NbTestCase {
failOnException(Level.INFO).
enableClasspathModules(false).
clusters(".*").
+enableModules("org.netbeans.libs.nbjavacapi").
suite();
}
-
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: Adding ability to safely enable/disable module fragments (requires restart, obviously), and tweaking nbjavac so that it can be enable/disabled.
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new da71927247 Adding ability to safely enable/disable module fragments
(requires restart, obviously), and tweaking nbjavac so that it can be
enable/disabled.
new 865b3f3171 Merge pull request #6743 from lahodaj/option-disable-nbjavac
da71927247 is described below
commit da719272474b35d9c736c3242f4f19fb0a529aeb
Author: Jan Lahoda
AuthorDate: Wed Nov 15 13:14:37 2023 +0100
Adding ability to safely enable/disable module fragments (requires restart,
obviously), and tweaking nbjavac so that it can be enable/disabled.
---
.../netbeans/api/debugger/jpda/JPDASupport.java| 2 +-
java/java.source.base/manifest.mf | 1 -
.../autoupdate/ui/wizards/Bundle_nb.properties | 2 +
.../libsrc/org/netbeans/updater/Bundle.properties | 1 +
.../org/netbeans/updater/ModuleDeactivator.java| 53 ++-
.../org/netbeans/updater/UpdaterDispatcher.java| 20 +-
...l.java => ModuleEnableDisableDeleteHelper.java} | 31 -
.../autoupdate/services/OperationSupportImpl.java | 77 --
.../autoupdate/services/OperationValidator.java| 6 +-
.../modules/autoupdate/services/Utilities.java | 8 ++-
.../autoupdate/ui/wizards/UninstallStep.java | 8 ++-
.../src/org/netbeans/core/startup/NbInstaller.java | 12 +++-
platform/o.n.bootstrap/launcher/unix/nbexec| 4 +-
.../src/org/netbeans/ModuleManager.java| 20 +++---
.../unit/src/org/netbeans/ModuleManagerTest.java | 3 +-
15 files changed, 169 insertions(+), 79 deletions(-)
diff --git
a/java/debugger.jpda/test/unit/src/org/netbeans/api/debugger/jpda/JPDASupport.java
b/java/debugger.jpda/test/unit/src/org/netbeans/api/debugger/jpda/JPDASupport.java
index 28c45f5940..0a2112f469 100644
---
a/java/debugger.jpda/test/unit/src/org/netbeans/api/debugger/jpda/JPDASupport.java
+++
b/java/debugger.jpda/test/unit/src/org/netbeans/api/debugger/jpda/JPDASupport.java
@@ -90,7 +90,7 @@ public final class JPDASupport implements
DebuggerManagerListener {
public static Test createTestSuite(Class clazz) {
Configuration suiteConfiguration =
NbModuleSuite.createConfiguration(clazz);
-suiteConfiguration =
suiteConfiguration.clusters(".*").enableModules(".*java.source.*").gui(false);
+suiteConfiguration =
suiteConfiguration.clusters(".*").enableModules(".*java.source.*").enableModules(".*libs.nbjavacapi.*").gui(false);
if (!(ClassLoader.getSystemClassLoader() instanceof URLClassLoader)) {
//when running on JDK 9+, to make the com.sun.jdi package
dependency work, we need to make getPackage("com.sun.jdi") work
//for system CL's parent (which otherwise happily loads the
VirtualMachineManager class,
diff --git a/java/java.source.base/manifest.mf
b/java/java.source.base/manifest.mf
index e47516a822..8e95ab8e59 100644
--- a/java/java.source.base/manifest.mf
+++ b/java/java.source.base/manifest.mf
@@ -3,4 +3,3 @@ OpenIDE-Module: org.netbeans.modules.java.source.base
OpenIDE-Module-Implementation-Version: 6
OpenIDE-Module-Localizing-Bundle:
org/netbeans/modules/java/source/base/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/java/source/base/layer.xml
-OpenIDE-Module-Recommends: org.netbeans.libs.nbjavac
diff --git
a/nb/ide.branding/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/wizards/Bundle_nb.properties
b/nb/ide.branding/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/wizards/Bundle_nb.properties
index c311ec410e..376d282d3b 100644
---
a/nb/ide.branding/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/wizards/Bundle_nb.properties
+++
b/nb/ide.branding/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/wizards/Bundle_nb.properties
@@ -24,6 +24,8 @@ InstallStep_Header_Restart_Head=Restart NetBeans IDE to
complete installation.
InstallStep_Header_Restart_Content=Restart NetBeans IDE to finish plugin
installation.
UninstallStep_Header_Restart_Head=Restart NetBeans IDE to complete
deactivation.
UninstallStep_Header_Restart_Content=Restart NetBeans IDE to finish plugin
deactivation.
+UninstallStep_Activate_Header_Restart_Head=Restart NetBeans IDE to complete
activation.
+UninstallStep_Activate_Header_Restart_Content=Restart NetBeans IDE to finish
plugin activation.
InstallUnitWizardModel_Buttons_RestartNow= IDE Now
InstallUnitWizardModel_Buttons_RestartLater=Restart IDE
InstallStep_InstallDone_Text=The NetBeans IDE Installer has successfully \
diff --git
a/platform/autoupdate.services/libsrc/org/netbeans/updater/Bundle.properties
b/platform/autoupdate.services/libsrc/org/netbeans/updater/Bundle.properties
index 5afe441dd0..936ee3324c 100644
(netbeans) branch master updated: [NETBEANS-6881][NETBEANS-6880][NETBEANS-6921] Additional fixes for the multi-file launcher: - checking for null return result for getClassPath(COMPILE) - filtering ou
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 18524270fd [NETBEANS-6881][NETBEANS-6880][NETBEANS-6921] Additional
fixes for the multi-file launcher: - checking for null return result for
getClassPath(COMPILE) - filtering out directories that belong to a project from
the multi-file launcher source path - more thoroughly prevent creating of the
multi-file launcher source ClassPath for files under projects - never touch
read-only filesystems (i.e. typically jars/zip) - do not register the source CP
into GlobalPathRegistry by de [...]
new 7fc8a87c21 Merge pull request #6912 from
lahodaj/multi-file-launcher-fixes
18524270fd is described below
commit 18524270fd822604724ca07acf3b578663d64f40
Author: Jan Lahoda
AuthorDate: Wed Jan 3 11:12:35 2024 +0100
[NETBEANS-6881][NETBEANS-6880][NETBEANS-6921] Additional fixes for the
multi-file launcher:
- checking for null return result for getClassPath(COMPILE)
- filtering out directories that belong to a project from the multi-file
launcher source path
- more thoroughly prevent creating of the multi-file launcher source
ClassPath for files under projects
- never touch read-only filesystems (i.e. typically jars/zip)
- do not register the source CP into GlobalPathRegistry by default in the
IDE - the behavior can either be overriden using a localization bundle
---
.../lsp/client/bindings/CustomIndexerImpl.java | 7 ++-
java/java.file.launcher/nbproject/project.xml | 18 ++
.../launcher/AttributeBasedSingleFileOptions.java | 6 +-
.../modules/java/file/launcher/SharedRootData.java | 10 +--
.../java/file/launcher/SingleSourceFileUtil.java | 13 +++-
.../launcher/indexer/CompilerOptionsIndexer.java | 14 -
.../launcher/queries/MultiSourceRootProvider.java | 72 +-
.../java/file/launcher/queries/Bundle.properties | 18 ++
.../modules/java/source/indexing/APTUtils.java | 8 ++-
9 files changed, 141 insertions(+), 25 deletions(-)
diff --git
a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/CustomIndexerImpl.java
b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/CustomIndexerImpl.java
index c46c3d4095..9e97e8c736 100644
---
a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/CustomIndexerImpl.java
+++
b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/CustomIndexerImpl.java
@@ -51,8 +51,13 @@ public class CustomIndexerImpl extends CustomIndexer {
@Override
protected void index(Iterable files, Context context)
{
+FileObject root = context.getRoot();
+
+if (root == null) {
+return ; //ignore
+}
+
handleStoredFiles(context, props -> {
-FileObject root = context.getRoot();
for (Indexable i : files) {
FileObject file = root.getFileObject(i.getRelativePath());
if (file != null) {
diff --git a/java/java.file.launcher/nbproject/project.xml
b/java/java.file.launcher/nbproject/project.xml
index d5520075de..195981d25e 100644
--- a/java/java.file.launcher/nbproject/project.xml
+++ b/java/java.file.launcher/nbproject/project.xml
@@ -140,6 +140,15 @@
1.84
+
+
org.netbeans.modules.parsing.api
+
+
+
+1
+9.30
+
+
org.netbeans.modules.parsing.indexing
@@ -166,6 +175,15 @@
1.63
+
+
org.netbeans.spi.editor.hints
+
+
+
+0
+1.65
+
+
org.openide.filesystems
diff --git
a/java/java.file.launcher/src/org/netbeans/modules/java/file/launcher/AttributeBasedSingleFileOptions.java
b/java/java.file.launcher/src/org/netbeans/modules/java/file/launcher/AttributeBasedSingleFileOptions.java
index 586415f3c4..cfa6c4d209 100644
---
a/java/java.file.launcher/src/org/netbeans/modules/java/file/launcher/AttributeBasedSingleFileOptions.java
+++
b/java/java.file.launcher/src/org/netbeans/modules/java/file/launcher/AttributeBasedSingleFileOptions.java
@@ -19,8 +19,6 @@
package org.netbeans.modules.java.file.launcher;
import javax.swing.event.ChangeListener;
-import org.netbeans.api.project.FileOwnerQuery;
-import org.netbeans.api.project.Project;
import org.netbeans.modules.java.file.launcher.queries.MultiSourceRootProvider;
imp
(netbeans) branch master updated: Forcing restart when to_enable.txt file exists in the Windows launcher.
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 6aadb9aa5a Forcing restart when to_enable.txt file exists in the
Windows launcher.
new 64c134cfa1 Merge pull request #6914 from
lahodaj/to_enable_in_windows_launcher
6aadb9aa5a is described below
commit 6aadb9aa5a4aceb075591d4b1562b21b293e58f4
Author: Jan Lahoda
AuthorDate: Thu Jan 4 09:49:05 2024 +0100
Forcing restart when to_enable.txt file exists in the Windows launcher.
---
platform/o.n.bootstrap/launcher/windows/platformlauncher.cpp | 9 +
1 file changed, 9 insertions(+)
diff --git a/platform/o.n.bootstrap/launcher/windows/platformlauncher.cpp
b/platform/o.n.bootstrap/launcher/windows/platformlauncher.cpp
index 76fc6fc204..33bf8ee83e 100644
--- a/platform/o.n.bootstrap/launcher/windows/platformlauncher.cpp
+++ b/platform/o.n.bootstrap/launcher/windows/platformlauncher.cpp
@@ -484,6 +484,15 @@ bool PlatformLauncher::shouldAutoUpdate(bool firstStart,
const char *basePath) {
return true;
}
+path = basePath;
+path += "\\update\\deactivate\\to_enable.txt";
+hFind = FindFirstFile(path.c_str(), );
+if (hFind != INVALID_HANDLE_VALUE) {
+logMsg("to_enable.txt found: %s", path.c_str());
+FindClose(hFind);
+return true;
+}
+
path = basePath;
path += "\\update\\deactivate\\to_uninstall.txt";
hFind = FindFirstFile(path.c_str(), );
-
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: Adjusting command name for surround.with.
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 1a4d5cf09f Adjusting command name for surround.with.
new ec574b89e2 Merge pull request #6771 from
lahodaj/fix-vscode-surround-with
1a4d5cf09f is described below
commit 1a4d5cf09fb424214c9090f6a233daec9ae467bd
Author: Jan Lahoda
AuthorDate: Thu Nov 30 15:30:14 2023 +0100
Adjusting command name for surround.with.
---
.../org/netbeans/modules/java/lsp/server/protocol/SurroundWithHint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/SurroundWithHint.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/SurroundWithHint.java
index d893783f69..3f90097b60 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/SurroundWithHint.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/SurroundWithHint.java
@@ -80,7 +80,7 @@ import org.openide.util.lookup.ServiceProvider;
public final class SurroundWithHint extends CodeActionsProvider {
private static final String COMMAND_INSERT_SNIPPET =
"editor.action.insertSnippet";
-private static final String COMMAND_SURROUND_WITH = "surround.with";
+private static final String COMMAND_SURROUND_WITH = "nbls.surround.with";
private static final String DOTS = "...";
private static final String SNIPPET = "snippet";
private static final String SELECTION_VAR = "${selection}";
-
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: Not registering the LSP's SingleFileOptionsQueryImpl in java.lsp.server, but only in nbcode
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new a9dc51215e Not registering the LSP's SingleFileOptionsQueryImpl in
java.lsp.server, but only in nbcode
new e92309ca46 Merge pull request #6854 from
lahodaj/fix-single-file-options-in-nb
a9dc51215e is described below
commit a9dc51215e2958e12488a9c39f5fbe1daddb4005
Author: Jan Lahoda
AuthorDate: Fri Dec 15 18:44:20 2023 +0100
Not registering the LSP's SingleFileOptionsQueryImpl in java.lsp.server,
but only in nbcode
---
java/java.file.launcher/nbproject/project.xml | 1 +
.../nbcode/integration/nbproject/project.xml | 8 +
.../integration/LspSingleFileOptionsQueryImpl.java | 27 +++
.../server/protocol/TextDocumentServiceImpl.java | 38 --
.../SingleFileOptionsQueryImpl.java| 4 +--
5 files changed, 57 insertions(+), 21 deletions(-)
diff --git a/java/java.file.launcher/nbproject/project.xml
b/java/java.file.launcher/nbproject/project.xml
index 1bc8cb541b..d5520075de 100644
--- a/java/java.file.launcher/nbproject/project.xml
+++ b/java/java.file.launcher/nbproject/project.xml
@@ -260,6 +260,7 @@
org.netbeans.modules.java.lsp.server
+org.netbeans.modules.nbcode.integration
org.netbeans.modules.refactoring.java
org.netbeans.modules.java.file.launcher.api
org.netbeans.modules.java.file.launcher.spi
diff --git a/java/java.lsp.server/nbcode/integration/nbproject/project.xml
b/java/java.lsp.server/nbcode/integration/nbproject/project.xml
index debf5ec044..fab44f77aa 100644
--- a/java/java.lsp.server/nbcode/integration/nbproject/project.xml
+++ b/java/java.lsp.server/nbcode/integration/nbproject/project.xml
@@ -101,6 +101,14 @@
+
+
org.netbeans.modules.java.file.launcher
+
+
+
+1.0
+
+
org.netbeans.modules.java.lsp.server
diff --git
a/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/LspSingleFileOptionsQueryImpl.java
b/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/LspSingleFileOptionsQueryImpl.java
new file mode 100644
index 00..a796f89ad6
--- /dev/null
+++
b/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/LspSingleFileOptionsQueryImpl.java
@@ -0,0 +1,27 @@
+/*
+ * 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.nbcode.integration;
+
+import
org.netbeans.modules.java.file.launcher.spi.SingleFileOptionsQueryImplementation;
+import
org.netbeans.modules.java.lsp.server.singlesourcefile.SingleFileOptionsQueryImpl;
+import org.openide.util.lookup.ServiceProvider;
+
+@ServiceProvider(service=SingleFileOptionsQueryImplementation.class,
position=100)
+public class LspSingleFileOptionsQueryImpl extends SingleFileOptionsQueryImpl {
+}
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..0c3f2868c5 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
@@ -1128,28 +1128,30 @@ public class TextDocumentServiceImpl implements
TextDocumentService, LanguageCli
CompletableFuture future = new CompletableFuture<>();
BACKGROUND_TASKS.post(() -> {
JsonObject data = (JsonObject) unresolved.getData();
-if (data.has(CodeActionsProvider.CODE_ACTIONS_PROVIDER_CLASS)) {
-
(netbeans) branch master updated: added warning for case where var and diamond operator used together
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 147b0ad83b added warning for case where var and diamond operator used
together
new cfa5a87a41 Merge pull request #6780 from Achal1607/javavscode-69
147b0ad83b is described below
commit 147b0ad83bdac19affd6047895770a907b480a53
Author: Achal Talati
AuthorDate: Tue Dec 5 10:21:11 2023 +0530
added warning for case where var and diamond operator used together
Signed-off-by: Achal Talati
---
.../modules/java/hints/bugs/Bundle.properties | 4 +
.../org/netbeans/modules/java/hints/bugs/Tiny.java | 40 +++
.../modules/java/hints/bugs/Bundle_test.properties | 2 +
.../netbeans/modules/java/hints/bugs/TinyTest.java | 115 +
4 files changed, 161 insertions(+)
diff --git
a/java/java.hints/src/org/netbeans/modules/java/hints/bugs/Bundle.properties
b/java/java.hints/src/org/netbeans/modules/java/hints/bugs/Bundle.properties
index aa59c260fd..eb396dcc3a 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/bugs/Bundle.properties
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/bugs/Bundle.properties
@@ -49,6 +49,10 @@
DESC_org.netbeans.modules.java.hints.bugs.Tiny.equalsNull=Finds invocations of t
ERR_equalsNull=Object equals "null" is never true
FIX_equalsNull=Use == instead of equals method
+DN_org.netbeans.modules.java.hints.bugs.Tiny.varTypeDiamondOperator= var used
with diamond operator
+DESC_org.netbeans.modules.java.hints.bugs.Tiny.varTypeDiamondOperator=Finds
variables initialzed using var and diamond operator
+ERR_varTypeDiamondOperator=<> would be inferred as
+
DN_org.netbeans.modules.java.hints.bugs.Tiny.resultSet=Incorrect column index
in ResultSet
DESC_org.netbeans.modules.java.hints.bugs.Tiny.resultSet=Reports Iincorrect
column indices passed to various methods of java.sql.ResultSet
ERR_ResultSetZero=Column index is zero, but ResultSet columns are counted from
1
diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/bugs/Tiny.java
b/java/java.hints/src/org/netbeans/modules/java/hints/bugs/Tiny.java
index c3544a5a9f..4ad1f50f26 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/bugs/Tiny.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/bugs/Tiny.java
@@ -32,9 +32,11 @@ import com.sun.source.tree.LineMap;
import com.sun.source.tree.LiteralTree;
import com.sun.source.tree.MemberSelectTree;
import com.sun.source.tree.MethodInvocationTree;
+import com.sun.source.tree.NewClassTree;
import com.sun.source.tree.SwitchTree;
import com.sun.source.tree.Tree;
import com.sun.source.tree.Tree.Kind;
+import com.sun.source.tree.VariableTree;
import com.sun.source.tree.WhileLoopTree;
import com.sun.source.util.SourcePositions;
import com.sun.source.util.TreePath;
@@ -51,6 +53,8 @@ import javax.lang.model.element.ElementKind;
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.Name;
import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.TypeParameterElement;
+import javax.lang.model.element.VariableElement;
import javax.lang.model.type.DeclaredType;
import javax.lang.model.type.TypeKind;
import javax.lang.model.type.TypeMirror;
@@ -195,6 +199,42 @@ public class Tiny {
return ErrorDescriptionFactory.forTree(ctx, ctx.getPath(),
displayName, fix);
}
+@Hint(displayName =
"#DN_org.netbeans.modules.java.hints.bugs.Tiny.varTypeDiamondOperator",
description =
"#DESC_org.netbeans.modules.java.hints.bugs.Tiny.varTypeDiamondOperator",
category="bugs", suppressWarnings="AllowVarTypeDiamondOperator")
+@TriggerPatterns({
+@TriggerPattern(value="$mods$ $varType $name = new $type<>($args$)",
constraints=@ConstraintVariableType(variable="$type",
type="java.util.Collection")),
+@TriggerPattern(value="$mods$ $varType $name = new $type<>($args$)",
constraints=@ConstraintVariableType(variable="$type", type="java.util.Map"))
+})
+public static ErrorDescription varTypeDiamondOperator(HintContext ctx) {
+TreePath path = ctx.getPath();
+Boolean isVarUsed = ctx.getInfo().getTreeUtilities().isVarType(path);
+if(!isVarUsed){
+return null;
+}
+
+VariableTree vt = (VariableTree) ctx.getPath().getLeaf();
+NewClassTree nct = (NewClassTree) vt.getInitializer();
+Element constructorCand = ctx.getInfo().getTrees().getElement(new
TreePath(ctx.getPath(), nct));
+
+if (constructorCand.getKind() != ElementKind.CONSTRUCTOR) {
+return null;
+}
+
+ExecutableElement constructor = (ExecutableElement) constructorCand;
+
+
(netbeans) branch master updated: Improving handling of string templates in the Java syntax.
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new c45b21f4cf Improving handling of string templates in the Java syntax.
new 063d12340e Merge pull request #6745 from
lahodaj/string-templates-vscode-grammar
c45b21f4cf is described below
commit c45b21f4cfc9c05bc021e839a5abcc067e7dde6b
Author: Jan Lahoda
AuthorDate: Fri Nov 24 16:21:11 2023 +0100
Improving handling of string templates in the Java syntax.
---
.../vscode/syntaxes/java.tmLanguage.json | 26 ++
1 file changed, 22 insertions(+), 4 deletions(-)
diff --git a/java/java.lsp.server/vscode/syntaxes/java.tmLanguage.json
b/java/java.lsp.server/vscode/syntaxes/java.tmLanguage.json
index cd3b0541e0..a0310c0525 100644
--- a/java/java.lsp.server/vscode/syntaxes/java.tmLanguage.json
+++ b/java/java.lsp.server/vscode/syntaxes/java.tmLanguage.json
@@ -1575,20 +1575,38 @@
"begin": "\"",
"beginCaptures": {
"0": {
- "name":
"punctuation.definition.string.begin.java"
+ "name":
"punctuation.definition.string.begin.java string.quoted.double.java"
}
},
"end": "\"",
"endCaptures": {
"0": {
- "name":
"punctuation.definition.string.end.java"
+ "name":
"punctuation.definition.string.end.java string.quoted.double.java"
}
},
- "name": "string.quoted.double.java",
"patterns": [
+ {
+ "begin": "{",
+ "beginCaptures": {
+ "0": {
+ "name":
"punctuation.definition.string.end.java string.quoted.double.java"
+ }
+ },
+ "end": "}",
+ "endCaptures": {
+ "0": {
+ "name":
"punctuation.definition.string.begin.java string.quoted.double.java"
+ }
+ },
+ "patterns":
[{"include": "#code"}]
+ },
{
"match": ".",
- "name":
"constant.character.escape.java"
+ "name":
"constant.character.escape.java string.quoted.double.java"
+ },
+ {
+ "match": ".",
+ "name":
"string.quoted.double.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 (50ed41597a -> 0db6df731a)
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 50ed41597a Merge pull request #6710 from mbien/ci-branch-restricted-trigger new cec4d6056f Adding CommandProvider API, to allow removal of commands out of java.lsp.server. new 7b3a0bd800 Merge branch 'master' into commandprovider2 new 0db6df731a Merge pull request #6133 from lahodaj/commandprovider2 The 9333 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 | 13 + ide/api.lsp/manifest.mf| 2 +- .../src/org/netbeans/spi/lsp/CommandProvider.java | 48 .../integration/commands/ProjectAuditCommand.java | 20 +- .../commands/ProjectMetadataCommand.java | 20 +- .../java/lsp/server/db/DBAddConnection.java| 290 ++--- .../java/lsp/server/db/DBCommandProvider.java | 22 +- .../CodeActionsProvider2CommandProviderBridge.java | 63 + platform/openide.dialogs/apichanges.xml| 15 ++ platform/openide.dialogs/manifest.mf | 2 +- .../src/org/openide/NotifyDescriptor.java | 58 - .../unit/src/org/openide/NotifyDescriptorTest.java | 44 +++- 12 files changed, 400 insertions(+), 197 deletions(-) create mode 100644 ide/api.lsp/src/org/netbeans/spi/lsp/CommandProvider.java create mode 100644 java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/CodeActionsProvider2CommandProviderBridge.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: Improving String templates support in the code gen.
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 7ade6d64e0 Improving String templates support in the code gen.
new 5fe7d3da21 Merge pull request #6637 from
lahodaj/string-templates-write-model
7ade6d64e0 is described below
commit 7ade6d64e07557433486998dd1cff7c81c204396
Author: Jan Lahoda
AuthorDate: Mon Oct 30 11:26:04 2023 +0100
Improving String templates support in the code gen.
---
java/java.source.base/apichanges.xml | 12 +
java/java.source.base/nbproject/project.properties | 2 +-
.../org/netbeans/api/java/source/TreeMaker.java| 13 +
.../modules/java/source/pretty/VeryPretty.java | 47 ++-
.../modules/java/source/save/CasualDiff.java | 83 -
.../modules/java/source/save/DiffContext.java | 13 +
.../modules/java/source/save/EstimatorFactory.java | 7 +
.../java/source/save/PositionEstimator.java| 33 ++
.../modules/java/source/save/Reformatter.java | 12 +
.../api/java/source/gen/StringTemplateTest.java| 349 +
.../modules/java/source/save/FormatingTest.java| 26 ++
11 files changed, 591 insertions(+), 6 deletions(-)
diff --git a/java/java.source.base/apichanges.xml
b/java/java.source.base/apichanges.xml
index 27f23bf96b..8b5551495c 100644
--- a/java/java.source.base/apichanges.xml
+++ b/java/java.source.base/apichanges.xml
@@ -25,6 +25,18 @@
Java Source API
+
+
+Adding TreeMaker.StringTemplate
+
+
+
+
+
+Adding TreeMaker.StringTemplate
+
+
+
Source file name for Element
diff --git a/java/java.source.base/nbproject/project.properties
b/java/java.source.base/nbproject/project.properties
index 5a122a5c1d..59475c538a 100644
--- a/java/java.source.base/nbproject/project.properties
+++ b/java/java.source.base/nbproject/project.properties
@@ -23,7 +23,7 @@ javadoc.name=Java Source Base
javadoc.title=Java Source Base
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
-spec.version.base=2.64.0
+spec.version.base=2.65.0
test.qa-functional.cp.extra=${refactoring.java.dir}/modules/ext/nb-javac-api.jar
test.unit.run.cp.extra=${o.n.core.dir}/core/core.jar:\
${o.n.core.dir}/lib/boot.jar:\
diff --git
a/java/java.source.base/src/org/netbeans/api/java/source/TreeMaker.java
b/java/java.source.base/src/org/netbeans/api/java/source/TreeMaker.java
index 74a4e8b3b5..8eeca54802 100644
--- a/java/java.source.base/src/org/netbeans/api/java/source/TreeMaker.java
+++ b/java/java.source.base/src/org/netbeans/api/java/source/TreeMaker.java
@@ -3916,4 +3916,17 @@ public final class TreeMaker {
public LambdaExpressionTree setLambdaBody(LambdaExpressionTree method,
Tree newBody) {
return delegate.setLambdaBody(method, newBody);
}
+
+/**Creates a new string template expression from the given parameters.
+ *
+ * @param processor the processor of the string template
+ * @param fragments the template fragments
+ * @param expressions the template expressions
+ * @return the string template instance
+ * @since 2.65
+ */
+public StringTemplateTree StringTemplate(ExpressionTree processor,
List fragments, List expressions) {
+return delegate.StringTemplate(processor, fragments, expressions);
+}
+
}
diff --git
a/java/java.source.base/src/org/netbeans/modules/java/source/pretty/VeryPretty.java
b/java/java.source.base/src/org/netbeans/modules/java/source/pretty/VeryPretty.java
index 9c94b6f4c4..23851bb985 100644
---
a/java/java.source.base/src/org/netbeans/modules/java/source/pretty/VeryPretty.java
+++
b/java/java.source.base/src/org/netbeans/modules/java/source/pretty/VeryPretty.java
@@ -116,6 +116,7 @@ import
org.netbeans.modules.java.source.builder.CommentSetImpl;
import org.netbeans.modules.java.source.parsing.FileObjects;
import org.netbeans.modules.java.source.parsing.JavacParser;
import org.netbeans.modules.java.source.save.CasualDiff;
+import
org.netbeans.modules.java.source.save.CasualDiff.StringTemplateFragmentTree;
import org.netbeans.modules.java.source.save.DiffContext;
import org.netbeans.modules.java.source.save.PositionEstimator;
import org.netbeans.modules.java.source.save.Reformatter;
@@ -1865,7 +1866,7 @@ public final class VeryPretty extends JCTree.Visitor
implements DocTreeVisitor= 0 //#137564
-&& (end =
diffContext.trees.getSourcePositions().getEndPosition(diffContext.origUnit,
tree)) >= 0
+&& (end = diffContext.getEndPosition(diffContext.origUnit, tree))
>= 0
&& origText != null) {
print(origText.substring((int) start, (int) end));
return ;
@@ -1873,7 +1874,7 @@
(netbeans) branch master updated: [JAVAVSCODE-52] Avoiding crash during indexing when a record has a component with a wrong name.
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 05c942d119 [JAVAVSCODE-52] Avoiding crash during indexing when a
record has a component with a wrong name.
new 60eb7a172e Merge pull request #6649 from lahodaj/javavscode-52
05c942d119 is described below
commit 05c942d119450ad9f5975c4dd32b1771f8fe8070
Author: Jan Lahoda
AuthorDate: Wed Nov 1 16:27:24 2023 +0100
[JAVAVSCODE-52] Avoiding crash during indexing when a record has a
component with a wrong name.
---
.../java/source/indexing/VanillaCompileWorker.java | 9 +
.../source/indexing/VanillaCompileWorkerTest.java | 45 ++
2 files changed, 54 insertions(+)
diff --git
a/java/java.source.base/src/org/netbeans/modules/java/source/indexing/VanillaCompileWorker.java
b/java/java.source.base/src/org/netbeans/modules/java/source/indexing/VanillaCompileWorker.java
index c4ff2100e0..1503fe37fb 100644
---
a/java/java.source.base/src/org/netbeans/modules/java/source/indexing/VanillaCompileWorker.java
+++
b/java/java.source.base/src/org/netbeans/modules/java/source/indexing/VanillaCompileWorker.java
@@ -90,6 +90,7 @@ import org.netbeans.lib.nbjavac.services.CancelService;
import com.sun.tools.javac.util.FatalError;
import com.sun.tools.javac.util.ListBuffer;
import com.sun.tools.javac.util.Log;
+import com.sun.tools.javac.util.Names;
import com.sun.tools.javac.util.Pair;
import java.io.File;
import java.io.IOException;
@@ -541,6 +542,7 @@ final class VanillaCompileWorker extends CompileWorker {
return ;
}
hu.handled.add(cut);
+Names names = Names.instance(ctx);
Symtab syms = Symtab.instance(ctx);
Trees trees = Trees.instance(BasicJavacTask.instance(ctx));
Types types = Types.instance(ctx);
@@ -732,6 +734,13 @@ final class VanillaCompileWorker extends CompileWorker {
for (RecordComponent rc : clazz.sym.getRecordComponents()) {
rc.type = error2Object(rc.type);
scan(rc.accessorMeth, p);
+if (rc.accessor == null) {
+//the accessor is not created when the component type
matches
+//a non-arg j.l.Object method (which is a compile-time
error)
+//but the missing accessor will break Lower.
+//initialize the field:
+rc.accessor = new MethodSymbol(0, names.empty, new
MethodType(com.sun.tools.javac.util.List.nil(), syms.errType,
com.sun.tools.javac.util.List.nil(), syms.methodClass), clazz.sym);
+}
}
for (JCTree def : clazz.defs) {
boolean errorClass = isErroneousClass(def);
diff --git
a/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/indexing/VanillaCompileWorkerTest.java
b/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/indexing/VanillaCompileWorkerTest.java
index e2b0b3d0fb..fd8d5bdc47 100644
---
a/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/indexing/VanillaCompileWorkerTest.java
+++
b/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/indexing/VanillaCompileWorkerTest.java
@@ -2297,6 +2297,51 @@ public class VanillaCompileWorkerTest extends
CompileWorkerTestBase {
assertEquals(expected, file2Fixed);
}
+public void testWrongRecordComponent() throws Exception {
+setSourceLevel("17");
+
+Map file2Fixed = new HashMap<>();
+VanillaCompileWorker.fixedListener = (file, cut) -> {
+try {
+FileObject source =
URLMapper.findFileObject(file.toUri().toURL());
+file2Fixed.put(FileUtil.getRelativePath(getRoot(), source),
cut.toString());
+} catch (MalformedURLException ex) {
+throw new IllegalStateException(ex);
+}
+};
+ParsingOutput result =
runIndexing(Arrays.asList(compileTuple("test/Test.java",
+ "package
test;\n" +
+ "public
record Test(int wait) {\n" +
+ "}\n")),
+ Arrays.asList());
+
+assertFalse(result.lowMemory);
+assertTrue(result.success);
+
+Set createdFiles = new HashSet();
+
+for (File created : result.createdFiles) {
+
createdFiles.add(getWorkDir().toURI().relativize(created.toURI()).getPath());
+}
+
+assertEquals(new
HashSet(Arrays.asList("cache/s1/java/15/classes/test/Test.si
(netbeans) branch master updated: The list of tests should include TestNG tests.
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 8deace60d9 The list of tests should include TestNG tests.
new 96f6fefb96 Merge pull request #6615 from lahodaj/include-testng-tests
8deace60d9 is described below
commit 8deace60d995131825d9b31c536a4e9099abe8eb
Author: Jan Lahoda
AuthorDate: Tue Oct 24 13:08:44 2023 +0200
The list of tests should include TestNG tests.
---
.../gsf/testrunner/ui/TestMethodFinderImpl.java| 2 +-
java/java.lsp.server/vscode/README.md | 2 +-
.../junit/ui/actions/TestClassInfoTask.java| 2 +-
java/testng.ui/nbproject/project.xml | 9 ++
.../testng/ui/actions/TestClassInfoTask.java | 34 ++
5 files changed, 46 insertions(+), 3 deletions(-)
diff --git
a/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/TestMethodFinderImpl.java
b/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/TestMethodFinderImpl.java
index cd505c486c..1aa46f7245 100644
---
a/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/TestMethodFinderImpl.java
+++
b/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/TestMethodFinderImpl.java
@@ -56,7 +56,7 @@ import org.openide.util.WeakSet;
public final class TestMethodFinderImpl extends EmbeddingIndexer {
public static final String NAME = "tests"; // NOI18N
-public static final int VERSION = 1;
+public static final int VERSION = 2;
public static final TestMethodFinderImpl INSTANCE = new
TestMethodFinderImpl();
private final WeakSet>> listeners = new WeakSet<>();
diff --git a/java/java.lsp.server/vscode/README.md
b/java/java.lsp.server/vscode/README.md
index 2d401e928f..ddf404874d 100644
--- a/java/java.lsp.server/vscode/README.md
+++ b/java/java.lsp.server/vscode/README.md
@@ -42,7 +42,7 @@ When running this extension on GraalVM, as its runtime JDK,
behind proxy it requ
* __Java: New Project...__ allows creation of new Maven or Gradle project
* __Java: New from Template...__ add various files to currently selected open
project. Files are:
* Java - broad selection of various predefined Java classes
-* Unit tests - JUnit and TestNB templates for test suites and test cases
+* Unit tests - JUnit and TestNG templates for test suites and test cases
* HTML5/JavaScript - Templates for JS, HTML, CSS,... files
* Other - various templates for JSON, YAML, properties, ... files
* __Java: Compile Workspace__ - invoke Maven or Gradle build
diff --git
a/java/junit.ui/src/org/netbeans/modules/junit/ui/actions/TestClassInfoTask.java
b/java/junit.ui/src/org/netbeans/modules/junit/ui/actions/TestClassInfoTask.java
index 051645ab73..00103e9b96 100644
---
a/java/junit.ui/src/org/netbeans/modules/junit/ui/actions/TestClassInfoTask.java
+++
b/java/junit.ui/src/org/netbeans/modules/junit/ui/actions/TestClassInfoTask.java
@@ -281,7 +281,7 @@ public final class TestClassInfoTask implements
Task {
}
@MimeRegistration(mimeType="text/x-java",
service=org.netbeans.modules.gsf.testrunner.ui.spi.ComputeTestMethods.class)
-public static final class GenericComputeTestMethodsImpl implements
org.netbeans.modules.gsf.testrunner.ui.spi.ComputeTestMethods {
+public static final class JUnitComputeTestMethodsImpl implements
org.netbeans.modules.gsf.testrunner.ui.spi.ComputeTestMethods {
@Override
public List computeTestMethods(Parser.Result parserResult,
AtomicBoolean cancel) {
diff --git a/java/testng.ui/nbproject/project.xml
b/java/testng.ui/nbproject/project.xml
index 971beaa66b..65c7364426 100644
--- a/java/testng.ui/nbproject/project.xml
+++ b/java/testng.ui/nbproject/project.xml
@@ -34,6 +34,15 @@
1.52
+
+
org.netbeans.api.java.classpath
+
+
+
+1
+1.77
+
+
org.netbeans.api.progress
diff --git
a/java/testng.ui/src/org/netbeans/modules/testng/ui/actions/TestClassInfoTask.java
b/java/testng.ui/src/org/netbeans/modules/testng/ui/actions/TestClassInfoTask.java
index 5a9bb9b781..e8419fa08e 100644
---
a/java/testng.ui/src/org/netbeans/modules/testng/ui/actions/TestClassInfoTask.java
+++
b/java/testng.ui/src/org/netbeans/modules/testng/ui/actions/TestClassInfoTask.java
@@ -41,6 +41,9 @@ import javax.lang.model.util.Elements;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import javax.swing.text.Position;
+import org.netbeans.api.editor.mimelookup.MimeRegistration;
+import org.netbe
(netbeans) branch master updated: Fixing the UnitTestForSourceQueryImpl for openjdk projects.
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 8c2c04c441 Fixing the UnitTestForSourceQueryImpl for openjdk projects.
new 5639632600 Merge pull request #6481 from
lahodaj/fix-unit-test-for-openjdk-project
8c2c04c441 is described below
commit 8c2c04c4417d5f5055e0a9789df148fadf418307
Author: Jan Lahoda
AuthorDate: Fri Sep 22 14:14:44 2023 +0200
Fixing the UnitTestForSourceQueryImpl for openjdk projects.
---
.../project/UnitTestForSourceQueryImpl.java| 46 --
1 file changed, 35 insertions(+), 11 deletions(-)
diff --git
a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/UnitTestForSourceQueryImpl.java
b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/UnitTestForSourceQueryImpl.java
index 8bba362c33..e25900149a 100644
---
a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/UnitTestForSourceQueryImpl.java
+++
b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/UnitTestForSourceQueryImpl.java
@@ -20,10 +20,12 @@ package org.netbeans.modules.java.openjdk.project;
import java.net.URL;
import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
import org.netbeans.api.java.project.JavaProjectConstants;
import org.netbeans.api.project.ProjectUtils;
import org.netbeans.api.project.SourceGroup;
-import org.netbeans.modules.java.openjdk.project.JDKProject;
import
org.netbeans.spi.java.queries.MultipleRootsUnitTestForSourceQueryImplementation;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
@@ -42,23 +44,45 @@ public class UnitTestForSourceQueryImpl implements
MultipleRootsUnitTestForSourc
@Override
public URL[] findUnitTests(FileObject source) {
-SourceGroup[] groups = ProjectUtils.getSources(prj)
-
.getSourceGroups(SourcesImpl.SOURCES_TYPE_JDK_PROJECT_TESTS);
-return notInReturn(source, groups);
+Set roots =
getRoots(SourcesImpl.SOURCES_TYPE_JDK_PROJECT_TESTS);
+
+if (!insideAnyRoot(roots, source)) {
+return toURLs(roots);
+}
+
+return null;
}
@Override
public URL[] findSources(FileObject unitTest) {
-SourceGroup[] groups = ProjectUtils.getSources(prj)
-
.getSourceGroups(JavaProjectConstants.SOURCES_TYPE_JAVA);
-return notInReturn(unitTest, groups);
+Set roots =
getRoots(JavaProjectConstants.SOURCES_TYPE_JAVA);
+
+roots.removeAll(getRoots(SourcesImpl.SOURCES_TYPE_JDK_PROJECT_TESTS));
+
+if (!insideAnyRoot(roots, unitTest)) {
+return toURLs(roots);
+}
+
+return null;
}
-private URL[] notInReturn(FileObject file, SourceGroup[] groups) {
+private Set getRoots(String type) {
+SourceGroup[] groups = ProjectUtils.getSources(prj)
+ .getSourceGroups(type);
+
return Arrays.stream(groups)
.map(sg -> sg.getRootFolder())
- .filter(root -> FileUtil.isParentOf(root, file) || root
== file)
- .map(f -> f.toURL())
- .toArray(s -> new URL[s]);
+ .collect(Collectors.toCollection(LinkedHashSet::new));
+}
+
+private boolean insideAnyRoot(Set roots, FileObject toTest) {
+return roots.stream()
+.anyMatch(root -> FileUtil.isParentOf(root, toTest) ||
root == toTest);
+}
+
+private URL[] toURLs(Set roots) {
+return roots.stream()
+.map(f -> f.toURL())
+.toArray(s -> new URL[s]);
}
}
-
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: The LSP client may send document content with non-LF line endings, normalize before comparing with NB document content.
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new f56a1bf250 The LSP client may send document content with non-LF line
endings, normalize before comparing with NB document content.
new a92b79d5ad Merge pull request #6690 from
lahodaj/java-lsp-normalize-document-line-endings
f56a1bf250 is described below
commit f56a1bf250315fd3f7e4ba52e9ed423acf0a9d39
Author: Jan Lahoda
AuthorDate: Mon Nov 13 12:00:33 2023 +0100
The LSP client may send document content with non-LF line endings,
normalize before comparing with NB document content.
---
.../server/protocol/TextDocumentServiceImpl.java | 41 ++-
.../protocol/TextDocumentServiceImplTest.java | 120 +
2 files changed, 157 insertions(+), 4 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 8f71804dfc..99face0774 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
@@ -1661,10 +1661,7 @@ public class TextDocumentServiceImpl implements
TextDocumentService, LanguageCli
if (doc == null) {
doc = ec.openDocument();
}
-if (!text.contentEquals(doc.getText(0, doc.getLength( {
-doc.remove(0, doc.getLength());
-doc.insertString(0, text, null);
-}
+updateDocumentIfNeeded(text, doc);
} catch (BadLocationException ex) {
Exceptions.printStackTrace(ex);
//TODO: include stack trace:
@@ -1683,6 +1680,42 @@ public class TextDocumentServiceImpl implements
TextDocumentService, LanguageCli
}
}
+static void updateDocumentIfNeeded(String text, Document doc) throws
BadLocationException {
+String docText = doc.getText(0, doc.getLength());
+
+if (text.contentEquals(docText)) {
+//the texts are the same, no need to change the Document content:
+return ;
+}
+
+//normalize line endings:
+StringBuilder newText = new StringBuilder(text.length());
+int len = text.length();
+boolean modified = false;
+
+for (int i = 0; i < len; i++) {
+char c = text.charAt(i);
+if (c == '\r') {
+if (i + 1 < len && text.charAt(i + 1) == '\n') {
+i++;
+}
+c = '\n';
+modified = true;
+}
+newText.append(c);
+}
+
+String newTextString = newText.toString();
+
+if (modified && docText.equals(newTextString)) {
+//only change in line endings, no need to change the Document
content:
+return ;
+}
+
+doc.remove(0, doc.getLength());
+doc.insertString(0, newTextString, null);
+}
+
@Override
public void didChange(DidChangeTextDocumentParams params) {
String uri = params.getTextDocument().getUri();
diff --git
a/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImplTest.java
b/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImplTest.java
new file mode 100644
index 00..0f2bda50ae
--- /dev/null
+++
b/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/protocol/TextDocumentServiceImplTest.java
@@ -0,0 +1,120 @@
+/*
+ * 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.concurrent.atomic.AtomicInteger;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import java
(netbeans) branch master updated: fixed xml files formatting in LSP
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new c541e60ca3 fixed xml files formatting in LSP
new f314e57c34 Merge pull request #6631 from Achal1607/NETBEANS-6527
c541e60ca3 is described below
commit c541e60ca33457f568da289f77c9badcbd41e1fd
Author: Achal Talati
AuthorDate: Sat Oct 28 10:08:26 2023 +0530
fixed xml files formatting in LSP
Signed-off-by: Achal Talati
---
.../src/org/netbeans/editor/BaseDocument.java | 25 +-
.../src/org/netbeans/editor/Utilities.java | 54 +-
.../modules/xml/text/indent/XMLLexerFormatter.java | 17 +++
3 files changed, 61 insertions(+), 35 deletions(-)
diff --git a/ide/editor.lib/src/org/netbeans/editor/BaseDocument.java
b/ide/editor.lib/src/org/netbeans/editor/BaseDocument.java
index 1dc3c6ba45..b564977b02 100644
--- a/ide/editor.lib/src/org/netbeans/editor/BaseDocument.java
+++ b/ide/editor.lib/src/org/netbeans/editor/BaseDocument.java
@@ -2169,30 +2169,7 @@ public class BaseDocument extends AbstractDocument
implements AtomicLockDocument
* the function itself computes the begining of the line first
*/
int getVisColFromPos(int offset) throws BadLocationException {
-if (offset < 0 || offset > getLength()) {
-throw new BadLocationException("Invalid offset", offset); // NOI18N
-}
-int startLineOffset = Utilities.getRowStart(this, offset);
-int tabSize = getTabSize();
-CharSequence docText =
org.netbeans.lib.editor.util.swing.DocumentUtilities.getText(this);
-int visCol = 0;
-for (int i = startLineOffset; i < offset; i++) {
-char ch = docText.charAt(i);
-if (ch == '\t') {
-visCol = (visCol + tabSize) / tabSize * tabSize;
-} else {
-// #17356
-int codePoint;
-if (Character.isHighSurrogate(ch) && i + 1 < docText.length())
{
-codePoint = Character.toCodePoint(ch, docText.charAt(++i));
-} else {
-codePoint = ch;
-}
-int w = WcwdithUtil.wcwidth(codePoint);
-visCol += w > 0 ? w : 0;
-}
-}
-return visCol;
+return Utilities.getVisColFromPos(this, offset);
}
protected Dictionary createDocumentProperties(Dictionary
origDocumentProperties) {
diff --git a/ide/editor.lib/src/org/netbeans/editor/Utilities.java
b/ide/editor.lib/src/org/netbeans/editor/Utilities.java
index e5fa316eb6..635bd02c09 100644
--- a/ide/editor.lib/src/org/netbeans/editor/Utilities.java
+++ b/ide/editor.lib/src/org/netbeans/editor/Utilities.java
@@ -71,15 +71,18 @@ import javax.swing.text.Element;
import javax.swing.text.Position;
import javax.swing.text.View;
import org.netbeans.api.editor.EditorRegistry;
+import org.netbeans.api.editor.document.LineDocument;
import org.netbeans.api.editor.document.LineDocumentUtils;
import org.netbeans.api.editor.mimelookup.MimeLookup;
import org.netbeans.api.editor.settings.SimpleValueNames;
import org.netbeans.lib.editor.util.CharSequenceUtilities;
import org.netbeans.lib.editor.util.swing.DocumentListenerPriority;
import org.netbeans.lib.editor.util.swing.DocumentUtilities;
+import org.netbeans.modules.editor.indent.api.IndentUtils;
import org.netbeans.modules.editor.indent.api.Reformat;
import org.netbeans.modules.editor.indent.spi.CodeStylePreferences;
import org.netbeans.modules.editor.lib.BeforeSaveTasks;
+import org.netbeans.modules.editor.lib.WcwdithUtil;
import org.netbeans.modules.editor.lib2.EditorPreferencesDefaults;
import org.netbeans.modules.editor.lib2.view.DocumentView;
import org.netbeans.modules.editor.lib2.view.EditorView;
@@ -152,7 +155,40 @@ public class Utilities {
}
return -1;
}
-
+
+/** Get visual column from position. This method can be used
+* only for superfixed font i.e. all characters of all font styles
+* have the same width.
+* @param offset position for which the visual column should be returned
+* the function itself computes the begining of the line first
+*/
+static int getVisColFromPos(LineDocument doc, int offset) throws
BadLocationException {
+if (offset < 0 || offset > doc.getLength()) {
+throw new BadLocationException("Invalid offset", offset); // NOI18N
+}
+int startLineOffset = LineDocumentUtils.getLineStart(doc, offset);
+int tabSize = IndentUtils.tabSize(doc);
+CharSequence docText =
org.netbeans.lib.editor.util.swing.DocumentUtilities.getText(doc);
+int visCol = 0;
+for (int i = startLineOffset; i < offset; i++) {
+cha
(netbeans) branch master updated: fix for outline tab not loading in case pacakge-info.java file is present in the workspace in vscode
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 9819bc8852 fix for outline tab not loading in case pacakge-info.java
file is present in the workspace in vscode
new 3647f61d97 Merge pull request #6642 from Achal1607/javavscode-23
9819bc8852 is described below
commit 9819bc8852363b7477d6d6c2f93662267adfef91
Author: Achal Talati
AuthorDate: Tue Nov 7 02:23:08 2023 +0530
fix for outline tab not loading in case pacakge-info.java file is present
in the workspace in vscode
Signed-off-by: Achal Talati
---
.../netbeans/modules/editor/java/JavaStructureProvider.java | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git
a/java/java.editor/src/org/netbeans/modules/editor/java/JavaStructureProvider.java
b/java/java.editor/src/org/netbeans/modules/editor/java/JavaStructureProvider.java
index 61d08c6671..be87f4b2b8 100644
---
a/java/java.editor/src/org/netbeans/modules/editor/java/JavaStructureProvider.java
+++
b/java/java.editor/src/org/netbeans/modules/editor/java/JavaStructureProvider.java
@@ -65,10 +65,13 @@ public class JavaStructureProvider implements
StructureProvider {
TreePath tp = trees.getPath(cu, cu.getPackage());
Element el = trees.getElement(tp);
if (el != null && el.getKind() == ElementKind.PACKAGE)
{
-StructureElement jse =
element2StructureElement(cc, el);
-if (jse != null) {
-result.add(jse);
-}
+Builder builder =
StructureProvider.newBuilder(el.getSimpleName().toString(),
ElementHeaders.javaKind2Structure(el));
+int start = (int)
cc.getTrees().getSourcePositions().getStartPosition(cu, cu.getPackage());
+int end = (int)
cc.getTrees().getSourcePositions().getEndPosition(cu, cu.getPackage());
+
+
builder.expandedStartOffset(start).selectionStartOffset(start);
+
builder.expandedEndOffset(end).selectionEndOffset(end);
+result.add(builder.build());
}
}
for (Element tel : cc.getTopLevelElements()) {
-
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: The ClassLoader used to load annotation processors does not return directories from getResource/getResources methods, while normal ClassLoaders do - fixing.
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 9762c40938 The ClassLoader used to load annotation processors does not
return directories from getResource/getResources methods, while normal
ClassLoaders do - fixing.
new a2e110a6e3 Merge pull request #6466 from
lahodaj/fix-classloader-getresource-directory
9762c40938 is described below
commit 9762c409389cecb5416da8d2b8951031456ea290
Author: Jan Lahoda
AuthorDate: Fri Sep 15 09:40:58 2023 +0200
The ClassLoader used to load annotation processors does not return
directories from getResource/getResources methods, while normal ClassLoaders do
- fixing.
---
.../modules/java/source/parsing/Archive.java | 15 ++
.../java/source/parsing/CacheFolderArchive.java| 6 +++
.../java/source/parsing/CachingArchive.java| 16 ++
.../source/parsing/CachingArchiveClassLoader.java | 10
.../java/source/parsing/CachingPathArchive.java| 26 +++--
.../java/source/parsing/FileObjectArchive.java | 10
.../modules/java/source/parsing/FileObjects.java | 55 ++-
.../modules/java/source/parsing/FolderArchive.java | 13 +
.../modules/java/source/parsing/PathArchive.java | 11
.../modules/java/source/parsing/ProxyArchive.java | 12 +
.../parsing/CachingArchiveClassLoaderTest.java | 61 ++
.../java/source/parsing/CachingArchiveTest.java| 21
.../source/parsing/CachingPathArchiveTest.java | 17 ++
.../java/source/parsing/FileObjectArchiveTest.java | 13 +
.../java/source/parsing/PathArchiveTest.java | 19 +++
15 files changed, 275 insertions(+), 30 deletions(-)
diff --git
a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/Archive.java
b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/Archive.java
index 47b4983222..ac8d9894ad 100644
---
a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/Archive.java
+++
b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/Archive.java
@@ -20,6 +20,7 @@
package org.netbeans.modules.java.source.parsing;
import java.io.IOException;
+import java.net.URI;
import java.util.Collections;
import java.util.Set;
import javax.tools.JavaFileObject;
@@ -65,6 +66,15 @@ public interface Archive {
*/
public JavaFileObject getFile(final @NonNull String name) throws
IOException;
+/**
+ * Returns a {@link URI} for a directory of the given name, or null if it
does
+ * not exist.
+ *
+ * @param dirName the name of the directory
+ * @return a URI if the given directory is in this archive, {@code null}
otherwise.
+ */
+public URI getDirectory(final @NonNull String dirName) throws IOException;
+
/**
* Checks if the {@link Archive} is represents a multi release archive.
* @return true if the {@link Archive} is supports multiple releases.
@@ -91,6 +101,11 @@ public interface Archive {
return null;
}
+@Override
+public URI getDirectory(String name) throws IOException {
+return null;
+}
+
@Override
public boolean isMultiRelease() {
return false;
diff --git
a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CacheFolderArchive.java
b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CacheFolderArchive.java
index fed6986da9..792fa89532 100644
---
a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CacheFolderArchive.java
+++
b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CacheFolderArchive.java
@@ -21,6 +21,7 @@ package org.netbeans.modules.java.source.parsing;
import java.io.File;
import java.io.IOException;
+import java.net.URI;
import java.util.Set;
import javax.tools.JavaFileObject;
@@ -62,6 +63,11 @@ class CacheFolderArchive implements Archive,
FileChangeListener {
return delegate.getFile(name);
}
+@Override
+public URI getDirectory(String dirName) throws IOException {
+return delegate.getDirectory(dirName);
+}
+
@Override
public void clear() {
delegate.clear();
diff --git
a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchive.java
b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchive.java
index 8a9b29d56f..9be20747b8 100644
---
a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchive.java
+++
b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchive.java
@@ -24,6 +24,8 @@ import java.io.BufferedInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.net.URI;
+import
[netbeans] tag 19.0.301 created (now f48f91e6c1)
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a change to tag 19.0.301 in repository https://gitbox.apache.org/repos/asf/netbeans.git at f48f91e6c1 (commit) No new revisions were added by this update. - 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: Supporting source file launcher in VS Code extension
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 42caa8adc5 Supporting source file launcher in VS Code extension
new f06522f08b Merge pull request #6262 from lahodaj/source-launcher-in-lsp
42caa8adc5 is described below
commit 42caa8adc5faf020865c772fa93b2b385804bddf
Author: Jan Lahoda
AuthorDate: Mon Jul 31 13:07:04 2023 +0200
Supporting source file launcher in VS Code extension
---
java/java.api.common/nbproject/project.xml | 9 +
.../api/common/singlesourcefile/LaunchProcess.java | 46 ++-
.../SingleJavaSourceRunActionProvider.java | 8 +-
.../api/common/singlesourcefile/JavaFileTest.java | 3 +-
.../errors/EnablePreviewSingleSourceFile.java | 2 +-
.../hints/infrastructure/JavaErrorProvider.java| 4 +-
.../server/protocol/TextDocumentServiceImpl.java | 2 +-
.../lsp/server/protocol/WorkspaceServiceImpl.java | 13 +
.../singlesourcefile/CompilerOptionsQueryImpl.java | 307 +
.../EnablePreviewSingleSourceFile.java | 125 +
.../CompilerOptionsQueryImplTest.java | 109
java/java.lsp.server/vscode/src/extension.ts | 3 +-
.../java.lsp.server/vscode/src/runConfiguration.ts | 9 +-
.../modules/java/source/parsing/Hacks.java | 13 +
14 files changed, 623 insertions(+), 30 deletions(-)
diff --git a/java/java.api.common/nbproject/project.xml
b/java/java.api.common/nbproject/project.xml
index 1556766ea3..46ddf51403 100644
--- a/java/java.api.common/nbproject/project.xml
+++ b/java/java.api.common/nbproject/project.xml
@@ -137,6 +137,15 @@
1.61
+
+
org.netbeans.modules.extexecution.base
+
+
+
+2
+1.27
+
+
org.netbeans.modules.java.platform
diff --git
a/java/java.api.common/src/org/netbeans/modules/java/api/common/singlesourcefile/LaunchProcess.java
b/java/java.api.common/src/org/netbeans/modules/java/api/common/singlesourcefile/LaunchProcess.java
index 2d080b64a9..4a574834c7 100644
---
a/java/java.api.common/src/org/netbeans/modules/java/api/common/singlesourcefile/LaunchProcess.java
+++
b/java/java.api.common/src/org/netbeans/modules/java/api/common/singlesourcefile/LaunchProcess.java
@@ -25,20 +25,22 @@ import java.util.Arrays;
import java.util.List;
import java.util.concurrent.Callable;
import java.util.logging.Level;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import org.netbeans.api.extexecution.base.ExplicitProcessParameters;
import org.netbeans.api.java.platform.JavaPlatformManager;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
+import org.openide.util.BaseUtilities;
final class LaunchProcess implements Callable {
private final FileObject fileObject;
private final JPDAStart start;
+private final ExplicitProcessParameters params;
-LaunchProcess(FileObject fileObject, JPDAStart start) {
+LaunchProcess(FileObject fileObject, JPDAStart start,
ExplicitProcessParameters params) {
this.fileObject = fileObject;
this.start = start;
+this.params = params;
}
@Override
@@ -67,19 +69,28 @@ final class LaunchProcess implements Callable {
File javaFile = FileUtil.toFile(java);
String javaPath = javaFile.getAbsolutePath();
-Object argumentsObject =
fileObject.getAttribute(SingleSourceFileUtil.FILE_ARGUMENTS);
-String arguments = argumentsObject != null ? ((String)
argumentsObject).trim() : ""; // NOI18N
-
-Object vmOptionsObj =
fileObject.getAttribute(SingleSourceFileUtil.FILE_VM_OPTIONS);
-String vmOptions = vmOptionsObj != null ? ((String) vmOptionsObj)
: ""; // NOI18N
+ExplicitProcessParameters paramsFromAttributes =
+ExplicitProcessParameters.builder()
+
.args(readArgumentsFromAttribute(fileObject,
SingleSourceFileUtil.FILE_ARGUMENTS))
+
.launcherArgs(readArgumentsFromAttribute(fileObject,
SingleSourceFileUtil.FILE_VM_OPTIONS))
+
.workingDirectory(FileUtil.toFile(fileObject.getParent()))
+ .build();
+ExplicitProcessParameters realParameters =
+ExplicitProcessParameters.builder()
+ .combine(params)
+ .combine(
[netbeans] branch master updated: Reverting "Prefixing all code names of commands with 'nbls'.", as more time will be needed to discuss, validate the patch and adjust to it.
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 4847b62492 Reverting "Prefixing all code names of commands with
'nbls'.", as more time will be needed to discuss, validate the patch and adjust
to it.
new 98cecc0d1b Merge pull request #6114 from
lahodaj/revert-lsp-server-generic-commands-settings
4847b62492 is described below
commit 4847b6249280dfdc3cd95c5fc02672bcb5d613e0
Author: Jan Lahoda
AuthorDate: Thu Jun 22 13:16:06 2023 +0200
Reverting "Prefixing all code names of commands with 'nbls'.", as more time
will be needed to discuss, validate the patch and adjust to it.
---
.../netbeans/modules/java/lsp/server/Utils.java| 39
.../java/lsp/server/db/DBAddConnection.java| 2 +-
.../java/lsp/server/db/DBCommandProvider.java | 2 +-
.../java/lsp/server/db/DBConnectionProvider.java | 2 +-
.../modules/java/lsp/server/htmlui/WebView.java| 2 +-
.../ImplementAllAbstractMethodsAction.java | 2 +-
.../server/protocol/NbCodeClientCapabilities.java | 27 -
.../java/lsp/server/protocol/QuickOpen.java| 2 +-
.../modules/java/lsp/server/protocol/Server.java | 75 +++---
.../java/lsp/server/protocol/SurroundWithHint.java | 2 +-
.../lsp/server/protocol/TestClassGenerator.java| 2 +-
.../server/protocol/TextDocumentServiceImpl.java | 20 ++--
.../lsp/server/protocol/WorkspaceServiceImpl.java | 24 ++---
.../ChangeMethodParametersRefactoring.java | 2 +-
.../ExtractSuperclassOrInterfaceRefactoring.java | 4 +-
.../lsp/server/refactoring/MoveRefactoring.java| 2 +-
.../lsp/server/refactoring/PullUpRefactoring.java | 2 +-
.../server/refactoring/PushDownRefactoring.java| 2 +-
.../java/lsp/server/protocol/ServerTest.java | 14 +--
java/java.lsp.server/vscode/package.json | 110 ++---
.../vscode/src/dbConfigurationProvider.ts | 4 +-
java/java.lsp.server/vscode/src/extension.ts | 83
.../vscode/src/launchConfigurations.ts | 7 +-
.../vscode/src/test/suite/extension.test.ts| 22 ++---
.../vscode/src/test/suite/testutils.ts | 6 +-
java/java.lsp.server/vscode/src/testAdapter.ts | 9 +-
.../java/openjdk/jtreg/CodeLensProviderImpl.java | 4 +-
27 files changed, 200 insertions(+), 272 deletions(-)
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/Utils.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/Utils.java
index 958071f8cc..08c637304a 100644
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/Utils.java
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/Utils.java
@@ -26,13 +26,11 @@ import java.io.IOException;
import java.io.StringWriter;
import java.net.MalformedURLException;
import java.net.URI;
-import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Set;
-import java.util.stream.Collectors;
import javax.lang.model.element.Element;
import javax.lang.model.element.ElementKind;
import javax.lang.model.element.ExecutableElement;
@@ -55,7 +53,6 @@ import org.netbeans.api.editor.document.LineDocumentUtils;
import org.netbeans.api.java.source.CompilationInfo;
import org.netbeans.api.lsp.StructureElement;
import org.netbeans.modules.editor.java.Utilities;
-import org.netbeans.modules.java.lsp.server.protocol.NbCodeClientCapabilities;
import org.netbeans.modules.parsing.spi.indexing.support.QuerySupport;
import org.netbeans.spi.jumpto.type.SearchType;
import org.openide.cookies.EditorCookie;
@@ -70,8 +67,6 @@ import org.openide.util.Exceptions;
*/
public class Utils {
-public static final String DEFAULT_COMMAND_PREFIX = "nbls";
-
public static SymbolKind structureElementKind2SymbolKind
(StructureElement.Kind kind) {
switch (kind) {
case Array : return SymbolKind.Array;
@@ -449,38 +444,4 @@ public class Utils {
return sb.toString();
}
-public static String encodeCommand(String cmd, NbCodeClientCapabilities
capa) {
-String prefix = capa != null ? capa.getCommandPrefix()
- : DEFAULT_COMMAND_PREFIX;
-
-if (cmd.startsWith(DEFAULT_COMMAND_PREFIX) &&
-!DEFAULT_COMMAND_PREFIX.equals(prefix)) {
-return prefix + cmd.substring(DEFAULT_COMMAND_PREFIX.length());
-} else {
-return cmd;
-}
-}
-
-public static String decodeCommand(String cmd, NbCodeClientCapabilities
capa) {
-String prefix = capa != null ? capa.getCommandPrefix()
- : DEFAULT_COMMAND_PREFIX
[netbeans] branch master updated: Prefixing all code names of commands with 'nbls'. Adding support for changing the prefix of code names of commands and configuration options from on the client extens
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 5005a99293 Prefixing all code names of commands with 'nbls'. Adding
support for changing the prefix of code names of commands and configuration
options from on the client extension.
new 987396ce9b Merge pull request #6015 from
lahodaj/lsp-server-generic-commands-settings
5005a99293 is described below
commit 5005a9929379d80f79f96b1c773891a9cfb0244e
Author: Jan Lahoda
AuthorDate: Fri Jun 2 14:58:02 2023 +0200
Prefixing all code names of commands with 'nbls'.
Adding support for changing the prefix of code names of commands and
configuration options from on the client extension.
---
.../netbeans/modules/java/lsp/server/Utils.java| 39
.../java/lsp/server/db/DBAddConnection.java| 2 +-
.../java/lsp/server/db/DBCommandProvider.java | 2 +-
.../java/lsp/server/db/DBConnectionProvider.java | 2 +-
.../modules/java/lsp/server/htmlui/WebView.java| 2 +-
.../ImplementAllAbstractMethodsAction.java | 2 +-
.../server/protocol/NbCodeClientCapabilities.java | 27 +
.../java/lsp/server/protocol/QuickOpen.java| 2 +-
.../modules/java/lsp/server/protocol/Server.java | 75 +++---
.../java/lsp/server/protocol/SurroundWithHint.java | 2 +-
.../lsp/server/protocol/TestClassGenerator.java| 2 +-
.../server/protocol/TextDocumentServiceImpl.java | 20 ++--
.../lsp/server/protocol/WorkspaceServiceImpl.java | 24 ++---
.../ChangeMethodParametersRefactoring.java | 2 +-
.../ExtractSuperclassOrInterfaceRefactoring.java | 4 +-
.../lsp/server/refactoring/MoveRefactoring.java| 2 +-
.../lsp/server/refactoring/PullUpRefactoring.java | 2 +-
.../server/refactoring/PushDownRefactoring.java| 2 +-
.../java/lsp/server/protocol/ServerTest.java | 14 +--
java/java.lsp.server/vscode/package.json | 110 ++---
.../vscode/src/dbConfigurationProvider.ts | 4 +-
java/java.lsp.server/vscode/src/extension.ts | 83
.../vscode/src/launchConfigurations.ts | 7 +-
.../vscode/src/test/suite/extension.test.ts| 22 ++---
.../vscode/src/test/suite/testutils.ts | 6 +-
java/java.lsp.server/vscode/src/testAdapter.ts | 9 +-
.../java/openjdk/jtreg/CodeLensProviderImpl.java | 4 +-
27 files changed, 272 insertions(+), 200 deletions(-)
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/Utils.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/Utils.java
index 08c637304a..958071f8cc 100644
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/Utils.java
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/Utils.java
@@ -26,11 +26,13 @@ import java.io.IOException;
import java.io.StringWriter;
import java.net.MalformedURLException;
import java.net.URI;
+import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Set;
+import java.util.stream.Collectors;
import javax.lang.model.element.Element;
import javax.lang.model.element.ElementKind;
import javax.lang.model.element.ExecutableElement;
@@ -53,6 +55,7 @@ import org.netbeans.api.editor.document.LineDocumentUtils;
import org.netbeans.api.java.source.CompilationInfo;
import org.netbeans.api.lsp.StructureElement;
import org.netbeans.modules.editor.java.Utilities;
+import org.netbeans.modules.java.lsp.server.protocol.NbCodeClientCapabilities;
import org.netbeans.modules.parsing.spi.indexing.support.QuerySupport;
import org.netbeans.spi.jumpto.type.SearchType;
import org.openide.cookies.EditorCookie;
@@ -67,6 +70,8 @@ import org.openide.util.Exceptions;
*/
public class Utils {
+public static final String DEFAULT_COMMAND_PREFIX = "nbls";
+
public static SymbolKind structureElementKind2SymbolKind
(StructureElement.Kind kind) {
switch (kind) {
case Array : return SymbolKind.Array;
@@ -444,4 +449,38 @@ public class Utils {
return sb.toString();
}
+public static String encodeCommand(String cmd, NbCodeClientCapabilities
capa) {
+String prefix = capa != null ? capa.getCommandPrefix()
+ : DEFAULT_COMMAND_PREFIX;
+
+if (cmd.startsWith(DEFAULT_COMMAND_PREFIX) &&
+!DEFAULT_COMMAND_PREFIX.equals(prefix)) {
+return prefix + cmd.substring(DEFAULT_COMMAND_PREFIX.length());
+} else {
+return cmd;
+}
+}
+
+public static String decodeCommand(String cmd, NbCodeClientCapabilities
capa) {
+String prefix = capa != null ? cap
[netbeans] branch master updated: Adding an option to disable unused hint for package private elements, ignoring elements that possibly are looked up using MethodHandles.Lookup.
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 731e7c9e05 Adding an option to disable unused hint for package private
elements, ignoring elements that possibly are looked up using
MethodHandles.Lookup.
new c649c82879 Merge pull request #5173 from jlahoda/unused-improvements
731e7c9e05 is described below
commit 731e7c9e05f38ee7950bf32150391d5ca2cc474a
Author: Jan Lahoda
AuthorDate: Sun Jan 1 09:21:22 2023 +0100
Adding an option to disable unused hint for package private elements,
ignoring elements that possibly are looked up using MethodHandles.Lookup.
---
.../java/editor/base/semantic/UnusedDetector.java | 88 +++-
.../editor/base/semantic/UnusedDetectorTest.java | 225 +
.../netbeans/modules/java/hints/bugs/Unused.java | 14 +-
.../modules/java/hints/bugs/UnusedTest.java| 20 ++
4 files changed, 335 insertions(+), 12 deletions(-)
diff --git
a/java/java.editor.base/src/org/netbeans/modules/java/editor/base/semantic/UnusedDetector.java
b/java/java.editor.base/src/org/netbeans/modules/java/editor/base/semantic/UnusedDetector.java
index d5a7cadce4..6e2e28e46f 100644
---
a/java/java.editor.base/src/org/netbeans/modules/java/editor/base/semantic/UnusedDetector.java
+++
b/java/java.editor.base/src/org/netbeans/modules/java/editor/base/semantic/UnusedDetector.java
@@ -22,15 +22,19 @@ import com.sun.source.tree.AssignmentTree;
import com.sun.source.tree.ClassTree;
import com.sun.source.tree.CompoundAssignmentTree;
import com.sun.source.tree.EnhancedForLoopTree;
+import com.sun.source.tree.ExpressionTree;
import com.sun.source.tree.IdentifierTree;
+import com.sun.source.tree.LiteralTree;
import com.sun.source.tree.MemberReferenceTree;
import com.sun.source.tree.MemberSelectTree;
+import com.sun.source.tree.MethodInvocationTree;
import com.sun.source.tree.MethodTree;
import com.sun.source.tree.NewClassTree;
import com.sun.source.tree.Tree;
import com.sun.source.tree.Tree.Kind;
import com.sun.source.tree.VariableTree;
import com.sun.source.util.TreePath;
+import java.lang.invoke.MethodHandles;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Arrays;
@@ -76,11 +80,13 @@ public class UnusedDetector {
public static class UnusedDescription {
public final Element unusedElement;
public final TreePath unusedElementPath;
+public final boolean packagePrivate;
public final UnusedReason reason;
-public UnusedDescription(Element unusedElement, TreePath
unusedElementPath, UnusedReason reason) {
+public UnusedDescription(Element unusedElement, TreePath
unusedElementPath, boolean packagePrivate, UnusedReason reason) {
this.unusedElement = unusedElement;
this.unusedElementPath = unusedElementPath;
+this.packagePrivate = packagePrivate;
this.reason = reason;
}
@@ -118,39 +124,39 @@ public class UnusedDetector {
boolean isWritten = uses.contains(UseTypes.WRITTEN);
boolean isRead = uses.contains(UseTypes.READ);
if (!isWritten && !isRead) {
-result.add(new UnusedDescription(el, declaration,
UnusedReason.NOT_WRITTEN_READ));
+result.add(new UnusedDescription(el, declaration,
isPkgPrivate, UnusedReason.NOT_WRITTEN_READ));
} else if (!isWritten) {
-result.add(new UnusedDescription(el, declaration,
UnusedReason.NOT_WRITTEN));
+result.add(new UnusedDescription(el, declaration,
isPkgPrivate, UnusedReason.NOT_WRITTEN));
} else if (!isRead) {
-result.add(new UnusedDescription(el, declaration,
UnusedReason.NOT_READ));
+result.add(new UnusedDescription(el, declaration,
isPkgPrivate, UnusedReason.NOT_READ));
}
} else if (el.getKind().isField() && (isPrivate || isPkgPrivate)) {
-if (!isSerialSpecField(info, el)) {
+if (!isSerialSpecField(info, el) && !lookedUpElement(el,
uv.type2LookedUpFields, uv.allStringLiterals)) {
boolean isWritten = uses.contains(UseTypes.WRITTEN);
boolean isRead = uses.contains(UseTypes.READ);
if (!isWritten && !isRead) {
if (isPrivate || isUnusedInPkg(info, el, cancel)) {
-result.add(new UnusedDescription(el, declaration,
UnusedReason.NOT_WRITTEN_READ));
+result.add(new UnusedDescription(el, declaration,
isPkgPrivate, UnusedReason.NOT_WRITTEN_READ));
}
} else if (!isWritten) {
-res
[netbeans] branch master updated (18542bfc7e -> 0ea83ccc87)
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 18542bfc7e Merge pull request #5722 from jlahoda/jtreg-init-projects new 30afb956d8 When jtreg is not specified, ask for it during test run. new df614cabfb Running debugger with the correct lookup (duplicates code from PR 5536 new 8a9df658a4 Reverting unnecessary change. new 0ea83ccc87 Merge pull request #5721 from jlahoda/select-jtreg The 8664 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/openjdk/jtreg/ActionProviderImpl.java | 77 -- 1 file changed, 58 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 (5c5cce4cd1 -> 18542bfc7e)
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 5c5cce4cd1 Merge pull request #5536 from jlahoda/run-ask-main new 5f5fe4162f Make sure the test roots are associated with the correct project(s) before attempting to run tests. new 3aea2cf62c Merge branch 'master' into jtreg-init-projects new 18542bfc7e Merge pull request #5722 from jlahoda/jtreg-init-projects The 8660 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/openjdk/jtreg/ActionProviderImpl.java | 43 +- 1 file changed, 41 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: Let the user choose main class, when none is open
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 83b55a2776 Let the user choose main class, when none is open
new 5c5cce4cd1 Merge pull request #5536 from jlahoda/run-ask-main
83b55a2776 is described below
commit 83b55a277674e72f3b7e4b50fbfda7294b513c87
Author: Jan Lahoda
AuthorDate: Sun Apr 2 13:38:19 2023 +0200
Let the user choose main class, when none is open
---
.../debugging/launch/NbLaunchRequestHandler.java | 106 -
1 file changed, 102 insertions(+), 4 deletions(-)
diff --git
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchRequestHandler.java
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchRequestHandler.java
index 5ec31be351..b79320a62e 100644
---
a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchRequestHandler.java
+++
b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/launch/NbLaunchRequestHandler.java
@@ -23,13 +23,19 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import javax.lang.model.element.TypeElement;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.lsp4j.debug.OutputEventArguments;
@@ -37,12 +43,25 @@ import org.eclipse.lsp4j.debug.Source;
import org.eclipse.lsp4j.debug.TerminatedEventArguments;
import org.eclipse.lsp4j.jsonrpc.messages.ResponseErrorCode;
import org.netbeans.api.java.classpath.ClassPath;
+import org.netbeans.api.java.project.JavaProjectConstants;
+import org.netbeans.api.java.source.ClasspathInfo;
+import org.netbeans.api.java.source.ElementHandle;
+import org.netbeans.api.java.source.SourceUtils;
+import org.netbeans.api.project.ProjectUtils;
+import org.netbeans.modules.java.lsp.server.LspServerState;
import org.netbeans.modules.java.lsp.server.debugging.DebugAdapterContext;
import org.netbeans.modules.java.lsp.server.debugging.NbSourceProvider;
import org.netbeans.modules.java.lsp.server.debugging.utils.ErrorUtilities;
+import org.netbeans.spi.java.classpath.support.ClassPathSupport;
+import org.openide.DialogDescriptor;
+import org.openide.DialogDisplayer;
+import org.openide.NotifyDescriptor;
+import org.openide.NotifyDescriptor.QuickPick.Item;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
+import org.openide.util.Lookup;
import org.openide.util.Utilities;
+import org.openide.util.lookup.Lookups;
/**
*
@@ -71,10 +90,89 @@ public final class NbLaunchRequestHandler {
if (!isNative && (StringUtils.isBlank(mainFilePath) &&
StringUtils.isBlank(filePath) && StringUtils.isBlank(projectFilePath)
|| modulePaths.isEmpty() && classPaths.isEmpty())) {
-ErrorUtilities.completeExceptionally(resultFuture,
-"Failed to launch debuggee VM. Missing mainClass or
modulePaths/classPaths options in launch configuration.",
-ResponseErrorCode.ServerNotInitialized);
-return resultFuture;
+if (modulePaths.isEmpty() && classPaths.isEmpty()) {
+ErrorUtilities.completeExceptionally(resultFuture,
+"Failed to launch debuggee VM. Missing
modulePaths/classPaths options in launch configuration.",
+ResponseErrorCode.ServerNotInitialized);
+return resultFuture;
+}
+if (StringUtils.isBlank(mainFilePath) &&
StringUtils.isBlank(filePath) && StringUtils.isBlank(projectFilePath)) {
+LspServerState state =
Lookup.getDefault().lookup(LspServerState.class);
+if (state == null) {
+ErrorUtilities.completeExceptionally(resultFuture,
+"Failed to launch debuggee VM. Missing mainClass or
modulePaths/classPaths options in launch configuration.",
+ResponseErrorCode.ServerNotInitialized);
+return resultFuture;
+}
+return state.openedProjects().thenCompose(prjs -> {
+FileObject[] sourceRoots =
+Arrays.stream(prjs)
+ .flatMap(p ->
Arr
[netbeans] branch master updated: Adding ability to run OpenJDK's jtreg tests in VSCode using LSP's code lens
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 2a7063a196 Adding ability to run OpenJDK's jtreg tests in VSCode using
LSP's code lens
2a7063a196 is described below
commit 2a7063a196168bf578f5c78b2abd6ae516d8f9d5
Author: Jan Lahoda
AuthorDate: Mon Jul 11 07:19:08 2022 +0200
Adding ability to run OpenJDK's jtreg tests in VSCode using LSP's code lens
---
ide/api.lsp/apichanges.xml | 13 ++
.../api/lsp/{Command.java => CodeLens.java}| 48 +++---
ide/api.lsp/src/org/netbeans/api/lsp/Command.java | 24 +++
.../src/org/netbeans/spi/lsp/CodeLensProvider.java | 42 ++
.../modules/java/lsp/server/protocol/Server.java | 18 +++
.../server/protocol/TextDocumentServiceImpl.java | 161 +
java/java.openjdk.project/nbproject/project.xml| 9 ++
.../release/scripts/build-generic.xml | 1 +
.../modules/java/openjdk/common/BuildUtils.java| 4 +
.../java/openjdk/jtreg/ActionProviderImpl.java | 34 -
.../java/openjdk/jtreg/CodeLensProviderImpl.java | 72 +
.../java/openjdk/project/ActionProviderImpl.java | 7 +
.../modules/java/openjdk/project/Settings.java | 2 +-
13 files changed, 355 insertions(+), 80 deletions(-)
diff --git a/ide/api.lsp/apichanges.xml b/ide/api.lsp/apichanges.xml
index 323d4c53d3..967bc85ad4 100644
--- a/ide/api.lsp/apichanges.xml
+++ b/ide/api.lsp/apichanges.xml
@@ -51,6 +51,19 @@
+
+
+Added CodeLensProvider and relevant elements
+
+
+
+
+
+CodeLensProvider
SPI allows to provide code lens for a given document.
+
+
+
+
Added DiagnosticReporter to trigger diagnostic
collection
diff --git a/ide/api.lsp/src/org/netbeans/api/lsp/Command.java
b/ide/api.lsp/src/org/netbeans/api/lsp/CodeLens.java
similarity index 50%
copy from ide/api.lsp/src/org/netbeans/api/lsp/Command.java
copy to ide/api.lsp/src/org/netbeans/api/lsp/CodeLens.java
index f93a5bdb99..3765c6bc2a 100644
--- a/ide/api.lsp/src/org/netbeans/api/lsp/Command.java
+++ b/ide/api.lsp/src/org/netbeans/api/lsp/CodeLens.java
@@ -19,43 +19,53 @@
package org.netbeans.api.lsp;
/**
- * A command. The exact list of known commands depends on
- * the implementation of the server.
+ * Description of code lens from the LSP.
*
- * @since 1.3
+ * @since 1.12
*/
-public class Command {
-
-private final String title;
-private final String command;
+public class CodeLens {
+private final Range range;
+private final Command command;
+private final Object data;
/**
- * Construct a new {@code Command}.
+ * Create a new instance of CodeLens.
*
- * @param title the title of the command
- * @param command the code of the command that should be invoked
+ * @param range the range of the code lens
+ * @param command the command associated with the lens
+ * @param data additional data
*/
-public Command(String title, String command) {
-this.title = title;
+public CodeLens(Range range, Command command, Object data) {
+this.range = range;
this.command = command;
+this.data = data;
}
/**
- * The title of the command.
+ * Returns the range of the code lens.
*
- * @return the title of the command
+ * @return the range of the code lens
*/
-public String getTitle() {
-return title;
+public Range getRange() {
+return range;
}
/**
- * The code of the command that should be invoked.
+ * Returns the command associated with the code lens.
*
- * @return the code of the command that should be invoked
+ * @return the command associated with the code lens
*/
-public String getCommand() {
+public Command getCommand() {
return command;
}
+/**
+ * Returns additional data associated with the lens, if any.
+ *
+ * @return additional data associated with the lens
+ */
+public Object getData() {
+return data;
+}
+
}
diff --git a/ide/api.lsp/src/org/netbeans/api/lsp/Command.java
b/ide/api.lsp/src/org/netbeans/api/lsp/Command.java
index f93a5bdb99..dfaff25166 100644
--- a/ide/api.lsp/src/org/netbeans/api/lsp/Command.java
+++ b/ide/api.lsp/src/org/netbeans/api/lsp/Command.java
@@ -18,6 +18,8 @@
*/
package org.netbeans.api.lsp;
+import java.util.List;
+
/**
* A command. The exact list of known commands depends on
* the implementation of the server.
@@ -28,6 +30,7 @@ public class Command {
private final String title;
private final String command;
+private final List arguments;
/**
* Construct a new {@code Command}.
@@ -3
svn commit: r55464 - /dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc3/ /release/netbeans/netbeans-jackpot/netbeans-jackpot-12.5/ /release/netbeans/netbeans-jackpot/netbeans-jackpot-13.0/
Author: jlahoda Date: Tue Jul 5 05:58:39 2022 New Revision: 55464 Log: Releasing Apache NetBeans standalone Java hints, v 13.0 Added: release/netbeans/netbeans-jackpot/netbeans-jackpot-13.0/ - copied from r55236, dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc3/ Removed: dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc3/ release/netbeans/netbeans-jackpot/netbeans-jackpot-12.5/ - 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
svn commit: r55236 - in /dev/netbeans/netbeans-jackpot: netbeans-jackpot-13.0-vc2/ netbeans-jackpot-13.0-vc3/
Author: jlahoda Date: Tue Jun 21 04:34:56 2022 New Revision: 55236 Log: Preparing Apache NetBeans Stanalone Java Hints release 13.0, vc3 Added: dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc3/ dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc3/apache-netbeans-jackpot-13.0-bin.zip (with props) dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc3/apache-netbeans-jackpot-13.0-bin.zip.asc dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc3/apache-netbeans-jackpot-13.0-bin.zip.sha512 dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc3/apache-netbeans-jackpot-13.0.zip (with props) dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc3/apache-netbeans-jackpot-13.0.zip.asc dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc3/apache-netbeans-jackpot-13.0.zip.sha512 Removed: dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc2/ Added: dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc3/apache-netbeans-jackpot-13.0-bin.zip == Binary file - no diff available. Propchange: dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc3/apache-netbeans-jackpot-13.0-bin.zip -- svn:mime-type = application/octet-stream Added: dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc3/apache-netbeans-jackpot-13.0-bin.zip.asc == --- dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc3/apache-netbeans-jackpot-13.0-bin.zip.asc (added) +++ dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc3/apache-netbeans-jackpot-13.0-bin.zip.asc Tue Jun 21 04:34:56 2022 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE5reiA6oYSXqyUgKntMGUD+qTZPEFAmKu0cYACgkQtMGUD+qT +ZPEPQg/9FKgYKA08rsoC5eXe9RuALzUwCmt7mewPp9jbwlhHsnSLEAxsag2G7ffd +ulynDj3/+ApS1dOM4b4/Rxq+GwV5joANbwk6Fav6nXkUbCbAX6R7G7axCP+WXqhY +Xe0KJKvv4q9Pe/EOjU7oSYX4wEPgxW6gGBqRjtdTC4m3s44bwJRTaXiegzMcFne5 +bMMxP21zmIaJsgeeOXLMermUqqseDsLZaK4RPXzLyHKlBSAHIGwzdvYNscxwvwbR +LQfSwcOBhOU35D95uZDCaXNLNpyhARf7+4BXe4Iq9GMujsvCDr3zOene50bo5Yaf +USfg/pSptCSR4/kv3E3IwCdejvQuyr4eRKpQvvejg7jip2wYGJBuQIz5CG+OS5ta +3sm1TWNC02qyC8L1cZKuc8SjYIV/pljjQRjBAuur6AWflXJbX6Y++Z7eNb6mH0BN +CUV5L+lkDGjCssCi7cV76trJTm9JkMIY1LJPlAxSmcIkg8iSQp9BAMNOSiBuX82q +Uq/LRuX97Ixz6ZSuQKiWDMrUbT+5wKDhPP1pDsKzeFxyyi51MTnT/OFJBxaGjYe6 +bQelLToqkIZiDKJg/J6QNyaIjNweUvrpC8pZXcyHebtT154M9I9WOxSmEmFDTjB7 +4apwBMs46/Sr91AflP7gCwALvydUIbjBLv9oVmpsc58E4L/sRd8= +=gFgP +-END PGP SIGNATURE- Added: dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc3/apache-netbeans-jackpot-13.0-bin.zip.sha512 == --- dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc3/apache-netbeans-jackpot-13.0-bin.zip.sha512 (added) +++ dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc3/apache-netbeans-jackpot-13.0-bin.zip.sha512 Tue Jun 21 04:34:56 2022 @@ -0,0 +1 @@ +088baf19e5479a80ab6c10d9fcf3ffc36d4abd927230fde9bad859778121433db5b94b7913c8ad15c68915dfaefe4f688ff8cb1cdb984baaff9b84a884585c1c ./apache-netbeans-jackpot-13.0-bin.zip Added: dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc3/apache-netbeans-jackpot-13.0.zip == Binary file - no diff available. Propchange: dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc3/apache-netbeans-jackpot-13.0.zip -- svn:mime-type = application/octet-stream Added: dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc3/apache-netbeans-jackpot-13.0.zip.asc == --- dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc3/apache-netbeans-jackpot-13.0.zip.asc (added) +++ dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc3/apache-netbeans-jackpot-13.0.zip.asc Tue Jun 21 04:34:56 2022 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE5reiA6oYSXqyUgKntMGUD+qTZPEFAmKu0cwACgkQtMGUD+qT +ZPFSwQ/9FA2TgTor2TkWfmGtBiskfF8Q3oJtnMq4XRF8wPyp/fj7Nv3IMYlhE61R +HCBZoJZUbpBBlVGv6v2m2HM3GqcoeVkdEESK8ynUIhVKoyGNdk/kyhkE6gq4s+N0 +65JH7bIO6cgjP344LOrldsuHfA1847eDe1CQAWOWnI+FCgHZ4VF/+TVVJFbYIZOF +RpUa2i4wdhvOziZNZQ+yxa0ThpnghkF3fbNDHp3E3jNwLWCJIkvum4hR1yfeDUnj +1EZRtb9sYCd/hhUYhprMcd5nc3PGehV77SxPtrAKP8WvsAqPdD527rycHB/vntdX +hEkhE1amNIGl4MZizes1nEBrhFlxkvO5Tw2EgJ5pbWWMYYqw/lI7eEf2TcES699R +qZE7vh2ZdC4fyVxjpQV29tUmPAhJZW8DnF8RiuMluZP30PfpL7fNBW0n9afLWhoU +PZvhhlx8g0wXVAc1oFp42ruw/Keqb2eZyOFdbGfGqLGVvLJOD5+thjagmF8yUrih +7nXvqnoqvfKF+BHwSMmdzVPKPVSuV3oh2jw6XG45QaP67/tR9KRa2RDv0YTui5u7 +CAmKfYlWzeoPzezbfXoylTC74qdKq0mFu9fXElruI+4nYAOanZhvO5mxpAYs5Hr4 +Ww/RwhrcRlCy0h733b/eGjSpxfGywaQKPahKYf2Yq7uaVpPH5g4= +=Omhh +-END PGP SIGNATURE- Added: dev/netbeans
[netbeans-jackpot30] tag netbeans-jackpot-13.0-vc3 created (now 13e22c1)
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a change to tag netbeans-jackpot-13.0-vc3 in repository https://gitbox.apache.org/repos/asf/netbeans-jackpot30.git at 13e22c1 (commit) No new revisions were added by this update. - 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-jackpot30] branch master updated: Fixing tests.
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-jackpot30.git
The following commit(s) were added to refs/heads/master by this push:
new 13e22c1 Fixing tests.
13e22c1 is described below
commit 13e22c19c583f2ca687f951c64aab9f3f271c0fc
Author: Jan Lahoda
AuthorDate: Sat Jun 18 07:27:24 2022 +0200
Fixing tests.
---
cmdline/maven/tests/fail-on-warnings2/golden | 9 +
cmdline/maven/tests/fail-on-warnings2/pom.xml | 1 +
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/cmdline/maven/tests/fail-on-warnings2/golden
b/cmdline/maven/tests/fail-on-warnings2/golden
index bea3cf1..91c448d 100644
--- a/cmdline/maven/tests/fail-on-warnings2/golden
+++ b/cmdline/maven/tests/fail-on-warnings2/golden
@@ -1,12 +1,5 @@
${basedir}/src/main/java/test/App.java:24: warning:
[Convert_to_Lambda_or_Member_Reference] This anonymous inner class creation can
be turned into a lambda expression.
Runnable r = new Runnable() { public void run() { } };
^
-[ERROR] Failed to execute goal
org.apache.netbeans.modules.jackpot30:jackpot30-maven-plugin:13.0:analyze
(default-cli) on project maven-test: jackpo30 failed. -> [Help 1]
-[ERROR]
-[ERROR] To see the full stack trace of the errors, re-run Maven with the -e
switch.
-[ERROR] Re-run Maven using the -X switch to enable full debug logging.
-[ERROR]
-[ERROR] For more information about the errors and possible solutions, please
read the following articles:
-[ERROR] [Help 1]
http://cwiki.apache.org/confluence/display/MAVEN/MojoExecutionException
-result: 1
\ No newline at end of file
+result: 0
\ No newline at end of file
diff --git a/cmdline/maven/tests/fail-on-warnings2/pom.xml
b/cmdline/maven/tests/fail-on-warnings2/pom.xml
index 0dadded..19c02d8 100644
--- a/cmdline/maven/tests/fail-on-warnings2/pom.xml
+++ b/cmdline/maven/tests/fail-on-warnings2/pom.xml
@@ -47,6 +47,7 @@
${jackpot.plugin.version}
jackpot-settings.xml
+ false
-
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-jackpot30] branch master updated: Maven's analyze task should fail on warnings by default.
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-jackpot30.git
The following commit(s) were added to refs/heads/master by this push:
new 0874fd2 Maven's analyze task should fail on warnings by default.
0874fd2 is described below
commit 0874fd228e173594a38f3f81d4613098aead3e2f
Author: Jan Lahoda
AuthorDate: Thu Jun 9 07:34:04 2022 +0200
Maven's analyze task should fail on warnings by default.
---
.../netbeans/modules/jackpot30/maven/Utils.java| 2 +-
cmdline/maven/tests/fail-on-warnings/pom.xml | 1 -
cmdline/maven/tests/fail-on-warnings2/golden | 12 +
.../tests/fail-on-warnings2/jackpot-settings.xml | 29 ++
.../tests/{sl-17 => fail-on-warnings2}/pom.xml | 0
.../fail-on-warnings2/src/main/java/test/App.java | 27
cmdline/maven/tests/sl-17/pom.xml | 1 +
cmdline/maven/tests/sl-1_18/pom.xml| 1 +
cmdline/maven/tests/sl-failure/pom.xml | 1 +
cmdline/maven/tests/test-custom/pom.xml| 3 +++
cmdline/maven/tests/test1/pom.xml | 1 +
11 files changed, 76 insertions(+), 2 deletions(-)
diff --git
a/cmdline/maven/src/main/java/org/netbeans/modules/jackpot30/maven/Utils.java
b/cmdline/maven/src/main/java/org/netbeans/modules/jackpot30/maven/Utils.java
index 3fd1b65..8310a22 100644
---
a/cmdline/maven/src/main/java/org/netbeans/modules/jackpot30/maven/Utils.java
+++
b/cmdline/maven/src/main/java/org/netbeans/modules/jackpot30/maven/Utils.java
@@ -71,7 +71,7 @@ public class Utils {
}
}
-return false;
+return true;
}
private static Xpp3Dom getJackpotPluginConfiguration(MavenProject project)
{
diff --git a/cmdline/maven/tests/fail-on-warnings/pom.xml
b/cmdline/maven/tests/fail-on-warnings/pom.xml
index c4536a7..0dadded 100644
--- a/cmdline/maven/tests/fail-on-warnings/pom.xml
+++ b/cmdline/maven/tests/fail-on-warnings/pom.xml
@@ -47,7 +47,6 @@
${jackpot.plugin.version}
jackpot-settings.xml
- true
diff --git a/cmdline/maven/tests/fail-on-warnings2/golden
b/cmdline/maven/tests/fail-on-warnings2/golden
new file mode 100644
index 000..bea3cf1
--- /dev/null
+++ b/cmdline/maven/tests/fail-on-warnings2/golden
@@ -0,0 +1,12 @@
+${basedir}/src/main/java/test/App.java:24: warning:
[Convert_to_Lambda_or_Member_Reference] This anonymous inner class creation can
be turned into a lambda expression.
+Runnable r = new Runnable() { public void run() { } };
+ ^
+[ERROR] Failed to execute goal
org.apache.netbeans.modules.jackpot30:jackpot30-maven-plugin:13.0:analyze
(default-cli) on project maven-test: jackpo30 failed. -> [Help 1]
+[ERROR]
+[ERROR] To see the full stack trace of the errors, re-run Maven with the -e
switch.
+[ERROR] Re-run Maven using the -X switch to enable full debug logging.
+[ERROR]
+[ERROR] For more information about the errors and possible solutions, please
read the following articles:
+[ERROR] [Help 1]
http://cwiki.apache.org/confluence/display/MAVEN/MojoExecutionException
+
+result: 1
\ No newline at end of file
diff --git a/cmdline/maven/tests/fail-on-warnings2/jackpot-settings.xml
b/cmdline/maven/tests/fail-on-warnings2/jackpot-settings.xml
new file mode 100644
index 000..0461d8a
--- /dev/null
+++ b/cmdline/maven/tests/fail-on-warnings2/jackpot-settings.xml
@@ -0,0 +1,29 @@
+
+
+http://www.netbeans.org/dtds/ToolConfiguration-1_0.dtd;>
+
+
+
+
+
+
+
+
+
+
diff --git a/cmdline/maven/tests/sl-17/pom.xml
b/cmdline/maven/tests/fail-on-warnings2/pom.xml
similarity index 100%
copy from cmdline/maven/tests/sl-17/pom.xml
copy to cmdline/maven/tests/fail-on-warnings2/pom.xml
diff --git a/cmdline/maven/tests/fail-on-warnings2/src/main/java/test/App.java
b/cmdline/maven/tests/fail-on-warnings2/src/main/java/test/App.java
new file mode 100644
index 000..37f42dc
--- /dev/null
+++ b/cmdline/maven/tests/fail-on-warnings2/src/main/java/test/App.java
@@ -0,0 +1,27 @@
+/**
+ * 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
svn commit: r54877 - in /dev/netbeans/netbeans-jackpot: netbeans-jackpot-13.0-vc1/ netbeans-jackpot-13.0-vc2/
Author: jlahoda Date: Mon Jun 6 05:37:48 2022 New Revision: 54877 Log: Staging release of netbeans-jackpot-13.0-vc2 Added: dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc2/ dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc2/apache-netbeans-jackpot-13.0-bin.zip (with props) dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc2/apache-netbeans-jackpot-13.0-bin.zip.asc dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc2/apache-netbeans-jackpot-13.0-bin.zip.sha512 dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc2/apache-netbeans-jackpot-13.0.zip (with props) dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc2/apache-netbeans-jackpot-13.0.zip.asc dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc2/apache-netbeans-jackpot-13.0.zip.sha512 Removed: dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc1/ Added: dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc2/apache-netbeans-jackpot-13.0-bin.zip == Binary file - no diff available. Propchange: dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc2/apache-netbeans-jackpot-13.0-bin.zip -- svn:mime-type = application/octet-stream Added: dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc2/apache-netbeans-jackpot-13.0-bin.zip.asc == --- dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc2/apache-netbeans-jackpot-13.0-bin.zip.asc (added) +++ dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc2/apache-netbeans-jackpot-13.0-bin.zip.asc Mon Jun 6 05:37:48 2022 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE5reiA6oYSXqyUgKntMGUD+qTZPEFAmKdkh8ACgkQtMGUD+qT +ZPGwMhAAmpy2YADNBMM8IhsvyXmo5EN1LVQ/YBC3/7skB354guCiE0DvY0hERATD +G0eUU7/PQtaoAo6Nj7aQZFEWoF9k4Z8RBxIew08yLaw93cKjsrATugYoKjwnceHT +h5AxcaUs5cy1Qgdzi8yBaRs7GMzBW6UYyO9CiUKWxgMmOwntO9AZnNhhQTotjtdb +zXJhRk+B1mzFpbUaD6aZhQiKcBSbBtIAfmx4QAhfnV6hU7U5KHMXTw812E7F1948 +UA3Ts2vA1bunyL/VnYhCZr46hGqffFVQES4xPIKATZicSarNMkhjEj6VCQfv8d/p +AlKwKcE06kCiYPQj678UjmnWUxFaMxB8ZHG+1uQx2H0nt5m2LTBLyz1fbRkqFpNr +dYNqX/Y06erQ7RxL3gT8s8EFgzNNqhvjOiC0mpsfS6G7FCADpG4RfAVzZ6B7tIRA +IFDBQ5+Mh7R4XiUG+z1Dy/iu0J6fa/J+6Ds6dAVPb7Xyf0AuWmZzwEmhVtYHqAHf +inopAPfztGceVPELmO8hBHlkPwRG1wD32mO6OsVwWU0OM2IIr19/Lwha6hVOLzXW +M7oPJvz9TVaPupeDFV6p999JXFnsaiiG8a6jjYxzrX4aCt8rG0cQAHFYVFIDzIpe +fr0AmtuGUwiBvK24zTaTf4FY2aNsTbOQnVc8dA0ZYoOUhEPOKSE= +=hCOD +-END PGP SIGNATURE- Added: dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc2/apache-netbeans-jackpot-13.0-bin.zip.sha512 == --- dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc2/apache-netbeans-jackpot-13.0-bin.zip.sha512 (added) +++ dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc2/apache-netbeans-jackpot-13.0-bin.zip.sha512 Mon Jun 6 05:37:48 2022 @@ -0,0 +1 @@ +1f26952c3d456ec0c6f0e3dcecd69ba67c070082d9f9c7416ec398cdff1bdeada7a26779f0a98e9c30d5219dff937ef0aab3bc1a5a8917f9e15039620aeb1dd3 ./apache-netbeans-jackpot-13.0-bin.zip Added: dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc2/apache-netbeans-jackpot-13.0.zip == Binary file - no diff available. Propchange: dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc2/apache-netbeans-jackpot-13.0.zip -- svn:mime-type = application/octet-stream Added: dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc2/apache-netbeans-jackpot-13.0.zip.asc == --- dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc2/apache-netbeans-jackpot-13.0.zip.asc (added) +++ dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc2/apache-netbeans-jackpot-13.0.zip.asc Mon Jun 6 05:37:48 2022 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE5reiA6oYSXqyUgKntMGUD+qTZPEFAmKdkiAACgkQtMGUD+qT +ZPEJDRAAuVgSf/BQRM0Z3Xm+Tp5ID7YHLAAoJ0XPd6mCimb3aeK2IwWyIse9D8it +LdJGj5dhkcOxnuzeTysdQ0mbZSMYzhvRQtHKEWiCQxspuzyleBVsw6556HpbOIIO +5q9NUrIm1LIjXkRO49IPJKiAwmLm1kg7ZjVlyT0s2atEKpBf8M04qGlRULOAiUZA +XRwgXVDt6dTOhnnuVEaA7GDfqrJgx1sEermMBeQnCvjJgBiPySjl+C3PNr6DwfBl ++Av5r+PN+i2m7WNkEjKysi6gmgGKRZF6hNNQrViZqfvdOeCp2V9bu6ivuBYOhMnP +K+RoBdBpn7AyNEwhx9XM//hYhjiQn4a6BsnAC5O/NQmH7Gd57+yIVFqLX62SJPv/ +G1THquRwRPfTMuvUJOiGPDUU22XSJ0l8mX2StI2xzaMW4MT5L1qORmCfi8OBeUFO +auUZcDsNNUZjX4CkbPBbPJk8AiguoeKhMHZaxMW+r+xGy+A0JoAjBzX7OZNcTNGh +J4hCpc8BkykngbBsqlPjabMylSnyhFrYANabipUcjg88zpiHjJIIHFrQvn1CDZyc +bsbvnkPe1ktrQdY1/TFOVmatGAGts0Gp7fdnJFjSiylF7GJTUaTDWjzRdDHW3XVz +kdINsEGZ1tyLq5e3ywVp00eF3Y54Fhfjo/h0SdA+pHqbGNG3T8I= +=OpUq +-END PGP SIGNATURE- Added: dev/netbeans/netbeans-jackpot
[netbeans-jackpot30] tag netbeans-jackpot-13.0-vc2 created (now db82ffa)
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a change to tag netbeans-jackpot-13.0-vc2 in repository https://gitbox.apache.org/repos/asf/netbeans-jackpot30.git at db82ffa (commit) No new revisions were added by this update. - 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-jackpot30] branch master updated: Fixing tests on new versions of Maven
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-jackpot30.git
The following commit(s) were added to refs/heads/master by this push:
new db82ffa Fixing tests on new versions of Maven
db82ffa is described below
commit db82ffa0d6aae6d18545f5a6effe44cfaeff3fbb
Author: Jan Lahoda
AuthorDate: Mon Jun 6 06:03:10 2022 +0200
Fixing tests on new versions of Maven
---
.../test/java/org/netbeans/modules/jackpot30/maven/RunJackpot30Test.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/cmdline/maven/src/test/java/org/netbeans/modules/jackpot30/maven/RunJackpot30Test.java
b/cmdline/maven/src/test/java/org/netbeans/modules/jackpot30/maven/RunJackpot30Test.java
index 27e6da6..a1a7536 100644
---
a/cmdline/maven/src/test/java/org/netbeans/modules/jackpot30/maven/RunJackpot30Test.java
+++
b/cmdline/maven/src/test/java/org/netbeans/modules/jackpot30/maven/RunJackpot30Test.java
@@ -69,6 +69,7 @@ public class RunJackpot30Test extends TestCase {
maven,
"-Djackpot.plugin.version=13.0",
"-q",
+"--batch-mode",
"jackpot30:analyze"
}, null, testDir);
-
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-jackpot30] branch master updated: Acccept source levels 10+, allow to fail the build when warnings are reported.
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-jackpot30.git
The following commit(s) were added to refs/heads/master by this push:
new ed24596 Acccept source levels 10+, allow to fail the build when
warnings are reported.
ed24596 is described below
commit ed24596503d462e50896b2e0d851a8de5ff65e25
Author: Jan Lahoda
AuthorDate: Sat Jun 4 10:29:22 2022 +0200
Acccept source levels 10+, allow to fail the build when warnings are
reported.
---
.../modules/jackpot30/maven/RunJackpot30.java | 9 +++-
.../netbeans/modules/jackpot30/maven/Utils.java| 20 -
.../modules/jackpot30/maven/RunJackpot30Test.java | 8 ---
cmdline/maven/tests/fail-on-warnings/golden| 12 ++
.../jackpot-settings.xml | 0
.../tests/{sl-17 => fail-on-warnings}/pom.xml | 5 +++--
.../src/main/java/test/App.java| 0
cmdline/maven/tests/sl-17/golden | 5 +
cmdline/maven/tests/sl-17/pom.xml | 4 ++--
cmdline/maven/tests/sl-1_17/golden | 2 ++
.../tests/{sl-18 => sl-1_17}/jackpot-settings.xml | 0
cmdline/maven/tests/{sl-17 => sl-1_17}/pom.xml | 0
.../{sl-18 => sl-1_17}/src/main/java/test/App.java | 0
cmdline/maven/tests/{sl-18 => sl-1_18}/golden | 2 ++
.../tests/{sl-18 => sl-1_18}/jackpot-settings.xml | 0
cmdline/maven/tests/{sl-18 => sl-1_18}/pom.xml | 0
.../{sl-18 => sl-1_18}/src/main/java/test/App.java | 0
cmdline/maven/tests/sl-failure/golden | 10 +
.../{sl-18 => sl-failure}/jackpot-settings.xml | 0
cmdline/maven/tests/{sl-17 => sl-failure}/pom.xml | 4 ++--
.../src/main/java/test/App.java| 0
cmdline/maven/tests/test-custom/golden | 2 ++
cmdline/maven/tests/test1/golden | 2 ++
.../netbeans/modules/jackpot30/cmdline/Main.java | 4 ++--
.../modules/jackpot30/cmdline/MainTest.java| 26 ++
25 files changed, 102 insertions(+), 13 deletions(-)
diff --git
a/cmdline/maven/src/main/java/org/netbeans/modules/jackpot30/maven/RunJackpot30.java
b/cmdline/maven/src/main/java/org/netbeans/modules/jackpot30/maven/RunJackpot30.java
index 423cd73..c86be4c 100644
---
a/cmdline/maven/src/main/java/org/netbeans/modules/jackpot30/maven/RunJackpot30.java
+++
b/cmdline/maven/src/main/java/org/netbeans/modules/jackpot30/maven/RunJackpot30.java
@@ -53,6 +53,7 @@ public abstract class RunJackpot30 extends AbstractMojo {
}
String configurationFile =
Utils.getJackpotConfigurationFile(project);
+boolean failOnWarnings = Utils.getJackpotFailOnWarnings(project);
List cmdLine = new ArrayList();
@@ -70,6 +71,10 @@ public abstract class RunJackpot30 extends AbstractMojo {
cmdLine.add(configurationFile);
}
+if (failOnWarnings) {
+cmdLine.add("--fail-on-warnings");
+}
+
boolean hasSourceRoots = false;
for (String sr : (List) project.getCompileSourceRoots()) {
@@ -96,7 +101,9 @@ public abstract class RunJackpot30 extends AbstractMojo {
"--add-opens=java.base/java.net=ALL-UNNAMED",
"--add-opens=java.desktop/sun.awt=ALL-UNNAMED",
Main.class.getCanonicalName()));
-new ProcessBuilder(cmdLine).inheritIO().start().waitFor();
+if (new ProcessBuilder(cmdLine).inheritIO().start().waitFor() !=
0) {
+throw new MojoExecutionException("jackpo30 failed.");
+}
} catch (IOException ex) {
throw new MojoExecutionException(ex.getMessage(), ex);
} catch (InterruptedException ex) {
diff --git
a/cmdline/maven/src/main/java/org/netbeans/modules/jackpot30/maven/Utils.java
b/cmdline/maven/src/main/java/org/netbeans/modules/jackpot30/maven/Utils.java
index 5ea91a9..3fd1b65 100644
---
a/cmdline/maven/src/main/java/org/netbeans/modules/jackpot30/maven/Utils.java
+++
b/cmdline/maven/src/main/java/org/netbeans/modules/jackpot30/maven/Utils.java
@@ -47,7 +47,7 @@ public class Utils {
}
public static String getJackpotConfigurationFile(MavenProject project) {
-Xpp3Dom configuration = getPluginConfiguration(project,
"org.apache.netbeans.modules.jackpot30", "jackpot30-maven-plugin");
+Xpp3Dom configuration = getJackpotPluginConfiguration(project);
if (configuration != null) {
Xpp3Dom configurationFileElement =
configuration.getChild("configurationFile");
@@ -59,4 +59,22 @@ public class Utils {
return null;
}
+
+p
[netbeans] branch master updated: Set --enable-preview for jtreg tests.
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 71918030e4 Set --enable-preview for jtreg tests.
71918030e4 is described below
commit 71918030e4b7395f752b1088df0581ec210c822c
Author: Jan Lahoda
AuthorDate: Sun May 22 10:23:17 2022 +0200
Set --enable-preview for jtreg tests.
---
.../java/openjdk/jtreg/ClassPathProviderImpl.java | 215 ++---
.../openjdk/jtreg/CompilerOptionsQueryImpl.java| 63 ++
.../java/openjdk/jtreg/TestRootDescription.java| 54 ++
3 files changed, 221 insertions(+), 111 deletions(-)
diff --git
a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/ClassPathProviderImpl.java
b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/ClassPathProviderImpl.java
index 803ef58757..36ce45d091 100644
---
a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/ClassPathProviderImpl.java
+++
b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/ClassPathProviderImpl.java
@@ -58,137 +58,130 @@ public class ClassPathProviderImpl implements
ClassPathProvider {
@Override
public ClassPath findClassPath(FileObject file, String type) {
-FileObject search = file.getParent();
-FileObject testProperties = null;
+TestRootDescription rootDesc =
TestRootDescription.findRootDescriptionFor(file);
-while (search != null) {
-if (testProperties == null) {
-testProperties = BuildUtils.getFileObject(search,
"TEST.properties");
-}
+if (rootDesc == null) {
+return null;
+}
-FileObject testRoot = BuildUtils.getFileObject(search,
"TEST.ROOT");
-
-if (testRoot != null) {
-boolean javac =
(Utilities.isLangtoolsRepository(search.getParent()) ||
search.getNameExt().equals("langtools")) &&
-
ShortcutUtils.getDefault().shouldUseCustomTest("langtools",
FileUtil.getRelativePath(search.getParent(), file));
-FileObject keyRoot = javac ?
search.getNameExt().equals("langtools") ?
Utilities.getLangtoolsKeyRoot(search.getParent().getParent()) :
Utilities.getLangtoolsKeyRoot(search.getParent()) : null;
-//XXX: hack to make things work for langtools:
-switch (type) {
-case ClassPath.COMPILE:
-if (javac) {
-ClassPath langtoolsCP =
ClassPath.getClassPath(keyRoot, ClassPath.COMPILE);
-Library testngLib =
LibraryManager.getDefault().getLibrary("testng");
-
-if (testngLib != null) {
-return
ClassPathSupport.createProxyClassPath(ClassPathSupport.createClassPath(testngLib.getContent("classpath").toArray(new
URL[0])),
-
langtoolsCP);
-}
+FileObject testProperties = rootDesc.testProperties;
+FileObject testRoot = rootDesc.testRoot;
+FileObject testRootFile = rootDesc.testRootFile;
+
+boolean javac = (Utilities.isLangtoolsRepository(testRoot.getParent())
|| testRoot.getNameExt().equals("langtools")) &&
+
ShortcutUtils.getDefault().shouldUseCustomTest("langtools",
FileUtil.getRelativePath(testRoot.getParent(), file));
+FileObject keyRoot = javac ? testRoot.getNameExt().equals("langtools")
? Utilities.getLangtoolsKeyRoot(testRoot.getParent().getParent()) :
Utilities.getLangtoolsKeyRoot(testRoot.getParent()) : null;
+//XXX: hack to make things work for langtools:
+switch (type) {
+case ClassPath.COMPILE:
+if (javac) {
+ClassPath langtoolsCP = ClassPath.getClassPath(keyRoot,
ClassPath.COMPILE);
+Library testngLib =
LibraryManager.getDefault().getLibrary("testng");
+
+if (testngLib != null) {
+return
ClassPathSupport.createProxyClassPath(ClassPathSupport.createClassPath(testngLib.getContent("classpath").toArray(new
URL[0])),
+
langtoolsCP);
+}
-if (langtoolsCP == null)
-return ClassPath.EMPTY;
-else
-return langtoolsCP;
-}
-else return null;
-case ClassPath.BOOT:
-if (javac) {
-
svn commit: r54672 - in /dev/netbeans/netbeans-jackpot: 13.0/ netbeans-jackpot-12.5-vc1/ netbeans-jackpot-13.0-vc1/
Author: jlahoda Date: Sun May 22 06:26:48 2022 New Revision: 54672 Log: Updating folder name. Added: dev/netbeans/netbeans-jackpot/netbeans-jackpot-13.0-vc1/ - copied from r54671, dev/netbeans/netbeans-jackpot/13.0/ Removed: dev/netbeans/netbeans-jackpot/13.0/ dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.5-vc1/ - 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
svn commit: r54671 - /dev/netbeans/netbeans-jackpot/13.0/
Author: jlahoda Date: Sun May 22 06:25:02 2022 New Revision: 54671 Log: Staging Apache NetBeans Standalone Hints release 13.0 Added: dev/netbeans/netbeans-jackpot/13.0/ dev/netbeans/netbeans-jackpot/13.0/apache-netbeans-jackpot-13.0-bin.zip (with props) dev/netbeans/netbeans-jackpot/13.0/apache-netbeans-jackpot-13.0-bin.zip.asc dev/netbeans/netbeans-jackpot/13.0/apache-netbeans-jackpot-13.0-bin.zip.sha512 dev/netbeans/netbeans-jackpot/13.0/apache-netbeans-jackpot-13.0.zip (with props) dev/netbeans/netbeans-jackpot/13.0/apache-netbeans-jackpot-13.0.zip.asc dev/netbeans/netbeans-jackpot/13.0/apache-netbeans-jackpot-13.0.zip.sha512 Added: dev/netbeans/netbeans-jackpot/13.0/apache-netbeans-jackpot-13.0-bin.zip == Binary file - no diff available. Propchange: dev/netbeans/netbeans-jackpot/13.0/apache-netbeans-jackpot-13.0-bin.zip -- svn:mime-type = application/octet-stream Added: dev/netbeans/netbeans-jackpot/13.0/apache-netbeans-jackpot-13.0-bin.zip.asc == --- dev/netbeans/netbeans-jackpot/13.0/apache-netbeans-jackpot-13.0-bin.zip.asc (added) +++ dev/netbeans/netbeans-jackpot/13.0/apache-netbeans-jackpot-13.0-bin.zip.asc Sun May 22 06:25:02 2022 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE5reiA6oYSXqyUgKntMGUD+qTZPEFAmKJ07YACgkQtMGUD+qT +ZPHJ8w/+PxR7bR/7oR+LUg2ahH6jjWlZGcHfqVbnGQGF2F4vn1PUZYKNq+Eh1y+K +GToZXL3IZjFMpr+QJNCo/Ny+Bd/jQB2s2gtE4LIVa0K0rTbv9yCIiuWOPimzmu5n +LNjFFPuixcC3HXtr/tMRsxLZrTf0sFax/9UpsmSMgemab78EXOv6XLpZaIWWbb9/ +4AJdjCXTlz/GgraAW6p+U0B/9hWwWnYAcMej9ev3fqx/6ShlSMcK49mLCykUn7VX +9ErUbc8LFE2vRGBKMP61Voml1DAHj5Cknjsp5sOV6m9xhVO9vdn3jc7Rkx4lgibg +IljGb6OKRpVuIe2GcgQjQyJ4J3VEd1GxJPUSSt7388Sk+iokCS+wsoDUKJsfDE/+ +Nkrh2O+VASibysUCJ9710jo3hmimoCureobIRylrovYcRTPE2M49hxws7s1Da0JU +1gkkogeSlOUAKOClDB/EHqE1zVjzxFKfOQUT6dI9fpSuATfp9NZv2b6JyB4sYZPq +LGd7i2vbq8nLN5t7TQze3cGzivyGgqWr+d9xf594eSyE7G0ijR8estZsWDDyp0Gf +1bCUZG76HdKhXHq4RRfEwwwyoX8epPgvKe+0D3jrTpCj9fO5qEcE1dTrtOpDFrI1 +Ni+YpDr5dy6LWANLEYhBdeqx17U797Im1fTOogbQaEfZZO79dkM= +=FPew +-END PGP SIGNATURE- Added: dev/netbeans/netbeans-jackpot/13.0/apache-netbeans-jackpot-13.0-bin.zip.sha512 == --- dev/netbeans/netbeans-jackpot/13.0/apache-netbeans-jackpot-13.0-bin.zip.sha512 (added) +++ dev/netbeans/netbeans-jackpot/13.0/apache-netbeans-jackpot-13.0-bin.zip.sha512 Sun May 22 06:25:02 2022 @@ -0,0 +1 @@ +3746cc0ae84ed61395db7c254254476d451f96366789feb2a02e92b630c6ea2e150baa1c7190f089e1b259319191d08a302211c47e648615b4b130de7cb9b036 apache-netbeans-jackpot-13.0-bin.zip Added: dev/netbeans/netbeans-jackpot/13.0/apache-netbeans-jackpot-13.0.zip == Binary file - no diff available. Propchange: dev/netbeans/netbeans-jackpot/13.0/apache-netbeans-jackpot-13.0.zip -- svn:mime-type = application/octet-stream Added: dev/netbeans/netbeans-jackpot/13.0/apache-netbeans-jackpot-13.0.zip.asc == --- dev/netbeans/netbeans-jackpot/13.0/apache-netbeans-jackpot-13.0.zip.asc (added) +++ dev/netbeans/netbeans-jackpot/13.0/apache-netbeans-jackpot-13.0.zip.asc Sun May 22 06:25:02 2022 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE5reiA6oYSXqyUgKntMGUD+qTZPEFAmKJ07oACgkQtMGUD+qT +ZPHyLRAAj0G16Nox4VifJcO0EvoBzRw9yk0z9sZYqq0tTlE6HCs/GV47/D/ul26O +MMK58xkUTlm1kMGk9uuT6BlTDWKV+PUtFJ5fmizR7TTh3LZv+WxfTwTXgKdO6mNE +3HXsenUcxcAnkivWq5vJp83nliFWGGZ+aMzd2vJSnxK1lmRZqGVmHnjpVzfrsMGe +8I9c1FxjWl6FCuHuB3nIFalSZNiEpfMUnK283ZaaNiLhQjUPa6uhWwYwDJP4NEsZ +THM0txfnNvDOL2ULm0qar21Yq9g5as2nexMZSV4471MRnQQa+GI32YGSdOBlu+W8 +VUmykixPid19yaHV7bCNEc4oHh4Tum0RMYIF6H6rtdB7u6I1+w2YG07rvx9gV6O4 +Hiw16yICEH7mV3NoqMlESwamECTxzkr94ktvx2ioDc3mukXmmqSAnLrEp+fMQNZV +Nnj8v0YZZtCZX/2BmUV3M5HYpcXJL/nNegKdWf6QAta3BkfOSjhJ8OksLgGdedNp +XyFsCcnovr1L133fYqtHeVuBQpTmWtyY8igYusCJGmt8pa5KGZuPHHLIT08dP7ed +sIHmEiYkkjmHs74gxM1myHdQbx0DqvBNQtCx4E71axsnpGq6HBvmrhBn1CFa+IXC +Qkc76ZrdsbryelJ2OlY4SQ2rixPROSwDwmQCff8VIzTyNSk+8CY= +=0rwy +-END PGP SIGNATURE- Added: dev/netbeans/netbeans-jackpot/13.0/apache-netbeans-jackpot-13.0.zip.sha512 == --- dev/netbeans/netbeans-jackpot/13.0/apache-netbeans-jackpot-13.0.zip.sha512 (added) +++ dev/netbeans/netbeans-jackpot/13.0/apache-netbeans-jackpot-13.0.zip.sha512 Sun May 22 06:25:02 2022 @@ -0,0 +1 @@ +7c1bf5e57a550791e2c9ca56578ce62c403bd6d2cae580a55cae09ad54b3002a990e05a23a5a337268b22141e57c7b1073644a1dd5c0f630592da070295bbcf9 apache-netbeans-jackpot-13.0.zip
[netbeans-jackpot30] tag netbeans-jackpot-13.0-vc1 created (now 840703b)
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a change to tag netbeans-jackpot-13.0-vc1 in repository https://gitbox.apache.org/repos/asf/netbeans-jackpot30.git at 840703b (commit) No new revisions were added by this update. - 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-jackpot30] branch master updated: Updating to NetBeans 13
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-jackpot30.git
The following commit(s) were added to refs/heads/master by this push:
new 840703b Updating to NetBeans 13
840703b is described below
commit 840703b1e90f4c69c087f7a48d9780fcb7c200af
Author: Jan Lahoda
AuthorDate: Sun Apr 3 11:00:55 2022 +0200
Updating to NetBeans 13
---
.travis.yml| 15 +-
cmdline/README.md | 8 +-
cmdline/build.xml | 27 +-
cmdline/lib/nbproject/project.properties | 1 -
cmdline/lib/nbproject/project.xml | 3 +-
.../jackpot30/cmdline/lib/CreateStandaloneJar.java | 8 +-
.../modules/jackpot30/cmdline/lib/TestUtils.java | 59
cmdline/maven/pom.xml | 2 +-
.../modules/jackpot30/maven/RunJackpot30.java | 2 +-
.../modules/jackpot30/maven/RunJackpot30Test.java | 2 +-
cmdline/nbproject/project.properties | 4 +-
cmdline/processor/build.xml| 43 +++
cmdline/processor/manifest.mf | 5 +
cmdline/processor/nbproject/build-impl.xml | 62
.../nbproject/genfiles.properties} | 14 +-
.../nbproject/project.properties | 5 +
cmdline/{tool => processor}/nbproject/project.xml | 2 +-
.../nbproject/suite.properties}| 6 +-
.../jackpot30/cmdline/processor/Bundle.properties} | 6 +-
.../cmdline/processor}/ProcessorImpl.java | 4 +-
.../jackpot30/cmdline/processor}/cfg_hints.xml | 0
.../cmdline/processor/CreateToolProcessor.java}| 24 +-
.../processor}/CreateToolProcessorTest.java| 4 +-
.../cmdline/processor}/ProcessorImplTest.java | 13 +-
.../jackpot30/cmdline/processor}/Utils.java| 53 +---
cmdline/tool/build.xml | 15 +-
cmdline/tool/nbproject/project.properties | 4 +
cmdline/tool/nbproject/project.xml | 8 +
cmdline/tool/scripts/LICENSE-bin-tool.txt | 352 +
cmdline/tool/scripts/jackpot | 2 +-
cmdline/tool/scripts/pom.xml | 2 +-
.../netbeans/modules/jackpot30/cmdline/Main.java | 2 -
.../modules/jackpot30/cmdline/CreateTool.java | 8 +-
.../modules/jackpot30/cmdline/CreateToolTest.java | 2 +-
.../modules/jackpot30/cmdline/MainTest.java| 44 +--
.../netbeans/modules/jackpot30/cmdline/Utils.java | 52 +--
36 files changed, 667 insertions(+), 196 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 9e0c2d3..2555715 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,15 +22,16 @@ addons:
- ant
- ant-optional
- openjdk-8-jdk
+ - openjdk-11-jdk
+ - openjdk-17-jdk
jdk:
- - openjdk11
+ - openjdk8
before_script:
- - wget
'https://www.apache.org/dist/netbeans/netbeans/12.5/netbeans-12.5-bin.zip' -O
/tmp/netbeans-12.5-bin.zip
- - (cd $HOME; unzip /tmp/netbeans-12.5-bin.zip)
+ - wget
'https://downloads.apache.org/netbeans/netbeans/13/netbeans-13-bin.zip' -O
/tmp/netbeans-13-bin.zip
+ - (cd $HOME; unzip /tmp/netbeans-13-bin.zip)
- unset _JAVA_OPTIONS
script:
- - export JDK11=$JAVA_HOME
- - export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
- - export PATH=$JAVA_HOME/bin:$PATH
+ - export JDK11=/usr/lib/jvm/java-11-openjdk-amd64
+ - export JDK17=/usr/lib/jvm/java-17-openjdk-amd64
- (cd cmdline; ant -Dnbplatform.default.harness.dir=$HOME/netbeans/harness
rat)
- - (cd cmdline; ant -Dnbplatform.default.harness.dir=$HOME/netbeans/harness
-DNETBEANS_PLATFORM=$HOME/netbeans -DJDK11=$JDK11 build-and-test)
+ - (cd cmdline; ant -Dnbplatform.default.harness.dir=$HOME/netbeans/harness
-DNETBEANS_PLATFORM=$HOME/netbeans -DJDK11=$JDK11 -DJDK17=$JDK17 build-and-test)
diff --git a/cmdline/README.md b/cmdline/README.md
index 094ccf7..99a76a5 100644
--- a/cmdline/README.md
+++ b/cmdline/README.md
@@ -27,22 +27,22 @@ This tool allows to run NetBeans Java code checker without
the NetBeans IDE. Thi
To Build
-* Apache NetBeans 12.5
-* JDK 8 and JDK 11
+* Apache NetBeans 13.0
+* JDK 8, JDK 11 and JDK 17
* bash
* Apache ant 1.9.9 or above
* Apache Maven 3.3.9 or above
To Run
-* JDK 11
+* JDK 8-17
### Building
Build using:
```
-$ ant -DNETBEANS_PLATFORM= -DJDK11=
build-and-test
+$ ant -DNETBEANS_PLATFORM= -DJDK11=
-DJDK17= build-and-test
```
The built product is in tool/build/jackpot.
diff --git a/cmdline/build.xml b/cmdline/build.xml
index f386b5e..c11008a 100644
--- a/cmdline/build.xml
+++ b/cmdline/build.xml
@@ -52,33 +52
[netbeans] branch master updated: Semantic highlight support for both the LSP client and Java LSP server.
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new d2ae8ba Semantic highlight support for both the LSP client and Java
LSP server.
d2ae8ba is described below
commit d2ae8ba167c659458deca4a8cea3177af8450947
Author: Jan Lahoda
AuthorDate: Fri Jan 14 07:22:39 2022 +0100
Semantic highlight support for both the LSP client and Java LSP server.
---
ide/lsp.client/external/binaries-list |6 +-
...-0.9.0-license.txt => lsp4j-0.12.0-license.txt} |4 +-
ide/lsp.client/nbproject/project.properties|6 +-
ide/lsp.client/nbproject/project.xml | 12 +-
.../netbeans/modules/lsp/client/LSPBindings.java | 23 +-
.../src/org/netbeans/modules/lsp/client/Utils.java |4 +
.../lsp/client/bindings/BreadcrumbsImpl.java |2 +-
.../client/bindings/CompletionProviderImpl.java|8 +-
.../modules/lsp/client/bindings/Formatter.java |8 +-
.../lsp/client/bindings/LanguageClientImpl.java| 57 +
.../lsp/client/bindings/MarkOccurrences.java |3 +-
.../lsp/client/bindings/SemanticHighlight.java | 207
.../TextDocumentSyncServerCapabilityHandler.java |5 +
.../refactoring/RefactoringActionsProvider.java|3 +-
.../textmate/lexer/resources/fontsColors.xml | 36 +
.../modules/java/lsp/server/protocol/Server.java | 23 +-
.../server/protocol/TextDocumentServiceImpl.java | 150 +++
.../java/lsp/server/protocol/ServerTest.java | 95 ++
java/java.lsp.server/vscode/package-lock.json | 1160 +++-
.../org/netbeans/nbbuild/extlibs/ignored-overlaps |6 +-
20 files changed, 1785 insertions(+), 33 deletions(-)
diff --git a/ide/lsp.client/external/binaries-list
b/ide/lsp.client/external/binaries-list
index a8dc71e..c89b3b0 100644
--- a/ide/lsp.client/external/binaries-list
+++ b/ide/lsp.client/external/binaries-list
@@ -15,9 +15,9 @@
# specific language governing permissions and limitations
# under the License.
-4FF29B93C50F6768C9A73040AE818E96EB2E68DB
org.eclipse.lsp4j:org.eclipse.lsp4j:0.9.0
-DA453B2A6C9BBD9369DE41365C59E88574EC1F0B
org.eclipse.lsp4j:org.eclipse.lsp4j.generator:0.9.0
-1CF7FCE1E2F4DFA76C3B91E4C2D72EA0C6899945
org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:0.9.0
+419B5181A4B2D054BF8FF764FCEB67DF09D87E7D
org.eclipse.lsp4j:org.eclipse.lsp4j:0.12.0
+80607078CEB77F92C6BFEC3CDEC050D3222EFDFF
org.eclipse.lsp4j:org.eclipse.lsp4j.generator:0.12.0
+8A80D1368F19A2F6E328E41B9BC68E53C628C68B
org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:0.12.0
751B324BED8C077BF6B7B8C2055595EB8C28509D
org.eclipse.xtend:org.eclipse.xtend.lib:2.19.0
F3626A047A3ABFA47CF62D76BDEF1D246F7985F6
org.eclipse.xtend:org.eclipse.xtend.lib.macro:2.19.0
997BA9935D0069B3F1CD2F93B56B91D24E9C60A0
org.eclipse.xtext:org.eclipse.xtext.xbase.lib:2.19.0
diff --git a/ide/lsp.client/external/lsp4j-0.9.0-license.txt
b/ide/lsp.client/external/lsp4j-0.12.0-license.txt
similarity index 99%
rename from ide/lsp.client/external/lsp4j-0.9.0-license.txt
rename to ide/lsp.client/external/lsp4j-0.12.0-license.txt
index 208dfb7..7151ac5 100644
--- a/ide/lsp.client/external/lsp4j-0.9.0-license.txt
+++ b/ide/lsp.client/external/lsp4j-0.12.0-license.txt
@@ -1,10 +1,10 @@
Name: Eclipse Language Server Protocol Library
Origin: Eclipse
-Version: 0.9.0
+Version: 0.12.0
License: EPL-v20
URL: http://www.eclipse.org/
Description: Eclipse Language Server Protocol Library
-Files: org.eclipse.lsp4j-0.9.0.jar org.eclipse.lsp4j.generator-0.9.0.jar
org.eclipse.lsp4j.jsonrpc-0.9.0.jar
+Files: org.eclipse.lsp4j-0.12.0.jar org.eclipse.lsp4j.generator-0.12.0.jar
org.eclipse.lsp4j.jsonrpc-0.12.0.jar
Eclipse Public License - v 2.0
THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
diff --git a/ide/lsp.client/nbproject/project.properties
b/ide/lsp.client/nbproject/project.properties
index f6a201b..f2bd513 100644
--- a/ide/lsp.client/nbproject/project.properties
+++ b/ide/lsp.client/nbproject/project.properties
@@ -18,9 +18,9 @@
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
javadoc.arch=${basedir}/arch.xml
-release.external/org.eclipse.lsp4j-0.9.0.jar=modules/ext/org.eclipse.lsp4j-0.9.0.jar
-release.external/org.eclipse.lsp4j.generator-0.9.0.jar=modules/ext/org.eclipse.lsp4j.generator-0.9.0.jar
-release.external/org.eclipse.lsp4j.jsonrpc-0.9.0.jar=modules/ext/org.eclipse.lsp4j.jsonrpc-0.9.0.jar
+release.external/org.eclipse.lsp4j-0.12.0.jar=modules/ext/org.eclipse.lsp4j-0.12.0.jar
+release.external/org.eclipse.lsp4j.generator-0.12.0.jar=modules/ext/org.eclipse.lsp4j.generator-0.12.0.jar
+release.external/org.eclipse.lsp4j.jsonrpc-0.12.0.jar=modules/
[netbeans] branch master updated (61795d6 -> 3649573)
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 61795d6 Micronaut Data Finder completion ceck for @Repository annotation fixed. (#3346) new da9a9f9 fixed class modifier auto completion for sealed classes. new 2735b5e added auto completion tests for sealed class declarations. new 3649573 Merge pull request #3228 from mbien/contains The 6237 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: .../nbjunit/src/org/netbeans/junit/NbTestCase.java | 6 +- .../java/completion/JavaCompletionTask.java| 26 +++-- .../JavaCompletionTaskTest/1.8/afterAbstract.pass | 6 ++ .../JavaCompletionTaskTest/1.8/afterSealed.pass| 4 + .../1.8/afterSealedClassName.pass | 3 + .../JavaCompletionTaskTest/1.8/finalClass.pass | 4 + .../modules/java/completion/data/Sealed.java | 24 + .../JavaCompletionTask115FeaturesTest.java | 107 + 8 files changed, 171 insertions(+), 9 deletions(-) create mode 100644 java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/afterAbstract.pass create mode 100644 java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/afterSealed.pass create mode 100644 java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/afterSealedClassName.pass create mode 100644 java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/finalClass.pass create mode 100644 java/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Sealed.java create mode 100644 java/java.completion/test/unit/src/org/netbeans/modules/java/completion/JavaCompletionTask115FeaturesTest.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 (735dcf7 -> 77cd083)
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 735dcf7 Merge pull request #3318 from matthiasblaesing/client_project_catch_exception add 77cd083 Dynamically switching from all-file processing to single-file processing of multi file JavaSources. No new revisions were added by this update. Summary of changes: ide/parsing.api/apichanges.xml | 15 +++ .../modules/parsing/api/ParserManager.java | 12 +- .../modules/parsing/impl/ParserAccessor.java | 1 + .../org/netbeans/modules/parsing/spi/Parser.java | 22 +++- .../java/source/parsing/CompilationInfoImpl.java | 93 +++--- .../modules/java/source/parsing/JavacParser.java | 136 +++-- .../java/source/parsing/JavacParserResult.java | 5 + .../netbeans/api/java/source/JavaSourceTest.java | 4 - .../java/source/parsing/JavacParserTest.java | 135 ++-- .../org/netbeans/lib/nbjavac/services/NBAttr.java | 8 ++ 10 files changed, 333 insertions(+), 98 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: jackpot sourceVersion() fix for java 8 and newer.
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 1c4e68a jackpot sourceVersion() fix for java 8 and newer.
1c4e68a is described below
commit 1c4e68afd7ca1b248488392648241163c8a8d15e
Author: Michael Bien
AuthorDate: Sun Sep 19 11:07:29 2021 +0200
jackpot sourceVersion() fix for java 8 and newer.
---
.../modules/java/hints/declarative/conditionapi/Context.java | 12 +---
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git
a/java/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/conditionapi/Context.java
b/java/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/conditionapi/Context.java
index b9820fc..0632315 100644
---
a/java/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/conditionapi/Context.java
+++
b/java/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/conditionapi/Context.java
@@ -43,7 +43,6 @@ import javax.lang.model.type.TypeKind;
import javax.lang.model.type.TypeMirror;
import org.netbeans.api.annotations.common.CheckForNull;
import org.netbeans.api.annotations.common.NonNull;
-import org.netbeans.api.java.queries.SourceLevelQuery;
import org.netbeans.api.java.source.TreeUtilities;
import org.netbeans.modules.java.hints.declarative.APIAccessor;
import org.netbeans.modules.java.hints.spiimpl.Hacks;
@@ -70,16 +69,7 @@ public class Context {
}
public @NonNull SourceVersion sourceVersion() {
-String sourceLevel =
SourceLevelQuery.getSourceLevel(ctx.getInfo().getFileObject());
-
-if (sourceLevel == null) {
-return SourceVersion.latest(); //TODO
-}
-
-String[] splited = sourceLevel.split("\\.");
-String spec= splited[1];
-
-return SourceVersion.valueOf("RELEASE_"+ spec);//!!!
+return ctx.getInfo().getSourceVersion();
}
public @NonNull Set modifiers(@NonNull Variable variable) {
-
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: Added Collection/Map.size() > 0 case to the isEmpty() refactoring.
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new b26b9c2 Added Collection/Map.size() > 0 case to the isEmpty()
refactoring.
b26b9c2 is described below
commit b26b9c213bdb4bda1012431ac54fb4f62b52b9de
Author: Michael Bien
AuthorDate: Sun Sep 12 13:03:59 2021 +0200
Added Collection/Map.size() > 0 case to the isEmpty() refactoring.
---
.../modules/java/hints/perf/Bundle.properties | 18 ++---
.../modules/java/hints/perf/SizeEqualsZero.java| 35 +++---
.../modules/java/hints/perf/Bundle_test.properties | 6 +-
.../java/hints/perf/SizeEqualsZeroTest.java| 77 +-
4 files changed, 116 insertions(+), 20 deletions(-)
diff --git
a/java/java.hints/src/org/netbeans/modules/java/hints/perf/Bundle.properties
b/java/java.hints/src/org/netbeans/modules/java/hints/perf/Bundle.properties
index f5ca735..bbcd6fc 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/perf/Bundle.properties
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/perf/Bundle.properties
@@ -23,14 +23,16 @@ FIX_manual-array-copy-coll=Replace with
Collection.addAll(Arrays.asList(...))
ERR_manual-array-copy=Manual array copy
FIX_manual-array-copy=Replace with System.arraycopy
-DN_org.netbeans.modules.java.hints.perf.SizeEqualsZero=Usage of .size() == 0
-DESC_org.netbeans.modules.java.hints.perf.SizeEqualsZero=Use .isEmpty() or
!.isEmpty() instead of .size() == 0 or .size() != 0 where possible.
-ERR_SizeEqualsZero=Usage of .size() == 0 can be replaced with .isEmpty()
-ERR_SizeEqualsZeroNeg=Usage of .size() != 0 can be replaced with !.isEmpty()
-FIX_UseIsEmpty=Use .isEmpty() instead of .size() == 0
-FIX_UseIsEmptyNeg=Use .isEmpty() instead of .size() != 0
-LBL_org.netbeans.modules.java.hints.perf.SizeEqualsZero.CHECK_NOT_EQUALS=Also
check for .size() != 0
-TP_org.netbeans.modules.java.hints.perf.SizeEqualsZero.CHECK_NOT_EQUALS=Should
this hint also report occurrences of ".size() != 0"?
+DN_org.netbeans.modules.java.hints.perf.SizeEqualsZero=Usage of
[Collection|Map].size() == 0
+DESC_org.netbeans.modules.java.hints.perf.SizeEqualsZero=Use
[Collection|Map].isEmpty() instead of .size() == 0 and !.isEmpty() instead of
.size() != 0 or .size() > 0 where possible.
+ERR_SizeEqualsZero={0}.size() == 0 can be replaced with {0}.isEmpty()
+ERR_SizeEqualsZeroNeg={0}.size() != 0 can be replaced with !{0}.isEmpty()
+ERR_SizeGreaterZeroNeg={0}.size() > 0 can be replaced with !{0}.isEmpty()
+FIX_SizeEqualsZero=Change to {0}.isEmpty()
+FIX_SizeEqualsZeroNeg=Change to !{0}.isEmpty()
+FIX_SizeGreaterZeroNeg=Change to !{0}.isEmpty()
+LBL_org.netbeans.modules.java.hints.perf.SizeEqualsZero.CHECK_NOT_EQUALS=Also
check for .size() != 0 and .size() > 0
+TP_org.netbeans.modules.java.hints.perf.SizeEqualsZero.CHECK_NOT_EQUALS=Should
this hint also report occurrences of ".size() != 0" and ".size() > 0"?
DN_org.netbeans.modules.java.hints.perf.Tiny.stringConstructor=String
constructor
DESC_org.netbeans.modules.java.hints.perf.Tiny.stringConstructor=Use of
java.lang.String constructor is usually useless.
diff --git
a/java/java.hints/src/org/netbeans/modules/java/hints/perf/SizeEqualsZero.java
b/java/java.hints/src/org/netbeans/modules/java/hints/perf/SizeEqualsZero.java
index f9e28aa..24ffba2 100644
---
a/java/java.hints/src/org/netbeans/modules/java/hints/perf/SizeEqualsZero.java
+++
b/java/java.hints/src/org/netbeans/modules/java/hints/perf/SizeEqualsZero.java
@@ -62,7 +62,7 @@ public class SizeEqualsZero {
constraints = @ConstraintVariableType(type = "java.util.Map",
variable = "$subj")),
})
public static ErrorDescription sizeEqualsZero(HintContext ctx) {
-return sizeEqualsZeroHint(ctx, false);
+return sizeEqualsZeroHint(ctx, "SizeEqualsZero", "$subj.isEmpty()");
// NOI18N
}
@TriggerPatterns({
@@ -79,10 +79,27 @@ public class SizeEqualsZero {
if (!ctx.getPreferences().getBoolean(CHECK_NOT_EQUALS,
CHECK_NOT_EQUALS_DEFAULT)) {
return null;
}
-return sizeEqualsZeroHint(ctx, true);
+return sizeEqualsZeroHint(ctx, "SizeEqualsZeroNeg",
"!$subj.isEmpty()"); // NOI18N
}
-public static ErrorDescription sizeEqualsZeroHint(HintContext ctx, boolean
not) {
+@TriggerPatterns({
+@TriggerPattern(value="$subj.size() > 0",
+constraints = @ConstraintVariableType(type =
"java.util.Collection", variable = "$subj")),
+@TriggerPattern(value="$subj.size() > 0",
+constraints = @ConstraintVariableType(type = "java.util.Map",
variable = "$subj")),
+@TriggerPattern(val
[netbeans-website] branch upgrade-to-jackpot-12.5 created (now c32f07c)
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a change to branch upgrade-to-jackpot-12.5 in repository https://gitbox.apache.org/repos/asf/netbeans-website.git. at c32f07c Upgrading the description to use Jackpot 12.5. No new revisions were added by this update. - 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
svn commit: r50335 - in /release/netbeans/netbeans-jackpot: netbeans-jackpot-12.3/ netbeans-jackpot-12.5/
Author: jlahoda Date: Sat Oct 9 06:51:29 2021 New Revision: 50335 Log: Apache Netbeans Standalone Java Hints Tool 12.5 vote has passed, the tools is released. Added: release/netbeans/netbeans-jackpot/netbeans-jackpot-12.5/ - copied from r50230, dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.5-vc1/ Removed: release/netbeans/netbeans-jackpot/netbeans-jackpot-12.3/ - 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: When java.lang is not available, avoid throwing a FatalError, but rather try to report an error to the user and continue.
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 1115605 When java.lang is not available, avoid throwing a FatalError,
but rather try to report an error to the user and continue.
1115605 is described below
commit 11156054b7c12b8e1eaf567010d62d83342ac796
Author: Jan Lahoda
AuthorDate: Sat Oct 9 07:24:09 2021 +0200
When java.lang is not available, avoid throwing a FatalError, but rather
try to report an error to the user and continue.
---
.../lib/nbjavac/services/NBClassFinder.java| 59 +
.../lib/nbjavac/services/NBClassFinderTest.java| 139 +
2 files changed, 198 insertions(+)
diff --git
a/java/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBClassFinder.java
b/java/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBClassFinder.java
index c43f322..11f67b3 100644
--- a/java/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBClassFinder.java
+++ b/java/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBClassFinder.java
@@ -19,7 +19,23 @@
package org.netbeans.lib.nbjavac.services;
import com.sun.tools.javac.code.ClassFinder;
+import com.sun.tools.javac.code.Flags;
+import com.sun.tools.javac.code.Kinds.Kind;
+import com.sun.tools.javac.code.Symbol;
+import com.sun.tools.javac.code.Symbol.Completer;
+import com.sun.tools.javac.code.Symbol.CompletionFailure;
import com.sun.tools.javac.util.Context;
+import com.sun.tools.javac.util.JCDiagnostic;
+import com.sun.tools.javac.util.JCDiagnostic.DiagnosticInfo;
+import com.sun.tools.javac.util.JCDiagnostic.DiagnosticType;
+import com.sun.tools.javac.util.JCDiagnostic.SimpleDiagnosticPosition;
+import com.sun.tools.javac.util.Log;
+import com.sun.tools.javac.util.Names;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.function.Supplier;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.tools.JavaFileObject;
/**
@@ -36,8 +52,17 @@ public class NBClassFinder extends ClassFinder {
});
}
+private final Context context;
+private final Names names;
+private final JCDiagnostic.Factory diagFactory;
+private final Log log;
+
public NBClassFinder(Context context) {
super(context);
+this.context = context;
+this.names = Names.instance(context);
+this.diagFactory = JCDiagnostic.Factory.instance(context);
+this.log = Log.instance(context);
}
@Override
@@ -55,4 +80,38 @@ public class NBClassFinder extends ClassFinder {
return super.preferredFileObject(a, b);
}
+private Completer completer;
+
+@Override
+public Completer getCompleter() {
+if (completer == null) {
+try {
+Class.forName("com.sun.tools.javac.model.LazyTreeLoader");
+//patched nb-javac, handles missing java.lang itself:
+completer = super.getCompleter();
+} catch (ClassNotFoundException e) {
+Completer delegate = super.getCompleter();
+completer = sym -> {
+delegate.complete(sym);
+if (sym.kind == Kind.PCK &&
+sym.flatName() == names.java_lang &&
+sym.members().isEmpty()) {
+sym.flags_field |= Flags.EXISTS;
+try {
+Class dcfhClass =
Class.forName("com.sun.tools.javac.code.DeferredCompletionFailureHandler");
+Constructor constr =
CompletionFailure.class.getDeclaredConstructor(Symbol.class, Supplier.class,
dcfhClass);
+Object dcfh =
dcfhClass.getDeclaredMethod("instance", Context.class).invoke(null, context);
+throw constr.newInstance(sym,
(Supplier) () -> {
+return diagFactory.create(log.currentSource(),
new SimpleDiagnosticPosition(0), DiagnosticInfo.of(DiagnosticType.ERROR,
"compiler", "cant.resolve", "package", "java.lang"));
+}, dcfh);
+} catch (ClassNotFoundException |
NoSuchMethodException | SecurityException | IllegalAccessException |
IllegalArgumentException | InvocationTargetException | InstantiationException
ex) {
+
Logger.getLogger(NBClassFinder.class.getName()).log(Level.FINE, null, ex);
+}
+}
+};
+}
+}
+return completer;
+}
+
}
diff --git
a/java/lib.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/NBClassFinderTest.java
b/java/lib.nbjavac/test/unit/src/org/netbeans/lib/
[netbeans] branch master updated: Fixing TreeUtilities.pathFor in the presence of the synthetic 'value=' in annotations.
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 30ea25a Fixing TreeUtilities.pathFor in the presence of the synthetic
'value=' in annotations.
30ea25a is described below
commit 30ea25a0860e3e1c06936e9ad0d1163a3fc13bf4
Author: Jan Lahoda
AuthorDate: Thu Oct 7 07:38:20 2021 +0200
Fixing TreeUtilities.pathFor in the presence of the synthetic 'value=' in
annotations.
---
.../netbeans/api/java/source/TreeUtilities.java| 7 +-
.../api/java/source/TreeUtilitiesTest.java | 27 ++
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git
a/java/java.source.base/src/org/netbeans/api/java/source/TreeUtilities.java
b/java/java.source.base/src/org/netbeans/api/java/source/TreeUtilities.java
index 5a20ee5..3316ce9 100644
--- a/java/java.source.base/src/org/netbeans/api/java/source/TreeUtilities.java
+++ b/java/java.source.base/src/org/netbeans/api/java/source/TreeUtilities.java
@@ -374,7 +374,12 @@ public final class TreeUtilities {
public Void scan(Tree tree, Void p) {
if (tree != null) {
-if
(sourcePositions.getStartPosition(getCurrentPath().getCompilationUnit(), tree)
< pos && sourcePositions.getEndPosition(getCurrentPath().getCompilationUnit(),
tree) >= pos) {
+long endPos =
sourcePositions.getEndPosition(getCurrentPath().getCompilationUnit(), tree);
+if (endPos == (-1) && tree.getKind() == Kind.ASSIGNMENT &&
getCurrentPath().getLeaf().getKind() == Kind.ANNOTATION) {
+ExpressionTree value = ((AssignmentTree)
tree).getExpression();
+endPos =
sourcePositions.getEndPosition(getCurrentPath().getCompilationUnit(), value);
+}
+if
(sourcePositions.getStartPosition(getCurrentPath().getCompilationUnit(), tree)
< pos && endPos >= pos) {
if (tree.getKind() == Tree.Kind.ERRONEOUS) {
tree.accept(this, p);
throw new Result(getCurrentPath());
diff --git
a/java/java.source.base/test/unit/src/org/netbeans/api/java/source/TreeUtilitiesTest.java
b/java/java.source.base/test/unit/src/org/netbeans/api/java/source/TreeUtilitiesTest.java
index c415776..83754eb 100644
---
a/java/java.source.base/test/unit/src/org/netbeans/api/java/source/TreeUtilitiesTest.java
+++
b/java/java.source.base/test/unit/src/org/netbeans/api/java/source/TreeUtilitiesTest.java
@@ -390,6 +390,33 @@ public class TreeUtilitiesTest extends NbTestCase {
assertFalse(Kind.METHOD == tp.getParentPath().getLeaf().getKind());
}
+public void testAnnotationSyntheticValue1() throws Exception {
+prepareTest("Test", "package test; @Meta(Test.VALUE) public class Test
{ public static final String VALUE = \"\"; } @interface Meta { public String
value(); }");
+
+TreePath tp = info.getTreeUtilities().pathFor(58 - 30);
+
+assertEquals(Kind.MEMBER_SELECT, tp.getLeaf().getKind());
+assertEquals("Test.VALUE", tp.getLeaf().toString());
+}
+
+public void testAnnotationSyntheticValue2() throws Exception {
+prepareTest("Test", "package test; @Meta(Test.VALUE) public class Test
{ public static final String VALUE = \"\"; } @interface Meta { public String[]
value(); }");
+
+TreePath tp = info.getTreeUtilities().pathFor(58 - 30);
+
+assertEquals(Kind.MEMBER_SELECT, tp.getLeaf().getKind());
+assertEquals("Test.VALUE", tp.getLeaf().toString());
+}
+
+public void testAnnotationSyntheticValue3() throws Exception {
+prepareTest("Test", "package test; @Meta({Test.VALUE}) public class
Test { public static final String VALUE = \"\"; } @interface Meta { public
String[] value(); }");
+
+TreePath tp = info.getTreeUtilities().pathFor(58 - 30);
+
+assertEquals(Kind.MEMBER_SELECT, tp.getLeaf().getKind());
+assertEquals("Test.VALUE", tp.getLeaf().toString());
+}
+
public void testAutoMapComments1() throws Exception {
prepareTest("Test", "package test;\n" +
"import java.io.File;\n" +
-
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 (3584df0 -> 18fabb5)
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 3584df0 Correction of layer location and thread filtering. add 18fabb5 Java code completion should show effectivelly final variables for use from anonymous classes. No new revisions were added by this update. Summary of changes: .../1.8/effectivellyFinal.pass | 4 + .../modules/java/completion/data/Final.java| 36 ++ .../JavaCompletionTask18FeaturesTest.java | 4 + .../lib/nbjavac/services/NBJavacTrees.java | 22 +++- .../lib/nbjavac/services/NBJavacTreesTest.java | 128 + 5 files changed, 193 insertions(+), 1 deletion(-) create mode 100644 java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/1.8/effectivellyFinal.pass create mode 100644 java/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Final.java create mode 100644 java/lib.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/NBJavacTreesTest.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
svn commit: r50230 - /dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.5-vc1/
Author: jlahoda Date: Sun Oct 3 06:45:42 2021 New Revision: 50230 Log: Staging release 12.5 of NetBeans standalone Java Hints. Added: dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.5-vc1/ dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.5-vc1/apache-netbeans-jackpot-12.5-bin.zip (with props) dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.5-vc1/apache-netbeans-jackpot-12.5-bin.zip.asc dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.5-vc1/apache-netbeans-jackpot-12.5-bin.zip.sha512 dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.5-vc1/apache-netbeans-jackpot-12.5.zip (with props) dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.5-vc1/apache-netbeans-jackpot-12.5.zip.asc dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.5-vc1/apache-netbeans-jackpot-12.5.zip.sha512 Added: dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.5-vc1/apache-netbeans-jackpot-12.5-bin.zip == Binary file - no diff available. Propchange: dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.5-vc1/apache-netbeans-jackpot-12.5-bin.zip -- svn:mime-type = application/octet-stream Added: dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.5-vc1/apache-netbeans-jackpot-12.5-bin.zip.asc == --- dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.5-vc1/apache-netbeans-jackpot-12.5-bin.zip.asc (added) +++ dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.5-vc1/apache-netbeans-jackpot-12.5-bin.zip.asc Sun Oct 3 06:45:42 2021 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE5reiA6oYSXqyUgKntMGUD+qTZPEFAmFZTuYACgkQtMGUD+qT +ZPGathAAwJzvcRyCI5NwKS2ln0lrb8xQR0rzc2hNSKsGKC0KIWkofY65LDWYX+6G +FWeTMurg07tDoEKxxiieurmkKS8mpnlQ+jgIXY/3gJjENHMs2q11bzmPOeLwn03J +AaRAJ0NlZwhS4qD9WoVAOw/o2nx9vQXfEAMTG/OR5ZNtzY0dDTx8Os3TyYmcjoCn +z9mejaVnDAEcwLRqYWurzf4j1p14qT77BcZKfXntxNhRmILLrhc/LIcQ/nGRoEk2 +ZK7j56ablM5VvrDXTRpf2bgm++VWqfeLnfK2Nxx5tM/ZlOqD85GqNwkJwz3xNrOY +VYp5YtS0c2+3mHpaSHQS7/jL4SNHP2GdpIX9UKYmpVAmpFoaZxeNRmJJFSkksOIh +i0ZACvwILTNRRFd5zoarSMXO1RGA56m35wEHU28VuygWMEaQbLlGhR4ihJJ7x/OY +cMQSsu+2INeHE9HAmr71FA9Ezu3qayATRD9yC7z3HX/xoLSfhE6EwKX5f9M2ENyZ ++B2oWAKHNL0LhWXxM0Gg05eRFCmADL2HAQ7sGqyJIixjozJN1wRodHk9w9v6doTJ +YlBFrDzZ3T5hKvRkz/wS2kGfwL/QWC2ZgXpSPJlf0K/xsyLfbQs5Nv8s9qIYoKja +Pz1xQkCyC4J4j+3t11XMDD/4qwbx59mpjVoce1m9IrqRnqKHvV0= +=pnPw +-END PGP SIGNATURE- Added: dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.5-vc1/apache-netbeans-jackpot-12.5-bin.zip.sha512 == --- dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.5-vc1/apache-netbeans-jackpot-12.5-bin.zip.sha512 (added) +++ dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.5-vc1/apache-netbeans-jackpot-12.5-bin.zip.sha512 Sun Oct 3 06:45:42 2021 @@ -0,0 +1 @@ +4905d2c044cd0251854046d042586ffb7ea092d09a495a8b605a640e9c4f45d45b7a60026af4a6ef9b26ffe054d676d8768d106d5e62b119ad9f9546f56c9551 ./apache-netbeans-jackpot-12.5-bin.zip Added: dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.5-vc1/apache-netbeans-jackpot-12.5.zip == Binary file - no diff available. Propchange: dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.5-vc1/apache-netbeans-jackpot-12.5.zip -- svn:mime-type = application/octet-stream Added: dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.5-vc1/apache-netbeans-jackpot-12.5.zip.asc == --- dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.5-vc1/apache-netbeans-jackpot-12.5.zip.asc (added) +++ dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.5-vc1/apache-netbeans-jackpot-12.5.zip.asc Sun Oct 3 06:45:42 2021 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE5reiA6oYSXqyUgKntMGUD+qTZPEFAmFZTswACgkQtMGUD+qT +ZPEEuw/+LMeqEVRmh8VbpeIjlcErelYnn82SU4Y3r8FyJb4OOwigcUASU8maDRfV +Wm+TgI22oj5uke8i5htSdzhQl+MT0PJWMW1cr1eVOI4maBIHECAbJvThYYVpS+MU +wV6ZyXQcu8LLkwXeMgHc4PJaS3gx51HNWX2NcvBNbwOEaYERoqHOrgHZwfIXAu19 +9oo/Fn6OKX7SM6/sRUlyiwyiwNDuMcdJM1qR53q8QZPhzRJbWeRulzMM1abB +LZRbtgOMklitZt3+seRrGarkhAF5BOFonhdfwQnRDrK283r0cCfEczS8QS3ax45n +img06OmJNmrwN1e+06nkQYwTxobEaXjgO36CJJ9GjiIuxWrk0vzNDsYS2h/olgRd +eZ4PXXcLRhycdShwq9UDAjsiwZQdIHWzc1DnTFOhDmwLCIGQR5x0PtMeJaVQ8Vzt ++/dIToNN4e70ITEwmvuNzVnKGy6GuKWJ4gm7nkgp57gUWl7sxCemVPpV0m7R3oR7 +oALEhNla36VND76gxnEnIPRHtMc8ANo8XsReyggPLd4im5lOZW4PT+DVYsJuch5H +fUPBsinR2NdrjWrhJTyLgNoY6fhhmFwhwL0DNkHvyx8FOvvCZDfdQ9hd1+vDA9xP +wEejCB51feKrQ0Dk3sNQxVtit7OR76dcpGC4KK6iSFQb6sXmrMk= +=qdku +-END PGP SIGNATURE- Added: dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.5-vc1/apache-netbeans-jackpot-12.5
[netbeans-jackpot30] tag netbeans-jackpot-12.5-vc1 created (now 0d8d8f8)
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a change to tag netbeans-jackpot-12.5-vc1 in repository https://gitbox.apache.org/repos/asf/netbeans-jackpot30.git. at 0d8d8f8 (commit) No new revisions were added by this update. - 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-jackpot30] branch master updated: Updating to release 12.5
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-jackpot30.git
The following commit(s) were added to refs/heads/master by this push:
new 0d8d8f8 Updating to release 12.5
0d8d8f8 is described below
commit 0d8d8f89dfb0bd8eb7fa77f708c87a14be5cec45
Author: Jan Lahoda
AuthorDate: Sun Sep 19 11:50:19 2021 +0200
Updating to release 12.5
---
.travis.yml| 5 +++--
cmdline/README.md | 4 ++--
cmdline/build.xml | 2 +-
cmdline/maven/pom.xml | 2 +-
.../org/netbeans/modules/jackpot30/maven/RunJackpot30Test.java | 2 +-
cmdline/tool/scripts/pom.xml | 2 +-
.../org/netbeans/modules/jackpot30/cmdline/ProcessorImpl.java | 10 +-
7 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 72b9493..9e0c2d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.
language: java
+dist: bionic
addons:
apt:
packages:
@@ -24,8 +25,8 @@ addons:
jdk:
- openjdk11
before_script:
- - wget
'https://archive.apache.org/dist/netbeans/netbeans/12.3/netbeans-12.3-bin.zip'
-O /tmp/netbeans-12.3-bin.zip
- - (cd $HOME; unzip /tmp/netbeans-12.3-bin.zip)
+ - wget
'https://www.apache.org/dist/netbeans/netbeans/12.5/netbeans-12.5-bin.zip' -O
/tmp/netbeans-12.5-bin.zip
+ - (cd $HOME; unzip /tmp/netbeans-12.5-bin.zip)
- unset _JAVA_OPTIONS
script:
- export JDK11=$JAVA_HOME
diff --git a/cmdline/README.md b/cmdline/README.md
index c439325..094ccf7 100644
--- a/cmdline/README.md
+++ b/cmdline/README.md
@@ -27,7 +27,7 @@ This tool allows to run NetBeans Java code checker without
the NetBeans IDE. Thi
To Build
-* Apache NetBeans 12.3
+* Apache NetBeans 12.5
* JDK 8 and JDK 11
* bash
* Apache ant 1.9.9 or above
@@ -42,7 +42,7 @@ This tool allows to run NetBeans Java code checker without
the NetBeans IDE. Thi
Build using:
```
-$ ant -DNETBEANS_PLATFORM= -DJDK11=
build-and-test
+$ ant -DNETBEANS_PLATFORM= -DJDK11=
build-and-test
```
The built product is in tool/build/jackpot.
diff --git a/cmdline/build.xml b/cmdline/build.xml
index 308eaab..f386b5e 100644
--- a/cmdline/build.xml
+++ b/cmdline/build.xml
@@ -52,7 +52,7 @@
-
+
diff --git a/cmdline/maven/pom.xml b/cmdline/maven/pom.xml
index 2526a0e..6c61c58 100644
--- a/cmdline/maven/pom.xml
+++ b/cmdline/maven/pom.xml
@@ -21,7 +21,7 @@
org.apache.netbeans.modules.jackpot30
jackpot30-maven-plugin
- 12.3
+ 12.5
maven-plugin
Jackpot 3.0 Command Line Tool Maven Bridge
diff --git
a/cmdline/maven/src/test/java/org/netbeans/modules/jackpot30/maven/RunJackpot30Test.java
b/cmdline/maven/src/test/java/org/netbeans/modules/jackpot30/maven/RunJackpot30Test.java
index de02a51..1e64e92 100644
---
a/cmdline/maven/src/test/java/org/netbeans/modules/jackpot30/maven/RunJackpot30Test.java
+++
b/cmdline/maven/src/test/java/org/netbeans/modules/jackpot30/maven/RunJackpot30Test.java
@@ -67,7 +67,7 @@ public class RunJackpot30Test extends TestCase {
Process p = Runtime.getRuntime().exec(new String[] {
maven,
-"-Djackpot.plugin.version=12.3",
+"-Djackpot.plugin.version=12.5",
"-q",
"jackpot30:analyze"
}, null, testDir);
diff --git a/cmdline/tool/scripts/pom.xml b/cmdline/tool/scripts/pom.xml
index 2bb3fb3..34488f6 100644
--- a/cmdline/tool/scripts/pom.xml
+++ b/cmdline/tool/scripts/pom.xml
@@ -21,7 +21,7 @@
org.apache.netbeans.modules.jackpot30
jackpot30-maven-plugin
- 12.3
+ 12.5
maven-plugin
Jackpot 3.0 Command Line Tool
diff --git
a/cmdline/tool/src/org/netbeans/modules/jackpot30/cmdline/ProcessorImpl.java
b/cmdline/tool/src/org/netbeans/modules/jackpot30/cmdline/ProcessorImpl.java
index 0826581..6082d4d 100644
--- a/cmdline/tool/src/org/netbeans/modules/jackpot30/cmdline/ProcessorImpl.java
+++ b/cmdline/tool/src/org/netbeans/modules/jackpot30/cmdline/ProcessorImpl.java
@@ -193,7 +193,15 @@ public class ProcessorImpl extends AbstractProcessor {
HintsSettings settings =
HintsSettings.createPreferencesBasedHintsSettings(ToolPreferences.from(settingsURI).getPreferences("hints",
"text/x-java"), true, null);
-final Map> allHints = RulesManager.getInstance().readHints(null,
Arrays.asList(bootCP, compileCP, sourceCP), new AtomicBoolean());
+final Map> allHints;
+java.io.PrintStream oldErr = System.err;
+try {
+//XXX: TreeUtilities.unenter prints exceptions to stderr
[netbeans] branch master updated: [NETBEANS-5775] Removing dependency on a removed Log constructor.
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 4333801 [NETBEANS-5775] Removing dependency on a removed Log
constructor.
4333801 is described below
commit 43338016d661b74317892298d88b0a32663adb05
Author: Jan Lahoda
AuthorDate: Thu Jun 17 07:46:17 2021 +0200
[NETBEANS-5775] Removing dependency on a removed Log constructor.
---
.../modules/java/source/parsing/JavacParser.java | 2 +-
java/lib.nbjavac/manifest.mf | 2 +-
.../org/netbeans/lib/nbjavac/services/NBLog.java | 22 +++---
.../netbeans/lib/nbjavac/services/NBAttrTest.java | 2 +-
.../lib/nbjavac/services/NBClassWriterTest.java| 4 ++--
5 files changed, 20 insertions(+), 12 deletions(-)
diff --git
a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/JavacParser.java
b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/JavacParser.java
index 6af9650..bc8ceca 100644
---
a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/JavacParser.java
+++
b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/JavacParser.java
@@ -988,7 +988,7 @@ public class JavacParser extends Parser {
Context context = new Context();
//need to preregister the Messages here, because the getTask below
requires Log instance:
-NBLog.preRegister(context, DEV_NULL, DEV_NULL, DEV_NULL);
+NBLog.preRegister(context, DEV_NULL);
JavacTaskImpl task = (JavacTaskImpl)JavacTool.create().getTask(null,
ClasspathInfoAccessor.getINSTANCE().createFileManager(cpInfo,
validatedSourceLevel.name),
diagnosticListener, options, files.iterator().hasNext() ? null
: Arrays.asList("java.lang.Object"), files,
diff --git a/java/lib.nbjavac/manifest.mf b/java/lib.nbjavac/manifest.mf
index 2138359..e49ef4e 100644
--- a/java/lib.nbjavac/manifest.mf
+++ b/java/lib.nbjavac/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.lib.nbjavac
-OpenIDE-Module-Implementation-Version: 3
+OpenIDE-Module-Implementation-Version: 4
OpenIDE-Module-Localizing-Bundle: org/netbeans/lib/nbjavac/Bundle.properties
diff --git a/java/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBLog.java
b/java/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBLog.java
index 20c88a5..ccc442c 100644
--- a/java/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBLog.java
+++ b/java/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBLog.java
@@ -49,10 +49,8 @@ public final class NBLog extends Log {
private NBLog(
final Context context,
-final PrintWriter errWriter,
-final PrintWriter warnWriter,
-final PrintWriter noticeWriter) {
-super(context, errWriter, warnWriter, noticeWriter);
+final PrintWriter output) {
+super(context, output);
}
public static NBLog instance(Context context) {
@@ -72,9 +70,19 @@ public final class NBLog extends Log {
public Log make(Context c) {
return new NBLog(
c,
-errWriter,
-warnWriter,
-noticeWriter);
+errWriter);
+}
+});
+}
+
+public static void preRegister(Context context,
+ final PrintWriter output) {
+context.put(logKey, new Context.Factory() {
+@Override
+public Log make(Context c) {
+return new NBLog(
+c,
+output);
}
});
}
diff --git
a/java/lib.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/NBAttrTest.java
b/java/lib.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/NBAttrTest.java
index 5891631..c374ef0 100644
---
a/java/lib.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/NBAttrTest.java
+++
b/java/lib.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/NBAttrTest.java
@@ -130,7 +130,7 @@ public class NBAttrTest extends NbTestCase {
std.setLocation(StandardLocation.CLASS_OUTPUT,
Collections.singleton(workingDir));
Context context = new Context();
-NBLog.preRegister(context, DEV_NULL, DEV_NULL, DEV_NULL);
+NBLog.preRegister(context, DEV_NULL);
NBAttr.preRegister(context);
final JavacTaskImpl ct = (JavacTaskImpl)
((JavacTool)tool).getTask(null, std, null, Arrays.asList("-source", "1.8",
"-target", "1.8"), null, Arrays.asList(new MyFileObject(code)), context);
diff --git
a/java/lib.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/NBClassWriterTest.java
b/java/lib.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/NB
[netbeans] branch master updated (e12dbc0 -> 7d9a276)
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from e12dbc0 Checking nullness of the the right variables add 7d9a276 Fixing selected tests and behavior on JDK 17. No new revisions were added by this update. Summary of changes: apisupport/apisupport.ant/nbproject/project.xml| 4 + .../modules/apisupport/project/EvaluatorTest.java | 3 +- .../project/queries/ClassPathProviderImplTest.java | 4 +- .../apisupport/hints/UseNbBundleMessagesTest.java | 60 --- groovy/groovy.editor/nbproject/project.xml | 12 ++- .../modules/groovy/editor/test/GroovyTestBase.java | 22 +--- .../netbeans/modules/classfile/ModuleTarget.java | 34 +++--- .../org/netbeans/modules/classfile/ModuleTest.java | 9 +- java/debugger.jpda.projects/nbproject/project.xml | 4 + .../jpda/projects/CodeSnippetCompiler.java | 1 + .../debugger/jpda/projects/IntroduceClass.java | 10 +- .../jpda/projects/CodeSnippetCompilerTest.java | 40 --- .../JavaCompletionTaskTest/17/javaUtilContent.pass | 116 + .../base/javadoc/JavadocCompletionUtils.java | 21 +++- .../base/semantic/SemanticHighlighterBase.java | 6 -- .../java/editor/base/semantic/Utilities.java | 5 + .../java/editor/base/semantic/DetectorTest.java| 4 +- .../editor/javadoc/JavadocCompletionQuery.java | 45 +--- .../codegen/EqualsHashCodeGeneratorTest.java | 3 +- .../java/editor/codegen/ToStringGeneratorTest.java | 3 +- .../editor/javadoc/JavadocCompletionQueryTest.java | 2 +- java/java.hints/nbproject/project.properties | 1 + .../testTestUnicodeError.pass | 3 +- .../modules/java/hints/errors/ExtraCatchTest.java | 6 +- .../infrastructure/ErrorHintsProviderTest.java | 10 +- .../platformdefinition/DefaultPlatformImpl.java| 14 ++- .../java/j2seplatform/platformdefinition/Util.java | 6 +- java/java.navigation/nbproject/project.xml | 4 + .../java/navigation/BreadCrumbsNodeImplTest.java | 24 ++--- .../api/java/platform/JavaPlatformManagerTest.java | 5 +- .../modules/java/source/JavaSourceUtilImpl.java| 21 +++- .../netbeans/modules/java/source/ModuleNames.java | 13 +-- .../netbeans/modules/java/source/TreeShims.java| 21 +++- .../java/source/indexing/VanillaCompileWorker.java | 13 ++- .../modules/java/source/matching/CopyFinder.java | 5 +- .../modules/java/source/save/CasualDiff.java | 47 ++--- .../source/transform/ImmutableTreeTranslator.java | 2 +- .../java/source/transform/TreeDuplicator.java | 2 +- .../modules/java/source/transform/TreeHelpers.java | 41 .../java/source/usages/SourceAnalyzerFactory.java | 2 + .../org/netbeans/api/java/source/ElementsTest.java | 1 + .../netbeans/api/java/source/JavaSourceTest.java | 5 + .../api/java/source/TreePathHandleTest.java| 3 +- .../api/java/source/gen/FieldGroupTest.java| 2 + .../netbeans/api/java/source/gen/LabelsTest.java | 14 +-- .../api/java/source/gen/ModuleInfoTest.java| 66 .../api/java/source/gen/TreeManipulationTest.java | 2 +- .../modules/java/source/BootClassPathUtil.java | 15 +++ .../java/source/JavaSourceUtilImplTest.java| 23 .../java/source/parsing/JavacParserTest.java | 6 ++ .../modules/java/source/save/FormatingTest.java| 20 ++-- java/java.source.queriesimpl/nbproject/project.xml | 9 ++ .../source/queriesimpl/JavaOperationsImpl.java | 6 ++ .../source/queriesimpl/JavaOperationsImplTest.java | 3 +- java/java.source/nbproject/project.xml | 16 +-- .../org/netbeans/api/java/source/UiUtilsTest.java | 22 +--- .../LookupBasedJavaSourceTaskFactoryTest.java | 4 +- .../modules/java/classfile/CodeGeneratorTest.java | 10 +- .../lib/nbjavac/services/NBClassWriterTest.java| 6 +- .../maven/classpath/ClassPathProviderImplTest.java | 8 ++ .../java/plugins/RenameTransformer.java| 4 + .../modules/java/hints/spiimpl/UtilitiesTest.java | 22 ++-- .../spi/java/hints/JavaFixUtilitiesTest.java | 11 +- .../o.n.bootstrap/src/org/netbeans/Module.java | 16 ++- .../util/test/AnnotationProcessorTestUtils.java| 2 +- 65 files changed, 649 insertions(+), 295 deletions(-) create mode 100644 java/java.completion/test/unit/data/goldenfiles/org/netbeans/modules/java/completion/JavaCompletionTaskTest/17/javaUtilContent.pass create mode 100644 java/java.source.base/src/org/netbeans/modules/java/source/transform/TreeHelpers.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
[netbeans] branch master updated: Improving reparsing for errors - not sending updates when the code has already changed.
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 02c6c65 Improving reparsing for errors - not sending updates when the
code has already changed.
02c6c65 is described below
commit 02c6c65cb118f083d85ac3d91627303db1fd
Author: Jan Lahoda
AuthorDate: Mon Jun 7 06:10:03 2021 +0200
Improving reparsing for errors - not sending updates when the code has
already changed.
---
.../server/protocol/TextDocumentServiceImpl.java | 156 +++--
.../java/lsp/server/protocol/ServerTest.java | 54 ++-
2 files changed, 167 insertions(+), 43 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 6c62e25..d425b46 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
@@ -46,14 +46,17 @@ import java.util.EnumMap;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.BiConsumer;
+import java.util.function.Consumer;
import java.util.function.IntFunction;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -66,6 +69,8 @@ import javax.lang.model.element.TypeElement;
import javax.lang.model.type.DeclaredType;
import javax.lang.model.type.TypeKind;
import javax.lang.model.type.TypeMirror;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import javax.swing.text.StyledDocument;
@@ -131,6 +136,9 @@ import org.eclipse.lsp4j.services.LanguageClient;
import org.eclipse.lsp4j.services.LanguageClientAware;
import org.eclipse.lsp4j.services.TextDocumentService;
import org.netbeans.api.annotations.common.CheckForNull;
+import org.netbeans.api.editor.EditorUtilities;
+import org.netbeans.api.editor.document.LineDocument;
+import org.netbeans.api.editor.document.LineDocumentUtils;
import org.netbeans.api.java.lexer.JavaTokenId;
import org.netbeans.api.java.project.JavaProjectConstants;
import org.netbeans.api.java.source.CompilationController;
@@ -153,6 +161,7 @@ import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectUtils;
import org.netbeans.api.project.SourceGroup;
import org.netbeans.api.project.Sources;
+import org.netbeans.editor.DocumentUtilities;
import org.netbeans.modules.editor.java.GoToSupport;
import org.netbeans.modules.editor.java.GoToSupport.GoToTarget;
import
org.netbeans.modules.gsf.testrunner.ui.api.TestMethodController.TestMethod;
@@ -247,7 +256,7 @@ public class TextDocumentServiceImpl implements
TextDocumentService, LanguageCli
Set documents = new HashSet<>(openedDocuments.keySet());
for (String doc : documents) {
-runDiagnoticTasks(doc);
+runDiagnosticTasks(doc);
}
}
@@ -1356,7 +1365,7 @@ public class TextDocumentServiceImpl implements
TextDocumentService, LanguageCli
// attempt to open the directly owning project, delay diagnostics
after project open:
server.asyncOpenFileOwner(file).thenRun(() ->
-runDiagnoticTasks(params.getTextDocument().getUri())
+runDiagnosticTasks(params.getTextDocument().getUri())
);
} catch (IOException ex) {
throw new IllegalStateException(ex);
@@ -1384,7 +1393,7 @@ public class TextDocumentServiceImpl implements
TextDocumentService, LanguageCli
}
});
}
-runDiagnoticTasks(params.getTextDocument().getUri());
+runDiagnosticTasks(params.getTextDocument().getUri());
reportNotificationDone("didChange", params);
}
@@ -1511,41 +1520,101 @@ public class TextDocumentServiceImpl implements
TextDocumentService, LanguageCli
return CompletableFuture.completedFuture(location);
}
-private void runDiagnoticTasks(String uri) {
+private void runDiagnosticTasks(String uri) {
if (server.openedProjects().getNow(null) == null) {
return;
}
-//XXX: cancelling/deferring the tasks!
diagnosticTasks.computeIfAbsent(uri, u -> {
return B
svn commit: r46987 - in /release/netbeans/netbeans-jackpot: netbeans-jackpot-11.1/ netbeans-jackpot-12.3/
Author: jlahoda Date: Sun Apr 11 19:39:34 2021 New Revision: 46987 Log: Apache NetBeans Java Hints 12.3 vote has been approved. Added: release/netbeans/netbeans-jackpot/netbeans-jackpot-12.3/ - copied from r46781, dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc2/ Removed: release/netbeans/netbeans-jackpot/netbeans-jackpot-11.1/ - 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
svn commit: r46984 - /dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc2/
Author: jlahoda Date: Sun Apr 11 17:41:19 2021 New Revision: 46984 Log: Apache NetBeans Java Hints 12.3 vote has been approved. Removed: dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc2/ - 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-jackpot30] tag netbeans-jackpot-12.3-vc2 created (now c405850)
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a change to tag netbeans-jackpot-12.3-vc2 in repository https://gitbox.apache.org/repos/asf/netbeans-jackpot30.git. at c405850 (commit) No new revisions were added by this update. - 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
svn commit: r46781 - in /dev/netbeans/netbeans-jackpot: netbeans-jackpot-12.3-vc1/ netbeans-jackpot-12.3-vc2/
Author: jlahoda Date: Mon Mar 29 05:30:34 2021 New Revision: 46781 Log: Staging VC2 of Java hints release 12.3 Added: dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc2/ dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc2/apache-netbeans-jackpot-12.3-bin.zip (with props) dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc2/apache-netbeans-jackpot-12.3-bin.zip.asc dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc2/apache-netbeans-jackpot-12.3-bin.zip.sha512 dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc2/apache-netbeans-jackpot-12.3.zip (with props) dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc2/apache-netbeans-jackpot-12.3.zip.asc dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc2/apache-netbeans-jackpot-12.3.zip.sha512 Removed: dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc1/ Added: dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc2/apache-netbeans-jackpot-12.3-bin.zip == Binary file - no diff available. Propchange: dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc2/apache-netbeans-jackpot-12.3-bin.zip -- svn:mime-type = application/octet-stream Added: dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc2/apache-netbeans-jackpot-12.3-bin.zip.asc == --- dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc2/apache-netbeans-jackpot-12.3-bin.zip.asc (added) +++ dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc2/apache-netbeans-jackpot-12.3-bin.zip.asc Mon Mar 29 05:30:34 2021 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE5reiA6oYSXqyUgKntMGUD+qTZPEFAmBhZXYACgkQtMGUD+qT +ZPGAXBAAxFJd/ZP6JSp07n3GjG/cY/F8lcPTUUPgqI5iSsLvKmHOTusramJHUOYL +2qk5ncLA+QLQ9MWI/RjA9/eQ0j5wfxocmD6XsjodL0zsVl8GlaAfqYgHjDBqj537 +zw4luFvqyRFrvFpYiieu+YxAdFLLSEuNJpiblK+AfweLW21wRe1hMiAXZ1OWsYG6 +rsI73kUj5svcnTJl+doF2MhM+gqsigAPqCpOnkukdGFVDJZcUO2mXlOxhi9/LQLw +vzR9Tx79X3icSIz4vLr7gy0MxiBgNkXqYELWcMiFgAQxL0upL87qX8dKsOIrBoSY +MDqlslEuu+JHJ64cEh322wpEwR6l7xQS6dFQg9bNzSC2Fkmy8VAsz7lfc/prvjvw +WheDHe1AoETZYoEHq+HY+MpWzpThmrJT2BzbUlgYs4Ld+0yNRw8jdLypbizZgDkf +eRey2YgBoxJI46AHJcr2siQJzJhpSz+mDFGyaldn8sbPsMfUwshnUe3gmU0UXm9I +OUiJrNwih5jYP9Y0zjfmZaL1Vbgcq/MElTJ2nDyZ2m4jt1nnC+sp0/MEcHkTdNr3 +0wHqGEt0n1KMj2kdRjhvfPV16n8Gol46Nly4xIsfmijPLxK52Ep5TwP5o6BF074d +4zvaxiYage7xYQ+0Z4+XeGXbyR5ICquFelSP3kdoC/dDUSPOzpY= +=vbnm +-END PGP SIGNATURE- Added: dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc2/apache-netbeans-jackpot-12.3-bin.zip.sha512 == --- dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc2/apache-netbeans-jackpot-12.3-bin.zip.sha512 (added) +++ dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc2/apache-netbeans-jackpot-12.3-bin.zip.sha512 Mon Mar 29 05:30:34 2021 @@ -0,0 +1 @@ +6dd7ca2f901d2a1c07d909fb51dc506d407413a0fc6f0ab514f17ce6dc12ae9e5daad51fb4e986e89c840f30bf9dcc39966b938d567ec8a64f2166ea8bbf7e1f apache-netbeans-jackpot-12.3-bin.zip Added: dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc2/apache-netbeans-jackpot-12.3.zip == Binary file - no diff available. Propchange: dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc2/apache-netbeans-jackpot-12.3.zip -- svn:mime-type = application/octet-stream Added: dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc2/apache-netbeans-jackpot-12.3.zip.asc == --- dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc2/apache-netbeans-jackpot-12.3.zip.asc (added) +++ dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc2/apache-netbeans-jackpot-12.3.zip.asc Mon Mar 29 05:30:34 2021 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE5reiA6oYSXqyUgKntMGUD+qTZPEFAmBhZXYACgkQtMGUD+qT +ZPHyEA/8C65DhN5F/95GpO67vOsWtGZWuM1D1iZYI1ZY69v+V9o8Ijxe5oYHluaw +yEPVm/48a7ujICEk/hpxG4bCGy6GyApo3bxpvVCZ0paoDon4AVtrifxkJkS0idtD +80U+bHNsEKFXDQRc7itJbngr11xT1QqvJ4iXLhoeNhU9BnM4zyeIr9wPaLtMB1zI +Z2ix8bF7s+xpUPfaacuOtY4/mH3Pv3/mmcH5ZF6bCvHO4COyqc8mpJdaz5AclM6f +12z4yokLmLrPJqltnURRys1YZOrz8FuJMlYP/A1Q0aSkkRen/CyoFe/6IdIl62XJ +Aze0GulzG6qu9s9MTznoj7+8Cdt7DZXHtQf4CJytan+3LYoirTLQRy/7mmxeXGyT +0LQFe7oW/Zli+53fxYVfnfUJh5mHES8g1FL7QI6ns18uVWDcUzF8DGUHARdv1FQQ +CW5gjuH/UrwMsFRjWw7vJlkYpHgniZ4tp0jx64CU4VB171JZ+5oCwrwNt7JSbBgu +8ggiyKSCT8D94KEWYx8yQTqSDMM+WEG/Ce4Ho+Gk3c387oSd2BOg66gMJCG5S8Uj +O8ripWDPF1bEuNoEml8sC3rabll16FFLkOiCNUZcgp+mMnGM5Z0BXn3q5dOUxv/c +LFCdmHxkCSwS793/ldKsQiRYjmg0kSPU/RuHw3jaXhWXB0ssYqI= +=5Zjr +-END PGP SIGNATURE- Added: dev/netbeans/netbeans-jackpot/netbeans
[netbeans] branch master updated (c4e6302 -> 46c1794)
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from c4e6302 [GR-28352] Java: Compile Workspace compiles more than workspace. (#2734) add 46c1794 Compile on Save support for vanilla javac. No new revisions were added by this update. Summary of changes: .../java/source/indexing/VanillaCompileWorker.java | 345 +- .../source/usages/BuildArtifactMapperImpl.java |2 +- .../source/indexing/VanillaCompileWorkerTest.java | 1218 +++- 3 files changed, 1510 insertions(+), 55 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-jackpot30] tag netbeans-jackpot-12.3-vc1 created (now c405850)
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a change to tag netbeans-jackpot-12.3-vc1 in repository https://gitbox.apache.org/repos/asf/netbeans-jackpot30.git. at c405850 (commit) No new revisions were added by this update. - 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
svn commit: r46620 - in /dev/netbeans/netbeans-jackpot: ./ netbeans-jackpot-12.3-vc1/
Author: jlahoda Date: Sun Mar 14 12:49:00 2021 New Revision: 46620 Log: Adding VC1 for standalone Java Hints tool 12.3 Added: dev/netbeans/netbeans-jackpot/ dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc1/ dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc1/apache-netbeans-jackpot-12.3-bin.zip (with props) dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc1/apache-netbeans-jackpot-12.3-bin.zip.asc dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc1/apache-netbeans-jackpot-12.3-bin.zip.sha512 dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc1/apache-netbeans-jackpot-12.3.zip (with props) dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc1/apache-netbeans-jackpot-12.3.zip.asc dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc1/apache-netbeans-jackpot-12.3.zip.sha512 Added: dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc1/apache-netbeans-jackpot-12.3-bin.zip == Binary file - no diff available. Propchange: dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc1/apache-netbeans-jackpot-12.3-bin.zip -- svn:mime-type = application/octet-stream Added: dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc1/apache-netbeans-jackpot-12.3-bin.zip.asc == --- dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc1/apache-netbeans-jackpot-12.3-bin.zip.asc (added) +++ dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc1/apache-netbeans-jackpot-12.3-bin.zip.asc Sun Mar 14 12:49:00 2021 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- + +iQJHBAABCgAxFiEE5reiA6oYSXqyUgKntMGUD+qTZPEFAmBOA1ETHGpsYWhvZGFA +YXBhY2hlLm9yZwAKCRC0wZQP6pNk8VnYEADDWPhTT5TlEx72bQbv0naVRcx0R++/ +eQ/3tA/AWV/TvrE8Ik6HYYlzEdEfRl7zv7+cczWTD0n4mbaQDIV2PXB7OC/wNa/8 +JjGqCGpAov9TVzALyPIZvRqcWOxESGIYspHF91sAuRSq1Rnfcn7+lzqMVzFX2BhE +zojp9vszZtjoN+UOylMjf7ZyiC8ifBWey7S5GZ9zBcJX0wmfOPeoIEfLdgP7zAJd +Q7h3o48N6pGBkzBWzH8vrJFyTcBj9Rj33q+4/tpAfejibebJUDfVzNbADiB+bUAo +oFYYZnty4o4uJfz/YyJ0G9HubGRXDdpJAK8Mi4PkwsZULlQboBk0QWbNHrHRzIM8 +2b1bfbExsGDKlldJA0+150hDJyJ0g+q0QnLonmrCT1gpwyzd5ieVWGqfIeNasHS2 +cm4uqfM7UbsK2q4FqMPjyk6t28mMm1fh/v/8SFo40/BoXJmljGI58t7jmUevhJoA +WyEJSFN3NGeAXydoTz2jYjnDPLHf9iIASqyr12IjXW58JHs4KNrxqMeVPllW1hCZ +QOIwYEmtORK2sL09GXmPuzCyw5/hi4SmEYlr8I2wj5Z8enLId7be6Y89LZ0/yZqF +rst6JUk/CZF2gaUfMEhdCJtl+IU9zh8SHbZ1ED4CHxV+5PVAhxMz64E+3uUQOPZU +bjjpjwtWyfKH5A== +=2qUn +-END PGP SIGNATURE- Added: dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc1/apache-netbeans-jackpot-12.3-bin.zip.sha512 == --- dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc1/apache-netbeans-jackpot-12.3-bin.zip.sha512 (added) +++ dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc1/apache-netbeans-jackpot-12.3-bin.zip.sha512 Sun Mar 14 12:49:00 2021 @@ -0,0 +1 @@ +de3ab8282083a86cbb4eb6c1720839656de7478697800e8132e9193ef15ab467217ab41dade993558938b350f543ff4df968e2513bb0c59095269a97f75ab76c apache-netbeans-jackpot-12.3-bin.zip Added: dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc1/apache-netbeans-jackpot-12.3.zip == Binary file - no diff available. Propchange: dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc1/apache-netbeans-jackpot-12.3.zip -- svn:mime-type = application/octet-stream Added: dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc1/apache-netbeans-jackpot-12.3.zip.asc == --- dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc1/apache-netbeans-jackpot-12.3.zip.asc (added) +++ dev/netbeans/netbeans-jackpot/netbeans-jackpot-12.3-vc1/apache-netbeans-jackpot-12.3.zip.asc Sun Mar 14 12:49:00 2021 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- + +iQJHBAABCgAxFiEE5reiA6oYSXqyUgKntMGUD+qTZPEFAmBOA1ETHGpsYWhvZGFA +YXBhY2hlLm9yZwAKCRC0wZQP6pNk8XoVD/9cSSSvYR21M0NgOVfRmsDVCB1f4ivt +Cs/V16QGr/G5LRvcY34f7+8jGtWkR0t4lXEIZyhUBTl7MXGHVhqe9XR/tS2BBSAK ++KNIy9LxO3tSmFrE5sgcIYz7df9Di30DyJA2Fw4DrrmNnFkzGjoGJz7QsiLcMGiO +VhgYc8ppz4F5gIWZQLGiz0ktMlD7QMAmmCliRjft4UgwetXBV9pG2CeVQFzUmUm9 +uizp3DBFOhYIHEjPwwVjYDW1jXa6xEM4I3lIrX1a0zAn+ViDiAgTHSM79pKfE95D +EARopdaevSIS78IIq1pQhTrRbA9losT9W039uMLheVZ5Knr8gdzIpp4UhYckAMHh +fFGHU7VhrWpKOBj6v6HdBc8yzeM4SqR7VH09l0yiidSQeY/Sx/jVMXTywyCap6RN +ixWix0CX/0nzUWs5XnsNatUIxSv/bVwFzVAtrpzENsXEIRDwc1STMTuTzuv3s1s/ +ZSgroAp7tj82HplH+Rdurnh8fD4I/vSLA0RRuOhIAFnDYfCvo/w0AQNblDYTA2XQ +XD8Q8isPwbkW3Jt+tH+mTQT+IMH8HZNXdh/NvcpI1oM+EtIBbwrQuDttqWk+fRZY +0/8mEluOQCzMSAp23Wps/mFskbKyXE/XMevPhGj5B8XyYfB0BsZRPFz42VslWlqy +0ccxLpoQaBbg1Q== +=e+fB +-END PGP SIGNATURE- Added: dev
[netbeans-jackpot30] branch master updated: Updating years in notice files.
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-jackpot30.git The following commit(s) were added to refs/heads/master by this push: new c405850 Updating years in notice files. c405850 is described below commit c40585071abebe384ec587e89f4a9357ef433aef Author: Jan Lahoda AuthorDate: Sun Mar 14 08:26:41 2021 +0100 Updating years in notice files. --- NOTICE | 2 +- cmdline/tool/scripts/NOTICE-bin-tool.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NOTICE b/NOTICE index c2055df..c5a2e19 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache NetBeans Jackpot 3.0 -Copyright 2017-2019 The Apache Software Foundation +Copyright 2017-2021 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/cmdline/tool/scripts/NOTICE-bin-tool.txt b/cmdline/tool/scripts/NOTICE-bin-tool.txt index 5435951..0ddc56a 100644 --- a/cmdline/tool/scripts/NOTICE-bin-tool.txt +++ b/cmdline/tool/scripts/NOTICE-bin-tool.txt @@ -1,5 +1,5 @@ Apache NetBeans Jackpot 3.0 -Copyright 2017-2018 The Apache Software Foundation +Copyright 2017-2021 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). @@ -9,7 +9,7 @@ and 1997-2015 Sun Microsystems, Inc. that has been kindly donated to the Apache Software Foundation. Apache NetBeans -Copyright 2017-2018 The Apache Software Foundation +Copyright 2017-2021 The Apache Software Foundation The code is based on NetBeans, that has been kindly donated to the Apache Software Foundation by Oracle. - 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-jackpot30] branch master updated: Updating version to 12.3
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-jackpot30.git
The following commit(s) were added to refs/heads/master by this push:
new 4d254f1 Updating version to 12.3
4d254f1 is described below
commit 4d254f1acb88b1e613d71b414e11bb9c34d8f208
Author: Jan Lahoda
AuthorDate: Tue Mar 9 23:54:46 2021 +0100
Updating version to 12.3
---
.travis.yml | 4 ++--
cmdline/README.md | 4 ++--
cmdline/build.xml | 2 +-
cmdline/maven/pom.xml | 2 +-
.../java/org/netbeans/modules/jackpot30/maven/RunJackpot30Test.java | 2 +-
cmdline/tool/scripts/pom.xml | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index e46bd23..72b9493 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,8 +24,8 @@ addons:
jdk:
- openjdk11
before_script:
- - wget
'https://archive.apache.org/dist/netbeans/netbeans/12.2/netbeans-12.2-bin.zip'
-O /tmp/netbeans-12.2-bin.zip
- - (cd $HOME; unzip /tmp/netbeans-12.2-bin.zip)
+ - wget
'https://archive.apache.org/dist/netbeans/netbeans/12.3/netbeans-12.3-bin.zip'
-O /tmp/netbeans-12.3-bin.zip
+ - (cd $HOME; unzip /tmp/netbeans-12.3-bin.zip)
- unset _JAVA_OPTIONS
script:
- export JDK11=$JAVA_HOME
diff --git a/cmdline/README.md b/cmdline/README.md
index c5ede07..c439325 100644
--- a/cmdline/README.md
+++ b/cmdline/README.md
@@ -27,7 +27,7 @@ This tool allows to run NetBeans Java code checker without
the NetBeans IDE. Thi
To Build
-* Apache NetBeans 12.2
+* Apache NetBeans 12.3
* JDK 8 and JDK 11
* bash
* Apache ant 1.9.9 or above
@@ -42,7 +42,7 @@ This tool allows to run NetBeans Java code checker without
the NetBeans IDE. Thi
Build using:
```
-$ ant -DNETBEANS_PLATFORM= -DJDK11=
build-and-test
+$ ant -DNETBEANS_PLATFORM= -DJDK11=
build-and-test
```
The built product is in tool/build/jackpot.
diff --git a/cmdline/build.xml b/cmdline/build.xml
index 40d1a45..308eaab 100644
--- a/cmdline/build.xml
+++ b/cmdline/build.xml
@@ -52,7 +52,7 @@
-
+
diff --git a/cmdline/maven/pom.xml b/cmdline/maven/pom.xml
index eaba73f..2526a0e 100644
--- a/cmdline/maven/pom.xml
+++ b/cmdline/maven/pom.xml
@@ -21,7 +21,7 @@
org.apache.netbeans.modules.jackpot30
jackpot30-maven-plugin
- 12.2
+ 12.3
maven-plugin
Jackpot 3.0 Command Line Tool Maven Bridge
diff --git
a/cmdline/maven/src/test/java/org/netbeans/modules/jackpot30/maven/RunJackpot30Test.java
b/cmdline/maven/src/test/java/org/netbeans/modules/jackpot30/maven/RunJackpot30Test.java
index 415ab66..de02a51 100644
---
a/cmdline/maven/src/test/java/org/netbeans/modules/jackpot30/maven/RunJackpot30Test.java
+++
b/cmdline/maven/src/test/java/org/netbeans/modules/jackpot30/maven/RunJackpot30Test.java
@@ -67,7 +67,7 @@ public class RunJackpot30Test extends TestCase {
Process p = Runtime.getRuntime().exec(new String[] {
maven,
-"-Djackpot.plugin.version=12.2",
+"-Djackpot.plugin.version=12.3",
"-q",
"jackpot30:analyze"
}, null, testDir);
diff --git a/cmdline/tool/scripts/pom.xml b/cmdline/tool/scripts/pom.xml
index d5a14f7..2bb3fb3 100644
--- a/cmdline/tool/scripts/pom.xml
+++ b/cmdline/tool/scripts/pom.xml
@@ -21,7 +21,7 @@
org.apache.netbeans.modules.jackpot30
jackpot30-maven-plugin
- 12.2
+ 12.3
maven-plugin
Jackpot 3.0 Command Line Tool
-
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 (e7e63e5 -> 8bb724b)
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from e7e63e5 Merge pull request #2789 from matthiasblaesing/netbeans-5380 add 8bb724b Enabling partial reparse; improvements and detection of mistakes. No new revisions were added by this update. Summary of changes: .../java/editor/overridden/ComputeAnnotations.java | 2 +- .../netbeans/api/java/source/CompilationInfo.java | 4 + .../java/source/CompilationInfoAccessor.java | 2 + .../java/source/parsing/CompilationInfoImpl.java | 17 +- .../modules/java/source/parsing/JavacParser.java | 107 +++- .../source/parsing/VanillaPartialReparser.java | 193 - .../java/source/parsing/PartialReparseTest.java| 13 ++ 7 files changed, 248 insertions(+), 90 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-jackpot30] branch master updated: Preparing a possible 12.2 release, and improving compatibility with JDK 16
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-jackpot30.git
The following commit(s) were added to refs/heads/master by this push:
new e84bb49 Preparing a possible 12.2 release, and improving
compatibility with JDK 16
e84bb49 is described below
commit e84bb49e63957c9a654336a9d8621bd29c3ebeca
Author: Jan Lahoda
AuthorDate: Mon Feb 8 22:21:56 2021 +0100
Preparing a possible 12.2 release, and improving compatibility with JDK 16
---
.travis.yml| 4 +--
cmdline/README.md | 4 +--
cmdline/build.xml | 2 +-
cmdline/lib/nbproject/project.properties | 1 +
.../modules/jackpot30/cmdline/lib/Utils.java | 32 ++
cmdline/maven/pom.xml | 2 +-
.../modules/jackpot30/maven/RunJackpot30Test.java | 2 +-
.../maven/tests/sl-17/src/main/java/test/App.java | 1 +
.../maven/tests/sl-18/src/main/java/test/App.java | 1 +
cmdline/tool/scripts/pom.xml | 2 +-
.../netbeans/modules/jackpot30/cmdline/Main.java | 12 +++-
.../modules/jackpot30/cmdline/ProcessorImpl.java | 13 -
.../jackpot30/cmdline/CreateToolProcessorTest.java | 7 -
.../modules/jackpot30/cmdline/MainTest.java| 19 ++---
.../jackpot30/cmdline/ProcessorImplTest.java | 16 +--
15 files changed, 81 insertions(+), 37 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 32d137f..e46bd23 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,8 +24,8 @@ addons:
jdk:
- openjdk11
before_script:
- - wget
'https://archive.apache.org/dist/netbeans/netbeans/11.3/netbeans-11.3-bin.zip'
-O /tmp/netbeans-11.3-bin.zip
- - (cd $HOME; unzip /tmp/netbeans-11.3-bin.zip)
+ - wget
'https://archive.apache.org/dist/netbeans/netbeans/12.2/netbeans-12.2-bin.zip'
-O /tmp/netbeans-12.2-bin.zip
+ - (cd $HOME; unzip /tmp/netbeans-12.2-bin.zip)
- unset _JAVA_OPTIONS
script:
- export JDK11=$JAVA_HOME
diff --git a/cmdline/README.md b/cmdline/README.md
index 146db79..c5ede07 100644
--- a/cmdline/README.md
+++ b/cmdline/README.md
@@ -27,7 +27,7 @@ This tool allows to run NetBeans Java code checker without
the NetBeans IDE. Thi
To Build
-* Apache NetBeans 12.0
+* Apache NetBeans 12.2
* JDK 8 and JDK 11
* bash
* Apache ant 1.9.9 or above
@@ -42,7 +42,7 @@ This tool allows to run NetBeans Java code checker without
the NetBeans IDE. Thi
Build using:
```
-$ ant -DNETBEANS_PLATFORM= -DJDK11=
build-and-test
+$ ant -DNETBEANS_PLATFORM= -DJDK11=
build-and-test
```
The built product is in tool/build/jackpot.
diff --git a/cmdline/build.xml b/cmdline/build.xml
index 6358c97..40d1a45 100644
--- a/cmdline/build.xml
+++ b/cmdline/build.xml
@@ -52,7 +52,7 @@
-
+
diff --git a/cmdline/lib/nbproject/project.properties
b/cmdline/lib/nbproject/project.properties
index 3ff4e3b..20a0642 100644
--- a/cmdline/lib/nbproject/project.properties
+++ b/cmdline/lib/nbproject/project.properties
@@ -17,3 +17,4 @@ is.autoload=true
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
spec.version.base=1.16.0
+cp.extra=${tools.jar}
diff --git
a/cmdline/lib/src/org/netbeans/modules/jackpot30/cmdline/lib/Utils.java
b/cmdline/lib/src/org/netbeans/modules/jackpot30/cmdline/lib/Utils.java
index 36ecc04..ceb220c 100644
--- a/cmdline/lib/src/org/netbeans/modules/jackpot30/cmdline/lib/Utils.java
+++ b/cmdline/lib/src/org/netbeans/modules/jackpot30/cmdline/lib/Utils.java
@@ -18,18 +18,29 @@
*/
package org.netbeans.modules.jackpot30.cmdline.lib;
+import com.sun.source.util.JavacTask;
import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
import java.lang.reflect.InvocationTargetException;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.regex.Pattern;
+import javax.tools.ForwardingJavaFileManager;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaCompiler.CompilationTask;
+import javax.tools.JavaFileManager;
+import javax.tools.JavaFileManager.Location;
+import javax.tools.ToolProvider;
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.java.classpath.ClassPath;
import org.netbeans.modules.java.hints.providers.spi.HintDescription;
@@ -157,4 +168,25 @@ public class Utils {
jrtRoot :
modules;
}
+
+public static void addExports() {
+class CurrentClassLoaderFM extends
ForwardingJavaFileManager {
+public CurrentClassLoaderFM(JavaFileManager delegate
[netbeans] branch master updated (4d92aa6 -> 2fcee89)
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 4d92aa6 Merge pull request #2658 from entlicher/EventsInterceptFix add 2fcee89 [NETBEANS-5229] Fixing mapping of jar:file URI to cache and back; disabling ErrorDescriptions in cases when they should be disabled. No new revisions were added by this update. Summary of changes: .../netbeans/modules/java/lsp/server/Utils.java| 23 +++ .../server/protocol/TextDocumentServiceImpl.java | 11 +++- .../java/lsp/server/protocol/ServerTest.java | 70 ++ 3 files changed, 89 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 (e916a56 -> 4f38051)
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from e916a56 Merge pull request #2634 from KacerCZ/netbeans-4783-cdnjs-files-unselected add 4f38051 Symbol.islocal has been renamed in JDK 16, avoiding the use of it No new revisions were added by this update. Summary of changes: .../modules/java/source/PostFlowAnalysis.java | 11 ++- .../java/source/builder/ElementsService.java | 11 ++- .../java/source/usages/SourceAnalyzerFactory.java | 5 +- .../api/java/source/ElementUtilitiesTest.java | 94 ++ 4 files changed, 115 insertions(+), 6 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: [NETBEANS-4550] Handling tests that have a module-info overriding module-info from sources.
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 676afdd [NETBEANS-4550] Handling tests that have a module-info
overriding module-info from sources.
676afdd is described below
commit 676afddf4dd68ddb40ca36b3ba46eb821a810470
Author: Jan Lahoda
AuthorDate: Tue Dec 29 20:55:45 2020 +0100
[NETBEANS-4550] Handling tests that have a module-info overriding
module-info from sources.
---
.../api/common/classpath/ModuleClassPaths.java | 1 +
.../api/common/classpath/ModuleClassPathsTest.java | 41 +++-
.../source/parsing/PatchModuleFileManager.java | 7 ++-
.../queries/UnitTestsCompilerOptionsQueryImpl.java | 27 +---
.../UnitTestsCompilerOptionsQueryImplTest.java | 72 ++
5 files changed, 136 insertions(+), 12 deletions(-)
diff --git
a/java/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ModuleClassPaths.java
b/java/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ModuleClassPaths.java
index 65a2797..2fb8d6f 100644
---
a/java/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ModuleClassPaths.java
+++
b/java/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ModuleClassPaths.java
@@ -870,6 +870,7 @@ final class ModuleClassPaths {
if (myModule != null) {
dependsOnUnnamed =
dependsOnUnnamed(myModule, true);
requires.addAll(collectRequiredModules(myModule, myModuleTree, true, false,
modulesByName));
+
requires.addAll(modulesByName.getOrDefault(myModule.getQualifiedName().toString(),
Collections.emptyList()));
} else if (base == systemModules) {
//When module unresolvable add at
least java.base to systemModules
Optional.ofNullable(modulesByName.get(MOD_JAVA_BASE))
diff --git
a/java/java.api.common/test/unit/src/org/netbeans/modules/java/api/common/classpath/ModuleClassPathsTest.java
b/java/java.api.common/test/unit/src/org/netbeans/modules/java/api/common/classpath/ModuleClassPathsTest.java
index 1c0ba04..a1ae2df 100644
---
a/java/java.api.common/test/unit/src/org/netbeans/modules/java/api/common/classpath/ModuleClassPathsTest.java
+++
b/java/java.api.common/test/unit/src/org/netbeans/modules/java/api/common/classpath/ModuleClassPathsTest.java
@@ -102,9 +102,11 @@ public class ModuleClassPathsTest extends NbTestCase {
.anyMatch((ed) -> ed.getTargetModules() ==
null);
private ClassPath src;
+private ClassPath testSrc;
private ClassPath systemModules;
private FileObject automaticModuleRoot;
private FileObject jarFileRoot;
+private FileObject target;
private TestProject tp;
public ModuleClassPathsTest(@NonNull final String name) {
@@ -130,6 +132,11 @@ public class ModuleClassPathsTest extends NbTestCase {
tp.getSourceRoots(),
tp.getUpdateHelper().getAntProjectHelper(),
tp.getEvaluator()));
+final FileObject testDir = FileUtil.createFolder(prjDir, "test");
//NOI18N
+assertNotNull(testDir);
+testSrc =
org.netbeans.spi.java.classpath.support.ClassPathSupport.createClassPath(testDir);
+target = FileUtil.createFolder(prjDir, "build");//NOI18N
+assertNotNull(target);
systemModules = Optional.ofNullable(TestUtilities.getJava9Home())
.map((jh) -> TestJavaPlatform.createModularPlatform(jh))
.map((jp) -> jp.getBootstrapLibraries())
@@ -182,7 +189,7 @@ public class ModuleClassPathsTest extends NbTestCase {
assertEquals(expectedURLs, resURLs);
}
-public void testModuleInfoInJDK8Project() throws IOException {
+public void DISABLEDtestModuleInfoInJDK8Project() throws IOException {
assertNotNull(src);
createModuleInfo(src, "ModuleInfoDebris"); //NOI18N
setSourceLevel(tp, "1.8"); //NOI18N
@@ -400,6 +407,38 @@ public class ModuleClassPathsTest extends NbTestCase {
assertEquals(expectedURLs, resURLs);
}
+public void testModuleInfoBothSourceAndTest() throws Exception {
+if (systemModules == null) {
+System.out.println("No jdk 9 home configured.");//NOI18N
+return;
+}
+assertNotNull(src);
+assertNotNull(testSrc);
+createModuleInfo(src, "modle", "java.logging"); //NOI18N
+createModuleInfo(testSrc, "modle&q
[netbeans] branch master updated (a276333 -> 0533124)
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from a276333 Merge pull request #2569 from junichi11/netbeans-5060 add 0533124 First attempt for Java getter/setter generator for the Java LSP server. No new revisions were added by this update. Summary of changes: .../lsp/server/protocol/GetterSetterGenerator.java | 164 + .../modules/java/lsp/server/protocol/Server.java | 5 +- .../server/protocol/TextDocumentServiceImpl.java | 158 +++- .../lsp/server/protocol/WorkspaceServiceImpl.java | 30 +++- .../java/lsp/server/protocol/ServerTest.java | 92 java/java.lsp.server/vscode/package.json | 46 +- java/java.lsp.server/vscode/src/extension.ts | 24 +++ 7 files changed, 511 insertions(+), 8 deletions(-) create mode 100644 java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/GetterSetterGenerator.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
svn commit: r44719 - in /release/netbeans/netbeans-vscode-ext/12.2.0: apache-netbeans-java-12.2.0-vc2.vsix.sha512 apache-netbeans-java-12.2.0.vsix.sha512
Author: jlahoda Date: Sat Nov 28 10:26:04 2020 New Revision: 44719 Log: Removing the VC2 suffix from the Apache NetBeans VSCode extension 12.2.0. Added: release/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0.vsix.sha512 Removed: release/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc2.vsix.sha512 Added: release/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0.vsix.sha512 == --- release/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0.vsix.sha512 (added) +++ release/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0.vsix.sha512 Sat Nov 28 10:26:04 2020 @@ -0,0 +1 @@ +297be45741aecf32d19e32c61214a8e56ca034a6594ddfd76e77761bac83a9af7747263e61f403753c18abb7918494600247e258061e8be4a5d526eedd25efeb - - 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
svn commit: r44718 - in /release/netbeans/netbeans-vscode-ext/12.2.0: apache-netbeans-java-12.2.0-vc2.vsix apache-netbeans-java-12.2.0-vc2.vsix.asc apache-netbeans-java-12.2.0.vsix apache-netbeans-jav
Author: jlahoda Date: Sat Nov 28 10:23:52 2020 New Revision: 44718 Log: Removing the VC2 suffix from the Apache NetBeans VSCode extension 12.2.0. Added: release/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0.vsix - copied unchanged from r44717, release/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc2.vsix release/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0.vsix.asc - copied unchanged from r44717, release/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc2.vsix.asc Removed: release/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc2.vsix release/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc2.vsix.asc - 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
svn commit: r44717 - /dev/netbeans/netbeans-vscode-ext/12.2.0/ /release/netbeans/netbeans-vscode-ext/0.0.1/ /release/netbeans/netbeans-vscode-ext/12.2.0/
Author: jlahoda Date: Sat Nov 28 10:20:34 2020 New Revision: 44717 Log: Apache NetBeans VSCode extension 12.2.0 has been released. Added: release/netbeans/netbeans-vscode-ext/12.2.0/ - copied from r44577, dev/netbeans/netbeans-vscode-ext/12.2.0/ release/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc2.vsix - copied unchanged from r44623, dev/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc2.vsix release/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc2.vsix.asc - copied unchanged from r44623, dev/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc2.vsix.asc release/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc2.vsix.sha512 - copied unchanged from r44623, dev/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc2.vsix.sha512 Removed: dev/netbeans/netbeans-vscode-ext/12.2.0/ release/netbeans/netbeans-vscode-ext/0.0.1/ release/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc1.vsix release/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc1.vsix.asc release/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc1.vsix.sha612 - 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
svn commit: r44623 - /dev/netbeans/netbeans-vscode-ext/12.2.0/
Author: jlahoda Date: Sat Nov 21 19:59:10 2020 New Revision: 44623 Log: Updating the VS Code extension for Apache NetBeans 12.2 based on VC2. Added: dev/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc2.vsix (with props) dev/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc2.vsix.asc dev/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc2.vsix.sha512 Removed: dev/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc1.vsix dev/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc1.vsix.asc dev/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc1.vsix.sha612 Added: dev/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc2.vsix == Binary file - no diff available. Propchange: dev/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc2.vsix -- svn:mime-type = application/octet-stream Added: dev/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc2.vsix.asc == --- dev/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc2.vsix.asc (added) +++ dev/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc2.vsix.asc Sat Nov 21 19:59:10 2020 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE5reiA6oYSXqyUgKntMGUD+qTZPEFAl+5cREACgkQtMGUD+qT +ZPHUcxAAhpoqbJwVCO1Oyazs0UA5bK2A7x++JHfhsXHShUhHaQtUNsnInefJnNNA +ZsgOksfppcR27eSVh+MAEFkESjX8M1C2djY9jQCQnmseIAWoU20yvrS2c/Fy6uTZ +IRIaMN0Vr54kTfm1JoXaBCKpHs4ixZIKP7725VWCSnBScqtyzvfsS3UnMyv40kCs +5mv/PXFA8o8TDAsbSaIXPBu6rzBKF2tflylEl5PKIEYY5YBROxewY4PCtUyR/PLG +lOWj63/Kr42sefscP+yI08bCq2BBvY+vl60PgildoXlMyMS/Au8i1kfMAMJ/1kNV +Q5AaZF2gxAMC9ycbGrNKmMyHj9x90D5gOgtM5ugju+D44B3FcRYLQvMhpCRSaqmk +j4TIqbXn9Sya7LpUMCNNIf8nvTce++pXAaspTbpKLXru/WnaVF0kaZy2EiePPWIg +glsvRPc7lqCfX9AIEGAEKh6vJFpb9xJEwhjssc6ALErr1tiENlQiaSSY/ZAQPNU9 +7dX1Q7SgJ3uhF8B1Ufgg/tKefPbRl4XOEfV8LNZnh8jH2cer54PPeYj6B2jikrKW +wkpOa1d7O1B5NyTEKPqMcj2mxim07rBrmYm7bG4t/ipJroBcTKdr2TVLNsjqM002 +Yl7L4KLSsZYgykVEYuWJFfKn46HaVanSCGviT0duFS03hn9ScNo= +=bKMu +-END PGP SIGNATURE- Added: dev/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc2.vsix.sha512 == --- dev/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc2.vsix.sha512 (added) +++ dev/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc2.vsix.sha512 Sat Nov 21 19:59:10 2020 @@ -0,0 +1 @@ +297be45741aecf32d19e32c61214a8e56ca034a6594ddfd76e77761bac83a9af7747263e61f403753c18abb7918494600247e258061e8be4a5d526eedd25efeb - - 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
svn commit: r44577 - in /dev/netbeans/netbeans-vscode-ext: 0.1.0/ 12.2.0/ 12.2.0/apache-netbeans-java-12.2.0-vc1.vsix 12.2.0/apache-netbeans-java-12.2.0-vc1.vsix.asc 12.2.0/apache-netbeans-java-12.2.0
Author: jlahoda Date: Thu Nov 19 05:38:16 2020 New Revision: 44577 Log: Correcting version number for Apache NetBeans VS Code Extension. Added: dev/netbeans/netbeans-vscode-ext/12.2.0/ dev/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc1.vsix (with props) dev/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc1.vsix.asc dev/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc1.vsix.sha612 Removed: dev/netbeans/netbeans-vscode-ext/0.1.0/ Added: dev/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc1.vsix == Binary file - no diff available. Propchange: dev/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc1.vsix -- svn:mime-type = application/octet-stream Added: dev/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc1.vsix.asc == --- dev/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc1.vsix.asc (added) +++ dev/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc1.vsix.asc Thu Nov 19 05:38:16 2020 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE5reiA6oYSXqyUgKntMGUD+qTZPEFAl+2BDgACgkQtMGUD+qT +ZPElgg/8D7uZNK3xhr4N9jvnSNB8w7oWUEUBuqtRMGH+Tui75UnzEC4ZwTWU5oPm +HdeocJ5uZMaL85xyELHk83lwa15BvZ0r38+ko5nRp2EKZXFjug5/Dh4RoxkMzhzo +jaU9QIAeOwOkLaBipVhlqcPgz2j6in6DzrGzKIUUVn7E/jyQilmC8PD5o3q1iU6e +N0FMbRY+WyxWbY6DYKVJc6Cb7ZriVdZcK29fVrrz3cR1InhKGSb/gWwpo8Du0/JW +vLsxr8yidMft4upEtejHLEhnVuB94NaYPLlUbN2zNVJarP2bNvWbTYCwpICHil36 +/3quFE/T1xVSbgveFjRSHNuLmt79WX6faqWcz8eIvam5fd9Z/0vBzS/1g6BpsD28 +tCbSh6khOJUst0AGQMujVshWp6grdOktyNIsVoqLPDfAgxu8ZlXMMooCr1FIHED/ +AoWisLPYhEYY1ULYGfVn/kVB4TQI56D9nEsvt8QMnRUNJeKa3jCD1p1NkbJQDY0Q +E15qekHOPGDEtdv34cNRMgdYlVeCk3wywh3L5tRljxdv0TTRpDPIpy8Cm88YIiXx +f6I4jkrlM3yrvpp8vjoEFjS0tW1nHh8XeT1r8mfF+WyLFBMrYNRqi9DTlZboyQnU ++fzCkzrG7f+8aLWzmsrwR4Sq2e7WHJJOZA44CV33fTo549OCIvw= +=rFKH +-END PGP SIGNATURE- Added: dev/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc1.vsix.sha612 == --- dev/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc1.vsix.sha612 (added) +++ dev/netbeans/netbeans-vscode-ext/12.2.0/apache-netbeans-java-12.2.0-vc1.vsix.sha612 Thu Nov 19 05:38:16 2020 @@ -0,0 +1 @@ +70fb55e6d16a3a4908405451df3b0a76758274cc391ce19519a1a7431151a85e7e13fbbbf191b0b7fcfc161b1c3e9c8ad274370b5cb10298ff071401e525ffbc apache-netbeans-java-12.2.0-vc1.vsix - 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 (f3d44fd -> c954f48)
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from f3d44fd Merge pull request #2526 from pepness/metro-2.4.4 add c954f48 Adding support for workspace/symbol to both the LSP client and Java LSP server. No new revisions were added by this update. Summary of changes: cpplite/cpplite.editor/nbproject/project.xml | 18 +- .../modules/cpplite/editor/PathRecognizerImpl.java | 53 .../cpplite/editor/lsp/LanguageServerImpl.java | 16 +- cpplite/cpplite.project/nbproject/project.xml | 9 + .../modules/cpplite/project/CPPLiteProject.java| 71 - ide/lsp.client/nbproject/project.xml | 17 ++ .../netbeans/modules/lsp/client/LSPBindings.java | 76 -- .../lsp/client/bindings/BaseSymbolProvider.java| 206 +++ .../lsp/client/bindings/CustomIndexerImpl.java | 143 ++ .../modules/lsp/client/bindings/Icons.java | 4 + .../lsp/client/bindings/SymbolProviderImpl.java| 108 .../lsp/client/bindings/TypeProviderImpl.java | 127 + ide/parsing.lucene/nbproject/project.properties| 2 +- ide/parsing.lucene/nbproject/project.xml | 1 + java/java.lsp.server/nbproject/project.xml | 45 +++- .../netbeans/modules/java/lsp/server/Utils.java| 214 +++ .../modules/java/lsp/server/protocol/Server.java | 6 +- .../server/protocol/TextDocumentServiceImpl.java | 217 +++ .../lsp/server/protocol/WorkspaceServiceImpl.java | 203 +- .../java/lsp/server/protocol/ServerTest.java | 159 --- java/java.lsp.server/vscode/package.json | 1 + .../modules/java/source/ui/JavaSymbolProvider.java | 294 - 22 files changed, 1607 insertions(+), 383 deletions(-) create mode 100644 cpplite/cpplite.editor/src/org/netbeans/modules/cpplite/editor/PathRecognizerImpl.java create mode 100644 ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/BaseSymbolProvider.java create mode 100644 ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/CustomIndexerImpl.java create mode 100644 ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/SymbolProviderImpl.java create mode 100644 ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/TypeProviderImpl.java create mode 100644 java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/Utils.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
svn commit: r44552 - in /dev/netbeans/netbeans-vscode-ext: ./ 0.1.0/ 0.1.0/apache-netbeans-java-0.1.0-vc1.vsix 0.1.0/apache-netbeans-java-0.1.0-vc1.vsix.asc 0.1.0/apache-netbeans-java-0.1.0-vc1.vsix.s
Author: jlahoda Date: Tue Nov 17 18:36:11 2020 New Revision: 44552 Log: Adding candidate convenience binary for Apache NetBeans VS Code Extension. Added: dev/netbeans/netbeans-vscode-ext/ dev/netbeans/netbeans-vscode-ext/0.1.0/ dev/netbeans/netbeans-vscode-ext/0.1.0/apache-netbeans-java-0.1.0-vc1.vsix (with props) dev/netbeans/netbeans-vscode-ext/0.1.0/apache-netbeans-java-0.1.0-vc1.vsix.asc dev/netbeans/netbeans-vscode-ext/0.1.0/apache-netbeans-java-0.1.0-vc1.vsix.sha512 Added: dev/netbeans/netbeans-vscode-ext/0.1.0/apache-netbeans-java-0.1.0-vc1.vsix == Binary file - no diff available. Propchange: dev/netbeans/netbeans-vscode-ext/0.1.0/apache-netbeans-java-0.1.0-vc1.vsix -- svn:mime-type = application/octet-stream Added: dev/netbeans/netbeans-vscode-ext/0.1.0/apache-netbeans-java-0.1.0-vc1.vsix.asc == --- dev/netbeans/netbeans-vscode-ext/0.1.0/apache-netbeans-java-0.1.0-vc1.vsix.asc (added) +++ dev/netbeans/netbeans-vscode-ext/0.1.0/apache-netbeans-java-0.1.0-vc1.vsix.asc Tue Nov 17 18:36:11 2020 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEE5reiA6oYSXqyUgKntMGUD+qTZPEFAl+0Fv8ACgkQtMGUD+qT +ZPH55w/8D4uDMiHhmU/Qrv+Y46PpqNdY8ks/72LX8amI32RGl2gzouvizIs6MD9j +AyaiHpgRTtZSNxjopULyuVeyI+KDGLb4FP2lca4lJETCdb0tzj2x7zsyue9e2laa +1xheInjKlFV51DysRaUXJ8wHSJED98WuOfaTzY6Axnu2QRZ03Gk2N779rjAfsmUe +vI3E0lvFQmtkSQcxuI2YhkOyUKnvpqihxQJKmCGDyqT88wJhGq1aosS18xvN6nm9 +lAdXXcBU+/Ta/uLSCUNLKfIdzt9E3SfB1lb1lawnYjMeIWs9WwOVRwyMJ3PUnVf7 +J4qeuOwYJy9wbmNnuq5RaksdCZNKMQ+2Egvozyz6k961AFL+BmZJuYtxVSZXSO2q ++Yz8Xfv6Rn/i/C9z1wGy/SzziROxIMlPFTk1hs7QsatmmWySpL6EbgZr616JJOSX +X1BXj5EXgP/EhNiXo5vC7Wnbz4WnKtYX1BjBL+CSemmmItrXF8rQpge+meQ11aBG +WIsvbVfkawuo424Iawiix+Aa0tCoqrHGTO/fkVyFO1xHlo7QqU5vAGz0E6SFoTJZ +nh5078CDMRYQY8Flev9h+1In3LMdLUWOIeZN8AYmlWPP3891AqVabxIDP/adDMAa ++1wyuG25EQnt4M+DQRbFD1tq525n9LUKDFSBCe0yuH+topqBngU= +=76i4 +-END PGP SIGNATURE- Added: dev/netbeans/netbeans-vscode-ext/0.1.0/apache-netbeans-java-0.1.0-vc1.vsix.sha512 == --- dev/netbeans/netbeans-vscode-ext/0.1.0/apache-netbeans-java-0.1.0-vc1.vsix.sha512 (added) +++ dev/netbeans/netbeans-vscode-ext/0.1.0/apache-netbeans-java-0.1.0-vc1.vsix.sha512 Tue Nov 17 18:36:11 2020 @@ -0,0 +1 @@ +bacdb170e8617c96d86a36e0d221fb4ffbdeb8a6998b12548f230e9a05b4f9e8783d93b630b7d29d49924a628df71885f9d27a449067d01f7c41791b9e3fdf91 apache-netbeans-java-0.1.0-vc1.vsix - 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: Find Usages for LSP languages - both client and (Java) server.
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git The following commit(s) were added to refs/heads/master by this push: new 8d22152 Find Usages for LSP languages - both client and (Java) server. 8d22152 is described below commit 8d221521d7ea8346a0508248844d892d61689aff Author: Jan Lahoda AuthorDate: Thu Oct 15 06:34:17 2020 +0200 Find Usages for LSP languages - both client and (Java) server. --- .../modules/cpplite/editor/file/CDataObject.java | 6 + .../modules/cpplite/editor/file/CPPDataObject.java | 6 + .../modules/cpplite/editor/file/HDataObject.java | 6 + .../modules/cpplite/editor/file/HPPDataObject.java | 6 + ide/lsp.client/external/binaries-list | 12 +- ide/lsp.client/external/lsp4j-0.8.1-p1-license.txt | 94 --- ...j-0.8.1-license.txt => lsp4j-0.9.0-license.txt} | 4 +- ...2.18.0-license.txt => xtend-2.19.0-license.txt} | 4 +- ide/lsp.client/nbproject/project.properties| 12 +- ide/lsp.client/nbproject/project.xml | 40 +++-- .../src/org/netbeans/modules/lsp/client/Utils.java | 33 ++-- .../client/bindings/CompletionProviderImpl.java| 11 +- .../lsp/client/bindings/HyperlinkProviderImpl.java | 18 +- .../lsp/client/bindings/MarkOccurrences.java | 4 +- .../client/bindings/refactoring/Refactoring.java | 183 + .../refactoring/RefactoringActionsProvider.java| 132 +++ .../bindings/refactoring/RefactoringUIImpl.java| 109 .../bindings/refactoring/tree/FileTreeElement.java | 96 +++ .../refactoring/tree/ProjectTreeElement.java | 74 + .../refactoring/tree/TreeElementFactoryImpl.java | 65 java/java.lsp.server/external/binaries-list| 6 +- ...2.14.0-license.txt => xtend-2.19.0-license.txt} | 4 +- java/java.lsp.server/nbproject/project.properties | 6 +- java/java.lsp.server/nbproject/project.xml | 16 +- .../modules/java/lsp/server/protocol/Server.java | 1 + .../server/protocol/TextDocumentServiceImpl.java | 136 ++- .../java/lsp/server/protocol/ServerTest.java | 126 ++ .../org/netbeans/nbbuild/extlibs/ignored-overlaps | 9 +- .../editor/TypeScriptDataObjectDataObject.java | 6 + 29 files changed, 1043 insertions(+), 182 deletions(-) diff --git a/cpplite/cpplite.editor/src/org/netbeans/modules/cpplite/editor/file/CDataObject.java b/cpplite/cpplite.editor/src/org/netbeans/modules/cpplite/editor/file/CDataObject.java index 6faf771..bbaa61d 100644 --- a/cpplite/cpplite.editor/src/org/netbeans/modules/cpplite/editor/file/CDataObject.java +++ b/cpplite/cpplite.editor/src/org/netbeans/modules/cpplite/editor/file/CDataObject.java @@ -96,6 +96,12 @@ import org.openide.util.NbBundle.Messages; path = "Loaders/" + MIMETypes.C + "/Actions", id = @ActionID(category = "System", id = "org.openide.actions.PropertiesAction"), position = 1400 +), +@ActionReference( +path = "Editors/" + MIMETypes.CPP + "/Popup", +id = @ActionID(category = "Refactoring", id = "org.netbeans.modules.refactoring.api.ui.WhereUsedAction"), +position = 1400, +separatorAfter = 1450 ) }) @GrammarRegistration(grammar="resources/c.tmLanguage.json", mimeType=MIMETypes.C) diff --git a/cpplite/cpplite.editor/src/org/netbeans/modules/cpplite/editor/file/CPPDataObject.java b/cpplite/cpplite.editor/src/org/netbeans/modules/cpplite/editor/file/CPPDataObject.java index d6fbbe8..b9fada4 100644 --- a/cpplite/cpplite.editor/src/org/netbeans/modules/cpplite/editor/file/CPPDataObject.java +++ b/cpplite/cpplite.editor/src/org/netbeans/modules/cpplite/editor/file/CPPDataObject.java @@ -96,6 +96,12 @@ import org.openide.util.NbBundle.Messages; path = "Loaders/" + MIMETypes.CPP + "/Actions", id = @ActionID(category = "System", id = "org.openide.actions.PropertiesAction"), position = 1400 +), +@ActionReference( +path = "Editors/" + MIMETypes.CPP + "/Popup", +id = @ActionID(category = "Refactoring", id = "org.netbeans.modules.refactoring.api.ui.WhereUsedAction"), +position = 1400, +separatorAfter = 1450 ) }) @GrammarRegistration(grammar="resources/cpp.tmLanguage.json", mimeType=MIMETypes.CPP) diff --git a/cpplite/cpplite.editor/src/org/netbeans/modules/cpplite/editor/file/HDataObject.java b/cpplite/cpplite.editor/src/org/netbeans/modules/cpplite/editor/file/HDataObject.java index 64075bb..df473e3 100644 --- a/cpplite/cpplite.editor/src/org/netbeans/modules/cpplite/editor/file
[netbeans] branch master updated (2a4a18a -> 1cf4221)
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 2a4a18a Make it easy to create dynamically updated ProxyLookup instances without subclassing add 1cf4221 Adding support for clangd to the lightweight C/C++ support No new revisions were added by this update. Summary of changes: .../modules/cpplite/editor/UnconfiguredHint.java | 10 +- .../org/netbeans/modules/cpplite/editor/Utils.java | 94 .../cpplite/editor/lsp/LanguageServerImpl.java | 118 +++-- .../cpplite/editor/lsp/options/Bundle.properties | 6 +- .../cpplite/editor/lsp/options/CPPLitePanel.form | 87 --- .../cpplite/editor/lsp/options/CPPLitePanel.java | 101 +++--- .../editor/spi/CProjectConfigurationProvider.java | 3 + .../CPPLiteCProjectConfigurationProvider.java | 27 - .../netbeans/modules/lsp/client/LSPBindings.java | 31 +- .../client/bindings/CompletionProviderImpl.java| 7 +- .../lsp/client/bindings/NavigatorPanelImpl.java| 2 +- .../TextDocumentSyncServerCapabilityHandler.java | 93 ++-- 12 files changed, 470 insertions(+), 109 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 (d69f4d1 -> 55b39bd)
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from d69f4d1 Merge pull request #2297 from apache/badgecibuild add 55b39bd Fixing removal of a double-quote inside a text block. No new revisions were added by this update. Summary of changes: .../org/netbeans/modules/editor/java/TypingCompletion.java | 2 +- .../modules/editor/java/TypingCompletionUnitTest.java| 12 2 files changed, 13 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 (277ab58 -> 0b4f995)
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git.
from 277ab58 Merge pull request # from arusinha/netbeans-4311
add 0b4f995 Improvements to the Java LSP Server
No new revisions were added by this update.
Summary of changes:
.../netbeans/modules/editor/java/GoToSupport.java | 15 +-
.../java/hints/errors/AddParameterOrLocalFix.java | 136 -
.../modules/java/hints/errors/CreateElement.java | 6 +-
.../modules/java/hints/errors/ImportClass.java | 7 +-
.../hints/errors/AddParameterOrLocalFixTest.java | 5 +-
.../java/hints/errors/CreateElementTest.java | 5 +-
.../hints/infrastructure/ErrorHintsTestBase.java | 1 +
java/java.lsp.server/build.xml | 6 +-
java/java.lsp.server/nbproject/project.xml | 5 +
.../netbeans/modules/java/lsp/server/Server.java | 11 +-
.../lsp/server/text/TextDocumentServiceImpl.java | 192 +++--
.../modules/java/lsp/server/ServerTest.java| 320 -
java/java.lsp.server/vscode/package-lock.json | 2 +-
java/java.lsp.server/vscode/package.json | 2 +-
.../src/{VerifyJDK11.java => VerifyJDK14.java} | 6 +-
java/java.lsp.server/vscode/src/extension.ts | 4 +-
java/java.sourceui/manifest.mf | 2 +-
.../netbeans/api/java/source/ui/ElementOpen.java | 19 +-
18 files changed, 586 insertions(+), 158 deletions(-)
rename java/java.lsp.server/vscode/src/{VerifyJDK11.java => VerifyJDK14.java}
(89%)
-
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-jackpot30] branch master updated: Preparing release 12.0 of the Standalone Java Hints.
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-jackpot30.git
The following commit(s) were added to refs/heads/master by this push:
new 84e56a6 Preparing release 12.0 of the Standalone Java Hints.
84e56a6 is described below
commit 84e56a62e68c2390a9b5a9b2a1db8ba8c5384cfe
Author: Jan Lahoda
AuthorDate: Sun Jun 21 20:36:34 2020 +0200
Preparing release 12.0 of the Standalone Java Hints.
---
cmdline/README.md | 4 ++--
cmdline/build.xml | 2 +-
cmdline/maven/pom.xml | 2 +-
.../java/org/netbeans/modules/jackpot30/maven/RunJackpot30Test.java | 2 +-
cmdline/tool/scripts/pom.xml | 2 +-
.../src/org/netbeans/modules/jackpot30/cmdline/ProcessorImplTest.java | 4 ++--
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/cmdline/README.md b/cmdline/README.md
index 9aa932e..146db79 100644
--- a/cmdline/README.md
+++ b/cmdline/README.md
@@ -27,7 +27,7 @@ This tool allows to run NetBeans Java code checker without
the NetBeans IDE. Thi
To Build
-* Apache NetBeans 11.1
+* Apache NetBeans 12.0
* JDK 8 and JDK 11
* bash
* Apache ant 1.9.9 or above
@@ -42,7 +42,7 @@ This tool allows to run NetBeans Java code checker without
the NetBeans IDE. Thi
Build using:
```
-$ ant -DNETBEANS_PLATFORM= -DJDK11=
build-and-test
+$ ant -DNETBEANS_PLATFORM= -DJDK11=
build-and-test
```
The built product is in tool/build/jackpot.
diff --git a/cmdline/build.xml b/cmdline/build.xml
index fd80860..6358c97 100644
--- a/cmdline/build.xml
+++ b/cmdline/build.xml
@@ -52,7 +52,7 @@
-
+
diff --git a/cmdline/maven/pom.xml b/cmdline/maven/pom.xml
index aa9182b..d1c58eb 100644
--- a/cmdline/maven/pom.xml
+++ b/cmdline/maven/pom.xml
@@ -21,7 +21,7 @@
org.apache.netbeans.modules.jackpot30
jackpot30-maven-plugin
- 11.1
+ 12.0
maven-plugin
Jackpot 3.0 Command Line Tool Maven Bridge
diff --git
a/cmdline/maven/src/test/java/org/netbeans/modules/jackpot30/maven/RunJackpot30Test.java
b/cmdline/maven/src/test/java/org/netbeans/modules/jackpot30/maven/RunJackpot30Test.java
index 3808034..cb46dce 100644
---
a/cmdline/maven/src/test/java/org/netbeans/modules/jackpot30/maven/RunJackpot30Test.java
+++
b/cmdline/maven/src/test/java/org/netbeans/modules/jackpot30/maven/RunJackpot30Test.java
@@ -67,7 +67,7 @@ public class RunJackpot30Test extends TestCase {
Process p = Runtime.getRuntime().exec(new String[] {
maven,
-"-Djackpot.plugin.version=11.1",
+"-Djackpot.plugin.version=12.0",
"-q",
"jackpot30:analyze"
}, null, testDir);
diff --git a/cmdline/tool/scripts/pom.xml b/cmdline/tool/scripts/pom.xml
index d4d329b..2fea196 100644
--- a/cmdline/tool/scripts/pom.xml
+++ b/cmdline/tool/scripts/pom.xml
@@ -21,7 +21,7 @@
org.apache.netbeans.modules.jackpot30
jackpot30-maven-plugin
- 11.1
+ 12.0
maven-plugin
Jackpot 3.0 Command Line Tool
diff --git
a/cmdline/tool/test/unit/src/org/netbeans/modules/jackpot30/cmdline/ProcessorImplTest.java
b/cmdline/tool/test/unit/src/org/netbeans/modules/jackpot30/cmdline/ProcessorImplTest.java
index 88c68fd..8f16ba4 100644
---
a/cmdline/tool/test/unit/src/org/netbeans/modules/jackpot30/cmdline/ProcessorImplTest.java
+++
b/cmdline/tool/test/unit/src/org/netbeans/modules/jackpot30/cmdline/ProcessorImplTest.java
@@ -123,7 +123,7 @@ public class ProcessorImplTest extends NbTestCase {
"public int size() { return 0; }\n" +
"}\n",
"src/META-INF/upgrade/test.hint",
- "$coll.size() == 0 :: $coll test.Test;;\n",
+ "$coll.size() == 0 :: $coll instanceof test.Test;;\n",
null,
"-source",
"7",
@@ -151,7 +151,7 @@ public class ProcessorImplTest extends NbTestCase {
"public int size() { return 0; }\n" +
"}\n",
"src/META-INF/upgrade/test.hint",
- "$coll.size() == 0 :: $coll test.Test;;\n",
+ "$coll.size() == 0 :: $coll instanceof test.Test;;\n",
null,
"-source",
"7",
-
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 (d39ef4f -> 89f2338)
This is an automated email from the ASF dual-hosted git repository. jlahoda pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from d39ef4f [NETBEANS-4420] Fix IAE on tooltip images with unknown size. add 89f2338 Adding tests for java.source.base without nb-javac and java.hints tests to Travis; fixing tests and code along the way. No new revisions were added by this update. Summary of changes: .travis.yml| 85 + .../modules/java/hints/test/api/HintTest.java | 3 + java/java.hints/nbproject/project.properties | 37 ++ .../modules/java/hints/bugs/SuspiciousToArray.java | 26 +- .../java/hints/errors/ChangeMethodReturnType.java | 8 +- .../modules/java/hints/errors/CreateElement.java | 2 +- .../java/hints/errors/RenameConstructor.java | 31 +- .../modules/java/hints/errors/Utilities.java | 2 +- .../java/hints/errors/VarCompDeclaration.java | 2 +- .../hints/infrastructure/ErrorHintsProvider.java | 10 + .../modules/java/hints/introduce/Flow.java | 2 +- .../modules/java/hints/suggestions/Move.java | 2 +- .../java/hints/ConvertAnonymousToInnerTest.java| 129 --- .../modules/java/hints/TestEntityCatalogImpl.java | 47 +++ .../modules/java/hints/errors/AccessErrorTest.java | 1 + .../hints/errors/AddParameterOrLocalFixTest.java | 21 +- .../hints/errors/ChangeMethodReturnTypeTest.java | 11 +- .../modules/java/hints/errors/CreateClassTest.java | 2 + .../modules/java/hints/errors/CreateFieldTest.java | 1 + .../java/hints/errors/CreateMethodTest.java| 1 + .../java/hints/errors/NewImportClassTest.java | 1 + .../hints/infrastructure/ErrorHintsTestBase.java | 14 +- .../java/hints/introduce/IntroduceHintTest.java| 2 + .../java/hints/jdk/AnnotationProcessorsTest.java | 3 +- .../hints/jdk/ConvertToPatternInstanceOfTest.java | 12 + .../jdk/mapreduce/ForLoopToFunctionalHintTest.java | 54 +-- .../modules/java/hints/suggestions/LambdaTest.java | 46 ++- java/java.source.base/nbproject/project.properties | 16 + .../netbeans/api/java/source/TreeUtilities.java| 13 + .../modules/java/source/matching/CopyFinder.java | 57 ++- .../modules/java/source/save/CasualDiff.java | 115 +++--- .../java/source/gen/GeneratorTestMDRCompat.java| 33 +- .../org/netbeans/api/java/source/gen/TryTest.java | 386 + .../org/netbeans/api/java/source/gen/VarTest.java | 140 .../org/netbeans/lib/nbjavac/services/NBAttr.java | 12 +- .../lib/nbjavac/services/NBParserFactory.java | 20 +- .../modules/java/hints/spiimpl/Utilities.java | 2 +- 37 files changed, 1133 insertions(+), 216 deletions(-) create mode 100644 java/java.hints/test/unit/src/org/netbeans/modules/java/hints/TestEntityCatalogImpl.java create mode 100644 java/java.source.base/test/unit/src/org/netbeans/api/java/source/gen/VarTest.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: Do not blindly cast to IndexedClassDecl while reassigning anonymous class numbers, as the class decl may not be IndexedClassDecl.
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new aa266cb Do not blindly cast to IndexedClassDecl while reassigning
anonymous class numbers, as the class decl may not be IndexedClassDecl.
aa266cb is described below
commit aa266cbc66f0dbcc637db5ee13efff363ae68ecd
Author: Jan Lahoda
AuthorDate: Sun Jun 14 08:49:38 2020 +0200
Do not blindly cast to IndexedClassDecl while reassigning anonymous class
numbers, as the class decl may not be IndexedClassDecl.
---
.../java/source/parsing/PartialReparseTest.java| 37 +-
.../lib/nbjavac/services/NBParserFactory.java | 4 +--
2 files changed, 38 insertions(+), 3 deletions(-)
diff --git
a/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/parsing/PartialReparseTest.java
b/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/parsing/PartialReparseTest.java
index 29e03fa..4a92897 100644
---
a/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/parsing/PartialReparseTest.java
+++
b/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/parsing/PartialReparseTest.java
@@ -19,6 +19,7 @@
package org.netbeans.modules.java.source.parsing;
import com.sun.source.tree.LineMap;
+import com.sun.source.tree.NewClassTree;
import com.sun.source.tree.Tree;
import com.sun.source.tree.Tree.Kind;
import com.sun.source.util.TreePath;
@@ -32,9 +33,11 @@ import java.util.Locale;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
import java.util.stream.Collectors;
import javax.lang.model.element.Element;
import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.TypeElement;
import javax.swing.JEditorPane;
import javax.swing.text.Document;
import javax.tools.Diagnostic;
@@ -208,6 +211,31 @@ public class PartialReparseTest extends NbTestCase {
"final int j = 5;\n");
}
+public void testAnonymousName() throws Exception {
+doRunTest("package test;\n" +
+ "public class Test {\n" +
+ "private Object o = new Object() {};\n" +
+ "private void test() {\n" +
+ "new Object() {\n" +
+ "};" +
+ "final int i = 5;\n" +
+ "^^\n" +
+ "}" +
+ "}",
+ "final int j = 5;\n",
+ info -> {
+ new TreePathScanner() {
+ public Void visitNewClass(NewClassTree tree, Void p)
{
+ if
(getCurrentPath().getParentPath().getLeaf().getKind() == Kind.METHOD) {
+ TypeElement el = (TypeElement)
info.getTrees().getElement(new TreePath(getCurrentPath(), tree.getClassBody()));
+ assertEquals("test.Test$2",
info.getElements().getBinaryName(el).toString());
+ }
+ return super.visitNewClass(tree, p);
+ }
+ }.scan(info.getCompilationUnit(), null);
+ });
+}
+
public void testAnonymousFullReparse1() throws Exception {
doVerifyFullReparse("package test;\n" +
"public class Test {\n" +
@@ -302,6 +330,10 @@ public class PartialReparseTest extends NbTestCase {
}
private void doRunTest(String code, String inject) throws Exception {
+doRunTest(code, inject, info -> {});
+}
+
+private void doRunTest(String code, String inject,
Consumer callback) throws Exception {
FileObject srcDir = FileUtil.createMemoryFileSystem().getRoot();
FileObject src = srcDir.createData("Test.java");
try (Writer out = new OutputStreamWriter(src.getOutputStream())) {
@@ -313,7 +345,8 @@ public class PartialReparseTest extends NbTestCase {
Object[] topLevel = new Object[1];
source.runUserActionTask(cc -> {
cc.toPhase(Phase.RESOLVED);
- topLevel[0] = cc.getCompilationUnit();
+topLevel[0] = cc.getCompilationUnit();
+callback.accept(cc);
}, true);
int startReplace = code.indexOf('^');
int endReplace = code.indexOf('^', startReplace + 1) + 1;
@@ -328,6 +361,7 @@ public class PartialReparseTest extends NbTestCase {
actualTree.set(dumpTree(cc));
actualDiagnostics.set(dumpDiagnostics(cc));
actualLineMap.set(dumpLineMap(cc));
+
[netbeans] branch master updated (5885596 -> b52d38d)
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git.
from 5885596 Merge pull request #2026 from pedro-w/jgit-551
add b52d38d Enhancing the OpenJDK support with ability to disable use of
ant langtools build; and specifying a different location for the build.
No new revisions were added by this update.
Summary of changes:
.../release/scripts/build-langtools-consol.xml | 6 +-
.../java/openjdk/jtreg/ActionProviderImpl.java | 10 +-
.../java/openjdk/project/ActionProviderImpl.java | 26 +++-
.../modules/java/openjdk/project/Settings.java | 20
.../{TestCategory.form => BuildCategory.form} | 63 --
.../openjdk/project/customizer/BuildCategory.java | 132 +
.../openjdk/project/customizer/Bundle.properties | 3 +
.../openjdk/project/customizer/TestCategory.form | 2 +
.../openjdk/project/customizer/TestCategory.java | 2 +-
9 files changed, 214 insertions(+), 50 deletions(-)
copy
java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/customizer/{TestCategory.form
=> BuildCategory.form} (54%)
create mode 100644
java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/customizer/BuildCategory.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
