(netbeans) branch php-nb21-features updated (ef46b15be8 -> 758c92a42a)
This is an automated email from the ASF dual-hosted git repository. junichi11 pushed a change to branch php-nb21-features in repository https://gitbox.apache.org/repos/asf/netbeans.git discard ef46b15be8 Merge pull request #6675 from junichi11/php82-dnf-types discard 9523012c56 PHP 8.2 Support: Disjunctive Normal Form Types (Part 11) discard 544093de4f PHP 8.2 Support: Disjunctive Normal Form Types (Part 10) discard 95ecb7e0c1 PHP 8.2 Support: Disjunctive Normal Form Types (Part 9) discard 69feae54c1 Merge pull request #6569 from junichi11/php82-dnf-types new dca223ab08 - Add Wildfly version 29 and 30 - Add Java 21 support for Wildfly 30+ - Prefer ConcurrentMap to synchronizedMap - Prefer ConcurrentHashMap.newKeySet to synchronizedSet - Remove synchronized blocks when using atomic and concurrent operations with ConcurrentHashMap - Set initial capacity for profile sets - Use try-with-resources when possible new 5e2a225f7f Merge pull request #6602 from pepness/wildfly-30 new b68146ac67 Update ASM from 9.5 to 9.6 new a5c96b738d Merge pull request #6597 from pepness/asm-9.6 new 0c437f1411 Micronaut Template for Data repository - add support for Pageable new 4c6ab9ac54 Merge pull request #6591 from thurka/GCN-3261 new 29b88adab0 make sure that there is database connection - getDialect() needs it new 2fde2b4fd6 Merge pull request #6609 from thurka/GCN-3613 new 774ff952a6 use clusters.config.release.list instead of clusters.config.full.list new cc0d88c3cd Merge pull request #6583 from thurka/vsix_build new b6dc0d4cd9 Prefixing all code names of commands with 'nbls'. new e0e448f436 Merge pull request #6218 from lahodaj/lsp-server-generic-commands-settings-try2 new aa5755a61c Fix Gradle version change in wrapper.properties new 5e712c89f2 Merge pull request #6589 from lkishalmi/fix-gradle-version-change-in-wrapper new e75a76521f JDK Downloader: fix current GA/EA values new 9eb9def620 Merge pull request #6590 from mbien/jdk-downloader-current-version-fix_delivery new c9c2ebf309 Fix Git show history regression. new 85b63563d6 Merge pull request #6594 from mbien/fix-git-history-regression new 49fac41e03 Try to close Gradle Daemons on exit. new db3c20eb85 Merge pull request #6598 from lkishalmi/gradle-disconnect-on-exit new a0e9284b89 Update FlatLaf from 3.2.1 to 3.2.5 new a2fe03e25e Merge pull request #6605 from DevCharly/flatlaf-3.2.4 new 23df8c64bf Fix unnamed main method detection code. new 40a9bb695c Merge pull request #6593 from mbien/fix-unnamed-main-detection new 409740b82f Priming build and reload improvements. new 9f51a38243 Include add-opens flags for tests/JDK9+ new b12970d271 Merge pull request #6514 from sdedic/maven/priming-and-reloads new 8ecaee2fd2 Naming panel should be set to its preferred size. new ec555891e4 Merge pull request #6619 from mbien/ui-fix-naming-panel-layout new e6ea7501e7 Be more friendly on 'runSingle' when 'run' task is missing. new 5ec24679f1 Merge pull request #6618 from lkishalmi/gradle-better-handle-runSingle new 2b20e6b270 Merge pull request #6608 from apache/delivery new a64cc72f02 CI: Add build-from-src-zip job new 20ee034c8a Merge pull request #6579 from mbien/ci-build-from-src-zip new 39ef2327ae Enable previously disabled tests for the java.hints module. new 1893738c5d Merge pull request #6554 from mbien/ci-java-hints-enable-more-tests new 6881b98d62 Fix openide.awt tests (annotation processor err msg changed) new cb439a0b9e Fix openide.filesystems, options.api and core.multiview tests. new 8295f4ed7e Fix platform/favorites tests, input does influence favorites order. new 03af07e74a Move platform jobs to JDK 11. new fb0835512d Merge pull request #6617 from mbien/platform-to-11 new 29773a3fc1 Adding priorities to SQLCompletionItem new 4a89c2b57a Merge pull request #6620 from jhorvath/sql_cc_priority new 32a9ff7702 Navigate to Scala classes in Analyze Stack Window new aa95958ec9 Navigate to Scala classes in Analyze Stack Window new e18f55e696 Ask for DB password when creating OCI Vault new c3bd066dab Merge pull request #6645 from jhorvath/db_vault_empty_password new 36a9b160de [NETBEANS-6599] Do not throw a CompletionFailure for empty java.lang package outside of java.base. new 8dd9867e1a Merge pull request #6629 from lahodaj/NETBEANS-6599 new 6468b24767 [JAVAVSCODE-53] Assignments to parameters to record compact constructors should not be marked as unused. new 68bb0e8e61 Merge pull request #6635 from lahodaj/javavscode-53 new 0136307ef3 [NETBEANS-6638]: Avoid adding a space after opening curly brace. new 7668ad1083 Merge pull request #6641 from lahodaj/NETBEANS-6638 new 7b478ba8ba PHP: Fix autocomplete for exception class when adding exception breakpoint. new 5bfd1a1eee
(netbeans) branch php-nb21-features updated (69feae54c1 -> ef46b15be8)
This is an automated email from the ASF dual-hosted git repository. junichi11 pushed a change to branch php-nb21-features in repository https://gitbox.apache.org/repos/asf/netbeans.git from 69feae54c1 Merge pull request #6569 from junichi11/php82-dnf-types new 95ecb7e0c1 PHP 8.2 Support: Disjunctive Normal Form Types (Part 9) new 544093de4f PHP 8.2 Support: Disjunctive Normal Form Types (Part 10) new 9523012c56 PHP 8.2 Support: Disjunctive Normal Form Types (Part 11) new ef46b15be8 Merge pull request #6675 from junichi11/php82-dnf-types The 9215 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/netbeans/modules/php/editor/CodeUtils.java | 1 + .../php/editor/csl/DeclarationFinderImpl.java | 48 +- .../elements/BaseFunctionElementSupport.java | 76 ++- .../php/editor/parser/PHPVarCommentParser.java | 13 +- .../testDNFTypesConstructor.php| 29 + ...Constructor.php.testDNFTypesConstructor.codegen | 7 + .../testDNFTypesGetter/testDNFTypesGetter.php | 29 + ...stDNFTypesGetter.php.testDNFTypesGetter.codegen | 24 + .../testDNFTypesImplementMethod01.php | 45 ++ ...hod01.php.testDNFTypesImplementMethod01.codegen | 4 + .../testDNFTypesImplementMethod02.php | 49 ++ ...hod02.php.testDNFTypesImplementMethod02.codegen | 2 + .../testDNFTypesImplementMethod03.php | 42 ++ ...hod03.php.testDNFTypesImplementMethod03.codegen | 2 + .../testDNFTypesImplementMethod04.php | 37 ++ ...hod04.php.testDNFTypesImplementMethod04.codegen | 2 + .../testDNFTypesOverrideMethod01.php | 39 ++ ...thod01.php.testDNFTypesOverrideMethod01.codegen | 3 + .../testDNFTypesOverrideMethod02.php | 51 ++ ...thod02.php.testDNFTypesOverrideMethod02.codegen | 3 + .../testDNFTypesOverrideMethod03.php | 45 ++ ...thod03.php.testDNFTypesOverrideMethod03.codegen | 3 + .../testDNFTypesSetter/testDNFTypesSetter.php | 29 + ...stDNFTypesSetter.php.testDNFTypesSetter.codegen | 24 + .../testDNFTypesImplementMethod01.php | 36 ++ ...1.php.testDNFTypesImplementMethod01.cccustomtpl | 4 + .../testDNFTypesImplementMethod02.php | 50 ++ ...2.php.testDNFTypesImplementMethod02.cccustomtpl | 4 + .../testDNFTypesImplementMethod03a.php | 44 ++ php.testDNFTypesImplementMethod03a.cccustomtpl | 4 + .../testDNFTypesImplementMethod03b.php | 47 ++ php.testDNFTypesImplementMethod03b.cccustomtpl | 4 + .../testDNFTypesImplementMethod04.php | 36 ++ ...4.php.testDNFTypesImplementMethod04.cccustomtpl | 4 + .../testDNFTypesOverrideMethod01.php | 38 ++ ...01.php.testDNFTypesOverrideMethod01.cccustomtpl | 4 + .../testDNFTypesOverrideMethod02.php | 52 ++ ...02.php.testDNFTypesOverrideMethod02.cccustomtpl | 4 + .../testDNFTypesOverrideMethod03.php | 46 ++ ...03.php.testDNFTypesOverrideMethod03.cccustomtpl | 4 + .../testDNFTypesOverrideMethodSpecialTypes01.php | 53 ++ ...NFTypesOverrideMethodSpecialTypes01.cccustomtpl | 9 + .../testDNFTypesOverrideMethodSpecialTypes02.php | 52 ++ ...NFTypesOverrideMethodSpecialTypes02.cccustomtpl | 9 + .../testDNFTypesOverrideMethodSpecialTypes03.php | 48 ++ ...NFTypesOverrideMethodSpecialTypes03.cccustomtpl | 9 + .../testDNFTypesOverrideMethodSpecialTypes04.php | 46 ++ ...NFTypesOverrideMethodSpecialTypes04.cccustomtpl | 9 + .../php82/testDNFType/testDNFType.php | 114 .../php82/testDNFType/testDNFType.php | 114 .../testDNFType.php.testDNFType_a01.occurrences| 38 ++ .../testDNFType.php.testDNFType_a02.occurrences| 38 ++ .../testDNFType.php.testDNFType_a03.occurrences| 38 ++ .../testDNFType.php.testDNFType_a04.occurrences| 38 ++ .../testDNFType.php.testDNFType_a05.occurrences| 38 ++ .../testDNFType.php.testDNFType_a06.occurrences| 38 ++ .../testDNFType.php.testDNFType_a07.occurrences| 38 ++ .../testDNFType.php.testDNFType_a08.occurrences| 38 ++ .../testDNFType.php.testDNFType_a09.occurrences| 38 ++ .../testDNFType.php.testDNFType_a10.occurrences| 38 ++ .../testDNFType.php.testDNFType_a11.occurrences| 38 ++ .../testDNFType.php.testDNFType_a12.occurrences| 38 ++ .../testDNFType.php.testDNFType_a13.occurrences| 38 ++ .../testDNFType.php.testDNFType_a14.occurrences| 38 ++ .../testDNFType.php.testDNFType_a15.occurrences| 38 ++ .../testDNFType.php.testDNFType_a16.occurrences| 38 ++ .../testDNFType.php.testDNFType_a17.occurrences| 38 ++ .../testDNFType.php.testDNFType_a18.occurrences| 38 ++
(netbeans) branch delivery updated: Bump hardcoded maven compiler and resource plugin version defaults.
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new 94f79acf1e Bump hardcoded maven compiler and resource plugin version
defaults.
new 52f41d8342 Merge pull request #6681 from
mbien/bump-hardcoded-plugin-versions
94f79acf1e is described below
commit 94f79acf1e1600f411af8f5d00e00bcbb276e77a
Author: Michael Bien
AuthorDate: Fri Nov 10 00:13:40 2023 +0100
Bump hardcoded maven compiler and resource plugin version defaults.
This caused the build to fail when deprecation warnings were toggled
via project properties UI, since the inserted maven compiler plugin
is not compatible with current JDKs.
At some point we should consolidate this and use the index, like
already done in other places.
---
.../org/netbeans/modules/maven/options/MavenVersionSettings.java | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git
a/java/maven/src/org/netbeans/modules/maven/options/MavenVersionSettings.java
b/java/maven/src/org/netbeans/modules/maven/options/MavenVersionSettings.java
index fd886ebeab..9f58ab7b0d 100644
---
a/java/maven/src/org/netbeans/modules/maven/options/MavenVersionSettings.java
+++
b/java/maven/src/org/netbeans/modules/maven/options/MavenVersionSettings.java
@@ -60,12 +60,11 @@ public final class MavenVersionSettings {
public String getVersion(String plugin) {
String toRet = getProperty(plugin);
if (toRet == null) {
-// XXX these should rather read the most recent version from the
repository index
+// XXX these should rather read the most recent version from the
repository index (agreed)
if (VERSION_RESOURCES.equals(plugin)) {
-toRet = "2.4.3"; //NOI18N
-}
-else if (VERSION_COMPILER.equals(plugin)) {
-toRet = "2.3.2"; //NOI18N
+toRet = "3.3.1"; //NOI18N
+} else if (VERSION_COMPILER.equals(plugin)) {
+toRet = "3.11.0"; //NOI18N
}
}
if (toRet == null) {
-
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
(netbeans) branch delivery updated (6fb214311c -> 1c1bb6c542)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch delivery in repository https://gitbox.apache.org/repos/asf/netbeans.git from 6fb214311c Merge pull request #6673 from mbien/fix-lsp-micronaut-tests_delivery new a2b207c7d5 Make sure to pass the attributes for all 3 trees in CherryPickCommand.FailuresDetectRecursiveStrategy. new 1977e4b00e Enable testing for libs.git. new 1c1bb6c542 Merge pull request #6672 from neilcsmith-net/gh6668 The 9245 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 ++-- .../libs/git/jgit/commands/CherryPickCommand.java | 17 + .../org/netbeans/libs/git/jgit/commands/AddTest.java| 5 +++-- .../netbeans/libs/git/jgit/commands/CheckoutTest.java | 3 ++- .../org/netbeans/libs/git/jgit/commands/MergeTest.java | 3 ++- .../org/netbeans/libs/git/jgit/commands/PushTest.java | 8 ++-- .../org/netbeans/libs/git/jgit/commands/RevertTest.java | 3 ++- 7 files changed, 30 insertions(+), 13 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 php-nb21-features updated (94ceb291d9 -> 69feae54c1)
This is an automated email from the ASF dual-hosted git repository. junichi11 pushed a change to branch php-nb21-features in repository https://gitbox.apache.org/repos/asf/netbeans.git discard 94ceb291d9 Merge pull request #6569 from junichi11/php82-dnf-types omit 73237de942 Merge pull request #6660 from mbien/output-options-ui-cleanup omit 1be2163379 Merge pull request #6684 from apache/delivery omit 6fb214311c Merge pull request #6673 from mbien/fix-lsp-micronaut-tests_delivery omit c0f09c927b Force TLS1.2 in MicronautGradleArtifactsImplTest and ProjectViewTest omit 1c3458d4d3 Update micronaut gradle tests omit 54b5d2a112 Merge pull request #6665 from mbien/stabilize-php-tag-folding-test omit 49cda01b0c Fix php tag fold test (attempt 2) omit 0c8313ebfd Merge pull request #5576 from tbw777/g2 omit 5cb5afea64 Installed some internal generics to fix some compiler warnings omit fb9b95d78c Terminal, Output and Syntax Coloring options UI cleanup. omit 27e53d96cd Merge pull request #6656 from neilcsmith-net/del-master-20rc3 omit 317bc96f9e Merge branch 'delivery' into del-master-20rc3 omit a385cb1a63 Merge pull request #6623 from mbien/revert-6514_delivery omit 7c99436d83 Merge pull request #6654 from neilcsmith-net/gh6448 omit 77185eab0f Enable JUnit output processing if the Maven goals include failsafe:integration-test omit efe5e1735d Merge pull request #6644 from neilcsmith-net/mouse-linux-horiz-scroll omit c3bd066dab Merge pull request #6645 from jhorvath/db_vault_empty_password omit 43693c87d7 Merge pull request #6646 from lahodaj/NETBEANS-5659 omit 5bfd1a1eee Merge pull request #6643 from troizet/php_fix_completion_exception_breakpoint omit 7668ad1083 Merge pull request #6641 from lahodaj/NETBEANS-6638 omit 0e0560d950 Drop horizontal scroll mouse button events on Linux to fix trackpad issues. omit 9e4a2603dd [NETBEANS-5659] Collection.forEach is always a read from the collection. omit e18f55e696 Ask for DB password when creating OCI Vault omit 7b478ba8ba PHP: Fix autocomplete for exception class when adding exception breakpoint. omit 68bb0e8e61 Merge pull request #6635 from lahodaj/javavscode-53 omit aa95958ec9 Navigate to Scala classes in Analyze Stack Window omit 0136307ef3 [NETBEANS-6638]: Avoid adding a space after opening curly brace. omit 32a9ff7702 Navigate to Scala classes in Analyze Stack Window omit 6468b24767 [JAVAVSCODE-53] Assignments to parameters to record compact constructors should not be marked as unused. omit 4a89c2b57a Merge pull request #6620 from jhorvath/sql_cc_priority omit 29773a3fc1 Adding priorities to SQLCompletionItem omit 8dd9867e1a Merge pull request #6629 from lahodaj/NETBEANS-6599 omit fb0835512d Merge pull request #6617 from mbien/platform-to-11 omit 36a9b160de [NETBEANS-6599] Do not throw a CompletionFailure for empty java.lang package outside of java.base. omit 1893738c5d Merge pull request #6554 from mbien/ci-java-hints-enable-more-tests omit 03af07e74a Move platform jobs to JDK 11. omit 8295f4ed7e Fix platform/favorites tests, input does influence favorites order. omit cb439a0b9e Fix openide.filesystems, options.api and core.multiview tests. omit 6881b98d62 Fix openide.awt tests (annotation processor err msg changed) omit 20ee034c8a Merge pull request #6579 from mbien/ci-build-from-src-zip omit 94aa2ddd90 Revert "Priming build and reload improvements." omit a64cc72f02 CI: Add build-from-src-zip job omit 2b20e6b270 Merge pull request #6608 from apache/delivery omit 5ec24679f1 Merge pull request #6618 from lkishalmi/gradle-better-handle-runSingle omit ec555891e4 Merge pull request #6619 from mbien/ui-fix-naming-panel-layout omit 8ecaee2fd2 Naming panel should be set to its preferred size. omit e6ea7501e7 Be more friendly on 'runSingle' when 'run' task is missing. omit 2fde2b4fd6 Merge pull request #6609 from thurka/GCN-3613 omit 4c6ab9ac54 Merge pull request #6591 from thurka/GCN-3261 omit b12970d271 Merge pull request #6514 from sdedic/maven/priming-and-reloads omit 40a9bb695c Merge pull request #6593 from mbien/fix-unnamed-main-detection omit 29b88adab0 make sure that there is database connection - getDialect() needs it omit a2fe03e25e Merge pull request #6605 from DevCharly/flatlaf-3.2.4 omit db3c20eb85 Merge pull request #6598 from lkishalmi/gradle-disconnect-on-exit omit 85b63563d6 Merge pull request #6594 from mbien/fix-git-history-regression omit 9eb9def620 Merge pull request #6590 from mbien/jdk-downloader-current-version-fix_delivery omit 5e712c89f2 Merge pull request #6589 from lkishalmi/fix-gradle-version-change-in-wrapper omit e0e448f436 Merge pull request #6218 from lahodaj/lsp-server-generic-commands-settings-try2 omit 9f51a38243 Include add-opens flags for tests/JDK9+ omit 409740b82f
(netbeans) branch php-nb21-features updated (b0a98ffdff -> 94ceb291d9)
This is an automated email from the ASF dual-hosted git repository. junichi11 pushed a change to branch php-nb21-features in repository https://gitbox.apache.org/repos/asf/netbeans.git discard b0a98ffdff PHP 8.2 Support: Disjunctive Normal Form Types (Part 8) discard ec679fe153 PHP 8.2 Support: Disjunctive Normal Form Types (Part 7) discard cefe6a1b81 PHP 8.2 Support: Disjunctive Normal Form Types (Part 6) discard 71d008672c PHP 8.2 Support: Disjunctive Normal Form Types (Part 5) discard ab297022ed PHP 8.2 Support: Disjunctive Normal Form Types (Part 4) discard d564b40f39 PHP 8.2 Support: Disjunctive Normal Form Types (Part 3) discard a32131e6ae PHP 8.2 Support: Disjunctive Normal Form Types (Part 2) new 505715ac92 PHP 8.2 Support: Disjunctive Normal Form Types (Part 2) new d686d1edf8 PHP 8.2 Support: Disjunctive Normal Form Types (Part 3) new 46f2330137 PHP 8.2 Support: Disjunctive Normal Form Types (Part 4) new 27829fa56d PHP 8.2 Support: Disjunctive Normal Form Types (Part 5) new 7832f690ec PHP 8.2 Support: Disjunctive Normal Form Types (Part 6) new b3b4694f47 PHP 8.2 Support: Disjunctive Normal Form Types (Part 7) new 3ffd6159f2 PHP 8.2 Support: Disjunctive Normal Form Types (Part 8) new 94ceb291d9 Merge pull request #6569 from junichi11/php82-dnf-types This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (b0a98ffdff) \ N -- N -- N refs/heads/php-nb21-features (94ceb291d9) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 9286 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: - 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/07: PHP 8.2 Support: Disjunctive Normal Form Types (Part 2)
This is an automated email from the ASF dual-hosted git repository.
junichi11 pushed a commit to branch php-nb21-features
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit a32131e6ae856fa87b0861572d05e9ffbffcb07d
Author: Junichi Yamamoto
AuthorDate: Fri Apr 28 11:01:36 2023 +0900
PHP 8.2 Support: Disjunctive Normal Form Types (Part 2)
- https://github.com/apache/netbeans/issues/4725
- https://wiki.php.net/rfc/dnf_types
- Fix DNF return types for the navigator
---
.../org/netbeans/modules/php/editor/CodeUtils.java | 90 ++
.../modules/php/editor/api/QualifiedName.java | 10 +-
.../php/editor/api/elements/AliasedFunction.java | 5 +
.../editor/api/elements/BaseFunctionElement.java | 6 +
.../modules/php/editor/csl/NavigatorScanner.java | 41 ++-
.../elements/BaseFunctionElementSupport.java | 25 +++-
.../php/editor/elements/FunctionElementImpl.java | 20 +++
.../php/editor/elements/MethodElementImpl.java | 42 +--
.../modules/php/editor/index/PHPIndexer.java | 2 +-
.../modules/php/editor/model/FunctionScope.java| 1 +
.../php/editor/model/impl/FunctionScopeImpl.java | 87 +++--
.../php/editor/model/impl/MethodScopeImpl.java | 7 ++
.../deprecatedTypesForNullableTypes_02.pass| 2 +-
.../php82/deprecatedDnfReturnTypes_01.pass | 14 +++
.../NavigatorTest/structure/nullableTypes_02.pass | 2 +-
.../structure/php82/dnfReturnTypes.pass| 14 +++
.../structure/pureIntersectionTypes.pass | 10 +-
.../index/testGetEnums/testGetEnums.php.indexed| 8 +-
.../testGetFunctions/testGetFunctions.php.indexed | 6 +-
.../testGetMethods/testGetMethods.php.indexed | 2 +-
.../testIssue240824/testIssue240824.php.indexed| 2 +-
.../testNullableTypesForFunctions.php.indexed | 4 +-
.../testNullableTypesForMethods.php.indexed| 8 +-
...stPHP80ConstructorPropertyPromotion.php.indexed | 20 +--
.../testPHP80MixedReturnType.php.indexed | 4 +-
.../testPHP80UnionTypesFunctions.php.indexed | 12 +-
.../testPHP80UnionTypesTypes.php.indexed | 16 +--
.../testPHP81PureIntersectionTypes.php.indexed | 24 ++--
.../testPHP82ConstantsInTraits.php.indexed | 2 +-
.../testPHP82DNFReturnTypes.php} | 37 ++
.../testPHP82DNFReturnTypes.php.indexed| 136 +
.../deprecatedDnfReturnTypes_01.php} | 43 +++
.../dnfReturnTypes.php}| 40 ++
.../testfiles/structure/pureIntersectionTypes.php | 2 +-
.../php/editor/csl/NavigatorDeprecatedTest.java| 4 +
.../modules/php/editor/csl/NavigatorTest.java | 4 +
.../modules/php/editor/index/PHPIndexTest.java | 4 +
37 files changed, 530 insertions(+), 226 deletions(-)
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/CodeUtils.java
b/php/php.editor/src/org/netbeans/modules/php/editor/CodeUtils.java
index d87712a333..e18311e208 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/CodeUtils.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/CodeUtils.java
@@ -254,15 +254,9 @@ public final class CodeUtils {
} else if (typeName instanceof NullableType) {
return NULLABLE_TYPE_PREFIX +
extractUnqualifiedName(((NullableType) typeName).getType());
} else if (typeName instanceof UnionType) {
-UnionType unionType = (UnionType) typeName;
-StringBuilder sb = new StringBuilder();
-for (Expression type : unionType.getTypes()) {
-if (sb.length() > 0) {
-sb.append(Type.SEPARATOR);
-}
-sb.append(extractUnqualifiedName(type));
-}
-return sb.toString();
+return extractUnqualifiedName((UnionType) typeName);
+} else if (typeName instanceof IntersectionType) {
+return extractUnqualifiedName((IntersectionType) typeName);
}
//TODO: php5.3 !!!
@@ -270,6 +264,35 @@ public final class CodeUtils {
return null;
}
+private static String extractUnqualifiedName(UnionType unionType) {
+StringBuilder sb = new StringBuilder();
+for (Expression type : unionType.getTypes()) {
+if (sb.length() > 0) {
+sb.append(Type.SEPARATOR);
+}
+boolean isIntersectionType = type instanceof IntersectionType;
+if (isIntersectionType) {
+sb.append("("); // NOI18N
+}
+sb.append(extractUnqualifiedName(type));
+if (isIntersectionType) {
+sb.append(")"); // NOI18N
+}
+}
+return sb.toString();
+}
+
+private static String extractUnqualifiedName(IntersectionType
intersectionType) {
+StringBuilder sb = new StringBuilder();
+for
(netbeans) 04/07: PHP 8.2 Support: Disjunctive Normal Form Types (Part 5)
This is an automated email from the ASF dual-hosted git repository. junichi11 pushed a commit to branch php-nb21-features in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 71d008672cad41afc4fdc36920349683f16859c4 Author: Junichi Yamamoto AuthorDate: Thu Oct 12 11:53:17 2023 +0900 PHP 8.2 Support: Disjunctive Normal Form Types (Part 5) - https://github.com/apache/netbeans/issues/4725 - https://wiki.php.net/rfc/dnf_types - Fix code completion for return, field, `@method`, `@property`, and `@var` DNF types - Fix the lexer to recognize DNF types of vardoc (`/** @var X|(Y) $var */`) - Add unit tests --- .../org/netbeans/modules/php/editor/CodeUtils.java | 2 +- .../php/editor/api/elements/FieldElement.java | 1 + .../php/editor/completion/PHPCompletionItem.java | 4 + .../php/editor/elements/FieldElementImpl.java | 32 ++- .../php/editor/model/impl/FieldElementImpl.java| 2 +- .../php/editor/model/impl/FunctionScopeImpl.java | 4 +- .../modules/php/editor/model/impl/Type.java| 26 +- .../modules/php/editor/parser/ASTPHP5Scanner.java | 316 - .../php/editor/parser/PHPVarCommentParser.java | 3 +- .../completion/lib/php82/testDNFTypes/dnfTypes.php | 215 ++ ...nfTypes.php.testDNFTypes_FieldType01.completion | 12 + ...fTypes.php.testDNFTypes_FieldType02a.completion | 12 + ...fTypes.php.testDNFTypes_FieldType02b.completion | 5 + ...nfTypes.php.testDNFTypes_FieldType03.completion | 18 ++ ...nfTypes.php.testDNFTypes_FieldType04.completion | 9 + ...nfTypes.php.testDNFTypes_FieldType05.completion | 13 + ...nfTypes.php.testDNFTypes_FieldType06.completion | 9 + ...nfTypes.php.testDNFTypes_FieldType07.completion | 9 + ...nfTypes.php.testDNFTypes_FieldType08.completion | 9 + ...nfTypes.php.testDNFTypes_FieldType09.completion | 13 + ...fTypes.php.testDNFTypes_FieldType10a.completion | 9 + ...fTypes.php.testDNFTypes_FieldType10b.completion | 4 + ...nfTypes.php.testDNFTypes_FieldType11.completion | 18 ++ ...nfTypes.php.testDNFTypes_FieldType12.completion | 12 + ...nfTypes.php.testDNFTypes_FieldType13.completion | 9 + ...hp.testDNFTypes_FunctionReturnType01.completion | 12 + ...hp.testDNFTypes_FunctionReturnType02.completion | 18 ++ ...hp.testDNFTypes_FunctionReturnType03.completion | 12 + ...p.testDNFTypes_FunctionReturnType04a.completion | 18 ++ ...p.testDNFTypes_FunctionReturnType04b.completion | 4 + php.testDNFTypes_MethodReturnType01.completion | 12 + ...php.testDNFTypes_MethodReturnType02a.completion | 12 + ...php.testDNFTypes_MethodReturnType02b.completion | 5 + php.testDNFTypes_MethodReturnType03.completion | 9 + php.testDNFTypes_MethodReturnType04.completion | 12 + php.testDNFTypes_MethodReturnType05.completion | 9 + php.testDNFTypes_MethodReturnType06.completion | 12 + php.testDNFTypes_MethodReturnType07.completion | 18 ++ php.testDNFTypes_MethodReturnType08.completion | 18 ++ ...php.testDNFTypes_MethodReturnType09a.completion | 12 + ...php.testDNFTypes_MethodReturnType09b.completion | 4 + php.testDNFTypes_MethodReturnType10.completion | 18 ++ php.testDNFTypes_MethodReturnType11.completion | 9 + php.testDNFTypes_MethodReturnType12.completion | 18 ++ ...php.testDNFTypes_MethodReturnType13a.completion | 18 ++ ...php.testDNFTypes_MethodReturnType13b.completion | 4 + php.testDNFTypes_MethodReturnType14.completion | 12 + php.testDNFTypes_MethodReturnType15.completion | 12 + php.testDNFTypes_MethodReturnType16.completion | 18 ++ php.testDNFTypes_MethodReturnType17.completion | 12 + php.testDNFTypes_MethodReturnType18.completion | 12 + ...Types.php.testDNFTypes_VarDocType01a.completion | 9 + ...Types.php.testDNFTypes_VarDocType01b.completion | 13 + ...Types.php.testDNFTypes_VarDocType02a.completion | 12 + ...Types.php.testDNFTypes_VarDocType02b.completion | 18 ++ ...Types.php.testDNFTypes_VarDocType03a.completion | 12 + ...Types.php.testDNFTypes_VarDocType03b.completion | 18 ++ ...Types.php.testDNFTypes_VarDocType04a.completion | 9 + ...Types.php.testDNFTypes_VarDocType04b.completion | 13 + ...Types.php.testDNFTypes_VarDocType05a.completion | 12 + ...Types.php.testDNFTypes_VarDocType05b.completion | 18 ++ ...Types.php.testDNFTypes_VarDocType06a.completion | 12 + ...Types.php.testDNFTypes_VarDocType06b.completion | 18 ++ .../editor/completion/PHP82CodeCompletionTest.java | 212 ++ .../modules/php/editor/model/impl/TypeTest.java| 101 +++ php/php.editor/tools/ASTPHP5Scanner.flex | 4 +- 66 files changed, 1411 insertions(+), 156 deletions(-) diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/CodeUtils.java b/php/php.editor/src/org/netbeans/modules/php/editor/CodeUtils.java index 746fecc67a..fb2c27caaa 100644 ---
(netbeans) branch php-nb21-features updated (69feae54c1 -> b0a98ffdff)
This is an automated email from the ASF dual-hosted git repository. junichi11 pushed a change to branch php-nb21-features in repository https://gitbox.apache.org/repos/asf/netbeans.git omit 69feae54c1 Merge pull request #6569 from junichi11/php82-dnf-types omit 3ffd6159f2 PHP 8.2 Support: Disjunctive Normal Form Types (Part 8) omit b3b4694f47 PHP 8.2 Support: Disjunctive Normal Form Types (Part 7) omit 7832f690ec PHP 8.2 Support: Disjunctive Normal Form Types (Part 6) omit 27829fa56d PHP 8.2 Support: Disjunctive Normal Form Types (Part 5) omit 46f2330137 PHP 8.2 Support: Disjunctive Normal Form Types (Part 4) omit d686d1edf8 PHP 8.2 Support: Disjunctive Normal Form Types (Part 3) omit 505715ac92 PHP 8.2 Support: Disjunctive Normal Form Types (Part 2) add dca223ab08 - Add Wildfly version 29 and 30 - Add Java 21 support for Wildfly 30+ - Prefer ConcurrentMap to synchronizedMap - Prefer ConcurrentHashMap.newKeySet to synchronizedSet - Remove synchronized blocks when using atomic and concurrent operations with ConcurrentHashMap - Set initial capacity for profile sets - Use try-with-resources when possible add 5e2a225f7f Merge pull request #6602 from pepness/wildfly-30 add b68146ac67 Update ASM from 9.5 to 9.6 add a5c96b738d Merge pull request #6597 from pepness/asm-9.6 add 0c437f1411 Micronaut Template for Data repository - add support for Pageable add 4c6ab9ac54 Merge pull request #6591 from thurka/GCN-3261 add 29b88adab0 make sure that there is database connection - getDialect() needs it add 2fde2b4fd6 Merge pull request #6609 from thurka/GCN-3613 add 774ff952a6 use clusters.config.release.list instead of clusters.config.full.list add cc0d88c3cd Merge pull request #6583 from thurka/vsix_build add b6dc0d4cd9 Prefixing all code names of commands with 'nbls'. add e0e448f436 Merge pull request #6218 from lahodaj/lsp-server-generic-commands-settings-try2 add aa5755a61c Fix Gradle version change in wrapper.properties add 5e712c89f2 Merge pull request #6589 from lkishalmi/fix-gradle-version-change-in-wrapper add e75a76521f JDK Downloader: fix current GA/EA values add 9eb9def620 Merge pull request #6590 from mbien/jdk-downloader-current-version-fix_delivery add c9c2ebf309 Fix Git show history regression. add 85b63563d6 Merge pull request #6594 from mbien/fix-git-history-regression add 49fac41e03 Try to close Gradle Daemons on exit. add db3c20eb85 Merge pull request #6598 from lkishalmi/gradle-disconnect-on-exit add a0e9284b89 Update FlatLaf from 3.2.1 to 3.2.5 add a2fe03e25e Merge pull request #6605 from DevCharly/flatlaf-3.2.4 add 23df8c64bf Fix unnamed main method detection code. add 40a9bb695c Merge pull request #6593 from mbien/fix-unnamed-main-detection add 409740b82f Priming build and reload improvements. add 9f51a38243 Include add-opens flags for tests/JDK9+ add b12970d271 Merge pull request #6514 from sdedic/maven/priming-and-reloads add 8ecaee2fd2 Naming panel should be set to its preferred size. add ec555891e4 Merge pull request #6619 from mbien/ui-fix-naming-panel-layout add e6ea7501e7 Be more friendly on 'runSingle' when 'run' task is missing. add 5ec24679f1 Merge pull request #6618 from lkishalmi/gradle-better-handle-runSingle add 2b20e6b270 Merge pull request #6608 from apache/delivery add a64cc72f02 CI: Add build-from-src-zip job add 20ee034c8a Merge pull request #6579 from mbien/ci-build-from-src-zip add 39ef2327ae Enable previously disabled tests for the java.hints module. add 1893738c5d Merge pull request #6554 from mbien/ci-java-hints-enable-more-tests add 6881b98d62 Fix openide.awt tests (annotation processor err msg changed) add cb439a0b9e Fix openide.filesystems, options.api and core.multiview tests. add 8295f4ed7e Fix platform/favorites tests, input does influence favorites order. add 03af07e74a Move platform jobs to JDK 11. add fb0835512d Merge pull request #6617 from mbien/platform-to-11 add 29773a3fc1 Adding priorities to SQLCompletionItem add 4a89c2b57a Merge pull request #6620 from jhorvath/sql_cc_priority add 32a9ff7702 Navigate to Scala classes in Analyze Stack Window add aa95958ec9 Navigate to Scala classes in Analyze Stack Window add e18f55e696 Ask for DB password when creating OCI Vault add c3bd066dab Merge pull request #6645 from jhorvath/db_vault_empty_password add 36a9b160de [NETBEANS-6599] Do not throw a CompletionFailure for empty java.lang package outside of java.base. add 8dd9867e1a Merge pull request #6629 from lahodaj/NETBEANS-6599 add 6468b24767 [JAVAVSCODE-53] Assignments to parameters to record compact constructors should not be marked as unused. add 68bb0e8e61 Merge pull request #6635 from lahodaj/javavscode-53 add 0136307ef3 [NETBEANS-6638]: Avoid adding a
(netbeans) 05/07: PHP 8.2 Support: Disjunctive Normal Form Types (Part 6)
This is an automated email from the ASF dual-hosted git repository.
junichi11 pushed a commit to branch php-nb21-features
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit cefe6a1b819c9138f88dc6afe48aedd5d611d12e
Author: Junichi Yamamoto
AuthorDate: Thu Oct 12 15:09:29 2023 +0900
PHP 8.2 Support: Disjunctive Normal Form Types (Part 6)
- https://github.com/apache/netbeans/issues/4725
- https://wiki.php.net/rfc/dnf_types
- Fix code completion for parameter DNF types
- Add unit tests
---
.../org/netbeans/modules/php/editor/CodeUtils.java | 1 +
.../php/editor/elements/ParameterElementImpl.java | 34 ++
.../php/editor/elements/TypeResolverImpl.java | 4 +-
.../modules/php/editor/model/impl/Type.java| 17 +++
.../php/editor/model/impl/VariousUtils.java| 7 +-
.../completion/lib/php82/testDNFTypes/dnfTypes.php | 49 +++-
...pes.php.testDNFTypes_ParameterType01.completion | 9 ++
...pes.php.testDNFTypes_ParameterType02.completion | 9 ++
...pes.php.testDNFTypes_ParameterType03.completion | 13 +++
...pes.php.testDNFTypes_ParameterType04.completion | 13 +++
...pes.php.testDNFTypes_ParameterType05.completion | 12 ++
...pes.php.testDNFTypes_ParameterType06.completion | 18 +++
...pes.php.testDNFTypes_ParameterType07.completion | 9 ++
...pes.php.testDNFTypes_ParameterType08.completion | 12 ++
...pes.php.testDNFTypes_ParameterType09.completion | 12 ++
...pes.php.testDNFTypes_ParameterType10.completion | 18 +++
...pes.php.testDNFTypes_ParameterType11.completion | 12 ++
...pes.php.testDNFTypes_ParameterType12.completion | 9 ++
...pes.php.testDNFTypes_ParameterType13.completion | 18 +++
...pes.php.testDNFTypes_ParameterType14.completion | 18 +++
...pes.php.testDNFTypes_ParameterType15.completion | 18 +++
...pes.php.testDNFTypes_ParameterType16.completion | 9 ++
...pes.php.testDNFTypes_ParameterType17.completion | 13 +++
...pes.php.testDNFTypes_ParameterType18.completion | 12 ++
...pes.php.testDNFTypes_ParameterType19.completion | 18 +++
...pes.php.testDNFTypes_ParameterType20.completion | 9 ++
...pes.php.testDNFTypes_ParameterType21.completion | 13 +++
...pes.php.testDNFTypes_ParameterType22.completion | 12 ++
...es.php.testDNFTypes_ParameterType23a.completion | 18 +++
...es.php.testDNFTypes_ParameterType23b.completion | 4 +
...pes.php.testDNFTypes_ParameterType24.completion | 12 ++
...pes.php.testDNFTypes_ParameterType25.completion | 18 +++
...pes.php.testDNFTypes_ParameterType26.completion | 9 ++
...pes.php.testDNFTypes_ParameterType27.completion | 12 ++
...pes.php.testDNFTypes_ParameterType28.completion | 9 ++
...pes.php.testDNFTypes_ParameterType29.completion | 12 ++
...testDNFTypes_ParameterTypeInCCList01.completion | 5 +
.../testPHP82DNFParameterTypes.php.indexed | 14 +--
.../editor/completion/PHP82CodeCompletionTest.java | 124 +
.../modules/php/editor/model/impl/TypeTest.java| 100 +
40 files changed, 696 insertions(+), 39 deletions(-)
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/CodeUtils.java
b/php/php.editor/src/org/netbeans/modules/php/editor/CodeUtils.java
index fb2c27caaa..49731d9552 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/CodeUtils.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/CodeUtils.java
@@ -91,6 +91,7 @@ public final class CodeUtils {
public static final Pattern WHITE_SPACES_PATTERN =
Pattern.compile("\\s+"); // NOI18N
public static final Pattern SPLIT_TYPES_PATTERN =
Pattern.compile("[()|&]+"); // NOI18N
+public static final Pattern TYPE_NAMES_IN_TYPE_DECLARATION_PATTERN =
Pattern.compile("[^?()|&]+"); // NOI18N
private static final Logger LOGGER =
Logger.getLogger(CodeUtils.class.getName());
diff --git
a/php/php.editor/src/org/netbeans/modules/php/editor/elements/ParameterElementImpl.java
b/php/php.editor/src/org/netbeans/modules/php/editor/elements/ParameterElementImpl.java
index b8a69c0acf..69c27825f8 100644
---
a/php/php.editor/src/org/netbeans/modules/php/editor/elements/ParameterElementImpl.java
+++
b/php/php.editor/src/org/netbeans/modules/php/editor/elements/ParameterElementImpl.java
@@ -26,7 +26,6 @@ import java.util.Set;
import org.netbeans.api.annotations.common.CheckForNull;
import org.netbeans.modules.csl.api.OffsetRange;
import org.netbeans.modules.php.api.util.StringUtils;
-import org.netbeans.modules.php.editor.CodeUtils;
import org.netbeans.modules.php.editor.api.elements.ParameterElement;
import org.netbeans.modules.php.editor.api.elements.TypeNameResolver;
import org.netbeans.modules.php.editor.api.elements.TypeResolver;
@@ -357,30 +356,17 @@ public final class ParameterElementImpl implements
ParameterElement {
}
}
if (forDeclaration && hasDeclaredType()) {
-if (isUnionType || isIntersectionType) {
-boolean firstType =
(netbeans) 06/07: PHP 8.2 Support: Disjunctive Normal Form Types (Part 7)
This is an automated email from the ASF dual-hosted git repository.
junichi11 pushed a commit to branch php-nb21-features
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit ec679fe153f0826730f85a0fc94b9b58641db384
Author: Junichi Yamamoto
AuthorDate: Sun Oct 15 14:36:50 2023 +0900
PHP 8.2 Support: Disjunctive Normal Form Types (Part 7)
- https://github.com/apache/netbeans/issues/4725
- https://wiki.php.net/rfc/dnf_types
- Fix documentation of code completion for parameter DNF types
- Add unit tests
- Increment the spec version to 2.27.0
---
.../modules/php/editor/completion/DocRenderer.java | 120 -
.../editor/parser/astnodes/PHPDocMethodTag.java| 20
.../php/editor/parser/astnodes/PHPDocTypeTag.java | 34 +++---
.../completion/documentation/arrayReturnType.php | 14 ++-
...turnType.php.testArrayReturnTypeWithTab_01.html | 9 ++
...turnType.php.testArrayReturnTypeWithTab_02.html | 9 ++
testFunctionIntersectionTypeWithoutPhpDoc.html | 2 +-
...tPhpDoc.php.testFunctionTypedWithoutPhpDoc.html | 2 +-
...Doc.php.testFunctionUnionTypeWithoutPhpDoc.html | 2 +-
...hp.testMethodIntersectionTypeWithoutPhpDoc.html | 2 +-
...oc.php.testMethodNullableTypeWithoutPhpDoc.html | 2 +-
...hpDoc.php.testMethodUnionTypeWithoutPhpDoc.html | 2 +-
.../completion/documentation/php82/dnfTypes.php| 101 +
.../php82/dnfTypes.php.testDNFTypesField.html | 9 ++
.../dnfTypes.php.testDNFTypesInheritdocMethod.html | 15 +++
.../php82/dnfTypes.php.testDNFTypesMethod.html | 14 +++
.../php82/dnfTypes.php.testDNFTypesMethodTag.html | 14 +++
.../dnfTypes.php.testDNFTypesPhpdocField.html | 9 ++
.../dnfTypes.php.testDNFTypesPhpdocMethod.html | 16 +++
...dnfTypes.php.testDNFTypesPhpdocStaticField.html | 9 ++
...nfTypes.php.testDNFTypesPhpdocStaticMethod.html | 16 +++
.../dnfTypes.php.testDNFTypesPropertyTag.html | 6 ++
.../dnfTypes.php.testDNFTypesStaticField.html | 9 ++
.../dnfTypes.php.testDNFTypesStaticMethod.html | 14 +++
.../dnfTypes.php.testDNFTypesStaticMethodTag.html | 14 +++
.../editor/completion/PHPCCDocumentationTest.java | 56 ++
26 files changed, 419 insertions(+), 101 deletions(-)
diff --git
a/php/php.editor/src/org/netbeans/modules/php/editor/completion/DocRenderer.java
b/php/php.editor/src/org/netbeans/modules/php/editor/completion/DocRenderer.java
index c16340c68a..5bfc5d23da 100644
---
a/php/php.editor/src/org/netbeans/modules/php/editor/completion/DocRenderer.java
+++
b/php/php.editor/src/org/netbeans/modules/php/editor/completion/DocRenderer.java
@@ -91,7 +91,6 @@ import
org.netbeans.modules.php.editor.parser.astnodes.PHPDocBlock;
import org.netbeans.modules.php.editor.parser.astnodes.PHPDocMethodTag;
import org.netbeans.modules.php.editor.parser.astnodes.PHPDocNode;
import org.netbeans.modules.php.editor.parser.astnodes.PHPDocTag;
-import org.netbeans.modules.php.editor.parser.astnodes.PHPDocTypeNode;
import org.netbeans.modules.php.editor.parser.astnodes.PHPDocTypeTag;
import org.netbeans.modules.php.editor.parser.astnodes.PHPDocVarTypeTag;
import org.netbeans.modules.php.editor.parser.astnodes.Program;
@@ -366,7 +365,12 @@ final class DocRenderer {
} else {
if (node instanceof PHPDocVarTypeTag) {
PHPDocVarTypeTag varTypeTag = (PHPDocVarTypeTag) node;
-String type = composeType(varTypeTag.getTypes(),
getTypeKind(varTypeTag));
+// e.g. @property (A)|C $property something
+String[] values =
CodeUtils.WHITE_SPACES_PATTERN.split(varTypeTag.getValue().trim(), 2);
+String type = ""; // NOI18N
+if (!values[0].startsWith("$")) { // NOI18N
+type =
putTypeSeparatorBetweenWhitespaces(values[0]);
+}
phpDoc.append(processPhpDoc(String.format("%sType:%s", // NOI18N
varTypeTag.getDocumentation(),
type)));
@@ -388,14 +392,12 @@ final class DocRenderer {
description = processPhpDoc(description);
}
-if (methodTag.getParameters() != null &&
methodTag.getParameters().size() > 0) {
+if (methodTag.getParameters() != null &&
!methodTag.getParameters().isEmpty()) {
for (PHPDocVarTypeTag tag : methodTag.getParameters()) {
params.append(composeParameterLine(tag));
}
}
-
-
returnValue.append(composeTypesAndDescription(methodTag.getTypes(), null,
methodTag));
-
+
returnValue.append(composeTypesAndDescription(putTypeSeparatorBetweenWhitespaces(methodTag.getReturnType()),
null));
phpDoc.append(composeFunctionDoc(description, params.toString(),
(netbeans) 07/07: PHP 8.2 Support: Disjunctive Normal Form Types (Part 8)
This is an automated email from the ASF dual-hosted git repository.
junichi11 pushed a commit to branch php-nb21-features
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit b0a98ffdffee5b331c39c91188a2a327b3e10dbb
Author: Junichi Yamamoto
AuthorDate: Mon Oct 16 11:57:08 2023 +0900
PHP 8.2 Support: Disjunctive Normal Form Types (Part 8)
- https://github.com/apache/netbeans/issues/4725
- https://wiki.php.net/rfc/dnf_types
- Fix the formatter(Prevent adding `WHITESPACE_BEFORE_METHOD_DEC_PAREN`
twice)
```php
// e.g. the following case has "(("
function example((X)|Z $param): void {}
```
- Add a unit test
---
.../modules/php/editor/indent/FormatVisitor.java | 5 +-
.../testfiles/formatting/php82/dnfTypes_01.php | 190 ++
.../formatting/php82/dnfTypes_01.php.formatted | 281 +
.../php/editor/indent/PHPFormatterTest.java| 5 +
4 files changed, 480 insertions(+), 1 deletion(-)
diff --git
a/php/php.editor/src/org/netbeans/modules/php/editor/indent/FormatVisitor.java
b/php/php.editor/src/org/netbeans/modules/php/editor/indent/FormatVisitor.java
index c03939e031..2913ec7a66 100644
---
a/php/php.editor/src/org/netbeans/modules/php/editor/indent/FormatVisitor.java
+++
b/php/php.editor/src/org/netbeans/modules/php/editor/indent/FormatVisitor.java
@@ -1465,13 +1465,16 @@ public class FormatVisitor extends DefaultVisitor {
scan(node.getAttributes());
scan(node.getFunctionName());
+// e.g. function paramHasDNFType((X)|Z $test): void {}
+boolean addedOpenParen = false;
// #270903 add indent
while (ts.moveNext() && (ts.token().id() == PHPTokenId.WHITESPACE
|| isComment(ts.token())
-|| isOpenParen(ts.token( {
+|| (isOpenParen(ts.token()) && !addedOpenParen))) {
addFormatToken(formatTokens);
if (isOpenParen(ts.token())) {
formatTokens.add(new FormatToken.IndentToken(ts.offset() +
ts.token().length(), options.continualIndentSize));
+addedOpenParen = true;
}
}
ts.movePrevious();
diff --git
a/php/php.editor/test/unit/data/testfiles/formatting/php82/dnfTypes_01.php
b/php/php.editor/test/unit/data/testfiles/formatting/php82/dnfTypes_01.php
new file mode 100644
index 00..7fa34460fa
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/formatting/php82/dnfTypes_01.php
@@ -0,0 +1,190 @@
+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.
+ */
+class ClassX {
+const IMPLICIT_X_CONSTANT = "implicit constant";
+public const PUBLIC_X_CONSTANT = "public constant";
+private const PRIVATE_X_CONSTANT = "private constant";
+protected const PROTECTED_X_CONSTANT = "protected constant";
+public (ClassY & ClassZ) | ClassX $publicXField;
+private (ClassX)|(ClassY)|ClassX $privateXField;
+protected ClassX|(ClassY)|ClassY $protectedXField;
+public static (ClassY)|ClassX $publicStaticXField;
+private static (ClassY)|ClassY $privateStaticXField;
+protected static (ClassY) | ClassX|ClassY $protectedStaticXField;
+
+public function publicXMethod((ClassY)|ClassX $param1):
ClassX|(ClassY) {}
+ private function privateMXethod(ClassZ|(ClassY)|ClassX $param1 =
null): (ClassY)|ClassX {}
+ protected function protectedXMethod( (ClassY & ClassZ) |(ClassX
) $param1): (ClassY)|(ClassX) {}
+public static function publicStaticXMethod(ClassX | (ClassY & ClassZ) $param1,
int $param2): (ClassY)|ClassX {}
+ private static function privateStaticXMethod(int $param1,
(ClassX)|ClassZ $param2): ClassX|(ClassY){}
+protected static function protectedStaticXMethod(ClassX|null $param1,
(ClassX)|null $param2 = null): (ClassY)|ClassX {}
+}
+
+class ClassY {
+const IMPLICIT_Y_CONSTANT = "implicit constant";
+public const PUBLIC_Y_CONSTANT = "public constant";
+private const PRIVATE_Y_CONSTANT = "private constant";
+protected const PROTECTED_Y_CONSTANT = "protected constant";
+public (ClassY)|ClassX $publicYField;
+ private (ClassX)|(ClassY)|ClassX $privateYField;
+protected ClassX|(ClassY)|ClassY $protectedYField;
+public static (ClassY& ClassZ)|ClassX $publicStaticYField;
+private static (ClassY)|ClassY $privateStaticYField;
+protected static (ClassY)|ClassX|ClassY $protectedStaticYField;
+
+public function publicYMethod((ClassY)| ClassX $param1,
(ClassY)|ClassX|(ClassX) $param2): ClassX|(ClassY) {}
+private function privateYMethod(ClassX $param1, (ClassY) |null
$param2): (ClassY)|ClassX {}
+protected function
(netbeans) 03/07: PHP 8.2 Support: Disjunctive Normal Form Types (Part 4)
This is an automated email from the ASF dual-hosted git repository.
junichi11 pushed a commit to branch php-nb21-features
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit ab297022ed085f8486337bc9803f650350a68caf
Author: Junichi Yamamoto
AuthorDate: Thu Sep 28 22:48:23 2023 +0900
PHP 8.2 Support: Disjunctive Normal Form Types (Part 4)
- https://github.com/apache/netbeans/issues/4725
- https://wiki.php.net/rfc/dnf_types
- Fix DNF field types for the navigator
---
.../org/netbeans/modules/php/editor/CodeUtils.java | 1 +
.../modules/php/editor/csl/NavigatorScanner.java | 19 ++
.../php/editor/model/impl/FieldElementImpl.java| 11 +---
.../php/editor/model/impl/ModelVisitor.java| 75 +-
.../modules/php/editor/model/impl/Type.java| 1 +
.../php/editor/model/impl/VariousUtils.java| 14
.../structure/deprecatedTypedFields.pass | 8 +--
.../php82/deprecatedDnfFieldTypes_01.pass | 23 +++
.../structure/php82/dnfFieldTypes.pass | 23 +++
.../structure/php82/deprecatedDnfFieldTypes_01.php | 58 +
.../testfiles/structure/php82/dnfFieldTypes.php| 55
.../php/editor/csl/NavigatorDeprecatedTest.java| 4 ++
.../modules/php/editor/csl/NavigatorTest.java | 4 ++
13 files changed, 252 insertions(+), 44 deletions(-)
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/CodeUtils.java
b/php/php.editor/src/org/netbeans/modules/php/editor/CodeUtils.java
index ab54785743..746fecc67a 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/CodeUtils.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/CodeUtils.java
@@ -90,6 +90,7 @@ public final class CodeUtils {
public static final String ELLIPSIS = "..."; // NOI18N
public static final Pattern WHITE_SPACES_PATTERN =
Pattern.compile("\\s+"); // NOI18N
+public static final Pattern SPLIT_TYPES_PATTERN =
Pattern.compile("[()|&]"); // NOI18N
private static final Logger LOGGER =
Logger.getLogger(CodeUtils.class.getName());
diff --git
a/php/php.editor/src/org/netbeans/modules/php/editor/csl/NavigatorScanner.java
b/php/php.editor/src/org/netbeans/modules/php/editor/csl/NavigatorScanner.java
index 3eed34cc26..a03c7c80f5 100644
---
a/php/php.editor/src/org/netbeans/modules/php/editor/csl/NavigatorScanner.java
+++
b/php/php.editor/src/org/netbeans/modules/php/editor/csl/NavigatorScanner.java
@@ -481,7 +481,7 @@ public final class NavigatorScanner {
if (declaredType == null) {
return;
}
-if (isReturn) {
+if (isReturn || modelElement instanceof FieldElement) {
formatter.appendHtml(FONT_GRAY_COLOR + ":"); // NOI18N
} else {
formatter.appendHtml(FONT_GRAY_COLOR);
@@ -508,7 +508,7 @@ public final class NavigatorScanner {
if (sb.length() > 0) {
processTypeName(sb, modelElement, formatter);
}
-if (!isReturn) {
+if (!isReturn && modelElement instanceof FunctionScope) { //
parameter
formatter.appendText(" "); // NOI18N
}
formatter.appendHtml(CLOSE_FONT);
@@ -606,19 +606,8 @@ public final class NavigatorScanner {
if (field.isDeprecated()) {
formatter.deprecated(false);
}
-Collection types = field.getDefaultTypeNames();
-boolean isIntersectionType = field.getDefaultType() != null &&
field.getDefaultType().contains(Type.SEPARATOR_INTERSECTION);
-if (!types.isEmpty()) {
-formatter.appendHtml(FONT_GRAY_COLOR + ":"); //NOI18N
-int i = 0;
-for (String type : types) {
-i++;
-if (i > 1) {
-
formatter.appendText(Type.getTypeSeparator(isIntersectionType));
-}
-processTypeName(type, field, formatter);
-}
-formatter.appendHtml(CLOSE_FONT);
+if (StringUtils.hasText(field.getDefaultType())) {
+processDeclaredType(field, formatter, field.getDefaultType(),
false);
}
return formatter.getText();
}
diff --git
a/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/FieldElementImpl.java
b/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/FieldElementImpl.java
index c258cdc3bb..e3d68b1494 100644
---
a/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/FieldElementImpl.java
+++
b/php/php.editor/src/org/netbeans/modules/php/editor/model/impl/FieldElementImpl.java
@@ -252,16 +252,7 @@ class FieldElementImpl extends ScopeImpl implements
FieldElement {
@Override
public Collection getDefaultTypeNames() {
-Collection retval = Collections.emptyList();
-if (defaultType
(netbeans) 02/07: PHP 8.2 Support: Disjunctive Normal Form Types (Part 3)
This is an automated email from the ASF dual-hosted git repository.
junichi11 pushed a commit to branch php-nb21-features
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit d564b40f39bb3c6248ec95f560319c074d81fd11
Author: Junichi Yamamoto
AuthorDate: Thu Sep 28 09:08:23 2023 +0900
PHP 8.2 Support: Disjunctive Normal Form Types (Part 3)
- https://github.com/apache/netbeans/issues/4725
- https://wiki.php.net/rfc/dnf_types
- Fix DNF parameter types for the navigator
- The following cases are incorrect syntax for `@method` tag
```
@method int i() i($a = array()) Comment 10
```
- See:
https://docs.phpdoc.org/3.0/guide/references/phpdoc/tags/method.html#method
- So, disable `PHPCodeCompletion201870Test` and
`PHPCodeCompletion203294Test`
---
.../org/netbeans/modules/php/editor/CodeUtils.java | 4 +
.../php/editor/api/elements/ParameterElement.java | 4 +
.../php/editor/completion/PHPCompletionItem.java | 2 +
.../modules/php/editor/csl/NavigatorScanner.java | 61 ++---
.../php/editor/elements/MethodElementImpl.java | 2 +-
.../php/editor/elements/ParameterElementImpl.java | 39 ++-
.../modules/php/editor/index/PHPIndexer.java | 2 +-
.../modules/php/editor/model/Parameter.java| 6 +
.../php/editor/model/impl/FunctionScopeImpl.java | 2 +-
.../php/editor/model/impl/ParameterImpl.java | 33 ++-
.../php/editor/model/impl/VariousUtils.java| 20 +-
.../editor/model/nodes/FormalParameterInfo.java| 19 +-
.../model/nodes/FunctionDeclarationInfo.java | 3 +-
.../model/nodes/LambdaFunctionDeclarationInfo.java | 2 +-
.../model/nodes/MagicMethodDeclarationInfo.java| 25 +-
.../editor/model/nodes/MethodDeclarationInfo.java | 3 +-
.../php/editor/parser/PHPDocCommentParser.java | 48 +++-
.../deprecatedTypesForNullableTypes_01.pass| 2 +-
.../deprecatedTypesForNullableTypes_02.pass| 2 +-
.../php82/deprecatedDnfParameterTypes_01.pass | 15 ++
.../NavigatorTest/structure/nullableTypes_01.pass | 2 +-
.../NavigatorTest/structure/nullableTypes_02.pass | 2 +-
.../structure/php82/dnfParameterTypes.pass | 26 ++
.../index/testGetEnums/testGetEnums.php.indexed| 4 +-
.../testGetFunctions/testGetFunctions.php.indexed | 2 +-
.../testIssue240824/testIssue240824.php.indexed| 2 +-
.../testNullableTypesForFunctions.php.indexed | 4 +-
.../testNullableTypesForMethods.php.indexed| 8 +-
...stPHP80ConstructorPropertyPromotion.php.indexed | 20 +-
.../testPHP80UnionTypesFunctions.php.indexed | 12 +-
.../testPHP80UnionTypesTypes.php.indexed | 16 +-
.../testPHP81PureIntersectionTypes.php.indexed | 16 +-
.../testPHP82DNFParameterTypes.php | 69 +
.../testPHP82DNFParameterTypes.php.indexed | 281 +
.../testPHP82DNFReturnTypes.php.indexed| 2 +-
.../php82/deprecatedDnfParameterTypes_01.php | 58 +
.../structure/php82/dnfParameterTypes.php | 69 +
.../completion/PHPCodeCompletion201870Test.java| 5 +-
.../completion/PHPCodeCompletion203294Test.java| 5 +-
.../php/editor/csl/NavigatorDeprecatedTest.java| 4 +
.../modules/php/editor/csl/NavigatorTest.java | 4 +
.../modules/php/editor/index/PHPIndexTest.java | 4 +
42 files changed, 796 insertions(+), 113 deletions(-)
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/CodeUtils.java
b/php/php.editor/src/org/netbeans/modules/php/editor/CodeUtils.java
index e18311e208..ab54785743 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/CodeUtils.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/CodeUtils.java
@@ -25,6 +25,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
+import java.util.regex.Pattern;
import javax.swing.text.Document;
import org.netbeans.api.annotations.common.CheckForNull;
import org.netbeans.api.annotations.common.NonNull;
@@ -87,6 +88,9 @@ public final class CodeUtils {
public static final String STATIC_METHOD_TYPE_PREFIX = "@static.mtd:"; //
NOI18N
public static final String NULLABLE_TYPE_PREFIX = "?"; // NOI18N
public static final String ELLIPSIS = "..."; // NOI18N
+
+public static final Pattern WHITE_SPACES_PATTERN =
Pattern.compile("\\s+"); // NOI18N
+
private static final Logger LOGGER =
Logger.getLogger(CodeUtils.class.getName());
private CodeUtils() {
diff --git
a/php/php.editor/src/org/netbeans/modules/php/editor/api/elements/ParameterElement.java
b/php/php.editor/src/org/netbeans/modules/php/editor/api/elements/ParameterElement.java
index 389aeebc95..7993e50ac2 100644
---
a/php/php.editor/src/org/netbeans/modules/php/editor/api/elements/ParameterElement.java
+++
b/php/php.editor/src/org/netbeans/modules/php/editor/api/elements/ParameterElement.java
(netbeans) branch master updated: Terminal, Output and Syntax Coloring options UI cleanup.
This is an automated email from the ASF dual-hosted git repository.
mbien 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 fb9b95d78c Terminal, Output and Syntax Coloring options UI cleanup.
new 73237de942 Merge pull request #6660 from
mbien/output-options-ui-cleanup
fb9b95d78c is described below
commit fb9b95d78cefb577bb84bf934c6da818aac2b9bc
Author: Michael Bien
AuthorDate: Sun Nov 5 18:59:18 2023 +0100
Terminal, Output and Syntax Coloring options UI cleanup.
- made font pickers wider so that the font columns render better
- adjusted component gaps and layouts for consistency
- basic code cleanup
---
.../terminalemulator/support/TermOptionsPanel.form | 2 +-
.../terminalemulator/support/TermOptionsPanel.java | 2 +
.../options/colors/SyntaxColoringPanel.java| 276 +
.../modules/terminal/nb/TermOptionsPanel.form | 58 ++---
.../modules/terminal/nb/TermOptionsPanel.java | 78 +++---
.../core/output2/options/OutputSettingsPanel.form | 63 +++--
.../core/output2/options/OutputSettingsPanel.java | 93 +++
7 files changed, 260 insertions(+), 312 deletions(-)
diff --git
a/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/TermOptionsPanel.form
b/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/TermOptionsPanel.form
index 1257933297..0c837f93bf 100644
---
a/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/TermOptionsPanel.form
+++
b/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/TermOptionsPanel.form
@@ -84,8 +84,8 @@
-
+
diff --git
a/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/TermOptionsPanel.java
b/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/TermOptionsPanel.java
index 960223c347..74d879b4ec 100644
---
a/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/TermOptionsPanel.java
+++
b/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/TermOptionsPanel.java
@@ -28,6 +28,8 @@ import javax.swing.border.Border;
import org.netbeans.lib.terminalemulator.LineDiscipline;
import org.netbeans.lib.terminalemulator.Term;
+// TODO seems to be the older copy of
ide/terminal.nb/src/org/netbeans/modules/terminal/nb/TermOptionsPanel.java
+// public via friend dependencies.
public final class TermOptionsPanel extends javax.swing.JPanel {
private TermOptions termOptions;
diff --git
a/ide/options.editor/src/org/netbeans/modules/options/colors/SyntaxColoringPanel.java
b/ide/options.editor/src/org/netbeans/modules/options/colors/SyntaxColoringPanel.java
index 8df2ec53c5..1f40953a4b 100644
---
a/ide/options.editor/src/org/netbeans/modules/options/colors/SyntaxColoringPanel.java
+++
b/ide/options.editor/src/org/netbeans/modules/options/colors/SyntaxColoringPanel.java
@@ -21,6 +21,7 @@ package org.netbeans.modules.options.colors;
import java.awt.Color;
import java.awt.Component;
+import java.awt.Dialog;
import java.awt.EventQueue;
import java.awt.Font;
import java.awt.Insets;
@@ -51,7 +52,6 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.ListSelectionModel;
import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
import javax.swing.text.AttributeSet;
import javax.swing.text.SimpleAttributeSet;
import javax.swing.text.StyleConstants;
@@ -89,12 +89,10 @@ public class SyntaxColoringPanel extends JPanel implements
ActionListener,
private String currentLanguage;
private String currentProfile;
/** cache Map (String (profile name) > Map (String (language name) > List
(AttributeSet))). */
-private Map>>
-profiles = new HashMap>>();
+private Map>> profiles = new
HashMap<>();
/** Map (String (profile name) > Set (String (language name))) of names of
changed languages. */
-private Map>
-toBeSaved = new HashMap>();
-private boolean listen = false;
+private Map> toBeSaved = new HashMap<>();
+private boolean listen = false;
private boolean changed = false;
private static Logger log =
Logger.getLogger(SyntaxColoringPanel.class.getName ());
@@ -122,12 +120,9 @@ public class SyntaxColoringPanel extends JPanel implements
ActionListener,
lCategories.setSelectionMode (ListSelectionModel.SINGLE_SELECTION);
lCategories.setVisibleRowCount (3);
lCategories.setCellRenderer (new CategoryRenderer ());
-lCategories.addListSelectionListener (new ListSelectionListener () {
-@Override
-public void valueChanged (ListSelectionEvent e) {
-if (!listen) return;
-
(netbeans) 01/01: Merge pull request #6684 from apache/delivery
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 1be216337997aebf5b52112f6214840e577ba94a Merge: 54b5d2a112 6fb214311c Author: Neil C Smith AuthorDate: Fri Nov 10 12:30:30 2023 + Merge pull request #6684 from apache/delivery Sync Gradle test fix from delivery to master .../data/gradle/artifacts/multi/app/build.gradle | 1 - .../data/gradle/artifacts/multi/gradle.properties | 2 +- .../data/gradle/artifacts/multi/oci/build.gradle | 1 - .../gradle/MicronautGradleArtifactsImplTest.java | 47 -- .../gradle/spi/newproject/TemplateOperation.java | 4 +- .../java/lsp/server/explorer/ProjectViewTest.java | 11 - 6 files changed, 56 insertions(+), 10 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 (54b5d2a112 -> 1be2163379)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 54b5d2a112 Merge pull request #6665 from mbien/stabilize-php-tag-folding-test add 1c3458d4d3 Update micronaut gradle tests add c0f09c927b Force TLS1.2 in MicronautGradleArtifactsImplTest and ProjectViewTest add 6fb214311c Merge pull request #6673 from mbien/fix-lsp-micronaut-tests_delivery new 1be2163379 Merge pull request #6684 from apache/delivery 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: .../data/gradle/artifacts/multi/app/build.gradle | 1 - .../data/gradle/artifacts/multi/gradle.properties | 2 +- .../data/gradle/artifacts/multi/oci/build.gradle | 1 - .../gradle/MicronautGradleArtifactsImplTest.java | 47 -- .../gradle/spi/newproject/TemplateOperation.java | 4 +- .../java/lsp/server/explorer/ProjectViewTest.java | 11 - 6 files changed, 56 insertions(+), 10 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 delivery updated (a385cb1a63 -> 6fb214311c)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch delivery in repository https://gitbox.apache.org/repos/asf/netbeans.git from a385cb1a63 Merge pull request #6623 from mbien/revert-6514_delivery new 1c3458d4d3 Update micronaut gradle tests new c0f09c927b Force TLS1.2 in MicronautGradleArtifactsImplTest and ProjectViewTest new 6fb214311c Merge pull request #6673 from mbien/fix-lsp-micronaut-tests_delivery The 9242 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: .../data/gradle/artifacts/multi/app/build.gradle | 1 - .../data/gradle/artifacts/multi/gradle.properties | 2 +- .../data/gradle/artifacts/multi/oci/build.gradle | 1 - .../gradle/MicronautGradleArtifactsImplTest.java | 47 -- .../gradle/spi/newproject/TemplateOperation.java | 4 +- .../java/lsp/server/explorer/ProjectViewTest.java | 11 - 6 files changed, 56 insertions(+), 10 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
