[netbeans] branch delivery updated: Naming panel should be set to its preferred size.
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 8ecaee2fd2 Naming panel should be set to its preferred size.
new ec555891e4 Merge pull request #6619 from
mbien/ui-fix-naming-panel-layout
8ecaee2fd2 is described below
commit 8ecaee2fd2d86812223ecd534d0f1ede017d0e37
Author: Michael Bien
AuthorDate: Wed Oct 25 00:24:19 2023 +0200
Naming panel should be set to its preferred size.
Allows the layout manager to compute its size properly,
esp when a non default font size is configured (e.g --fontsize 16)
fixes #6616
(also removes invisible and unused check box)
---
.../org/netbeans/modules/java/ui/FmtNaming.form| 29 +++-
.../org/netbeans/modules/java/ui/FmtNaming.java| 31 ++
2 files changed, 12 insertions(+), 48 deletions(-)
diff --git a/java/java.source/src/org/netbeans/modules/java/ui/FmtNaming.form
b/java/java.source/src/org/netbeans/modules/java/ui/FmtNaming.form
index 67ad4a9601..19170ade57 100644
--- a/java/java.source/src/org/netbeans/modules/java/ui/FmtNaming.form
+++ b/java/java.source/src/org/netbeans/modules/java/ui/FmtNaming.form
@@ -46,12 +46,9 @@
-
+
-
-
-
-
+
@@ -63,9 +60,7 @@
-
-
-
+
@@ -79,22 +74,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -227,7 +206,7 @@
-
+
diff --git a/java/java.source/src/org/netbeans/modules/java/ui/FmtNaming.java
b/java/java.source/src/org/netbeans/modules/java/ui/FmtNaming.java
index b1e1222967..55b5ece92a 100644
--- a/java/java.source/src/org/netbeans/modules/java/ui/FmtNaming.java
+++ b/java/java.source/src/org/netbeans/modules/java/ui/FmtNaming.java
@@ -58,8 +58,6 @@ public class FmtNaming extends javax.swing.JPanel implements
Runnable {
*/
public FmtNaming() {
initComponents();
-preferLongerNamesCheckBox.putClientProperty(OPTION_ID,
preferLongerNames);
-preferLongerNamesCheckBox.setVisible(false);
fieldPrefixField.putClientProperty(OPTION_ID, fieldNamePrefix);
fieldSuffixField.putClientProperty(OPTION_ID, fieldNameSuffix);
staticFieldPrefixField.putClientProperty(OPTION_ID,
staticFieldNamePrefix);
@@ -71,12 +69,10 @@ public class FmtNaming extends javax.swing.JPanel
implements Runnable {
}
public static PreferencesCustomizer.Factory getController() {
-return new PreferencesCustomizer.Factory() {
-public PreferencesCustomizer create(Preferences preferences) {
-NamingCategorySupport support = new
NamingCategorySupport(preferences, new FmtNaming());
-((Runnable) support.panel).run();
-return support;
-}
+return (Preferences preferences) -> {
+NamingCategorySupport support = new
NamingCategorySupport(preferences, new FmtNaming());
+((Runnable) support.panel).run();
+return support;
};
}
@@ -90,7 +86,6 @@ public class FmtNaming extends javax.swing.JPanel implements
Runnable {
java.awt.GridBagConstraints gridBagConstraints;
namingConventionsLabel = new javax.swing.JLabel();
-preferLongerNamesCheckBox = new javax.swing.JCheckBox();
jPanel1 = new javax.swing.JPanel();
prefixLabel = new javax.swing.JLabel();
suffixLabel = new javax.swing.JLabel();
@@ -112,11 +107,6 @@ public class FmtNaming extends javax.swing.JPanel
implements Runnable {
org.openide.awt.Mnemonics.setLocalizedText(namingConventionsLabel,
org.openide.util.NbBundle.getMessage(FmtNaming.class, "LBL_gen_Naming")); //
NOI18N
-org.openide.awt.Mnemonics.setLocalizedText(preferLongerNamesCheckBox,
org.openide.util.NbBundle.getMessage(FmtNaming.class,
"LBL_gen_PreferLongerNames")); // NOI18N
-
preferLongerNamesCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0,
0, 0, 0));
-preferLongerNamesCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
-preferLongerNamesCheckBox.setOpaque(false);
-
jPanel1.setLayout(new java.awt.GridBagLayout());
org.openide.awt.Mnemonics.setLocalizedText(prefixLabel,
org.o
[netbeans] branch delivery updated: Be more friendly on 'runSingle' when 'run' task is missing.
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 e6ea7501e7 Be more friendly on 'runSingle' when 'run' task is missing.
new 5ec24679f1 Merge pull request #6618 from
lkishalmi/gradle-better-handle-runSingle
e6ea7501e7 is described below
commit e6ea7501e7e2010e4f056df0df90b3d552228815
Author: Laszlo Kishalmi
AuthorDate: Tue Oct 24 19:28:05 2023 +0200
Be more friendly on 'runSingle' when 'run' task is missing.
---
.../gradle/tooling/NetBeansRunSinglePlugin.java| 95 +++---
1 file changed, 47 insertions(+), 48 deletions(-)
diff --git
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NetBeansRunSinglePlugin.java
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NetBeansRunSinglePlugin.java
index e68d087122..bf2bb72ac9 100644
---
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NetBeansRunSinglePlugin.java
+++
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NetBeansRunSinglePlugin.java
@@ -30,8 +30,8 @@ import org.gradle.api.Project;
import org.gradle.api.Task;
import org.gradle.api.tasks.JavaExec;
import org.gradle.api.tasks.SourceSetContainer;
+import org.gradle.api.tasks.TaskProvider;
import org.gradle.process.CommandLineArgumentProvider;
-import org.gradle.tooling.BuildException;
import org.gradle.util.GradleVersion;
/**
*
@@ -47,6 +47,8 @@ class NetBeansRunSinglePlugin implements Plugin {
private static final String RUN_SINGLE_JVM_ARGS = "runJvmArgs";
private static final String RUN_SINGLE_CWD = "runWorkingDir";
+private static final String DEPRECATE_RUN_SINGLE =
+"runSingle task is deprecated. Inspect your configuration and use
just 'run' task instead of 'runSingle'";
@Override
public void apply(Project project) {
project.afterEvaluate(p -> {
@@ -55,61 +57,58 @@ class NetBeansRunSinglePlugin implements Plugin {
&& project.hasProperty(RUN_SINGLE_MAIN)) {
Set runTasks = p.getTasksByName("run", false);
Task r = runTasks.isEmpty() ? null :
runTasks.iterator().next();
-String mainClass =
project.property(RUN_SINGLE_MAIN).toString();
-p.getTasks().withType(JavaExec.class).configureEach(je -> {
-if (GRADLE_VERSION.compareTo(GradleVersion.version("6.4"))
< 0) {
-// Using setMain to keep the backward compatibility
before Gradle 6.4
-je.setMain(mainClass);
-} else {
-je.getMainClass().set(mainClass);
-}
-if (project.hasProperty(RUN_SINGLE_ARGS)) {
-
je.setArgs(asList(project.property(RUN_SINGLE_ARGS).toString().split(" ")));
-}
-if (p.hasProperty(RUN_SINGLE_JVM_ARGS)) {
-// Property jvmArgumentProviders should not be
implemented as a lambda to allow execution optimizations.
-// See
https://docs.gradle.org/current/userguide/validation_problems.html#implementation_unknown
-je.getJvmArgumentProviders().add(new
CommandLineArgumentProvider() {
-// Do not convert to lambda.
-@Override
-public Iterable asArguments() {
-return
asList(p.property(RUN_SINGLE_JVM_ARGS).toString().split(" "));
-}
-});
-}
-try {
-je.setStandardInput(System.in);
-} catch (RuntimeException ex) {
-if(LOG.isEnabled(LogLevel.DEBUG)) {
-LOG.debug("Failed to set STDIN for Plugin: " +
je.toString(), ex);
-} else {
-LOG.info("Failed to set STDIN for Plugin: " +
je.toString());
-}
-}
-if (project.hasProperty(RUN_SINGLE_CWD)) {
-
je.setWorkingDir(project.property(RUN_SINGLE_CWD).toString());
-}
-});
+p.getTasks().withType(JavaExec.class).configureEach(je ->
configureJavaExec(project, je));
addTask(project, r);
}
});
}
-public static class JE extends JavaExec {
-@Override
-public void exec() {
+private void configureJavaExec(Project project, JavaExec je) {
+String mainClass = project.property(RUN_SINGLE_MAIN).toString();
+if (GRADLE_VERSION.c
[netbeans] 01/01: Merge pull request #6607 from apache/delivery
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch release200 in repository https://gitbox.apache.org/repos/asf/netbeans.git commit d30b8ef06f3f284c7ed2453dcb329775e573b700 Merge: f999eff60b 5ec24679f1 Author: Neil C Smith AuthorDate: Wed Oct 25 13:34:50 2023 +0100 Merge pull request #6607 from apache/delivery Sync delivery to release200 for 20-rc2 .github/workflows/main.yml | 2 +- .../gradle/tooling/NetBeansRunSinglePlugin.java| 95 ++-- .../modules/gradle/GradleConnectorManager.java | 80 +++ .../modules/gradle/GradleProjectConnection.java| 6 +- .../execute/GradleDistributionProviderImpl.java| 4 +- .../modules/gradle/loaders/GradleDaemon.java | 40 -- .../gradle/spi/newproject/TemplateOperation.java | 2 + .../modules/gradle/api/GradleBaseProjectTest.java | 1 + .../libs/git/jgit/commands/LogCommand.java | 6 +- .../org/netbeans/modules/java/disco/Client.java| 70 +-- .../modules/java/disco/SelectPackagePanel.java | 6 +- .../hints/infrastructure/JavaErrorProvider.java| 4 +- .../integration/commands/ProjectAuditCommand.java | 2 +- .../commands/ProjectMetadataCommand.java | 2 +- .../modules/nbcode/integration/maven.properties| 1 + .../netbeans/modules/java/lsp/server/Utils.java| 40 ++ .../java/lsp/server/db/DBAddConnection.java| 4 +- .../java/lsp/server/db/DBCommandProvider.java | 4 +- .../java/lsp/server/db/DBConnectionProvider.java | 6 +- .../attach/AttachConfigurationCompletion.java | 21 +- .../debugging/attach/AttachConfigurations.java | 13 +- .../debugging/attach/ConfigurationAttributes.java | 6 +- .../debugging/attach/NbAttachRequestHandler.java | 5 +- .../lsp/server/explorer/NodeActionsProvider.java | 2 +- .../server/explorer/NodePropertiesProvider.java| 4 +- .../modules/java/lsp/server/htmlui/WebView.java| 4 +- .../lsp/server/protocol/CodeActionsProvider.java | 6 +- .../lsp/server/protocol/ConstructorGenerator.java | 4 +- .../server/protocol/DelegateMethodGenerator.java | 4 +- .../server/protocol/EqualsHashCodeGenerator.java | 8 +- .../lsp/server/protocol/GetterSetterGenerator.java | 8 +- .../ImplementAllAbstractMethodsAction.java | 4 +- .../protocol/ImplementOverrideMethodGenerator.java | 6 +- .../protocol/LaunchConfigurationCompletion.java| 4 + .../java/lsp/server/protocol/LoggerGenerator.java | 4 +- .../server/protocol/NbCodeClientCapabilities.java | 40 ++ .../server/protocol/OrganizeImportsCodeAction.java | 4 +- .../protocol/ProjectConfigurationCompletion.java | 11 +- .../java/lsp/server/protocol/QuickOpen.java| 4 +- .../modules/java/lsp/server/protocol/Server.java | 75 +-- .../java/lsp/server/protocol/SurroundWithHint.java | 8 +- .../lsp/server/protocol/TestClassGenerator.java| 6 +- .../server/protocol/TextDocumentServiceImpl.java | 22 +- .../lsp/server/protocol/ToStringGenerator.java | 4 +- .../lsp/server/protocol/WorkspaceServiceImpl.java | 47 +- .../ChangeMethodParametersRefactoring.java | 6 +- .../ExtractSuperclassOrInterfaceRefactoring.java | 10 +- .../lsp/server/refactoring/MoveRefactoring.java| 8 +- .../lsp/server/refactoring/PullUpRefactoring.java | 6 +- .../server/refactoring/PushDownRefactoring.java| 6 +- .../EnablePreviewSingleSourceFile.java | 4 +- .../java/lsp/server/explorer/ProjectViewTest.java | 2 +- .../java/lsp/server/protocol/ServerTest.java | 16 +- java/java.lsp.server/vscode/package.json | 114 ++-- .../vscode/src/dbConfigurationProvider.ts | 4 +- java/java.lsp.server/vscode/src/extension.ts | 87 +-- .../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/java.mx.project/nbproject/project.properties | 2 + .../java/openjdk/jtreg/CodeLensProviderImpl.java | 4 +- .../org/netbeans/api/java/source/SourceUtils.java | 20 +- .../netbeans/api/java/source/SourceUtilsTest.java | 11 + .../org/netbeans/modules/java/ui/FmtNaming.form| 29 +- .../org/netbeans/modules/java/ui/FmtNaming.java| 31 +- java/maven/apichanges.xml | 14 + java/maven/build.xml | 3 +- java/maven/nbproject/project.properties| 2 +- .../netbeans/modules/maven/NbArtifactFixer.java| 49 ++ .../netbeans/modules/maven/NbMavenProjectImpl.java | 182 ++- .../netbeans/modules/maven/api/NbMavenProject.java | 54 +- .../classpath/AbstractProjectClassPathImpl.java| 9 + .../maven/classpath/ClassPathProviderImpl.java | 2 + .../maven/classpath/CompileClassPathImpl.java | 7
[netbeans] branch release200 updated (f999eff60b -> d30b8ef06f)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch release200 in repository https://gitbox.apache.org/repos/asf/netbeans.git from f999eff60b Merge pull request #6584 from apache/delivery 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 new d30b8ef06f Merge pull request #6607 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: .github/workflows/main.yml | 2 +- .../gradle/tooling/NetBeansRunSinglePlugin.java| 95 ++-- .../modules/gradle/GradleConnectorManager.java | 80 +++ .../modules/gradle/GradleProjectConnection.java| 6 +- .../execute/GradleDistributionProviderImpl.java| 4 +- .../modules/gradle/loaders/GradleDaemon.java | 40 -- .../gradle/spi/newproject/TemplateOperation.java | 2 + .../modules/gradle/api/GradleBaseProjectTest.java | 1 + .../libs/git/jgit/commands/LogCommand.java | 6 +- .../org/netbeans/modules/java/disco/Client.java| 70 +-- .../modules/java/disco/SelectPackagePanel.java | 6 +- .../hints/infrastructure/JavaErrorProvider.java| 4 +- .../integration/commands/ProjectAuditCommand.java | 2 +- .../commands/ProjectMetadataCommand.java | 2 +- .../modules/nbcode/integration/maven.properties| 1 + .../netbeans/modules/java/lsp/server/Utils.java| 40 ++ .../java/lsp/server/db/DBAddConnection.java| 4 +- .../java/lsp/server/db/DBCommandProvider.java | 4 +- .../java/lsp/server/db/DBConnectionProvider.java | 6 +- .../attach/AttachConfigurationCompletion.java | 21 +- .../debugging/attach/AttachConfigurations.java | 13 +- .../debugging/attach/ConfigurationAttributes.java | 6 +- .../debugging/attach/NbAttachRequestHandler.java | 5 +- .../lsp/server/explorer/NodeActionsProvider.java | 2 +- .../server/explorer/NodePropertiesProvider.java| 4 +- .../modules/java/lsp/server/htmlui/WebView.java| 4 +- .../lsp/server/protocol/CodeActionsProvider.java | 6 +- .../lsp/server/protocol/ConstructorGenerator.java | 4 +- .../server/protocol/DelegateMethodGenerator.java | 4 +- .../server/protocol/EqualsHashCodeGenerator.java | 8 +- .../lsp/server/protocol/GetterSetterGenerator.java | 8 +- .../ImplementAllAbstractMethodsAction.java | 4 +- .../protocol/ImplementOverrideMethodGenerator.java | 6 +- .../protocol/LaunchConfigurationCompletion.java| 4 + .../java/lsp/server/protocol/LoggerGenerator.java | 4 +- .../server/protocol/NbCodeClientCapabilities.java | 40 ++ .../server/protocol/OrganizeImportsCodeAction.java | 4 +- .../protocol/ProjectConfigurationCompletion.java | 11 +- .../java/lsp/server/protocol/QuickOpen.java| 4 +- .../modules/java/lsp/server/protocol/Server.java | 75 +-- .../java/lsp/server/protocol/SurroundWithHint.java | 8 +- .../lsp/server/protocol/TestClassGenerator.java| 6 +- .../server/protocol/TextDocumentServiceImpl.java | 22 +- .../lsp/server/protocol/ToStringGenerator.java | 4 +- .../lsp/server/protocol/WorkspaceServiceImpl.java | 47 +- .../ChangeMethodParametersRefactoring.java | 6 +- .../ExtractSuperclassOrInterfaceRefactorin
[netbeans-jenkins-lib] branch master updated: Add metadata for 20-rc2.
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-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new 7732b98 Add metadata for 20-rc2.
new a89ff16 Merge pull request #104 from neilcsmith-net/nb200
7732b98 is described below
commit 7732b98f60887b74b0c3b2d1488fcbb3865148e3
Author: Neil C Smith
AuthorDate: Wed Oct 25 13:40:01 2023 +0100
Add metadata for 20-rc2.
---
meta/netbeansrelease.json | 4
1 file changed, 4 insertions(+)
diff --git a/meta/netbeansrelease.json b/meta/netbeansrelease.json
index 423358a..46c28aa 100644
--- a/meta/netbeansrelease.json
+++ b/meta/netbeansrelease.json
@@ -1136,6 +1136,10 @@
"3fae03992a7987d2bb05dab272916e5d17a19302": {
"version": "rc1",
"position": "1"
+},
+"d30b8ef06f3f284c7ed2453dcb329775e573b700": {
+"version": "rc2",
+"position": "2"
}
},
"releasedate": {
-
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] annotated tag 20-rc2 updated (d30b8ef06f -> 220b1e7eb3)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to annotated tag 20-rc2 in repository https://gitbox.apache.org/repos/asf/netbeans.git *** WARNING: tag 20-rc2 was modified! *** from d30b8ef06f (commit) to 220b1e7eb3 (tag) tagging d30b8ef06f3f284c7ed2453dcb329775e573b700 (commit) replaces 20-rc1 by Neil C Smith on Wed Oct 25 17:38:11 2023 +0100 - Log - Apache NetBeans 20-rc2 --- No new revisions were added by this update. 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/01: Merge pull request #6608 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 2b20e6b27012faaf315b2bfddcbb501a1a56fd5b Merge: 2fde2b4fd6 5ec24679f1 Author: Neil C Smith AuthorDate: Wed Oct 25 17:46:32 2023 +0100 Merge pull request #6608 from apache/delivery Sync delivery to master after 20-rc2 .github/workflows/main.yml | 2 +- .../gradle/tooling/NetBeansRunSinglePlugin.java| 95 ++-- .../modules/gradle/GradleConnectorManager.java | 80 +++ .../modules/gradle/GradleProjectConnection.java| 6 +- .../execute/GradleDistributionProviderImpl.java| 4 +- .../modules/gradle/loaders/GradleDaemon.java | 40 -- .../gradle/spi/newproject/TemplateOperation.java | 2 + .../modules/gradle/api/GradleBaseProjectTest.java | 1 + .../libs/git/jgit/commands/LogCommand.java | 6 +- .../org/netbeans/modules/java/disco/Client.java| 70 +-- .../modules/java/disco/SelectPackagePanel.java | 6 +- .../hints/infrastructure/JavaErrorProvider.java| 4 +- java/java.lsp.server/build.xml | 2 +- .../integration/commands/ProjectAuditCommand.java | 2 +- .../commands/ProjectMetadataCommand.java | 2 +- .../modules/nbcode/integration/maven.properties| 1 + .../netbeans/modules/java/lsp/server/Utils.java| 40 ++ .../java/lsp/server/db/DBAddConnection.java| 4 +- .../java/lsp/server/db/DBCommandProvider.java | 4 +- .../java/lsp/server/db/DBConnectionProvider.java | 6 +- .../attach/AttachConfigurationCompletion.java | 21 +- .../debugging/attach/AttachConfigurations.java | 13 +- .../debugging/attach/ConfigurationAttributes.java | 6 +- .../debugging/attach/NbAttachRequestHandler.java | 5 +- .../lsp/server/explorer/NodeActionsProvider.java | 2 +- .../server/explorer/NodePropertiesProvider.java| 4 +- .../modules/java/lsp/server/htmlui/WebView.java| 4 +- .../lsp/server/protocol/CodeActionsProvider.java | 6 +- .../lsp/server/protocol/ConstructorGenerator.java | 4 +- .../server/protocol/DelegateMethodGenerator.java | 4 +- .../server/protocol/EqualsHashCodeGenerator.java | 8 +- .../lsp/server/protocol/GetterSetterGenerator.java | 8 +- .../ImplementAllAbstractMethodsAction.java | 4 +- .../protocol/ImplementOverrideMethodGenerator.java | 6 +- .../protocol/LaunchConfigurationCompletion.java| 4 + .../java/lsp/server/protocol/LoggerGenerator.java | 4 +- .../server/protocol/NbCodeClientCapabilities.java | 40 ++ .../server/protocol/OrganizeImportsCodeAction.java | 4 +- .../protocol/ProjectConfigurationCompletion.java | 11 +- .../java/lsp/server/protocol/QuickOpen.java| 4 +- .../modules/java/lsp/server/protocol/Server.java | 75 +-- .../java/lsp/server/protocol/SurroundWithHint.java | 8 +- .../lsp/server/protocol/TestClassGenerator.java| 6 +- .../server/protocol/TextDocumentServiceImpl.java | 22 +- .../lsp/server/protocol/ToStringGenerator.java | 4 +- .../lsp/server/protocol/WorkspaceServiceImpl.java | 47 +- .../ChangeMethodParametersRefactoring.java | 6 +- .../ExtractSuperclassOrInterfaceRefactoring.java | 10 +- .../lsp/server/refactoring/MoveRefactoring.java| 8 +- .../lsp/server/refactoring/PullUpRefactoring.java | 6 +- .../server/refactoring/PushDownRefactoring.java| 6 +- .../EnablePreviewSingleSourceFile.java | 4 +- .../java/lsp/server/explorer/ProjectViewTest.java | 2 +- .../java/lsp/server/protocol/ServerTest.java | 16 +- java/java.lsp.server/vscode/package.json | 114 ++-- .../vscode/src/dbConfigurationProvider.ts | 4 +- java/java.lsp.server/vscode/src/extension.ts | 87 +-- .../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/java.mx.project/nbproject/project.properties | 2 + .../java/openjdk/jtreg/CodeLensProviderImpl.java | 4 +- .../org/netbeans/api/java/source/SourceUtils.java | 20 +- .../netbeans/api/java/source/SourceUtilsTest.java | 11 + .../org/netbeans/modules/java/ui/FmtNaming.form| 29 +- .../org/netbeans/modules/java/ui/FmtNaming.java| 31 +- java/maven/apichanges.xml | 14 + java/maven/build.xml | 3 +- .../netbeans/modules/maven/NbArtifactFixer.java| 49 ++ .../netbeans/modules/maven/NbMavenProjectImpl.java | 182 ++- .../netbeans/modules/maven/api/NbMavenProject.java | 54 +- .../classpath/AbstractProjectClassPathImpl.java| 9 + .../maven/classpath/ClassPathProviderImpl.java | 2 + .../maven/classpath/CompileClassPathImpl.java | 7 +- ..
[netbeans] branch master updated (2fde2b4fd6 -> 2b20e6b270)
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 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 new 2b20e6b270 Merge pull request #6608 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: .github/workflows/main.yml | 2 +- .../gradle/tooling/NetBeansRunSinglePlugin.java| 95 ++-- .../modules/gradle/GradleConnectorManager.java | 80 +++ .../modules/gradle/GradleProjectConnection.java| 6 +- .../execute/GradleDistributionProviderImpl.java| 4 +- .../modules/gradle/loaders/GradleDaemon.java | 40 -- .../gradle/spi/newproject/TemplateOperation.java | 2 + .../modules/gradle/api/GradleBaseProjectTest.java | 1 + .../libs/git/jgit/commands/LogCommand.java | 6 +- .../org/netbeans/modules/java/disco/Client.java| 70 +-- .../modules/java/disco/SelectPackagePanel.java | 6 +- .../hints/infrastructure/JavaErrorProvider.java| 4 +- java/java.lsp.server/build.xml | 2 +- .../integration/commands/ProjectAuditCommand.java | 2 +- .../commands/ProjectMetadataCommand.java | 2 +- .../modules/nbcode/integration/maven.properties| 1 + .../netbeans/modules/java/lsp/server/Utils.java| 40 ++ .../java/lsp/server/db/DBAddConnection.java| 4 +- .../java/lsp/server/db/DBCommandProvider.java | 4 +- .../java/lsp/server/db/DBConnectionProvider.java | 6 +- .../attach/AttachConfigurationCompletion.java | 21 +- .../debugging/attach/AttachConfigurations.java | 13 +- .../debugging/attach/ConfigurationAttributes.java | 6 +- .../debugging/attach/NbAttachRequestHandler.java | 5 +- .../lsp/server/explorer/NodeActionsProvider.java | 2 +- .../server/explorer/NodePropertiesProvider.java| 4 +- .../modules/java/lsp/server/htmlui/WebView.java| 4 +- .../lsp/server/protocol/CodeActionsProvider.java | 6 +- .../lsp/server/protocol/ConstructorGenerator.java | 4 +- .../server/protocol/DelegateMethodGenerator.java | 4 +- .../server/protocol/EqualsHashCodeGenerator.java | 8 +- .../lsp/server/protocol/GetterSetterGenerator.java | 8 +- .../ImplementAllAbstractMethodsAction.java | 4 +- .../protocol/ImplementOverrideMethodGenerator.java | 6 +- .../protocol/LaunchConfigurationCompletion.java| 4 + .../java/lsp/server/protocol/LoggerGenerator.java | 4 +- .../server/protocol/NbCodeClientCapabilities.java | 40 ++ .../server/protocol/OrganizeImportsCodeAction.java | 4 +- .../protocol/ProjectConfigurationCompletion.java | 11 +- .../java/lsp/server/protocol/QuickOpen.java| 4 +- .../modules/java/lsp/server/protocol/Server.java | 75 +-- .../java/lsp/server/protocol/SurroundWithHint.java | 8 +- .../lsp/server/protocol/TestClassGenerator.java| 6 +- .../server/protocol/TextDocumentServiceImpl.java | 22 +- .../lsp/s
[netbeans] branch master updated: CI: Add build-from-src-zip job
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 a64cc72f02 CI: Add build-from-src-zip job
new 20ee034c8a Merge pull request #6579 from mbien/ci-build-from-src-zip
a64cc72f02 is described below
commit a64cc72f0265e1f4e6194ac30e4afe80c3bd7413
Author: Michael Bien
AuthorDate: Tue Oct 17 17:14:29 2023 +0200
CI: Add build-from-src-zip job
builds platform, release and NB vscode extension from src zips.
---
.github/workflows/main.yml | 103 -
1 file changed, 65 insertions(+), 38 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 321a2450fa..b140e6763c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -361,10 +361,10 @@ jobs:
build-nbms:
-name: Build NBMs, Source zips and Javadoc on JDK ${{ matrix.java }}
+name: Build NBMs and Javadoc on JDK ${{ matrix.java }}
needs: base-build
runs-on: ubuntu-latest
-timeout-minutes: 90
+timeout-minutes: 60
strategy:
matrix:
java: [ '11' ]
@@ -387,14 +387,72 @@ jobs:
- name: Build nbms
run: ant $OPTS build-nbms
- - name: Build source zips
-run: ant $OPTS build-source-zips
-
- name: Build javadoc
if: env.test_javadoc == 'true' && success()
run: ant $OPTS build-javadoc
+ build-from-src-zip:
+name: Build ${{ matrix.config }} from src.zip on JDK ${{ matrix.java }}
+# equals env.test_platform == 'true' || test_vscode_extension == 'true'
+if: ${{ contains(github.event.pull_request.labels.*.name, 'Platform') ||
contains(github.event.pull_request.labels.*.name, 'VSCode Extension') ||
contains(github.event.pull_request.labels.*.name, 'ci:all-tests') ||
github.event_name != 'pull_request' }}
+needs: base-build
+runs-on: ubuntu-latest
+timeout-minutes: 60
+strategy:
+ matrix:
+java: [ '11' ]
+config: [ 'platform', 'release' ]
+steps:
+
+ - name: Set up JDK ${{ matrix.java }}
+uses: actions/setup-java@v3
+with:
+ java-version: ${{ matrix.java }}
+ distribution: ${{ env.default_java_distribution }}
+
+ - name: Download Build
+uses: actions/download-artifact@v3
+with:
+ name: build
+
+ - name: Extract
+run: tar --zstd -xf build.tar.zst
+
+ - name: Restoring Cache
+uses: actions/cache/restore@v3
+with:
+ path: ~/.hgexternalcache
+ key: ${{ runner.os }}-${{ hashFiles('*/external/binaries-list',
'*/*/external/binaries-list') }}
+ restore-keys: ${{ runner.os }}-
+
+ - name: Create ${{ matrix.config }}-src zip
+run: ant $OPTS -quiet build-source-config -Dcluster.config=${{
matrix.config }}
+
+ - name: Extract ${{ matrix.config }}-src zip
+run: |
+ mkdir tmpbuild && cd tmpbuild
+ unzip -qq ../nbbuild/build/${{ matrix.config }}-src*
+
+ - name: Build from ${{ matrix.config }}-src zip
+run: |
+ cd tmpbuild
+ ant $OPTS -quiet build -Dcluster.config=${{ matrix.config }}
+
+ # extra round for VSCodeExt which is built with 'release' config
+ - name: Set up node
+if: ${{ (matrix.config == 'release') && success() }}
+uses: actions/setup-node@v3
+with:
+ node-version: 18
+
+ - name: Build NBVSCodeExt from ${{ matrix.config }}-src zip
+if: ${{ (matrix.config == 'release') && success() }}
+run: |
+ cd tmpbuild/java/java.lsp.server
+ ant $OPTS build-vscode-ext
-D3rdparty.modules=.*externalcodeformatter.*
+
+
ide-modules-test:
name: IDE Modules on Linux/JDK ${{ matrix.java }}
needs: base-build
@@ -867,12 +925,6 @@ jobs:
java: [ '8' ]
steps:
- - name: Set up JDK 11
-uses: actions/setup-java@v3
-with:
- java-version: 11
- distribution: ${{ env.default_java_distribution }}
-
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v3
with:
@@ -1009,32 +1061,6 @@ jobs:
- name: platform/o.n.swing.tabcontrol
run: ant $OPTS -Dvanilla.javac.exists=true -f
platform/o.n.swing.tabcontrol test
- - name: Set up JDK 11
-uses: actions/setup-java@v3
-with:
- java-version: 11
- distribution: ${{ env.default_java_distribution }}
-
- # use cache so that the platform build doesn't have to download
dependencies again
- - name: Caching dependencies
-uses: actions/cache/restore@v3
-with:
- path: ~/.hgexternalcache
- key: ${{ runner.os }}-${{ hashFiles('*/external/binaries-list',
'*/*/external/binaries-list') }}
- restore-keys: ${{ runner.os }}-
[netbeans] branch php-nb21-features updated (4086bd3bd6 -> 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 from 4086bd3bd6 Update netbeans_bug_report.yml for NB20 rc 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 69feae54c1 Merge pull request #6569 from junichi11/php82-dnf-types The 9211 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 | 96 -- .../modules/php/editor/api/QualifiedName.java | 10 +- .../php/editor/api/elements/AliasedFunction.java | 5 + .../editor/api/elements/BaseFunctionElement.java | 6 + .../php/editor/api/elements/FieldElement.java | 1 + .../php/editor/api/elements/ParameterElement.java | 4 + .../modules/php/editor/completion/DocRenderer.java | 120 +++- .../php/editor/completion/PHPCompletionItem.java | 6 + .../modules/php/editor/csl/NavigatorScanner.java | 99 +++--- .../elements/BaseFunctionElementSupport.java | 25 +- .../php/editor/elements/FieldElementImpl.java | 32 +- .../php/editor/elements/FunctionElementImpl.java | 20 ++ .../php/editor/elements/MethodElementImpl.java | 44 ++- .../php/editor/elements/ParameterElementImpl.java | 73 +++-- .../php/editor/elements/TypeResolverImpl.java | 4 +- .../modules/php/editor/indent/FormatVisitor.java | 5 +- .../modules/php/editor/index/PHPIndexer.java | 2 +- .../modules/php/editor/model/FunctionScope.java| 1 + .../modules/php/editor/model/Parameter.java| 6 + .../php/editor/model/impl/FieldElementImpl.java| 13 +- .../php/editor/model/impl/FunctionScopeImpl.java | 93 +++--- .../php/editor/model/impl/MethodScopeImpl.java | 7 + .../php/editor/model/impl/ModelVisitor.java| 75 - .../php/editor/model/impl/ParameterImpl.java | 33 +- .../modules/php/editor/model/impl/Type.java| 42 ++- .../php/editor/model/impl/VariousUtils.java| 41 ++- .../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 +- .../modules/php/editor/parser/ASTPHP5Scanner.java | 316 ++- .../php/editor/parser/PHPDocCommentParser.java | 48 ++- .../php/editor/parser/PHPVarCommentParser.java | 3 +- .../editor/parser/astnodes/PHPDocMethodTag.java| 20 ++ .../php/editor/parser/astnodes/PHPDocTypeTag.java | 34 +-- .../structure/deprecatedTypedFields.pass | 8 +- .../deprecatedTypesForNullableTypes_01.pass| 2 +- .../deprecatedTypesForNullableTypes_02.pass| 2 +- .../php82/deprecatedDnfFieldTypes_01.pass | 23 ++ .../php82/deprecatedDnfParameterTypes_01.pass | 15 + .../php82/deprecatedDnfReturnTypes_01.pass | 14 + .../NavigatorTest/structure/nullableTypes_01.pass | 2 +- .../NavigatorTest/structure/nullableTypes_02.pass | 2 +- .../structure/php82/dnfFieldTypes.pass | 23 ++ .../structure/php82/dnfParameterTypes.pass | 26 ++ .../structure/php82/dnfReturnTypes.pass| 14 + .../structure/pureIntersectionTypes.pass | 10 +- .../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 + .../dnf
