[cnd] merge master into cnd #6439
Conversation
…port Fix wrong javac tree access for module information in modular maven project
Update JDK version requirement warning
* Made HCLTokenId more detailed, useful for indenter/formater * Added basic line indenting to HCL languages * Fix IOOB exception when trying to parse '"' as identifier * Indent is based on the previous line from now. * Enable Flyweight tokens for HCL Lexer * Added some tests for the indenter.
25347df introduces a new unittest, that proved to be unstable in CI/CD pipeline. The failure can be reproduced after several tries. Adding workDir.getFileSystem().refresh(true); seems to fix the issue. Hypothesis: The new module files are written outside the filesystem infrastructure of NetBeans and the cache of the javac integration does not pick up the module files created by the javac-Tool. Apart from the fix, style of the code was improved.
Co-authored-by: Michael Bien <[email protected]>
…with-cast Fix `instanceof` expression with casting apache#5933
…orts Add "Fix Imports" changes again
- Update the version to PHPUnit 10 - Remove the unavailable URL from readme.html - Add setting for code coverage to readme.html - Fix the phpunit.xml (the `filter` element is available no longer. Instead, use the `coverage` element.) - See: https://docs.phpunit.de/en/10.1/configuration.html (https://phpunit.de/documentation.html)
- apache#6075 - Fix the scanner: Add the comments as `Comment.Type.TYPE_VARTYPE` in the following example - Add unit tests Example: ```php /** @var ?User $user */ $user->getId(); /* @var $user2 ?User */ $user2->getId(); ```
…ependencies Avoid needless dependency on LineDocument
…port_2 Fix unstable unittest org.netbeans.modules.maven.ModuleInfoSupportTest
- apache#6075 - Check types without nullable type prefix(`?`) - Add unit tests
…or-phpunit Update the PHP sample project for PHPUnit
…-nullable-type Fix "Fix Imports" when the vardoc has nullable types
…en clipped and not painting it.
- apache#6119 - Check whether the class name has `$` - Add unit tests
Add @asbachb to collaborator/triage list.
…bstract-instantiation-hint Fix incorrect AbstractClassInstantiationHintError apache#6119
Fix tab closing when trying to select partly clipped tab.
…ception when calling DatabaseConnection.showConnectionDialog from the EDT.
Provide Lambda expression option in Listener generation style
- apache#5578 - Find the first phptag position
- apache#5578 Example: ```php namespace NS1; class A { public function __construct() { declare (ticks=1) { } $test = new B(); } } ``` Before: ```php namespace NS1; class A { public function __construct() { use NS2\B; declare (ticks=1) { } $test = new B(); } } ``` After: ```php namespace NS1; use NS2\B; class A { public function __construct() { declare (ticks=1) { } $test = new B(); } } ```
- apache#5578 Example: ```php <?php namespace NS1; declare(ticks=1) { $test = 1; } declare(ticks=2) { $test = 1; } class DeclareTest1 { public function test() { declare(ticks=2) { } $test = new \NS2\DeclareTest2; } } ``` Before: ```php <?php namespace NS1; declare(ticks=1) { $test = 1; } use NS2\DeclareTest2; declare(ticks=2) { $test = 1; } class DeclareTest1 { public function test() { declare(ticks=2) { } $test = new DeclareTest2; } } ``` After: ```php <?php namespace NS1; declare(ticks=1) { $test = 1; } declare(ticks=2) { $test = 1; } use NS2\DeclareTest2; class DeclareTest1 { public function test() { declare(ticks=2) { } $test = new DeclareTest2; } } ```
Fix "Fix Imports" issues again apache#5578
… for use statements - apache#5681 - Avoid changing the file state if the created string is the same as the existing use statements
Fix NBLS 3rd party licenses
RustLanguageLexer: do not throw exceptions.
… and continue, rather than crash the whole processing.
Handle errors in annotation processor initialization
…ls-fix LSP: Fixed problem with workspace/symbols called before first JavacCompiler created.
Snapshot of APIs as of NetBeans 19
Apache NetBeans 19 current version
…e-participant Micronaut's lifecycle participant changed FQN in Micronaut 4.x
Micronaut 4 build plugin recognized.
…ency graphs explosion
…usion Workaround: Avoid reporting BOMs among dependencies to prevent dependency graphs explosion
|
Hi @bitrunner , Thanks for your interest in the cnd branch! I think it's better to discuss in the mailing list how to proceed with the cnd branch. Maybe we want to integrate it with master and disable the cluster by default, much like the Thanks, |
|
As someone new to netbeans development, I don't feel comfortable offering an opinion on or injecting myself into big picture decisions. I'm just a long time CND user with enough free time and motivation right now to try to help make CND great again. Let's make some forward progress happen. |
Hi @bitrunner , I see. We'll, I think we'll have to decide how to move cnd forward. There're many different possibilities. Let's see what people say in the mailing list and then we'll move things forward. "long time CND user" opinions are indeed welcome in the mailing list, even more if those users are motivated :-). |
|
Hi @matthiasblaesing , this looks fine to me. Mind taking a second look? |
There was a problem hiding this comment.
Looks sane to me. I had a look at the merge and the decisions look sane to me. @bitrunner @vieiro thank you for continued working on this.
This merges master into the cnd branch bringing it up to date with the changes since May 2022.
1 conflict with nbbuild/cluster.properties was resolved by taking the changes from master.
1 build error in cnd/cnd.ui/src/org/netbeans/modules/cnd/loaders/QtUiDataLoader.java due to changes to org.openide.util.MapFormat API was resolved by doing a type conversion.