[netbeans] branch master updated: Fixed incorrect regexp usage in KODataBindContext
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 2b7c432421 Fixed incorrect regexp usage in KODataBindContext
new f33416edc5 Merge pull request #5409 from tbw777/fix/KODataBindContext
2b7c432421 is described below
commit 2b7c43242164f98f55666c32e9825352a6eb6412
Author: Andrey Bruykhov
AuthorDate: Thu Feb 2 00:25:31 2023 +0300
Fixed incorrect regexp usage in KODataBindContext
$ = string end
---
.../src/org/netbeans/modules/html/knockout/KODataBindContext.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/webcommon/html.knockout/src/org/netbeans/modules/html/knockout/KODataBindContext.java
b/webcommon/html.knockout/src/org/netbeans/modules/html/knockout/KODataBindContext.java
index 03d4593ee9..7a764b59bf 100644
---
a/webcommon/html.knockout/src/org/netbeans/modules/html/knockout/KODataBindContext.java
+++
b/webcommon/html.knockout/src/org/netbeans/modules/html/knockout/KODataBindContext.java
@@ -76,7 +76,7 @@ public class KODataBindContext {
assert alias == null || foreach;
String replacement = (data == null || data.equals("$root")) ?
"ko.$bindings" : data; // NOI18N
-String toAdd = newData.replaceAll("$data", replacement); // NOI18N
+String toAdd = newData.replace("$data", replacement); // NOI18N
if (!noExpansion && foreach) {
toAdd = "(" + toAdd + ")[0]"; // NOI18N
-
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-tools] 01/01: Merge pull request #61 from apache/jkovalsky/notificationTemplate
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-tools.git commit 76580323b5b5d70b0bf38f266499a65ab76d4a34 Merge: 52ee39a eb1f188 Author: Matthias Bläsing AuthorDate: Fri Jan 20 18:59:00 2023 +0100 Merge pull request #61 from apache/jkovalsky/notificationTemplate More appropriate template for notifications about new NetBeans version .../src/Application/Controller/AdminController.php | 25 +- 1 file changed, 15 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-tools] branch master updated (52ee39a -> 7658032)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-tools.git from 52ee39a Merge pull request #60 from matthiasblaesing/project_member_admin add ad6b1ec More appropriate template for notifications about new NetBeans version add eb1f188 Replaced not yet available %4$s parameter with tag new 7658032 Merge pull request #61 from apache/jkovalsky/notificationTemplate 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: .../src/Application/Controller/AdminController.php | 25 +- 1 file changed, 15 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 (a97c3587f2 -> ad297ed60f)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from a97c3587f2 Merge pull request #5300 from apache/php82-support new b8f0e560c4 Jakarta EE 10 support new 273af6c126 Servlet 6.0, Application 10.0, JSF and Beans Resolver new e20d037e42 Schema update new b08bbe629a Payara Server - Jakarta EE 10 support new e1c4d14852 JAKARTA EE 10 Archetype new 59aecb4be5 Update Jakarta EE 10 version to Payara Config new a2f73f3e64 Adding support for JakartaEE in WildFly plugin new e6d965f201 Make JakartaEE 10 modules load on JDK 11+ only. new 48bf793464 GlassFish 7 was tested with up to java 19 and use Jersey 3.1.0 (Same with Payara) new dcfddc2ebb Fix one Jakarta 10 validation Add some missing Jakarta 10 validation new 903f91d7f9 Add missing Jakarta EE 10 entries to rat.exclusions and servlet build.xml files new 9df0dda994 Add support for Jakarta EE 10 to Tomcat new 7b55d2a757 Add support for javadoc that contains only the element-list file. The jakartaee-10 javadoc is not accessible in the IDE otherwise. new be2b078c59 return both WEB + FULL profiles for WF 27+. new ad297ed60f Merge pull request #4692 from jGauravGupta/JAKARTA_EE_10.0.0 The 8003 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-glassfish-common.sig |7 +- .../modules/glassfish/common/Bundle.properties |1 + .../common/GlassfishInstanceProvider.java |6 +- .../modules/glassfish/common/ServerDetails.java| 14 + .../common/registration/AutomaticRegistration.java |5 +- .../glassfish/common/wizards/Bundle.properties |3 + .../common/wizards/GlassfishWizardProvider.java|7 + .../modules/glassfish/spi/ServerUtilities.java |6 + .../org-netbeans-modules-glassfish-eecommon.sig|3 + .../eecommon/api/config/AppClientVersion.java |9 + .../eecommon/api/config/ApplicationVersion.java|9 + .../api/config/GlassfishConfiguration.java | 15 +- .../glassfish/eecommon/api/config/J2EEVersion.java |8 + .../org-netbeans-modules-glassfish-javaee.sig |2 + .../javaee/AbstractHk2ConfigurationFactory.java|9 +- .../modules/glassfish/javaee/Bundle.properties |2 + .../glassfish/javaee/Hk2DeploymentFactory.java | 17 + .../glassfish/javaee/Hk2JavaEEPlatformFactory.java | 15 +- .../glassfish/javaee/Hk2JavaEEPlatformImpl.java|4 + .../modules/glassfish/javaee/Hk2JaxWsStack.java| 27 +- .../glassfish/javaee/Hk2OptionalFactory.java |6 + .../javaee/JavaEEServerModuleFactory.java |7 +- .../modules/glassfish/javaee/RunTimeDDCatalog.java | 42 +- .../netbeans/modules/glassfish/javaee/layer.xml| 61 + .../modules/glassfish/javaee/nbdepjakartaee10.xml | 54 + .../org-netbeans-modules-glassfish-tooling.sig |5 +- .../glassfish/tooling/data/GlassFishVersion.java | 10 +- .../server/config/ConfigBuilderProvider.java |7 +- .../tooling/server/config/GlassFishV7_0_0.xml} | 67 +- .../tooling/server/config/JavaEEProfile.java | 12 +- .../tooling/data/GlassFishVersionTest.java |2 + .../gradle/javaee/GradleJavaEEProjectSettings.java |2 + .../web/newproject/ServerSelectionPanelVisual.java | 10 +- .../newproject/WebApplicationProjectWizard.java| 12 + enterprise/j2ee.clientproject/licenseinfo.xml |7 + .../j2ee/clientproject/AppClientProvider.java |4 +- .../api/AppClientProjectGenerator.java |4 + .../ui/customizer/AppClientProjectProperties.java |2 +- .../ui/resources/application-client-10.xml |7 + .../ui/resources/application-client-9.xml |7 + .../j2ee/clientproject/ui/resources/layer.xml |2 + .../AppClientProjectJAXWSClientSupport.java|4 + enterprise/j2ee.common/licenseinfo.xml |4 + .../j2ee/common/J2eeProjectCapabilities.java | 16 +- .../netbeans/modules/j2ee/common/dd/DDHelper.java | 34 +- .../modules/j2ee/common/dd/resources/beans-4.0.xml |7 + .../modules/j2ee/common/dd/resources/ear-10.xml|7 + .../modules/j2ee/common/dd/resources/web-6.0.xml |8 + .../j2ee/common/dd/resources/web-fragment-6.0.xml |8 + .../j2ee/common/J2eeProjectCapabilitiesTest.java | 40 + .../nbproject/org-netbeans-modules-j2ee-core.sig | 14 +- .../org/netbeans/api/j2ee/core/Bundle.properties |2 + .../src/org/netbeans/api/j2ee/core/Profile.java| 10 + .../org/netbeans/api/j2ee/core/ProfileTest.java| 40 +- enterprise/j2ee.dd/.gitignore
[netbeans-tools] branch master updated (4b1bacb -> 52ee39a)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-tools.git from 4b1bacb Merge pull request #45 from Chris2011/feature/update-to-php7 new c2bd6ee Use correct attribute to determine admin status of user new 9722b42 Make all committers verifier and all PMC members admins when logged in new 0db6ee7 Show all pending verifications to verifiers (even if created after verification was requested) new 52ee39a Merge pull request #60 from matthiasblaesing/project_member_admin The 262 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: .../src/Application/Controller/AdminController.php | 3 +- .../src/Application/Controller/LoginController.php | 14 ++- .../Controller/VerificationController.php | 120 - .../src/Application/Entity/Base/Verification.php | 5 +- .../Entity/Base/VerificationRequest.php| 5 +- .../Repository/VerificationRepository.php | 20 .../Repository/VerificationRequestRepository.php | 4 + .../view/application/verification/list.phtml | 26 +++-- 8 files changed, 156 insertions(+), 41 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated: Prevent NullPointerException when matching filenames in SourceUtils
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 8eee2dea1b Prevent NullPointerException when matching filenames in
SourceUtils
new eaa121c2c7 Merge pull request #5279 from matthiasblaesing/GH-5266
8eee2dea1b is described below
commit 8eee2dea1b94c8b1a2355c4174878401e956946e
Author: Matthias Bläsing
AuthorDate: Wed Jan 11 21:02:46 2023 +0100
Prevent NullPointerException when matching filenames in SourceUtils
Closes: #5266
---
java/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/java/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java
b/java/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java
index 2ceb750050..5b2b9a5880 100644
--- a/java/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java
+++ b/java/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java
@@ -683,7 +683,7 @@ public class SourceUtils {
}
final boolean apply(final FileObject fo) {
-if (name.equals(fo.getNameExt())) {
+if (fo.getNameExt().equals(name)) {
return true;
}
final String foName = fo.getName();
-
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-tools] branch master updated (059417a -> 4b1bacb)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-tools.git from 059417a Merge pull request #59 from neilcsmith-net/nbpackage-release-steps new 3f4ba18 Updated the code to PHP >= 7.2. Fixed problems with old, deprecated syntax. Updated readme. new 5f089bf Updated readme.md. new 4b1bacb Merge pull request #45 from Chris2011/feature/update-to-php7 The 258 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: pp3/README.txt | 17 + pp3/au/Db.php | 19 ++- pp3/au/Importer.php | 34 ++ pp3/au/Runner.php | 17 + pp3/au/build-dashboard_v2.php | 16 pp3/au/config.php | 13 ++--- pp3/au/db_connect.php.inc | 4 ++-- pp3/au/lib/Getopt.php | 3 ++- pp3/au/lib/Getopt/Exception.php | 4 ++-- 9 files changed, 70 insertions(+), 57 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 (b1192bacba -> 3291c89653)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from b1192bacba Catch IAE when Gradle error getLocation cannot be called. new 86df99417b Removed double null check with instance operator new 348afe979c Removed double null check with instance operator #2 new 805f750a2b Removed double null check with instance operator. Part 3 new 57a517fc9c Removed double null check with instance operator. Part 4 new 73bccfe35b Removed double null check with instance operator. Part 5 new 3291c89653 Merge pull request #5224 from tbw777/instance2 The 7949 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../project/suite/SuiteSubprojectProviderImpl.java | 2 +- .../project/ui/customizer/BasicCustomizer.java | 2 +- .../project/ui/platform/NbPlatformCustomizer.java | 2 +- .../project/ui/wizard/TypeChooserPanelImpl.java| 2 +- .../project/ui/wizard/spi/ModuleTypePanel.java | 6 ++-- .../apisupport/project/layers/BadgingSupport.java | 2 +- .../refactoring/AbstractRefactoringElement.java| 2 +- .../ui/wizard/common/BasicWizardIterator.java | 2 +- .../maven/apisupport/MavenPackageModifierImpl.java | 2 +- .../ui/wizards/GrailsArtifactWizardIterator.java | 2 +- .../ui/service/subpanels/TargetsPanel.java | 2 +- .../modules/websvc/wsitconf/wizard/STSWizard.java | 2 +- .../javaee/templates/WebLogicDDWizardIterator.java | 2 +- .../clientproject/ProjectAppClientProvider.java| 2 +- ...AppClientProjectWebServicesSupportProvider.java | 4 +-- .../j2ee/common/ui/NoSelectedServerWarning.java| 2 +- .../j2ee/dd/impl/commonws/EnclosingBean.java | 2 +- .../j2ee/dd/impl/webservices/WebServicesProxy.java | 2 +- .../j2ee/dd/impl/application/ApplicationProxy.java | 2 +- .../j2ee/dd/impl/client/AppClientProxy.java| 2 +- .../modules/j2ee/dd/impl/common/EnclosingBean.java | 2 +- .../ddloaders/common/xmlutils/XMLJ2eeUtils.java| 14 +- .../j2ee/earproject/ProjectEarProvider.java| 2 +- .../earproject/ui/customizer/CustomizerRun.java| 4 +-- .../methodcontroller/AbstractMethodController.java | 2 +- .../ejb/wizard/dd/EjbJarXmlWizardIterator.java | 2 +- .../wizard/mdb/MessageDestinationUiSupport.java| 2 +- .../ui/logicalview/entries/CallEjbDialog.java | 2 +- .../logicalview/entries/SelectDatabasePanel.java | 2 +- .../entries/SendEmailCodeGenerator.java| 2 +- .../entries/SendJMSMessageCodeGenerator.java | 2 +- .../logicalview/entries/SendJmsMessagePanel.java | 2 +- .../entries/UseDatabaseCodeGenerator.java | 2 +- .../ProjectWebServicesSupportProvider.java | 8 +++--- .../j2ee/ejbrefactoring/EjbRefactoringPlugin.java | 2 +- .../j2ee/sun/api/restricted/ResourceUtils.java | 2 +- .../j2ee/sun/ide/editors/ui/DDTablePanel.java | 4 +-- .../configbean/templates/SunDDWizardIterator.java | 2 +- .../javaee/beanvalidation/AbstractIterator.java| 2 +- .../javaee/beanvalidation/ConstraintIterator.java | 2 +- .../dd/ear/ApplicationXmlWizardIterator.java | 2 +- .../netbeans/modules/maven/j2ee/ear/EarImpl.java | 2 +- .../modules/maven/j2ee/web/WebCopyOnSave.java | 2 +- .../refactor/MicronautRefactoringFactory.java | 2 +- .../eecommon/dd/wizard/PayaraDDWizardIterator.java | 2 +- .../modules/web/beans/wizard/BeansXmlIterator.java | 2 +- .../web/beans/xml/impl/WebBeansComponentImpl.java | 2 +- .../web/beans/xml/impl/WebBeansElements.java | 2 +- .../modules/web/core/syntax/JSPELPlugin.java | 2 +- .../modules/web/core/syntax/JspSyntaxSupport.java | 4 +-- .../web/core/syntax/completion/AttrSupports.java | 2 +- .../web/core/jsploader/BaseJspEditorSupport.java | 2 +- .../modules/web/core/jsploader/JspLoader.java | 2 +- .../web/core/jsploader/JspServletDataObject.java | 6 ++-- .../web/core/palette/JspPaletteUtilities.java | 4 +-- .../modules/web/wizards/ListenerIterator.java | 2 +- .../netbeans/modules/web/wizards/PageIterator.java | 2 +- .../modules/web/wizards/ServletIterator.java | 2 +- .../modules/web/wizards/TagHandlerIterator.java| 2 +- .../wizards/dd/WebFragmentXmlWizardIterator.java | 2 +- .../web/wizards/dd/WebXmlWizardIterator.java | 2 +- .../navigation/graph/actions/MapActionUtility.java | 4 +-- .../netbeans/modules/web/jsf/JsfTemplateUtils.java | 2 +- .../modules/web/jsf/editor/JspJsfELPlugin.java | 6 ++-- .../web/jsf/palette/JSFPaletteUtilities.java | 2 +- .../wizards/CompositeComponentWizardIterator.java | 2 +- .../web/jsf/wizards/FacesComponentI
[netbeans] branch master updated: Removed StringUtils unused object creation
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 7e775d6d3d Removed StringUtils unused object creation
new cd14cf5e66 Merge pull request #5242 from tbw777/unused2
7e775d6d3d is described below
commit 7e775d6d3d62ed15d622e1d49ce72bcf5cf3b3bd
Author: Andrei Briukhov
AuthorDate: Sun Jan 8 08:26:05 2023 -0300
Removed StringUtils unused object creation
Removed unused StringBuffer object without any side effects.
---
.../installer/wizard/components/panels/PreInstallSummaryPanel.java | 6 ++
.../wizard/components/panels/netbeans/NbPreInstallSummaryPanel.java | 6 ++
nbi/engine/src/org/netbeans/installer/utils/StringUtils.java| 2 --
3 files changed, 4 insertions(+), 10 deletions(-)
diff --git
a/harness/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/panels/PreInstallSummaryPanel.java
b/harness/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/panels/PreInstallSummaryPanel.java
index 587f633163..c46e24b89b 100644
---
a/harness/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/panels/PreInstallSummaryPanel.java
+++
b/harness/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/panels/PreInstallSummaryPanel.java
@@ -210,13 +210,11 @@ public class PreInstallSummaryPanel extends
ErrorMessagePanel {
installationSizeLabel.setText(
panel.getProperty(INSTALLATION_SIZE_PROPERTY));
-installationSizeValue.setText(StringUtils.formatSize(
-installationSize));
+
installationSizeValue.setText(StringUtils.formatSize(installationSize));
downloadSizeLabel.setText(
panel.getProperty(DOWNLOAD_SIZE_PROPERTY));
-downloadSizeValue.setText(StringUtils.formatSize(
-downloadSize));
+downloadSizeValue.setText(StringUtils.formatSize(downloadSize));
if (registry.getProductsToInstall().size() == 0) {
locationsPane.setVisible(false);
diff --git
a/nbbuild/installer/engine/src/org/netbeans/installer/wizard/components/panels/netbeans/NbPreInstallSummaryPanel.java
b/nbbuild/installer/engine/src/org/netbeans/installer/wizard/components/panels/netbeans/NbPreInstallSummaryPanel.java
index 6d744533f8..04c4a1187d 100644
---
a/nbbuild/installer/engine/src/org/netbeans/installer/wizard/components/panels/netbeans/NbPreInstallSummaryPanel.java
+++
b/nbbuild/installer/engine/src/org/netbeans/installer/wizard/components/panels/netbeans/NbPreInstallSummaryPanel.java
@@ -458,13 +458,11 @@ public class NbPreInstallSummaryPanel extends
ErrorMessagePanel {
installationSizeLabel.setText(
panel.getProperty(INSTALLATION_SIZE_PROPERTY));
-installationSizeValue.setText(StringUtils.formatSize(
-installationSize));
+
installationSizeValue.setText(StringUtils.formatSize(installationSize));
downloadSizeLabel.setText(
panel.getProperty(DOWNLOAD_SIZE_PROPERTY));
-downloadSizeValue.setText(StringUtils.formatSize(
-downloadSize));
+downloadSizeValue.setText(StringUtils.formatSize(downloadSize));
if (registry.getProductsToInstall().isEmpty()) {
locationsPane.setVisible(false);
diff --git a/nbi/engine/src/org/netbeans/installer/utils/StringUtils.java
b/nbi/engine/src/org/netbeans/installer/utils/StringUtils.java
index 467e789f34..0d0aaab487 100644
--- a/nbi/engine/src/org/netbeans/installer/utils/StringUtils.java
+++ b/nbi/engine/src/org/netbeans/installer/utils/StringUtils.java
@@ -168,8 +168,6 @@ public abstract class StringUtils {
public static String formatSize(
final long longBytes) {
-StringBuffer result = new StringBuffer();
-
double bytes = (double) longBytes;
// try as GB
-
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 (42042bac68 -> e5dd712342)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 42042bac68 Merge pull request #5187 from matthiasblaesing/pr-4945 new 7c23807856 CslTestBase#checkNoOverlaps only detects special overlaps - contained ranges are not deteced new 5847f3519b CssSemanticAnalyser needs to flatten OffsetRanges for highlights new e5dd712342 Merge pull request #5151 from matthiasblaesing/GH-5012 The 7934 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../netbeans/modules/csl/api/test/CslTestBase.java | 20 .../css/editor/module/CssModuleSupport.java| 60 +- .../test/unit/data/testfiles/coloring1.css | 6 +++ .../unit/data/testfiles/coloring1.css.semantic | 6 +++ .../css/editor/csl/CssSemanticAnalyzerTest.java| 39 ++ 5 files changed, 120 insertions(+), 11 deletions(-) create mode 100644 ide/css.editor/test/unit/data/testfiles/coloring1.css create mode 100644 ide/css.editor/test/unit/data/testfiles/coloring1.css.semantic create mode 100644 ide/css.editor/test/unit/src/org/netbeans/modules/css/editor/csl/CssSemanticAnalyzerTest.java - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated (8e1e1dd442 -> 42042bac68)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 8e1e1dd442 Merge pull request #5174 from jlahoda/use-proper-javac-in-apisupport new e4fd2324b8 [NETBEANS-1603] resolving the problem with (un)showing MySQL procedures within NetBeans IDE DB explorer new 0f9587c36d [NETBEANS-1603] Handle procedures without parameters new 42042bac68 Merge pull request #5187 from matthiasblaesing/pr-4945 The 7931 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: .../db/metadata/model/jdbc/mysql/MySQLSchema.java | 14 ++--- .../db/explorer/dlg/ViewProcedureDialog.form | 10 +-- .../db/explorer/dlg/ViewProcedureDialog.java | 10 +-- .../modules/db/explorer/node/Bundle.properties | 4 +- .../modules/db/explorer/node/ProcedureNode.java| 71 +- .../db/explorer/node/ProcedureNodeProvider.java| 12 ++-- .../explorer/node/ProcedureParamNodeProvider.java | 3 +- 7 files changed, 69 insertions(+), 55 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated (cf284c4158 -> 8e1e1dd442)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from cf284c4158 Merge pull request #5262 from neilcsmith-net/nbm-buildnum new 6f07266b36 For nb.org projects, use the correct nbjavac prepend for the internal (boot)classpath. new 441cd88864 Use javac implementation for modules with implementation dependency. new 8e1e1dd442 Merge pull request #5174 from jlahoda/use-proper-javac-in-apisupport The 7928 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../modules/apisupport/project/Evaluator.java | 61 ++ .../project/queries/ClassPathProviderImpl.java | 7 ++- 2 files changed, 45 insertions(+), 23 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated: [NETBEANS-1615] fixed @throws hint for type variable
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 64b055527b [NETBEANS-1615] fixed @throws hint for type variable
new e944fa4211 Merge pull request #2974 from wal-jan/NETBEANS-1615
64b055527b is described below
commit 64b055527b807b6a0f9cbc4ee45f1fe056cdb12a
Author: Jan Walkotte
AuthorDate: Mon Oct 17 19:05:22 2022 +0200
[NETBEANS-1615] fixed @throws hint for type variable
---
.../netbeans/modules/javadoc/hints/Analyzer.java | 13 ++-
.../modules/javadoc/hints/AddTagFixTest.java | 26 ++
.../modules/javadoc/hints/Analyzer2Test.java | 17 ++
3 files changed, 51 insertions(+), 5 deletions(-)
diff --git a/java/javadoc/src/org/netbeans/modules/javadoc/hints/Analyzer.java
b/java/javadoc/src/org/netbeans/modules/javadoc/hints/Analyzer.java
index 94772b233a..1a75306226 100644
--- a/java/javadoc/src/org/netbeans/modules/javadoc/hints/Analyzer.java
+++ b/java/javadoc/src/org/netbeans/modules/javadoc/hints/Analyzer.java
@@ -77,6 +77,7 @@ import javax.lang.model.element.Name;
import javax.lang.model.element.TypeElement;
import javax.lang.model.type.TypeKind;
import javax.lang.model.type.TypeMirror;
+import javax.lang.model.type.TypeVariable;
import javax.lang.model.util.Elements;
import javax.lang.model.util.Types;
import org.netbeans.api.java.source.CompilationInfo;
@@ -676,8 +677,8 @@ final class Analyzer extends DocTreePathScanner> {
DocSourcePositions sp = (DocSourcePositions)
javac.getTrees().getSourcePositions();
int start = (int) sp.getStartPosition(javac.getCompilationUnit(),
currentDocPath.getDocComment(), tree);
int end = (int) sp.getEndPosition(javac.getCompilationUnit(),
currentDocPath.getDocComment(), tree);
-if (ex == null || (ex.asType().getKind() == TypeKind.DECLARED
-&& types.isAssignable(ex.asType(), throwable))) {
+boolean isType = ex != null && (ex.asType().getKind() ==
TypeKind.DECLARED || ex.asType().getKind() == TypeKind.TYPEVAR);
+if (ex == null || (isType && types.isAssignable(ex.asType(),
throwable))) {
switch (currentElement.getKind()) {
case CONSTRUCTOR:
case METHOD:
@@ -685,12 +686,14 @@ final class Analyzer extends DocTreePathScanner> {
|| types.isAssignable(ex.asType(), runtime))) {
ExecutableElement ee = (ExecutableElement)
currentElement;
String fqn;
-if (ex != null) {
-fqn = ((TypeElement)
ex).getQualifiedName().toString();
-} else {
+if (ex == null) {
ExpressionTree referenceClass =
javac.getTreeUtilities().getReferenceClass(new DocTreePath(currentDocPath,
exName));
if(referenceClass == null) break;
fqn = referenceClass.toString();
+} else if (ex.asType().getKind() == TypeKind.TYPEVAR) {
+fqn = ex.getSimpleName().toString();
+} else {
+fqn = ((TypeElement)
ex).getQualifiedName().toString();
}
checkThrowsDeclared(tree, ex, fqn,
ee.getThrownTypes(), dtph, start, end, errors);
}
diff --git
a/java/javadoc/test/unit/src/org/netbeans/modules/javadoc/hints/AddTagFixTest.java
b/java/javadoc/test/unit/src/org/netbeans/modules/javadoc/hints/AddTagFixTest.java
index 784c9df874..3aa3ebb493 100644
---
a/java/javadoc/test/unit/src/org/netbeans/modules/javadoc/hints/AddTagFixTest.java
+++
b/java/javadoc/test/unit/src/org/netbeans/modules/javadoc/hints/AddTagFixTest.java
@@ -641,6 +641,32 @@ public class AddTagFixTest extends NbTestCase {
+ "}\n");
}
+public void testAddThrowsTagFix_NETBEANS_1615() throws Exception {
+// issue NETBEANS-1615
+HintTest.create()
+.input(
+"package test;\n"
++ "interface Zima {\n"
++ "/**\n"
++ " */\n"
++ " void leden() throws X;\n"
++ "}\n")
+.preference(AVAILABILITY_KEY + true, true)
+.preference(SCOPE_KEY, "private")
+.run(JavadocHint.class)
+.findWarning("4:46-4:47:warning:Missing @throws tag for X")
+.applyFix("Add @throws X tag")
+.assertCompilable()
+.assertOutput(
+"package test;\n"
[netbeans] branch master updated (84068cd847 -> 7f4b8169cf)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from 84068cd847 Merge pull request #5160 from matthiasblaesing/GH-5134
new e61af8441b Fix/enable unittests for editor.options
new f7791e09de Add display name for Maven POM files (text/x-maven-pom+xml
-> Maven POM)
new 5b87b53aab Ensure languages in Options/Editor panels are
alphabetically sorted
new 7f4b8169cf Merge pull request #5164 from
matthiasblaesing/ordering_languages_options
The 7836 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 | 3 +++
.../options/editor/FolderBasedController.java | 12 +++--
.../completion/CodeCompletionOptionsPanel.java | 16 ++--
.../options/indentation/FormattingPanel.form | 5
.../options/indentation/FormattingPanel.java | 17 ++---
.../modules/options/util/LanguagesComparator.java} | 29 +++---
.../modules/options/editor/EditorOptionsTest.java | 11
.../modules/maven/grammar/Bundle.properties| 1 +
.../org/netbeans/modules/maven/grammar/layer.xml | 3 +--
.../modules/options/OptionsCategoryImpl.java | 5
10 files changed, 45 insertions(+), 57 deletions(-)
copy
ide/{bugtracking/src/org/netbeans/modules/bugtracking/ui/selectors/ConnectorComparator.java
=>
options.editor/src/org/netbeans/modules/options/util/LanguagesComparator.java}
(53%)
-
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 (57e480a874 -> 84068cd847)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 57e480a874 Merge pull request #5162 from matthiasblaesing/remove_bootclasspath_prepend new 9b6e3b4572 tomcat5: Enable usage of javac release and remove internal class use (fix JDK8 and JDK17+) new 0a9ce26b03 tomcat5: Fix TomcatModuleConfiguration (wrong Context object was used) and enable tomcat unittests new 84068cd847 Merge pull request #5160 from matthiasblaesing/GH-5134 The 7832 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 | 3 +++ enterprise/tomcat5/nbproject/project.properties| 1 - enterprise/tomcat5/nbproject/project.xml | 23 -- .../tomcat5/config/TomcatModuleConfiguration.java | 2 +- .../modules/tomcat5/deploy/TomcatManagerImpl.java | 6 +++--- .../modules/tomcat5/util/TomcatInstallUtil.java| 4 ++-- 6 files changed, 26 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 master updated: Remove unnecessary bootclasspath.prepend and reenable CI/CD tests for html.editor
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 b059c9359b Remove unnecessary bootclasspath.prepend and reenable CI/CD
tests for html.editor
new 57e480a874 Merge pull request #5162 from
matthiasblaesing/remove_bootclasspath_prepend
b059c9359b is described below
commit b059c9359bdc377ba10b63103ba0faed119a5209
Author: Matthias Bläsing
AuthorDate: Thu Dec 29 16:28:31 2022 +0100
Remove unnecessary bootclasspath.prepend and reenable CI/CD tests for
html.editor
---
.github/workflows/main.yml | 4 ++--
ide/html.editor/nbproject/project.properties| 2 --
ide/html.editor/test/unit/data/testfiles/simple01.html.formatted| 6 --
ide/html.editor/test/unit/data/testfiles/simple07.html.formatted| 2 +-
.../org/netbeans/modules/html/editor/indent/HtmlIndenterTest.java | 2 +-
php/php.latte/nbproject/project.properties | 2 --
6 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fc6e71dbb5..b3940ad121 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -481,8 +481,8 @@ jobs:
- name: ide/html.custom
run: ant $OPTS -f ide/html.custom test
-# - name: ide/html.editor
-#run: ant $OPTS -f ide/html.editor test
+ - name: ide/html.editor
+run: ant $OPTS -f ide/html.editor test
# - name: ide/html.lexer
#run: ant $OPTS -f ide/html.lexer test
diff --git a/ide/html.editor/nbproject/project.properties
b/ide/html.editor/nbproject/project.properties
index 933ce17a05..221d2e3f1b 100644
--- a/ide/html.editor/nbproject/project.properties
+++ b/ide/html.editor/nbproject/project.properties
@@ -27,5 +27,3 @@ test.config.stableBTD.excludes=\
**/Html5CompletionQueryTest.class,\
**/NavigationSideBarTest.class,\
**/HtmlIndenterTest.class
-nashorn.prepend=${basedir}/../libs.nashorn/external/nashorn-02f810c26ff9-patched.jar
-bootclasspath.prepend=${nashorn.prepend}${path.separator}${basedir}/../libs.nashorn/external/asm-all-4.0.jar
diff --git a/ide/html.editor/test/unit/data/testfiles/simple01.html.formatted
b/ide/html.editor/test/unit/data/testfiles/simple01.html.formatted
index e20b844413..696b88ba84 100644
--- a/ide/html.editor/test/unit/data/testfiles/simple01.html.formatted
+++ b/ide/html.editor/test/unit/data/testfiles/simple01.html.formatted
@@ -5,7 +5,7 @@
http-equiv="Content-Type" content="text/html; charset=UTF-8">
-Q:lang(en){
+Q:lang(en){
/*
my own
comment
@@ -16,7 +16,9 @@
}
-.error {color:red;}
+.error {
+color:red;
+}
diff --git a/ide/html.editor/test/unit/data/testfiles/simple07.html.formatted
b/ide/html.editor/test/unit/data/testfiles/simple07.html.formatted
index 0239635fc4..773a359661 100644
--- a/ide/html.editor/test/unit/data/testfiles/simple07.html.formatted
+++ b/ide/html.editor/test/unit/data/testfiles/simple07.html.formatted
@@ -1,2 +1,2 @@
+
diff --git
a/ide/html.editor/test/unit/src/org/netbeans/modules/html/editor/indent/HtmlIndenterTest.java
b/ide/html.editor/test/unit/src/org/netbeans/modules/html/editor/indent/HtmlIndenterTest.java
index 2cb106b406..d241e10d13 100644
---
a/ide/html.editor/test/unit/src/org/netbeans/modules/html/editor/indent/HtmlIndenterTest.java
+++
b/ide/html.editor/test/unit/src/org/netbeans/modules/html/editor/indent/HtmlIndenterTest.java
@@ -183,7 +183,7 @@ public class HtmlIndenterTest extends TestBase2 {
}
public void testFormattingHTML07() throws Exception {
-// #198659
+// #198659 - checks that indention works without assertion in
MarkupAbstractIndenter
reformatFileContents("testfiles/simple07.html",new IndentPrefs(4,4));
}
diff --git a/php/php.latte/nbproject/project.properties
b/php/php.latte/nbproject/project.properties
index 2aaf46bb91..0f4ec98bc9 100644
--- a/php/php.latte/nbproject/project.properties
+++ b/php/php.latte/nbproject/project.properties
@@ -16,5 +16,3 @@
# under the License.
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-nashorn.prepend=${basedir}/../libs.nashorn/external/nashorn-02f810c26ff9-patched.jar
-bootclasspath.prepend=${nashorn.prepend}${path.separator}${basedir}/../libs.nashorn/external/asm-all-4.0.jar
-
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about
[netbeans] branch master updated: Fix missing ICON_RESOURCE in git tag actions
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 baf42fa10b Fix missing ICON_RESOURCE in git tag actions
new 5f2e1382bc Merge pull request #5155 from
Atrament666/fix_git_tag_actions_icon_resources
baf42fa10b is described below
commit baf42fa10b8e8ef49a7d726b50ec00853d38a9fc
Author: Vladimír Machat
AuthorDate: Mon Dec 26 22:36:43 2022 +
Fix missing ICON_RESOURCE in git tag actions
---
.../src/org/netbeans/modules/git/ui/tag/CreateTagAction.java | 10 ++
.../src/org/netbeans/modules/git/ui/tag/ManageTagsAction.java | 10 ++
2 files changed, 20 insertions(+)
diff --git a/ide/git/src/org/netbeans/modules/git/ui/tag/CreateTagAction.java
b/ide/git/src/org/netbeans/modules/git/ui/tag/CreateTagAction.java
index 995bea1d5f..ed519c18eb 100644
--- a/ide/git/src/org/netbeans/modules/git/ui/tag/CreateTagAction.java
+++ b/ide/git/src/org/netbeans/modules/git/ui/tag/CreateTagAction.java
@@ -48,6 +48,16 @@ import org.openide.util.NbBundle;
public class CreateTagAction extends SingleRepositoryAction {
private static final Logger LOG =
Logger.getLogger(CreateTagAction.class.getName());
+private static final String ICON_RESOURCE =
"org/netbeans/modules/git/resources/icons/tag.png"; //NOI18N
+
+public CreateTagAction() {
+super(ICON_RESOURCE);
+}
+
+@Override
+protected String iconResource() {
+return ICON_RESOURCE;
+}
@Override
protected void performAction (File repository, File[] roots, VCSContext
context) {
diff --git a/ide/git/src/org/netbeans/modules/git/ui/tag/ManageTagsAction.java
b/ide/git/src/org/netbeans/modules/git/ui/tag/ManageTagsAction.java
index 7341b94efb..906c67fa5f 100644
--- a/ide/git/src/org/netbeans/modules/git/ui/tag/ManageTagsAction.java
+++ b/ide/git/src/org/netbeans/modules/git/ui/tag/ManageTagsAction.java
@@ -47,6 +47,16 @@ import org.openide.util.NbBundle;
public class ManageTagsAction extends SingleRepositoryAction {
private static final Logger LOG =
Logger.getLogger(ManageTagsAction.class.getName());
+private static final String ICON_RESOURCE =
"org/netbeans/modules/git/resources/icons/tags.png"; //NOI18N
+
+public ManageTagsAction() {
+super(ICON_RESOURCE);
+}
+
+@Override
+protected String iconResource() {
+return ICON_RESOURCE;
+}
@Override
protected void performAction (File repository, File[] roots, VCSContext
context) {
-
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 (08edf24ee5 -> 8415222d4a)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 08edf24ee5 Merge pull request #5142 from matthiasblaesing/GH-5104 new d9c4dd5952 Improving chained calls type visualization, so that it works inside method invocations as well. new 520b92ddc2 Showing return types of chained method invocation even when the end result is used e.g. as a method argument. new e8724b9e9f Adding type hint for 'var' variables new b33b8e5569 Fix compilation on current NetBeans new a9b7c741f9 Implement configuration for inline hints new f148d564a8 Fix and simplify rendering of "prepend-text" at EOL new 8415222d4a Merge pull request #5013 from matthiasblaesing/typehints The 7823 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: .../editor/lib2/view/PrependedTextView.java| 16 +- .../modules/options/editor/Bundle.properties | 5 + .../options/editor/FolderBasedController.java | 13 ++ .../options/editor/FolderBasedOptionPanel.java | 3 +- .../base/semantic/SemanticHighlighterBase.java | 136 +-- .../java/editor/base/semantic/DetectorTest.java| 259 + .../java/editor/base/semantic/TestBase.java| 15 +- java/java.editor/nbproject/project.xml | 8 + .../modules/java/editor/options/Bundle.properties | 5 +- .../options/InlineHintsOptionsPanelController.java | 82 +++ .../java/editor/options/InlineHintsPanel.form | 98 .../java/editor/options/InlineHintsPanel.java | 210 + .../java/editor/options/InlineHintsSettings.java | 43 .../modules/java/editor/resources/layer.xml| 10 + 14 files changed, 872 insertions(+), 31 deletions(-) create mode 100644 java/java.editor/src/org/netbeans/modules/java/editor/options/InlineHintsOptionsPanelController.java create mode 100644 java/java.editor/src/org/netbeans/modules/java/editor/options/InlineHintsPanel.form create mode 100644 java/java.editor/src/org/netbeans/modules/java/editor/options/InlineHintsPanel.java create mode 100644 java/java.editor/src/org/netbeans/modules/java/editor/options/InlineHintsSettings.java - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated (f58663d233 -> 08edf24ee5)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from f58663d233 Upgrade ANTLRv4 Runtime to 4.11.1 (#4845) new f6c2069442 [GH-5104] Ensure @use and @forward can be parsed in less files new 720129ea2e CSS: Enable "Goto source" for variable declarations in SCSS and LESS files new 08edf24ee5 Merge pull request #5142 from matthiasblaesing/GH-5104 The 7816 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: .../src/org/netbeans/modules/css/lib/Css3.g| 10 +- .../org/netbeans/modules/css/lib/Css3Lexer.java| 1302 +- .../org/netbeans/modules/css/lib/Css3Parser.java | 2619 ++-- .../modules/css/lib/Css3ParserLessTest.java|8 + .../modules/css/prep/editor/CPStructureItem.java |2 +- 5 files changed, 1991 insertions(+), 1950 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 (ceacfe52dc -> f49a2427f6)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from ceacfe52dc FlatLaf: fix font of window title when using `--fontsize` argument (on Windows) (issue #5041) new 74a8f416a9 Fixing pattern matching of instanceof with pattern matching and binding pattern. new 56d4ab47a5 Fix unittests in spi.java.hints new f49a2427f6 Merge pull request #5121 from matthiasblaesing/hints_instanceof The 7800 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: .../declarative/PatternMatchingInstanceof.hint | 37 ++ .../declarative/PatternMatchingInstanceof.test | 83 ++ .../modules/java/source/matching/CopyFinder.java | 20 +- .../modules/java/hints/spiimpl/Utilities.java | 4 +- .../modules/java/hints/spiimpl/UtilitiesTest.java | 6 +- .../JavaHintsAnnotationProcessorTest.java | 16 + .../spi/java/hints/matching/CopyFinderTest.java| 79 +++- 7 files changed, 238 insertions(+), 7 deletions(-) create mode 100644 java/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/PatternMatchingInstanceof.hint create mode 100644 java/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/PatternMatchingInstanceof.test - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated: LSP Client: Use full complete item to complete, not just the missing suffix
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 b4a0990f2f LSP Client: Use full complete item to complete, not just
the missing suffix
new e2468f0ef3 Merge pull request #4728 from matthiasblaesing/lsp_insert
b4a0990f2f is described below
commit b4a0990f2f465554523b3532d97bf68a6d272b57
Author: Matthias Bläsing
AuthorDate: Sat Oct 1 22:21:08 2022 +0200
LSP Client: Use full complete item to complete, not just the missing suffix
This is the test case (typescript):
export class test {
demo() {
this.runstranget|
}
runStrangeThings(): void {
}
}
The codecompletion at the | mark will offer "runStrangeThings", but
completion will yield "this.runstrangethings". The reason is, that
the CC is invoced case-insensitive, so the original string needs to be
replaced with the full result.
---
.../modules/lsp/client/bindings/CompletionProviderImpl.java | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git
a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/CompletionProviderImpl.java
b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/CompletionProviderImpl.java
index 0869a66500..d4eb07445f 100644
---
a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/CompletionProviderImpl.java
+++
b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/CompletionProviderImpl.java
@@ -213,9 +213,14 @@ public class CompletionProviderImpl implements
CompletionProvider {
toAdd = i.getLabel();
}
int[] identSpan =
Utilities.getIdentifierBlock((BaseDocument) doc, caretOffset);
-String printSuffix =
toAdd.substring(identSpan != null ? caretOffset - identSpan[0] : 0);
-doc.insertString(caretOffset,
printSuffix, null);
-endPos = caretOffset +
printSuffix.length();
+if (identSpan != null) {
+doc.remove(identSpan[0],
identSpan[1] - identSpan[0]);
+doc.insertString(identSpan[0],
toAdd, null);
+endPos = identSpan[0] +
toAdd.length();
+} else {
+doc.insertString(caretOffset,
toAdd, null);
+endPos = caretOffset +
toAdd.length();
+}
}
doc.insertString(endPos, appendText,
null);
} catch (BadLocationException ex) {
-
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 (0618061a28 -> 991f962819)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from 0618061a28 Merge pull request #4979 from
matthiasblaesing/css_documentation
new 1609dc7d0a CSS hex color support with alpha
new 483cd8c8ef Implement CSS3 sizing module
new 9c61cda11e Complete CSS3 positioning module
new cb00c5844d Update documentation for CSS3 properties
new 991f962819 Merge pull request #4964 from
matthiasblaesing/css_improvements
The 7734 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ide/css.editor/external/binaries-list | 2 +-
ide/css.editor/external/css3-spec-howtocreate.txt | 4 +-
.../css/editor/module/main/Bundle.properties | 1 +
.../editor/module/main/DefaultCssEditorModule.java | 3 +-
.../main/properties/basic_box_model.properties | 8 ---
.../properties/basic_user_interface.properties | 3 -
.../main/properties/default_module.properties | 8 ---
.../module/main/properties/positioning.properties | 6 ++
.../{positioning.properties => sizing.properties} | 12 +++-
.../module/main/BasicBoxModelModuleTest.java | 4 --
.../css/editor/module/main/ColorsModuleTest.java | 6 ++
.../editor/module/main/PositioningModuleTest.java | 53 ++
.../css/editor/module/main/SizingModuleTest.java | 65 ++
.../css/lib/api/properties/PropertyCategory.java | 3 +-
.../css/lib/api/properties/TokenAcceptor.java | 33 ++-
15 files changed, 179 insertions(+), 32 deletions(-)
copy
ide/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/{positioning.properties
=> sizing.properties} (58%)
create mode 100644
ide/css.editor/test/unit/src/org/netbeans/modules/css/editor/module/main/PositioningModuleTest.java
create mode 100644
ide/css.editor/test/unit/src/org/netbeans/modules/css/editor/module/main/SizingModuleTest.java
-
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated: Optimize matching for CSS completion queries
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 3e58e3c60c Optimize matching for CSS completion queries
new 0618061a28 Merge pull request #4979 from
matthiasblaesing/css_documentation
3e58e3c60c is described below
commit 3e58e3c60caa70f35929c6d2a98621cbc19623eb
Author: Matthias Bläsing
AuthorDate: Wed Nov 16 21:56:58 2022 +0100
Optimize matching for CSS completion queries
There are two different issues:
- The documentation is fetched based on the completion result. This was
only build based on the prefix. This change sorts the completion
result using the node image where the cursor is currently located and
sort by levenshtein distance between this image and the completion
proposal. This result in preferring better matching entries.
- The documentation is looked up from the W3C specificiation HTML
files. To do this the correct location is located using several
regular expressions. To make this more precise a less flexible
regexp is used. The other matches are retained and used as fallbacks.
Closes: #4778
---
.../modules/css/editor/csl/CssCompletion.java | 45 +-
.../main/StandardPropertiesHelpResolver.java | 7 +++-
2 files changed, 49 insertions(+), 3 deletions(-)
diff --git
a/ide/css.editor/src/org/netbeans/modules/css/editor/csl/CssCompletion.java
b/ide/css.editor/src/org/netbeans/modules/css/editor/csl/CssCompletion.java
index 4fc4d40875..9f87b66459 100644
--- a/ide/css.editor/src/org/netbeans/modules/css/editor/csl/CssCompletion.java
+++ b/ide/css.editor/src/org/netbeans/modules/css/editor/csl/CssCompletion.java
@@ -38,6 +38,7 @@ import javax.swing.ImageIcon;
import javax.swing.text.Caret;
import javax.swing.text.Document;
import javax.swing.text.JTextComponent;
+import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.editor.EditorRegistry;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.lexer.TokenHierarchy;
@@ -50,7 +51,6 @@ import org.netbeans.modules.csl.api.CompletionProposal;
import org.netbeans.modules.csl.api.ElementHandle;
import org.netbeans.modules.csl.api.ElementHandle.UrlHandle;
import org.netbeans.modules.csl.api.ElementKind;
-import org.netbeans.modules.csl.api.OffsetRange;
import org.netbeans.modules.csl.api.ParameterInfo;
import org.netbeans.modules.csl.spi.DefaultCompletionResult;
import org.netbeans.modules.csl.spi.ParserResult;
@@ -109,7 +109,7 @@ public class CssCompletion implements CodeCompletionHandler
{
@Override
public CodeCompletionResult complete(CodeCompletionContext context) {
-final List completionProposals = new ArrayList<>();
+List completionProposals = new ArrayList<>();
CssParserResult info = (CssParserResult) context.getParserResult();
Snapshot snapshot = info.getSnapshot();
@@ -235,6 +235,13 @@ public class CssCompletion implements
CodeCompletionHandler {
completePropertyName(completionContext, completionProposals);
completePropertyValue(completionContext, completionProposals,
charAfterCaret);
+String nodeImage = node.image().toString();
+completionProposals.sort((a, b) -> {
+int distA = levenshteinDistance(nodeImage, a.getName(), false);
+int distB = levenshteinDistance(nodeImage, b.getName(), false);
+return distA - distB;
+});
+
return new DefaultCompletionResult(completionProposals, false);
}
@@ -1682,6 +1689,40 @@ public class CssCompletion implements
CodeCompletionHandler {
} //switch
}
+@SuppressWarnings("AssignmentToMethodParameter")
+public final int levenshteinDistance(
+@NonNull String str1,
+@NonNull String str2,
+final boolean caseSensitive) {
+if (!caseSensitive) {
+str1 = str1.toLowerCase();
+str2 = str2.toLowerCase();
+}
+int[][] distance = new int[str1.length() + 1][str2.length() + 1];
+
+for (int i = 0; i <= str1.length(); i++) {
+distance[i][0] = i;
+}
+for (int j = 1; j <= str2.length(); j++) {
+distance[0][j] = j;
+}
+
+for (int i = 1; i <= str1.length(); i++) {
+for (int j = 1; j <= str2.length(); j++) {
+distance[i][j] = minimum(
+distance[i - 1][j] + 1,
+distance[i][j - 1] + 1,
+distance[i - 1][j - 1] + ((str1.charAt(i - 1) ==
str2.charAt(j - 1)) ? 0 : 1));
+}
+}
+
+return distance[str1.length()][str2.length()];
+}
+
+private static int minimum(int a, int b, int c) {
+
[netbeans] branch master updated: Lookup CSS properties case-insensitive
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 6f2056b492 Lookup CSS properties case-insensitive
new c9065c0b5a Merge pull request #4986 from
matthiasblaesing/css_case_insensitive_properties
6f2056b492 is described below
commit 6f2056b4929fc2089418b487defec1b4150efefa
Author: Matthias Bläsing
AuthorDate: Fri Nov 18 22:57:12 2022 +0100
Lookup CSS properties case-insensitive
Closes: #4861
---
.../modules/css/editor/module/main/BrowserSupportModule.java | 7 ++-
.../modules/css/editor/module/main/DefaultCssEditorModule.java| 8 ++--
.../modules/css/editor/module/main/ExtCssEditorModule.java| 7 ++-
.../css/editor/module/main/properties/PropertiesATest.java| 7 +++
4 files changed, 25 insertions(+), 4 deletions(-)
diff --git
a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/BrowserSupportModule.java
b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/BrowserSupportModule.java
index 4757fe5a66..57eecc2102 100644
---
a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/BrowserSupportModule.java
+++
b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/BrowserSupportModule.java
@@ -66,7 +66,12 @@ public class BrowserSupportModule extends CssEditorModule
implements CssModule {
@Override
public PropertyDefinition getPropertyDefinition(String propertyName) {
-return parser.getVendorSpecificProperties().get(propertyName);
+PropertyDefinition pd =
parser.getVendorSpecificProperties().get(propertyName);
+if (pd != null || propertyName == null) {
+return pd;
+} else {
+return
parser.getVendorSpecificProperties().get(propertyName.toLowerCase());
+}
}
@Override
diff --git
a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/DefaultCssEditorModule.java
b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/DefaultCssEditorModule.java
index 8b63bd8fee..a3147145d7 100644
---
a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/DefaultCssEditorModule.java
+++
b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/DefaultCssEditorModule.java
@@ -36,7 +36,6 @@ import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.lexer.TokenSequence;
-import org.netbeans.api.lexer.TokenUtilities;
import org.netbeans.lib.editor.util.CharSequenceUtilities;
import org.netbeans.modules.csl.api.ColoringAttributes;
import org.netbeans.modules.csl.api.CompletionProposal;
@@ -189,7 +188,12 @@ public class DefaultCssEditorModule extends
CssEditorModule {
@Override
public PropertyDefinition getPropertyDefinition(String propertyName) {
-return getProperties().get(propertyName);
+PropertyDefinition pd = getProperties().get(propertyName);
+if (pd != null || propertyName == null) {
+return pd;
+} else {
+return getProperties().get(propertyName.toLowerCase());
+}
}
@Override
diff --git
a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/ExtCssEditorModule.java
b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/ExtCssEditorModule.java
index e451ce6124..07866cac69 100644
---
a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/ExtCssEditorModule.java
+++
b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/ExtCssEditorModule.java
@@ -53,6 +53,11 @@ public abstract class ExtCssEditorModule extends
CssEditorModule {
@Override
public PropertyDefinition getPropertyDefinition(String propertyName) {
//Note: the context param is ignored by the "standard" css editor
modules.
-return getProperties().get(propertyName);
+PropertyDefinition pd = getProperties().get(propertyName);
+if (pd != null || propertyName == null) {
+return pd;
+} else {
+return getProperties().get(propertyName.toLowerCase());
+}
}
}
diff --git
a/ide/css.editor/test/unit/src/org/netbeans/modules/css/editor/module/main/properties/PropertiesATest.java
b/ide/css.editor/test/unit/src/org/netbeans/modules/css/editor/module/main/properties/PropertiesATest.java
index f2a92baa7a..f384cb2f08 100644
---
a/ide/css.editor/test/unit/src/org/netbeans/modules/css/editor/module/main/properties/PropertiesATest.java
+++
b/ide/css.editor/test/unit/src/org/netbeans/modules/css/editor/module/main/properties/PropertiesATest.java
@@ -2769,4 +2769,11 @@ public class PropertiesATest extends CssModuleTestBase {
assertCssCode(".demo {grid: auto-flow 1fr / repeat(auto-fill, 5em);}");
assert
[netbeans-tools] branch master updated: Improve image upload handling for PP3
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-tools.git
The following commit(s) were added to refs/heads/master by this push:
new 4a88fd3 Improve image upload handling for PP3
new 1158393 Merge pull request #55 from
matthiasblaesing/improve_image_upload
4a88fd3 is described below
commit 4a88fd3c11717a99ae1b5cd924742b2f538c952a
Author: Matthias Bläsing
AuthorDate: Thu Nov 10 20:47:23 2022 +0100
Improve image upload handling for PP3
- Allow the user/admin to remove an existing image
- Prepare the fileselector with a list of relevant files
- Remove old images
- Unify naming of uploaded images
---
.../Application/config/module.config.php.dist | 6 ++
.../src/Application/Controller/AdminController.php | 58 +
.../Application/Controller/PluginController.php| 74 ++
.../Application/view/application/admin/edit.phtml | 2 +-
.../view/application/plugin/_plugin-form.phtml | 11 +++-
.../view/application/plugin/confirm.phtml | 2 +-
.../Application/view/application/plugin/edit.phtml | 2 +-
7 files changed, 126 insertions(+), 29 deletions(-)
diff --git a/pp3/module/Application/config/module.config.php.dist
b/pp3/module/Application/config/module.config.php.dist
index 32f514b..36bae75 100755
--- a/pp3/module/Application/config/module.config.php.dist
+++ b/pp3/module/Application/config/module.config.php.dist
@@ -36,6 +36,12 @@ return array(
'dtdPath' =>
'http://localhost/checkout/pp3/public/dtd/autoupdate-catalog-2_8.dtd',
'downloadBaseUrl' => 'http://localhost/pp3/catalogue/download'
),
+'imageTypes' => array (
+'svg',
+'png',
+'jpg',
+'jpeg'
+),
'loginConfig' => array (
array(
'id' => 'github',
diff --git
a/pp3/module/Application/src/Application/Controller/AdminController.php
b/pp3/module/Application/src/Application/Controller/AdminController.php
index 546a77d..366ce20 100644
--- a/pp3/module/Application/src/Application/Controller/AdminController.php
+++ b/pp3/module/Application/src/Application/Controller/AdminController.php
@@ -588,23 +588,37 @@ NetBeans development team
$this->params()->fromPost('license'),
$this->params()->fromPost('description'),
$this->params()->fromPost('short_description'),
-$this->params()->fromPost('category')
+$this->params()->fromPost('category'),
+$this->params()->fromPost('homepage'),
+array_key_exists('image-file', $_FILES) ?
$_FILES['image-file'] : false
);
if ($validatedData) {
$plugin->setName($validatedData['name']);
$plugin->setLicense($validatedData['license']);
$plugin->setDescription($validatedData['description']);
$plugin->setShortDescription($validatedData['short_description']);
+$plugin->setHomepage($validatedData['homepage']);
$plugin->setLastUpdatedAt(new \DateTime('now'));
+$imageDir = $this->_config['pp3']['catalogSavepath'] .
'/plugins/' . $plugin->getId();
+
+$oldImage = $plugin->getImage();
+
// save image
-$im =
$this->handleImgUpload($this->_config['pp3']['catalogSavepath'] . '/plugins/' .
$plugin->getId());
+$im = $this->handleImgUpload($validatedData, $imageDir);
if ($im) {
$plugin->setImage($im);
}
+if($this->params()->fromPost('image-file-delete') ==
'true') {
+$plugin->setImage(null);
+}
-// categ
+if($oldImage && $oldImage != $plugin->getImage()) {
+unlink($imageDir . '/' . $oldImage);
+}
+
+// category
$plugin->removeCategories();
$this->_pluginRepository->persist($plugin);
$cat =
$this->_categoryRepository->find($validatedData['category']);
@@ -637,14 +651,29 @@ NetBeans development team
return new ViewModel(array(
'plugin' => $plugin,
'categories' =>
$this->_categoryRepository->getAllCategoriesSortByName(),
-'activeTab' => $activeTab
+'activeTab' => $activeTab,
+'imageTypes' => $this->_config['imageTypes']
));
}
-private function _validateAndCleanPluginData($nam
[netbeans] branch master updated: db.metadata.model: Bump connector/j version to prevent unittest failures ran against newer mysql server
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing 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 2add704921 db.metadata.model: Bump connector/j version to prevent unittest failures ran against newer mysql server new c69515d387 Merge pull request #4953 from matthiasblaesing/connector_j_bump2 2add704921 is described below commit 2add704921525da2e94402f261dcd7b3b05fa0dd Author: Matthias Bläsing AuthorDate: Wed Nov 9 19:50:21 2022 +0100 db.metadata.model: Bump connector/j version to prevent unittest failures ran against newer mysql server --- ide/db.metadata.model/external/binaries-list |2 +- .../external/mysql-connector-j-8.0.31-license.txt | 1392 .../mysql-connector-java-5.1.48-license.txt| 316 - ide/db.metadata.model/nbproject/project.properties |2 +- .../metadata/model/jdbc/JDBCMetadataMySQLTest.java |4 +- .../org/netbeans/nbbuild/extlibs/ignored-overlaps |3 + 6 files changed, 1399 insertions(+), 320 deletions(-) diff --git a/ide/db.metadata.model/external/binaries-list b/ide/db.metadata.model/external/binaries-list index 23a6dd9871..41f5d4e2eb 100644 --- a/ide/db.metadata.model/external/binaries-list +++ b/ide/db.metadata.model/external/binaries-list @@ -16,4 +16,4 @@ # under the License. 7EFAD40EF52FBB1F08142F07A83B42D29E47D8CE org.apache.derby:derby:10.14.2.0 -9140BE77AAFA5050BF4BB936D560CBACB5A6B5C1 mysql:mysql-connector-java:5.1.48 +3FD5850719D7E82D50705D34CC6A0037FAB5731F com.mysql:mysql-connector-j:8.0.31 diff --git a/ide/db.metadata.model/external/mysql-connector-j-8.0.31-license.txt b/ide/db.metadata.model/external/mysql-connector-j-8.0.31-license.txt new file mode 100644 index 00..eeaa4f59b3 --- /dev/null +++ b/ide/db.metadata.model/external/mysql-connector-j-8.0.31-license.txt @@ -0,0 +1,1392 @@ +Name: MySQL Connector/J +Version: 8.0.31 +License: GPL-mysql-connector +Type: compile-time +Comment: Dependency required to run unit tests with DB support +Description: MySQL Connector/J is the official JDBC driver for MySQL. +Origin: https://dev.mysql.com/downloads/connector/j/ + +Licensing Information User Manual + +MySQL Connector/J 8.0 + __ + +Introduction + + This License Information User Manual contains Oracle's product license + and other licensing information, including licensing information for + third-party software which may be included in this distribution of + MySQL Connector/J 8.0. + + Last updated: August 2022 + +Licensing Information + + This is a release of MySQL Connector/J 8.0, brought to you by the MySQL + team at Oracle. This software is released under version 2 of the GNU + General Public License (GPLv2), as set forth below, with the following + additional permissions: + + This distribution of MySQL Connector/J 8.0 is distributed with certain + software that is licensed under separate terms, as designated in a + particular file or component or in the license documentation. Without + limiting your rights under the GPLv2, the authors of MySQL hereby grant + you an additional permission to link the program and your derivative + works with the separately licensed software that they have included + with the program. + + Without limiting the foregoing grant of rights under the GPLv2 and + additional permission as to separately licensed software, this + Connector is also subject to the Universal FOSS Exception, version 1.0, + a copy of which is reproduced below and can also be found along with + its FAQ at http://oss.oracle.com/licenses/universal-foss-exception. + + Copyright (c) 2017, 2022, Oracle and/or its affiliates. + +Election of GPLv2 + + For the avoidance of doubt, except that if any license choice other + than GPL or LGPL is available it will apply instead, Oracle elects to + use only the General Public License version 2 (GPLv2) at this time for + any software where a choice of GPL license versions is made available + with the language indicating that GPLv2 or any later version may be + used, or where a choice of which version of the GPL is applied is + otherwise unspecified. + +GNU General Public License Version 2.0, June 1991 + +The following applies to all products licensed under the GNU General +Public License, Version 2.0: You may not use the identified files +except in compliance with the GNU General Public License, Version +2.0 (the "License.") You may obtain a copy of the License at +http://www.gnu.org/licenses/gpl-2.0.txt. A copy of the license is +also reproduced below. 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 exp
[netbeans-tools] branch master updated: Generate JS stub files for webcommon/javascript2.editor module from typescript definitions
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-tools.git
The following commit(s) were added to refs/heads/master by this push:
new 1ae7c1f Generate JS stub files for webcommon/javascript2.editor
module from typescript definitions
new 32d1cfc Merge pull request #50 from matthiasblaesing/jsstub-generator
1ae7c1f is described below
commit 1ae7c1f38e9bf7ca480089a0329e402a33d0feee
Author: Matthias Bläsing
AuthorDate: Mon Apr 18 22:16:19 2022 +0200
Generate JS stub files for webcommon/javascript2.editor module from
typescript definitions
This generator uses the type definitions files for the JS core
libraries distributed with the typescript compiler to generate the JS
stubs NetBeans uses to provide the user with code completion.
---
.gitignore | 6 +-
jsstub-generator/generate.ts | 809 +
jsstub-generator/package-lock.json | 453 +
jsstub-generator/package.json | 13 +
4 files changed, 1280 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index a0a7bed..3c005b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,8 @@
/translations/*/dist/
/translations/*/nbproject/private/
/translations/*/nbproject/genfiles.properties
-/pp3/module/Application/external/osgi-jar-parser/target
\ No newline at end of file
+/pp3/module/Application/external/osgi-jar-parser/target
+/jsstub-generator/out/
+/jsstub-generator/node_modules/
+/jsstub-generator/nbproject/
+/jsstub-generator/out.old/
diff --git a/jsstub-generator/generate.ts b/jsstub-generator/generate.ts
new file mode 100644
index 000..c149bb9
--- /dev/null
+++ b/jsstub-generator/generate.ts
@@ -0,0 +1,809 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * 'License'); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ /**
+ * Convert the typedefinitions bundled with the typescript compiler into the
+ * stub files used by NetBeans (module webcommon/javascript2.editor).
+ *
+ * Usage:
+ * - Run 'npm install' to initialize the node modules
+ * - Run 'npm run generate' to start the build process
+ *
+ * The resulting zip files are placed in the 'out' directory. The generated
+ * sources can be found in the child folders of the 'out' directory.
+ */
+
+import ts from 'typescript';
+import process from 'process';
+import fs from 'fs';
+import JSZip from 'jszip';
+
+/***
+ * Datastructures to hold type data while parsing
+
**/
+
+class TypeData {
+modules: Map = new Map();
+
+getModule(moduleName: string): ModuleInfo {
+if(! this.modules.has(moduleName)) {
+const mi = new ModuleInfo();
+this.modules.set(moduleName, mi);
+}
+return this.modules.get(moduleName)!;
+}
+}
+
+class ModuleInfo {
+aliases: Map = new Map();
+classes: Map = new Map();
+functions: Map = new Map();
+variables: Map = new Map();
+
+public getClass(className: string): ClassInfo {
+if (!this.classes.has(className)) {
+const ci = new ClassInfo();
+this.classes.set(className, ci);
+}
+return this.classes.get(className)!;
+}
+}
+
+class ClassInfo {
+doc: string | undefined;
+inherits: string[] = [];
+constructorInfo: MemberInfo[] = [];
+properties: Map = new Map();
+file: string[] = [];
+
+public addInterits(ancestor: string) {
+if(this.inherits.indexOf(ancestor) < 0) {
+this.inherits.push(ancestor);
+}
+}
+
+public addFile(file: string) {
+if(this.file.indexOf(file) < 0) {
+this.file.push(file);
+}
+}
+}
+
+class MemberInfo {
+constructor(callable: boolean, returnType: ts.TypeNode, doc: string, file:
string, parameters: {name: string, type: ts.TypeNode, doc: string, optional:
boolean}[] | undefined = undefined) {
+this.callable = callable;
+this.returnType = returnType;
+this.doc = doc;
+this.para
[netbeans] branch master updated: jna.nosys is required so that JNA tries to load native library via System#loadLibrary
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 84ec65abbd jna.nosys is required so that JNA tries to load native
library via System#loadLibrary
new c8de2fc95b Merge pull request #4736 from
matthiasblaesing/load_jna_from_exploded_binaries
84ec65abbd is described below
commit 84ec65abbdb38e3550765129ae9d70cd2d3945b7
Author: Matthias Bläsing
AuthorDate: Wed Oct 5 19:22:13 2022 +0200
jna.nosys is required so that JNA tries to load native library via
System#loadLibrary
Without it the embedded native library is always used.
---
platform/libs.jna/src/org/netbeans/libs/jna/Installer.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/platform/libs.jna/src/org/netbeans/libs/jna/Installer.java
b/platform/libs.jna/src/org/netbeans/libs/jna/Installer.java
index 95b7f3ff02..56e8f031d5 100644
--- a/platform/libs.jna/src/org/netbeans/libs/jna/Installer.java
+++ b/platform/libs.jna/src/org/netbeans/libs/jna/Installer.java
@@ -27,5 +27,6 @@ public class Installer extends ModuleInstall {
super.validate();
//#211655
System.setProperty( "jna.boot.library.name", "jnidispatch-nb" );
//NOI18N
+System.setProperty( "jna.nosys", "false" ); //NOI18N
}
}
-
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: Fixed JBoss EAP regex patterns to match two digit minor/patch versions Also added a bunch of unit tests for EAP 6 and 7
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 cdc8a9c994 Fixed JBoss EAP regex patterns to match two digit
minor/patch versions Also added a bunch of unit tests for EAP 6 and 7
new 694f319b06 Merge pull request #4694 from
akronenw/fix_wildfly_app_server_start_log_line_parsing
cdc8a9c994 is described below
commit cdc8a9c9947014db882e98ac87e1cc09099306b4
Author: Alexander Kronenwett
AuthorDate: Tue Sep 27 15:49:22 2022 +0200
Fixed JBoss EAP regex patterns to match two digit minor/patch versions
Also added a bunch of unit tests for EAP 6 and 7
---
.../javaee/wildfly/ide/WildflyOutputSupport.java | 37 +
.../javaee/wildfly/ide/WildflyStartLineParser.java | 83
.../wildfly/ide/WildflyStartLineParserTest.java| 149 +
3 files changed, 235 insertions(+), 34 deletions(-)
diff --git
a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyOutputSupport.java
b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyOutputSupport.java
index f2bd369591..71e6a2995a 100644
---
a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyOutputSupport.java
+++
b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyOutputSupport.java
@@ -34,15 +34,14 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.logging.Level;
import java.util.logging.Logger;
-import java.util.regex.Pattern;
import org.netbeans.api.extexecution.ExecutionDescriptor;
import org.netbeans.api.extexecution.ExecutionService;
import org.netbeans.api.extexecution.base.input.InputProcessor;
import org.netbeans.api.extexecution.base.input.InputProcessors;
+import org.netbeans.api.extexecution.base.input.InputReader;
import org.netbeans.api.extexecution.base.input.InputReaderTask;
import org.netbeans.api.extexecution.base.input.InputReaders;
import org.netbeans.api.extexecution.base.input.LineProcessor;
-import org.netbeans.api.extexecution.base.input.InputReader;
import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties;
import org.netbeans.modules.j2ee.deployment.profiler.api.ProfilerSupport;
import org.openide.windows.InputOutput;
@@ -65,18 +64,6 @@ public final class WildflyOutputSupport {
private static final ExecutorService LOG_FILE_SERVICE =
Executors.newCachedThreadPool();
-private static final Pattern JBOSS_7_STARTED_ML = Pattern.compile(".*JBoss
AS 7(\\..*)* \\d+ms .*");
-private static final Pattern WILDFLY_8_STARTED_ML =
Pattern.compile(".*JBAS015874: WildFly 8(\\..*)* .* started in \\d+ms .*");
-private static final Pattern WILDFLY_8_STARTING_ML =
Pattern.compile(".*JBAS015899: WildFly 8(\\..*)* .* starting");
-private static final Pattern WILDFLY_9_STARTED_ML =
Pattern.compile(".*WFLYSRV0050: WildFly Full \\d+(\\..*)* .* started in \\d+ms
.*");
-private static final Pattern WILDFLY_STARTING_ML =
Pattern.compile(".*WFLYSRV0049: WildFly .* \\d+(\\..*)* .* starting");
-private static final Pattern WILDFLY_10_STARTED_ML =
Pattern.compile(".*WFLYSRV0025: WildFly .* \\d+(\\..*)* .* started in \\d+ms
.*");
-
-private static final Pattern EAP6_STARTED_ML =
Pattern.compile(".*JBAS015874: JBoss EAP 6\\.[0-9]?.[0-9]?\\.GA .* \\d+ms .*");
-private static final Pattern EAP6_STARTING_ML =
Pattern.compile(".*JBAS015899: JBoss EAP 6\\.[0-9]?.[0-9]?\\.GA .*");
-private static final Pattern EAP7_STARTED_ML =
Pattern.compile(".*WFLYSRV0025: JBoss EAP 7\\.[0-9]?.[0-9]?\\.GA .* \\d+ms .*");
-private static final Pattern EAP7_STARTING_ML =
Pattern.compile(".*WFLYSRV0049: JBoss EAP 7\\.[0-9]?.[0-9]?\\.GA .*");
-
private final InstanceProperties props;
/**
@@ -368,29 +355,11 @@ public final class WildflyOutputSupport {
}
private boolean isStarting(String line) {
-return line.contains("Starting JBoss (MX MicroKernel)") // JBoss
4.x message // NOI18N
-|| line.contains("Starting JBoss (Microcontainer)") //
JBoss 5.0 message // NOI18N
-|| line.contains("Starting JBossAS") // JBoss 6.0 message
// NOI18N
-|| WILDFLY_8_STARTING_ML.matcher(line).matches()
-|| WILDFLY_STARTING_ML.matcher(line).matches()
-|| EAP6_STARTING_ML.matcher(line).matches()
-|| EAP7_STARTING_ML.matcher(line).matches();
+return WildflyStartLineParser.isStarting(line);
}
private boolean isStarted(String line) {
-return ((line.contains("JBoss (MX MicroKe
[netbeans] branch master updated: JavadocImports fixed for illegal string trim raises a StringIndexOutOfBoundsException.(#4646)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 f625c96538 JavadocImports fixed for illegal string trim raises a
StringIndexOutOfBoundsException.(#4646)
new 91b094cadd Merge pull request #4647 from
naotsugu/fixedStringOutOfBounds
f625c96538 is described below
commit f625c96538df59d16e226ee8398fc4c210d0d8fd
Author: Naotsugu Kobayashi
AuthorDate: Sat Sep 17 22:31:56 2022 +0900
JavadocImports fixed for illegal string trim raises a
StringIndexOutOfBoundsException.(#4646)
---
.../org/netbeans/modules/java/editor/base/javadoc/JavadocImports.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/java/java.editor.base/src/org/netbeans/modules/java/editor/base/javadoc/JavadocImports.java
b/java/java.editor.base/src/org/netbeans/modules/java/editor/base/javadoc/JavadocImports.java
index 63d1f49d5b..07ccd639c0 100644
---
a/java/java.editor.base/src/org/netbeans/modules/java/editor/base/javadoc/JavadocImports.java
+++
b/java/java.editor.base/src/org/netbeans/modules/java/editor/base/javadoc/JavadocImports.java
@@ -821,7 +821,7 @@ public final class JavadocImports {
jdctx.doc = javac.getDocument();
jdctx.javac = javac;
long startPosition =
trees.getSourcePositions().getStartPosition(javac.getCompilationUnit(),
dcComment, node);
-int errorBodyLength = body.trim().substring(0,
body.length()).trim().length();
+int errorBodyLength = body.trim().length();
int caretOffset = (int) startPosition + errorBodyLength;
TreePath javadocFor = result[0].getTreePath();
if (javadocFor == 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 master updated (4efad12307 -> 51ffae69c0)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 4efad12307 Minor cleanup in YAML Language Support new 24ae3e3d3d Adding test for multi release jars. new 786efe883b Running platform/o.n.bootstrap tests on JDK 11. new 18248af9a3 Add multi-release jar support to JarClassLoader new 7489342aa9 Identation and minor changes. new d8581a1391 Iterate over contained versions only. new d0a62879de Implement multi-release support to respect Archive support and loading constraints new 2b3da75816 Ensure jsch module reports itself as a multi release jar new ae4dfd7273 Implementation of multi-release jar support for Netbinox new 9c9de5edd5 Use a JDK 11 from jdk11-updates and not last unmaintained GA version new 51ffae69c0 Merge pull request #4589 from matthiasblaesing/multi-release The 7448 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: .travis.yml| 24 ++- ide/c.jcraft.jsch/build.xml| 1 + platform/netbinox/nbproject/project.properties | 2 +- platform/netbinox/nbproject/project.xml| 5 + .../netbeans/modules/netbinox/JarBundleFile.java | 116 +- .../netbeans/modules/netbinox/NetbinoxLoader.java | 3 - .../netbinox/NetbinoxMultiversionJarTest.java | 175 + .../src/org/netbeans/JarClassLoader.java | 90 ++- .../unit/src/org/netbeans/JarClassLoaderTest.java | 96 +++ 9 files changed, 499 insertions(+), 13 deletions(-) create mode 100644 platform/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetbinoxMultiversionJarTest.java - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated: CSS: Implemented position:sticky
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 9cdcfb18bb CSS: Implemented position:sticky
new 658e17362d Merge pull request #4480 from
troizet/implement_position_sticky
9cdcfb18bb is described below
commit 9cdcfb18bba8f5640fd461eea8d202a8779c4504
Author: Alexey Borokhvostov
AuthorDate: Mon Aug 8 22:41:53 2022 +0700
CSS: Implemented position:sticky
---
.../css/editor/module/main/Bundle.properties | 1 +
.../editor/module/main/DefaultCssEditorModule.java | 3 ++-
.../main/properties/default_module.properties | 2 --
.../module/main/properties/positioning.properties | 22 ++
.../css/lib/api/properties/PropertyCategory.java | 1 +
5 files changed, 26 insertions(+), 3 deletions(-)
diff --git
a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/Bundle.properties
b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/Bundle.properties
index 87510e9ff6..acef45abdc 100644
---
a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/Bundle.properties
+++
b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/Bundle.properties
@@ -53,6 +53,7 @@ css-module-displayname-lists_and_counters=List and Counters
css-module-displayname-paged_media=Paged Media
css-module-displayname-alignment=Box Alignment
css-module-displayname-fragmentation=Fragmentation
+css-module-displayname-positioning=Positioning
completion-help-no-documentation-found=No documentation found
diff --git
a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/DefaultCssEditorModule.java
b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/DefaultCssEditorModule.java
index 4fb61b5522..8b63bd8fee 100644
---
a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/DefaultCssEditorModule.java
+++
b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/DefaultCssEditorModule.java
@@ -104,7 +104,8 @@ public class DefaultCssEditorModule extends CssEditorModule
{
module("presentation_levels", "http://www.w3.org/TR/css3-preslev;),
//NOI18N
module("generated_and_replaced_content",
"http://www.w3.org/TR/css3-content;), //NOI18N
module("alignment", "http://www.w3.org/TR/css-align-3;), //NOI18N
-module("fragmentation", "http://www.w3.org/TR/css-break-3;) //NOI18N
+module("fragmentation", "http://www.w3.org/TR/css-break-3;), //NOI18N
+module("positioning", "http://www.w3.org/TR/css3-positioning;) //NOI18N
};
private static Map propertyDescriptors;
diff --git
a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/default_module.properties
b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/default_module.properties
index f7dcbd92eb..3da6a2f30a 100644
---
a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/default_module.properties
+++
b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/default_module.properties
@@ -72,8 +72,6 @@ pitch=!frequency | x-low | low | medium | high | x-high
play-during= [ mix || repeat ]? | auto | none |
-position=static | relative | absolute | fixed |
-
quotes=[ ]+ | none |
richness=
diff --git
a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/positioning.properties
b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/positioning.properties
new file mode 100644
index 00..9867713492
--- /dev/null
+++
b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/positioning.properties
@@ -0,0 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+#CSS Positioning Module
+
+$category=positioning
+
+position=static | relative | absolute | fixed | sticky |
diff --git
a/ide/css.lib/src/org/netbeans/modules/css/lib/api/properties/PropertyCategory.java
b/ide/css.lib/src/org/netbeans/modul
[netbeans] branch master updated: [GITHUB-3913] Disable Micronaut HyperlinkProviders to prevent deadlock
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing 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 42c7e8d3e1 [GITHUB-3913] Disable Micronaut HyperlinkProviders to prevent deadlock new e9964448fd Merge pull request #4385 from matthiasblaesing/github-3913 42c7e8d3e1 is described below commit 42c7e8d3e1a36cd12b7f53f8057ce887053eebd3 Author: Matthias Bläsing AuthorDate: Fri Jul 15 21:47:11 2022 +0200 [GITHUB-3913] Disable Micronaut HyperlinkProviders to prevent deadlock The relevant stacktraces for the affected threads are saved below. As there is also a warning logged with a clear indication: WARNING [org.netbeans.modules.parsing.impl.TaskProcessor]: ParserManager.parse called in AWT event thread by: org.netbeans.modules.micronaut.hyperlink.MicronautJavaHyperlinkProvider.getPropertyName(MicronautJavaHyperlinkProvider.java:151) Stacktraces: "AWT-EventQueue-0" #24 prio=6 os_prio=0 cpu=69156.33ms elapsed=76496.39s tid=0x7feca4122b90 nid=0x106e2a waiting on condition [0x7fec9756e000] java.lang.Thread.State: WAITING (parking) at jdk.internal.misc.Unsafe.park(java.base@17.0.3/Native Method) - parking to wait for <0x0006d7905fd0> (a java.util.concurrent.locks.ReentrantLock$FairSync) at java.util.concurrent.locks.LockSupport.park(java.base@17.0.3/LockSupport.java:211) at java.util.concurrent.locks.AbstractQueuedSynchronizer.acquire(java.base@17.0.3/AbstractQueuedSynchronizer.java:715) at java.util.concurrent.locks.AbstractQueuedSynchronizer.acquire(java.base@17.0.3/AbstractQueuedSynchronizer.java:938) at java.util.concurrent.locks.ReentrantLock$Sync.lock(java.base@17.0.3/ReentrantLock.java:153) at java.util.concurrent.locks.ReentrantLock.lock(java.base@17.0.3/ReentrantLock.java:322) at org.netbeans.modules.parsing.impl.TaskProcessor.runUserTask(TaskProcessor.java:170) at org.netbeans.modules.parsing.api.ParserManager.parse(ParserManager.java:83) at org.netbeans.api.java.source.JavaSource.runUserActionTaskImpl(JavaSource.java:454) at org.netbeans.api.java.source.JavaSource.runUserActionTask(JavaSource.java:425) at org.netbeans.modules.micronaut.hyperlink.MicronautJavaHyperlinkProvider.getPropertyName(MicronautJavaHyperlinkProvider.java:151) at org.netbeans.modules.micronaut.hyperlink.MicronautJavaHyperlinkProvider.resolve(MicronautJavaHyperlinkProvider.java:122) at org.netbeans.modules.micronaut.hyperlink.MicronautJavaHyperlinkProvider.getHyperlinkSpan(MicronautJavaHyperlinkProvider.java:85) "Editor Parsing Loop (14-c4f2d87113e1a2d2d4e21e8952e1f99612d5b3fd)" #28 daemon prio=1 os_prio=0 cpu=65769.71ms elapsed=76494.46s tid=0x7feca4401250 nid=0x106e35 in Object.wait() [0x7fec957fe000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(java.base@17.0.3/Native Method) - waiting on at java.lang.Object.wait(java.base@17.0.3/Object.java:338) at org.netbeans.modules.parsing.impl.TaskProcessor$CurrentRequestReference.setCurrentTask(TaskProcessor.java:1128) - locked <0x0006d75591d8> (a org.netbeans.modules.parsing.impl.TaskProcessor$CurrentRequestReference$CRRLock) at org.netbeans.modules.parsing.impl.TaskProcessor$RequestPerformer.run(TaskProcessor.java:842) at org.openide.util.lookup.Lookups.executeWith(Lookups.java:279) at org.netbeans.modules.parsing.impl.TaskProcessor$RequestPerformer.execute(TaskProcessor.java:702) at org.netbeans.modules.parsing.impl.TaskProcessor$CompilationJob.run(TaskProcessor.java:663) "Module-Actions" #163 daemon prio=1 os_prio=0 cpu=2546.95ms elapsed=253.00s tid=0x7fec806c9c90 nid=0x1abee2 in Object.wait() [0x7fec951fa000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(java.base@17.0.3/Native Method) - waiting on at java.lang.Object.wait(java.base@17.0.3/Object.java:338) at javax.swing.text.AbstractDocument.writeLock(java.desktop@17.0.3/AbstractDocument.java:1378) - locked <0x000718f28200> (a org.netbeans.modules.editor.NbEditorDocument) at org.netbeans.editor.BaseDocument.extWriteLock(BaseDocument.java:1696) at org.netbeans.editor.BaseDocument.atomicLockImpl(BaseDocument.java:1744) - locked <0x000718f28200> (a org.netbeans.modules.editor.NbEditorDocument) - locked <0x000718f28200> (a org.netbeans.modules.editor.NbEditorDocument) at org.netbeans
[netbeans] branch master updated: Disable flaky ValidateLayerConsistencyTest
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing 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 f3aeffc557 Disable flaky ValidateLayerConsistencyTest new 5fd9eb5278 Merge pull request #4218 from matthiasblaesing/disable_flaky_test_from_commit_validation f3aeffc557 is described below commit f3aeffc557243f51259aa191589e38b617035bd4 Author: Matthias Bläsing AuthorDate: Thu Jun 9 19:50:21 2022 +0200 Disable flaky ValidateLayerConsistencyTest See https://github.com/apache/netbeans/issues/4211 for details --- platform/o.n.core/nbproject/project.properties | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/o.n.core/nbproject/project.properties b/platform/o.n.core/nbproject/project.properties index d1c2854c4b..3e8e1aca8c 100644 --- a/platform/o.n.core/nbproject/project.properties +++ b/platform/o.n.core/nbproject/project.properties @@ -36,8 +36,10 @@ test.excludes=\ test.config.commit.includes=\ **/ValidateNbinst*Test.class,\ **/ValidateClassFilesTest.class,\ -**/ValidateLayerConsistencyTest.class,\ **/ValidateModulesTest.class +# Test was disable as it was found to be flaky: +# https://github.com/apache/netbeans/issues/4211 +#**/ValidateLayerConsistencyTest.class test.config.stableBTD.includes=**/*Test.class test.config.stableBTD.excludes=\ - 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: Invoke indexer in RepositoryUpdater grouped by mimepath of file
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 3d20d2582f Invoke indexer in RepositoryUpdater grouped by mimepath of
file
new 24203679e9 Merge pull request #4324 from matthiasblaesing/js_indexing
3d20d2582f is described below
commit 3d20d2582f2a9c8abdcd18dad4f62e6091b5673b
Author: Matthias Bläsing
AuthorDate: Fri Jul 1 22:13:11 2022 +0200
Invoke indexer in RepositoryUpdater grouped by mimepath of file
While analysing this it was found, that the GsfParserFactory#createParser
returned null as the parser for snapshots. Looking deeper, showed, that
the #createParser method was invoked with snapshots of differing mimetypes.
This works, but is a violation of the contract in
ParserFactory#createParser:
> It is guaranteed that all snapshots in the collection will be
> of the same mime type and it will be the mime type, which this factory
> was registered for (ie. in MimeLookup)
If the snapshots are inconsistent, parsing still works, but its performance
suffers. To fix this the call to ParserManager#parse in RepositoryUpdater
is split. The scanned sources are grouped by their mimepath and each group
is individually passed.
The observed improvements are:
Indexing Variant 1 (tour-of-heroes)
Before: ~125s
After: ~105s
Indexing Variant 2 (tour-of-heros with Indexability Filter)
Before: ~52s
After: ~38s
The Indexability Filter blocks scanning for all paths with paths containing
node_modules and where the indexer is in the list: js, angular, requirejs,
knockoutjs, TLIndexer, tests.
---
.../parsing/impl/indexing/RepositoryUpdater.java | 18 +-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git
a/ide/parsing.indexing/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java
b/ide/parsing.indexing/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java
index 0d8f9cf3ab..308fa7c7d6 100644
---
a/ide/parsing.indexing/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java
+++
b/ide/parsing.indexing/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java
@@ -3250,7 +3250,23 @@ public final class RepositoryUpdater implements
PathRegistryListener, PropertyCh
}
}
}
-ParserManager.parse(sources.keySet(), new T());
+
+// Performance of ParserManager#parse suffers if the
sources
+// are of mixed mimetype. ParserManager will then generate
+// snapshots with mixed mimetypes, which violates the
+// ParserFactory contract and leads to slower code paths.
+//
+// To work around this the sources are passed to the
+// ParserManager grouped by their mimetype
+
+Map> sourcesByMimeType = sources
+.keySet()
+.stream()
+
.collect(Collectors.groupingBy(s->s.getMimeType()));
+
+for(List l: sourcesByMimeType.values()) {
+ParserManager.parse(l, new T());
+}
} catch (final ParseException e) {
LOGGER.log(Level.WARNING, null, e);
} finally {
-
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: Issue 4243: delete java/lang/Module and use dynamic proxy to implement Instrumentation across JDK versions
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 69c8d6331e Issue 4243: delete java/lang/Module and use dynamic proxy
to implement Instrumentation across JDK versions
new a1b803a832 Merge pull request #4273 from nbauma109/patch-4243
69c8d6331e is described below
commit 69c8d6331e99d72d0d4c299a06c176e021e3187a
Author: Nicolas Baumann
AuthorDate: Wed Jun 22 22:33:00 2022 +0200
Issue 4243: delete java/lang/Module and use dynamic proxy to implement
Instrumentation across JDK versions
---
platform/o.n.bootstrap/src/java/lang/Module.java | 23
.../src/org/netbeans/NbInstrumentation.java| 134 -
2 files changed, 47 insertions(+), 110 deletions(-)
diff --git a/platform/o.n.bootstrap/src/java/lang/Module.java
b/platform/o.n.bootstrap/src/java/lang/Module.java
deleted file mode 100644
index 4b36b26142..00
--- a/platform/o.n.bootstrap/src/java/lang/Module.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package java.lang;
-
-/** Dummy */
-public class Module {
-}
diff --git a/platform/o.n.bootstrap/src/org/netbeans/NbInstrumentation.java
b/platform/o.n.bootstrap/src/org/netbeans/NbInstrumentation.java
index 15b373136d..f4a95fc09d 100644
--- a/platform/o.n.bootstrap/src/org/netbeans/NbInstrumentation.java
+++ b/platform/o.n.bootstrap/src/org/netbeans/NbInstrumentation.java
@@ -26,6 +26,8 @@ import java.lang.instrument.Instrumentation;
import java.lang.instrument.UnmodifiableClassException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Proxy;
import java.security.ProtectionDomain;
import java.util.Collection;
import java.util.List;
@@ -41,14 +43,20 @@ import org.openide.util.WeakSet;
*
* @author Jaroslav Tulach
*/
-final class NbInstrumentation implements Instrumentation {
+final class NbInstrumentation implements InvocationHandler {
private static final Logger LOG =
Logger.getLogger(NbInstrumentation.class.getName());
private static final Object LOCK = new Object();
private static volatile Collection ACTIVE;
-private final List transformers = new
CopyOnWriteArrayList();
-private static final ThreadLocal IN = new ThreadLocal();
-
+private final List transformers = new
CopyOnWriteArrayList<>();
+private static final ThreadLocal IN = new ThreadLocal<>();
+
+private final Instrumentation instrumentationProxy;
+
+public NbInstrumentation() {
+instrumentationProxy = (Instrumentation)
Proxy.newProxyInstance(getClass().getClassLoader(), new Class[] {
Instrumentation.class }, this);
+}
+
static NbInstrumentation registerAgent(ClassLoader l, String
agentClassName) {
try {
return registerImpl(agentClassName, l);
@@ -57,29 +65,31 @@ final class NbInstrumentation implements Instrumentation {
return null;
}
}
+
static void unregisterAgent(NbInstrumentation instr) {
synchronized (LOCK) {
if (ACTIVE != null) {
-Collection clone = new
WeakSet(ACTIVE);
+Collection clone = new WeakSet<>(ACTIVE);
clone.remove(instr);
ACTIVE = clone;
}
}
}
+
private static NbInstrumentation registerImpl(String agentClassName,
ClassLoader l) throws ClassNotFoundException, IllegalArgumentException,
NoSuchMethodException, SecurityException, IllegalAccessException,
InvocationTargetException {
final NbInstrumentation inst = new NbInstrumentation();
synchronized (LOCK) {
if (ACTIVE == null) {
-ACTIVE = new WeakSet();
+ACTIVE = new WeakSet<>();
} else {
-ACTIVE = new WeakSet(ACTIVE);
+ACTIVE = new WeakSet<>(ACTIVE);
}
ACTIVE.add(inst);
[netbeans] branch master updated: Improve performance of JS implementation of AlternativeLocationImpl
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 3d0065135c Improve performance of JS implementation of
AlternativeLocationImpl
new 191d64f4f6 Merge pull request #4313 from
matthiasblaesing/js_goto_declaration
3d0065135c is described below
commit 3d0065135c1495c61451d655c956a11e921dfde2
Author: Matthias Bläsing
AuthorDate: Thu Jun 30 19:18:55 2022 +0200
Improve performance of JS implementation of AlternativeLocationImpl
#getStringLocation reads the original file, but is called from the EDT,
so invocations must be kept to a minimum. What is more the method is
used by #compareTo and thus is potentially called often.
Two optimisations are applied:
- the result of #getStringLocation is cached and only calculated once
- #compareTo was rewritten to use the relative path and offset directly.
Before relative path and the line number was used to create an
ordering, as offset and line number are related, switching for
ordering shoud have no outside result
---
.../editor/navigation/DeclarationFinderImpl.java | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git
a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/navigation/DeclarationFinderImpl.java
b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/navigation/DeclarationFinderImpl.java
index 2a1c13278b..332e40a61a 100644
---
a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/navigation/DeclarationFinderImpl.java
+++
b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/navigation/DeclarationFinderImpl.java
@@ -398,6 +398,7 @@ public class DeclarationFinderImpl implements
DeclarationFinder {
private final int offset;
private final DeclarationLocation location;
private final IndexedElement element;
+private String stringLocation;
public AlternativeLocationImpl(IndexResult iResult) {
this.iResult = iResult;
@@ -412,7 +413,10 @@ public class DeclarationFinderImpl implements
DeclarationFinder {
return element;
}
-private String getStringLocation() {
+private String getStringLocation() {
+if(stringLocation != null) {
+return stringLocation;
+}
int lineNumber = 0;
int count = 0;
List asLines;
@@ -435,6 +439,7 @@ public class DeclarationFinderImpl implements
DeclarationFinder {
if (lineNumber > 0) {
result = result + " : " + lineNumber; //NOI18N
}
+stringLocation = result;
return result;
}
@@ -452,7 +457,13 @@ public class DeclarationFinderImpl implements
DeclarationFinder {
@Override
public int compareTo(AlternativeLocation o) {
AlternativeLocationImpl ali = (AlternativeLocationImpl)o;
-return getStringLocation().compareTo(ali.getStringLocation());
+String relPath1 = iResult.getRelativePath();
+String relPath2 = ali.iResult.getRelativePath();
+int comparison = relPath1.compareTo(relPath2);
+if(comparison != 0) {
+return comparison;
+}
+return offset - ali.offset;
}
}
-
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: LSPClient: Don't assume URL -> FileObject mapping exists
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 24f9b83fed LSPClient: Don't assume URL -> FileObject mapping exists
new 2cbef01f9b Merge pull request #4327 from
matthiasblaesing/lsp_client_improvement
24f9b83fed is described below
commit 24f9b83fed746251317f270b62ebed83f8b229af
Author: Matthias Bläsing
AuthorDate: Sun Jul 3 21:48:34 2022 +0200
LSPClient: Don't assume URL -> FileObject mapping exists
While working with a typescript project, I multiple times copied files,
renamed, edited and closed them. I noticed, that I got a
NullPointerException from the LanguageClientImpl:
java.lang.NullPointerException: Cannot invoke
"org.openide.filesystems.FileObject.getLookup()" because "file" is null
at
org.netbeans.modules.lsp.client.bindings.LanguageClientImpl.publishDiagnostics(LanguageClientImpl.java:161)
Caused: java.lang.reflect.InvocationTargetException
at
jdk.internal.reflect.GeneratedMethodAccessor159.invoke(Unknown Source)
at
java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.base/java.lang.reflect.Method.invoke(Method.java:568)
at
org.eclipse.lsp4j.jsonrpc.services.GenericEndpoint.lambda$null$0(GenericEndpoint.java:65)
Caused: java.lang.RuntimeException
at
org.eclipse.lsp4j.jsonrpc.services.GenericEndpoint.lambda$null$0(GenericEndpoint.java:67)
at
org.eclipse.lsp4j.jsonrpc.services.GenericEndpoint.notify(GenericEndpoint.java:152)
This looks like a race condition between the LSP server reporting
diagnostics and the URLMapper being updated or the LSP server reporting
diagnostics after the file was already closed.
LanguageClientImpl#publishDiagnostics already guards against missing
EditorCookies and Documents, so this change just expands this to the
FileObject itself.
---
.../org/netbeans/modules/lsp/client/bindings/LanguageClientImpl.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/LanguageClientImpl.java
b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/LanguageClientImpl.java
index 80c53ce351..21d87ca782 100644
---
a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/LanguageClientImpl.java
+++
b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/LanguageClientImpl.java
@@ -158,10 +158,11 @@ public class LanguageClientImpl implements
LanguageClient, Endpoint {
public void publishDiagnostics(PublishDiagnosticsParams pdp) {
try {
FileObject file = URLMapper.findFileObject(new
URI(pdp.getUri()).toURL());
-EditorCookie ec = file.getLookup().lookup(EditorCookie.class);
+EditorCookie ec = file != null ?
file.getLookup().lookup(EditorCookie.class) : null;
Document doc = ec != null ? ec.getDocument() : null;
-if (doc == null)
+if (doc == null) {
return ; //ignore...
+}
List diags = pdp.getDiagnostics().stream().map(d
-> {
LazyFixList fixList = allowCodeActions ? new
DiagnosticFixList(pdp.getUri(), d) :
ErrorDescriptionFactory.lazyListForFixes(Collections.emptyList());
return
ErrorDescriptionFactory.createErrorDescription(severityMap.get(d.getSeverity()),
d.getMessage(), fixList, file, Utils.getOffset(doc, d.getRange().getStart()),
Utils.getOffset(doc, d.getRange().getEnd()));
-
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 (df48f84e41 -> d75b277a42)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from df48f84e41 Merge pull request #4232 from matthiasblaesing/gh-4214 new b597ca7231 Rebuild completion reference files and enable tests for javascript2.editor new 6b7dfc98ef Fix unittests for javascript2.prototypejs and reenable CI/CD tests for html.angular, javascript2.nodejs, javascript2.prototypejs, javascript2.requirejs new e5c9f03673 Javascript: Consider global functions for checking undeclared global variables new d75b277a42 Merge pull request #4252 from matthiasblaesing/gh-4246 The 7197 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: .travis.yml| 54 ++-- .../editor/hints/GlobalIsNotDefined.java | 19 ...ts.js.testFunctionObjectProperties02.completion | 10 ++-- .../arguments.js.testIssue215763.completion| 10 ++-- ...le.js.testFunctionObjectProperties01.completion | 10 ++-- .../arrays/arrays1.js.testArrays01.completion | 22 - .../arrays/arrays2.js.testArrays04.completion | 22 - .../arrays/arrays3.js.testArrays05.completion | 22 - ...01.js.testOfferingCallbackFunction01.completion | 10 ++-- .../issue214205.js.testIssue214205_01.completion | 10 ++-- .../issue214205.js.testIssue214205_02.completion | 10 ++-- .../issue215353.js.testIssue215353.completion | 10 ++-- .../issue215863.js.testIssue215863_02.completion | 10 ++-- .../issue215863.js.testIssue215863_03.completion | 4 +- .../issue220917.js.testIssue220917_02.completion | 2 +- .../issue222993.js.testIssue222993_02.completion | 10 ++-- .../issue222993.js.testIssue222993_03.completion | 10 ++-- .../issue223037.js.testIssue223037_02.completion | 22 - .../issue223681.js.testIssue223681_01.completion | 10 ++-- .../issue230784.js.testIssue230784_01.completion | 2 +- .../issue235252.js.testIssue235252.completion | 4 +- ...xpLiterals01.js.testRegExpLiterals01.completion | 6 +-- ...ngLiterals01.js.testStringLiterals01.completion | 12 ++--- .../issue215746.js.testIssue215746_02.completion | 4 +- .../issue215777.js.testIssue215777_01.completion | 10 ++-- .../issue215777.js.testIssue215777_02.completion | 10 ++-- .../issue215861.js.testIssue215861_01.completion | 10 ++-- .../issue215861.js.testIssue215861_02.completion | 10 ++-- .../issue218361_1.js.testIssue218361_01.completion | 10 ++-- .../issue218361_2.js.testIssue218361_02.completion | 10 ++-- .../issue218361_3.js.testIssue218361_03.completion | 10 ++-- .../issue218361_4.js.testIssue218361_04.completion | 10 ++-- .../index.html.testIssue228634_01.completion | 2 +- .../test.js.testIssue228634_02.completion | 2 +- .../issue245252.js.testIssue245252_01.completion | 2 +- .../app.js.testIssue246060_01.completion | 10 ++-- ...1.js.testParameterTypesDocDefinition.completion | 18 +++ ...s.testShowMethodDefinedInOtherFile01.completion | 10 ++-- ...meterTypesMethodDefinedInOtherFile01.completion | 10 ++-- ...s.testShowMethodDefinedInOtherFile02.completion | 10 ++-- .../issue214556.js.testSimple01.completion | 10 ++-- .../issue214556.js.testSimple02.completion | 10 ++-- .../issue214556.js.testSimple03.completion | 10 ++-- .../issue214556_test.js.testFromIndex.completion | 10 ++-- ...ainSimple.js.testMethodChainSimple01.completion | 10 ++-- ...ainSimple.js.testMethodChainSimple02.completion | 2 +- ...ainSimple.js.testMethodChainSimple03.completion | 10 ++-- ...ainSimple.js.testMethodChainSimple05.completion | 18 +++ .../completion/with/with1.js.testWith1.completion | 10 ++-- .../completion/with/with2.js.testWith2.completion | 18 +++ .../completion/with/with3.js.testWith3.completion | 10 ++-- .../test.js.testWith5.completion | 22 - .../withAnonymous/with5.js.testWith5.completion| 10 ++-- .../withAnonymous/with6.js.testWith6.completion| 10 ++-- .../withComplex/with4.js.testWith4a.completion | 10 ++-- .../withComplex/with4.js.testWith4b.completion | 10 ++-- .../withComplex/with4.js.testWith4c.completion | 10 ++-- ...virtualSource2.js.testIssue247788_01.completion | 10 ++-- ...virtualSource2.js.testIssue247788_02.completion | 10 ++-- .../generator01.js.testGenerators01_02.completion | 2 +- .../generator02.js.testGenerators02_01.completion | 4 +- .../generator03.js.testGenerators03_01.completion | 10 ++-- .../generator03.js.testGenerators03_02.completion | 16 +++--- .../generator04.js.testGenerators04_01.completion | 2 +- .../test/unit/
[netbeans] branch master updated: Don't generate hint for missing semicolon in generated constructor node
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 a41856a756 Don't generate hint for missing semicolon in generated
constructor node
new df48f84e41 Merge pull request #4232 from matthiasblaesing/gh-4214
a41856a756 is described below
commit a41856a75601a4565852a022fccf4bd237c1fea5
Author: Matthias Bläsing
AuthorDate: Thu Jun 16 21:36:02 2022 +0200
Don't generate hint for missing semicolon in generated constructor node
For this construct:
class A {
}
class B extends A {
}
the graaljs parser generates the default constructor:
constructor(...args) {
super(...args);
}
This irritates the semicolon hint, as the token for the semicolon can't
be found and thus the hint is generated.
Closes: #4214
---
.../javascript2/editor/hints/JsConventionRule.java | 26 ++
.../hints/semicolonWarningGeneratedConstructor.js | 8 +++
testSemicolonWarningGeneratedConstructor.hints | 0
.../hints/semicolonWarningRealConstructor.js | 13 +++
...or.js.testSemicolonWarningRealConstructor.hints | 3 +++
.../editor/hint/JsConventionHintTest.java | 10 -
6 files changed, 59 insertions(+), 1 deletion(-)
diff --git
a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/hints/JsConventionRule.java
b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/hints/JsConventionRule.java
index 06105fad4e..54b25af55a 100644
---
a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/hints/JsConventionRule.java
+++
b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/hints/JsConventionRule.java
@@ -31,11 +31,14 @@ import com.oracle.js.parser.ir.ReturnNode;
import com.oracle.js.parser.ir.ThrowNode;
import com.oracle.js.parser.ir.VarNode;
import com.oracle.js.parser.ir.WhileNode;
+
import static com.oracle.js.parser.TokenType.EQ;
import static com.oracle.js.parser.TokenType.NE;
+
import com.oracle.js.parser.ir.ClassNode;
import com.oracle.js.parser.ir.ExpressionStatement;
import com.oracle.js.parser.ir.IdentNode;
+import com.oracle.js.parser.ir.PropertyNode;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -594,5 +597,28 @@ public class JsConventionRule extends JsAstRule {
checkCondition(binaryNode);
return super.enterBinaryNode(binaryNode);
}
+
+@Override
+public boolean enterPropertyNode(PropertyNode propertyNode) {
+ClassNode enclosingClass = classDefinitionHierarchie.isEmpty() ?
null : classDefinitionHierarchie.get(classDefinitionHierarchie.size() - 1);
+if(enclosingClass != null && propertyNode.getToken() ==
enclosingClass.getToken()) {
+return false;
+}
+return super.enterPropertyNode(propertyNode);
+}
+
+private List classDefinitionHierarchie = new ArrayList<>();
+
+@Override
+public boolean enterClassNode(ClassNode classNode) {
+classDefinitionHierarchie.add(classNode);
+return super.enterClassNode(classNode);
+}
+
+@Override
+public Node leaveClassNode(ClassNode classNode) {
+classDefinitionHierarchie.remove(classDefinitionHierarchie.size()
- 1);
+return super.leaveClassNode(classNode);
+}
}
}
diff --git
a/webcommon/javascript2.editor/test/unit/data/testfiles/hints/semicolonWarningGeneratedConstructor.js
b/webcommon/javascript2.editor/test/unit/data/testfiles/hints/semicolonWarningGeneratedConstructor.js
new file mode 100644
index 00..e3979f1b61
--- /dev/null
+++
b/webcommon/javascript2.editor/test/unit/data/testfiles/hints/semicolonWarningGeneratedConstructor.js
@@ -0,0 +1,8 @@
+class A {
+}
+
+/**
+ * This class definition should not generate a "missing semicolon" hint
+ */
+class B extends A {
+}
diff --git
a/webcommon/javascript2.editor/test/unit/data/testfiles/hints/semicolonWarningGeneratedConstructor.js.testSemicolonWarningGeneratedConstructor.hints
b/webcommon/javascript2.editor/test/unit/data/testfiles/hints/semicolonWarningGeneratedConstructor.js.testSemicolonWarningGeneratedConstructor.hints
new file mode 100644
index 00..e69de29bb2
diff --git
a/webcommon/javascript2.editor/test/unit/data/testfiles/hints/semicolonWarningRealConstructor.js
b/webcommon/javascript2.editor/test/unit/data/testfiles/hints/semicolonWarningRealConstructor.js
new file mode 100644
index 00..1b003cf989
--- /dev/null
+++
b/webcommon/javascript2.editor/test/unit/data/testfiles/hints/semicolonWarningRealConstructor.js
@@ -0,0 +1,13 @@
+class A {
+}
+
+/**
+ * This class de
[netbeans] branch master updated: Improve stability of gradle build info extraction
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 7e5e8f3484 Improve stability of gradle build info extraction
new e2d8fdf156 Merge pull request #4222 from
matthiasblaesing/gradle_improvements
7e5e8f3484 is described below
commit 7e5e8f34848c0b5fcffe2b2db883566f28c573a9
Author: Matthias Bläsing
AuthorDate: Sun Jun 12 21:02:17 2022 +0200
Improve stability of gradle build info extraction
While trying to work with the gradle projects from liferay-portal it
was observed, that loading failed with an exception. There are two
problems:
1. The liferay build provides incomplete implementation of JavaExec,
which do not support setting the standard input
2. The generated UnsupportedOperation exception carries a null message,
rendering the @NonNull annotation in GradleReport invalid and
causing NullPointerExceptions in use sites.
Fixes:
1. Setting stdin is changed to be a best-effort operation. It is
assumed that, if the setter fails, the access to stdin is not
expected and thus does not need to be wired.
2. If a null message is passed into GradleReport, it is replaced with
an empty string.
---
.../modules/gradle/tooling/NetBeansRunSinglePlugin.java | 16 +---
.../src/org/netbeans/modules/gradle/GradleReport.java| 2 +-
2 files changed, 14 insertions(+), 4 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 b3041bfb52..2ca9b4335d 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
@@ -19,19 +19,21 @@
package org.netbeans.modules.gradle.tooling;
-import java.util.ArrayList;
import static java.util.Arrays.asList;
+import org.gradle.api.logging.Logger;
+import org.gradle.api.logging.Logging;
+import org.gradle.api.logging.LogLevel;
import org.gradle.api.Plugin;
import org.gradle.api.Project;
import org.gradle.api.tasks.JavaExec;
import org.gradle.api.tasks.SourceSetContainer;
import org.gradle.process.CommandLineArgumentProvider;
-
/**
*
* @author Laszlo Kishalmi
*/
class NetBeansRunSinglePlugin implements Plugin {
+private static final Logger LOG =
Logging.getLogger(NetBeansRunSinglePlugin.class);
private static final String RUN_SINGLE_TASK = "runSingle";
private static final String RUN_SINGLE_MAIN = "runClassName";
@@ -59,7 +61,15 @@ class NetBeansRunSinglePlugin implements Plugin {
}
});
}
-je.setStandardInput(System.in);
+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());
}
diff --git a/extide/gradle/src/org/netbeans/modules/gradle/GradleReport.java
b/extide/gradle/src/org/netbeans/modules/gradle/GradleReport.java
index 18a646c31b..f6aabe0db0 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/GradleReport.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/GradleReport.java
@@ -46,7 +46,7 @@ public final class GradleReport {
this.errorClass = errorClass;
this.location = location;
this.line = line;
-this.message = message;
+this.message = message == null ? "" : message;
this.causedBy = causedBy;
}
-
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 (66e010eb26 -> 074670d4b4)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 66e010eb26 Merge pull request #4167 from sdedic/vscode/default-local-userdir new ea34cdbe02 Cleanup ModelVisitor and ModelTest new e3ec8beb64 Enable parsing of object structures, where the prototype contains complex properties new fd33417293 Update the JS corestubs to ES2022+ new 9694a39d91 Cleanup javascript2 .model, .jsdoc and .editor (Diamond, trailing whitespace, deadcode, lambda, final) new 901b6a8ddd Remove broken test methods in javascript2.extdoc relying on undonated source file new ee0be5e8ac Add documentation to object properties (documentation was only present on functions) new d2c4ded44d Use Objects#equals to prevent NullPointerException from String#equals if name is null new 5a0163a2ae Ensure JSDoc union types are correctly parsed new ac8cdc3747 Hide logs for successful tests new 538763dff6 Try to get error log on commit-validation failure new 3d34b503aa Improve stability for ValidateLayerConsistencyTest new 37b11d59f3 Do not cache NULL parser in SourceCache if parserFactory is not (yet) present new 074670d4b4 Merge pull request #4058 from matthiasblaesing/update_js_stubs The 7134 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 | 8 + .travis.yml| 4 +- .../netbeans/modules/parsing/impl/SourceCache.java | 4 +- nbbuild/licenses/Apache-2.0-typescript2| 12 + nbbuild/travis/scripting.sh| 31 +- platform/o.n.core/nbproject/project.properties | 3 + .../validation/ValidateLayerConsistencyTest.java | 7 +- webcommon/javascript2.editor/build.xml | 12 - .../javascript2.editor/external/binaries-list | 5 +- .../external/js-corestubs-5.1-license.txt | 44 -- .../external/js-domstubs-DOM3-license.txt | 46 -- .../external/js-reststubs-3-license.txt| 48 -- .../external/jsstubs-ts4.6.3-1-license.txt | 19 + .../nbproject/project.properties | 8 +- .../editor/CompletionContextFinder.java| 6 +- ...CompletionInterceptorRegistrationProcessor.java | 4 +- ...tionFinderInterceptorRegistrationProcessor.java | 4 +- .../modules/javascript2/editor/EditorExtender.java | 4 +- .../javascript2/editor/FSCompletionItem.java | 18 +- .../modules/javascript2/editor/FileUtils.java | 13 +- .../javascript2/editor/JsBracesMatcher.java| 3 - .../javascript2/editor/JsCamelCaseInterceptor.java | 9 +- .../javascript2/editor/JsCodeCompletion.java | 2 +- .../javascript2/editor/JsCompletionItem.java | 112 ++--- .../javascript2/editor/JsFoldTypeProvider.java | 8 +- .../javascript2/editor/JsInstantRenamer.java | 2 +- .../javascript2/editor/JsKeyStrokeHandler.java | 7 +- .../modules/javascript2/editor/JsKeywords.java | 6 +- .../modules/javascript2/editor/JsLanguage.java | 1 - .../javascript2/editor/JsSemanticAnalyzer.java | 41 +- .../javascript2/editor/JsStructureScanner.java | 110 ++--- .../editor/JsTypedBreakInterceptor.java| 18 +- .../javascript2/editor/JsTypedTextInterceptor.java | 152 --- .../javascript2/editor/JsonFoldTypeProvider.java | 17 +- .../javascript2/editor/JsonInstantRenamer.java | 2 - .../modules/javascript2/editor/JsonLanguage.java | 2 +- .../netbeans/modules/javascript2/editor/Utils.java | 10 +- .../javascript2/editor/api/FrameworksUtils.java| 4 +- .../editor/classpath/ClassPathProviderImpl.java| 33 +- .../editor/doc/JsDocumentationCodeCompletion.java | 2 +- .../editor/doc/JsDocumentationCompleter.java | 2 +- .../editor/embedding/JsEmbeddingProvider.java | 55 ++- .../javascript2/editor/formatter/CodeStyle.java| 30 +- .../javascript2/editor/formatter/Defaults.java | 4 +- .../javascript2/editor/formatter/FmtOptions.java | 26 +- .../editor/formatter/FormatContext.java| 41 +- .../javascript2/editor/formatter/FormatToken.java | 12 +- .../editor/formatter/FormatTokenStream.java| 4 +- .../editor/formatter/IndentContext.java| 8 +- .../editor/formatter/JsFormatVisitor.java | 20 +- .../javascript2/editor/formatter/JsFormatter.java | 109 +++-- .../editor/formatter/JsonFormatVisitor.java| 4 +- .../javascript2/editor/formatter/TokenUtils.java | 11 +- .../javascript2/editor/formatter/Utils.java| 15 +- .../javascript2/editor/formatter/ui/FmtSpaces.java
[netbeans] branch fix_unittests updated: Increase logging for lookup logger
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch fix_unittests
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/fix_unittests by this push:
new 2bdbb63765 Increase logging for lookup logger
2bdbb63765 is described below
commit 2bdbb637653cf19179963a3150add8f99d8b6977
Author: Matthias Bläsing
AuthorDate: Wed Jun 8 19:25:30 2022 +0200
Increase logging for lookup logger
---
.../src/org/netbeans/core/validation/ValidateLayerConsistencyTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/platform/o.n.core/test/qa-functional/src/org/netbeans/core/validation/ValidateLayerConsistencyTest.java
b/platform/o.n.core/test/qa-functional/src/org/netbeans/core/validation/ValidateLayerConsistencyTest.java
index 3dbf17e0fe..a49638a228 100755
---
a/platform/o.n.core/test/qa-functional/src/org/netbeans/core/validation/ValidateLayerConsistencyTest.java
+++
b/platform/o.n.core/test/qa-functional/src/org/netbeans/core/validation/ValidateLayerConsistencyTest.java
@@ -77,7 +77,7 @@ public class ValidateLayerConsistencyTest extends NbTestCase {
static {
System.setProperty("java.awt.headless", "true");
-//System.setProperty("org.openide.util.lookup.level", "FINE");
+System.setProperty("org.openide.util.lookup.level", "FINE");
}
private static final String SFS_LB = "SystemFileSystem.localizingBundle";
-
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 fix_unittests updated: Y
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch fix_unittests
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/fix_unittests by this push:
new d35b09240e Y
d35b09240e is described below
commit d35b09240e16b75faf4946747991fa474dfd3a69
Author: Matthias Bläsing
AuthorDate: Tue Jun 7 21:12:26 2022 +0200
Y
---
.../src/org/netbeans/core/validation/ValidateLayerConsistencyTest.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/platform/o.n.core/test/qa-functional/src/org/netbeans/core/validation/ValidateLayerConsistencyTest.java
b/platform/o.n.core/test/qa-functional/src/org/netbeans/core/validation/ValidateLayerConsistencyTest.java
index 1b6d38658f..3dbf17e0fe 100755
---
a/platform/o.n.core/test/qa-functional/src/org/netbeans/core/validation/ValidateLayerConsistencyTest.java
+++
b/platform/o.n.core/test/qa-functional/src/org/netbeans/core/validation/ValidateLayerConsistencyTest.java
@@ -881,6 +881,7 @@ public class ValidateLayerConsistencyTest extends
NbTestCase {
"EnvironmentProviders/ProfileTypes/Execution/nb-j2ee-deployment.instance",
"Shortcuts/D-BACK_QUOTE.shadow",
"Windows2/Components/", // cannot be loaded with a headless toolkit,
so we have to skip these for now
+"Maven/actionTemplate.instance", // template
};
private boolean skipFile(FileObject fo) {
String s = fo.getPath();
-
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: X
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch fix_unittests
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 2d9025aae0c0cad0df2816b7e98c7afd7b58979b
Author: Matthias Bläsing
AuthorDate: Tue Jun 7 19:28:44 2022 +0200
X
---
.github/workflows/main.yml | 246 +---
.travis.yml| 700 -
.../src/org/netbeans/core/startup/Main.java| 2 +-
.../src/org/openide/filesystems/Repository.java| 11 +
4 files changed, 13 insertions(+), 946 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 72aaf8e9c1..1e5aa05f70 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -113,255 +113,11 @@ jobs:
path:
/home/runner/work/netbeans/netbeans/nbbuild/build/test/commit-validation/results/
retention-days: 1
- linux-build-system-test:
-needs: base-build
-name: Build-System Test on Linux/JDK ${{ matrix.java }}
-runs-on: ubuntu-latest
-env:
- ANT_OPTS:
-Dmetabuild.jsonurl=https://raw.githubusercontent.com/apache/netbeans-jenkins-lib/master/meta/netbeansrelease.json
-strategy:
- matrix:
-java: [ '11' ]
-steps:
-
- - name: Set up JDK ${{ matrix.java }}
-uses: actions/setup-java@v2
-with:
- java-version: ${{ matrix.java }}
- distribution: 'zulu'
-
- - name: Download Build
-uses: actions/download-artifact@v3
-with:
- name: build
-
- - name: Extract
-run: tar --zstd -xf build.tar.zst
-
- - name: Test Netbeans Build System
-run: ant -Dcluster.config=release localtest
-
- linux-javadoc:
-needs: base-build
-name: Build NBMs, Source zips and Javadoc on JDK ${{ matrix.java }}
-runs-on: ubuntu-latest
-strategy:
- matrix:
-java: [ '11' ]
-env:
- ANT_OPTS:
-Dmetabuild.jsonurl=https://raw.githubusercontent.com/apache/netbeans-jenkins-lib/master/meta/netbeansrelease.json
-steps:
-
- - name: Set up JDK ${{ matrix.java }}
-uses: actions/setup-java@v2
-with:
- java-version: ${{ matrix.java }}
- distribution: 'zulu'
-
- - name: Download Build
-uses: actions/download-artifact@v3
-with:
- name: build
-
- - name: Extract
-run: tar --zstd -xf build.tar.zst
-
- - name: Get maven coordinates
-run: ant getallmavencoordinates
-
- - name: Build nbms
-run: ant build-nbms
-
- - name: Build source zips
-run: ant build-source-zips
-
- - name: Build javadoc
-run: ant build-javadoc
-
- macos:
-needs: base-build
-name: Tests on MacOS/JDK ${{ matrix.java }}
-runs-on: macos-11
-env:
- ANT_OPTS:
-Dmetabuild.jsonurl=https://raw.githubusercontent.com/apache/netbeans-jenkins-lib/master/meta/netbeansrelease.json
-strategy:
- matrix:
-java: [ '11' ]
-steps:
-
- - name: Set up JDK ${{ matrix.java }}
-uses: actions/setup-java@v2
-with:
- java-version: ${{ matrix.java }}
- distribution: 'zulu'
-
- - uses: actions/cache@v2
-with:
- path: ~/Library/Caches/Homebrew
- key: ${{ runner.os }}-homebrew
- restore-keys: ${{ runner.os }}-homebrew
-
- - name: Download Build
-uses: actions/download-artifact@v3
-with:
- name: build
-
- # tar on MacOS is not aware of zstd "tar --zstd -xf build.tar.zst" isn't
working
- - name: Extract
-run: unzstd -c build.tar.zst | tar -x
-
- - run: brew install ant
-
- - name: Test platform/masterfs.macosx
-run: ant -f platform/masterfs.macosx test
-
- - name: Test platform/core.network
-run: ant -f platform/core.network test
-
- - name: Commit Validation tests
-run: ant -Dcluster.config=release commit-validation
-
- php:
-needs: base-build
-name: PHP on ${{ matrix.os }}/JDK ${{ matrix.java }}
-runs-on: ${{ matrix.os }}
-defaults:
- run:
-shell: bash
-env:
- DISPLAY: ":99.0"
- ANT_OPTS:
-Dmetabuild.jsonurl=https://raw.githubusercontent.com/apache/netbeans-jenkins-lib/master/meta/netbeansrelease.json
- OPTS: -Dtest-unit-sys-prop.ignore.random.failures=true
-strategy:
- matrix:
-java: [ '8' ]
-os: [ 'windows-2022', 'ubuntu-20.04' ]
- fail-fast: false
-steps:
-
- - name: Set up JDK ${{ matrix.java }}
-uses: actions/setup-java@v2
-with:
- java-version: ${{ matrix.java }}
- distribution: 'zulu'
-
- # linux specific setup
- - name: Setup PHP
-if: contains(matrix.os, 'ubuntu')
-uses: shivammathur/setup-php@2.8.0
-with:
- php-version: '7.4'
- tools: pecl
-
[netbeans] branch fix_unittests updated (3413e78793 -> 2d9025aae0)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch fix_unittests in repository https://gitbox.apache.org/repos/asf/netbeans.git discard 3413e78793 X new 2d9025aae0 X 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 (3413e78793) \ N -- N -- N refs/heads/fix_unittests (2d9025aae0) 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 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: .../src/org/openide/filesystems/Repository.java | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch fix_unittests updated (624046821c -> 3413e78793)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch fix_unittests in repository https://gitbox.apache.org/repos/asf/netbeans.git discard 624046821c X new 3413e78793 X 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 (624046821c) \ N -- N -- N refs/heads/fix_unittests (3413e78793) 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 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: .../openide.filesystems/src/org/openide/filesystems/Repository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] 01/01: X
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch fix_unittests
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 3413e78793742ff94eafd8aa0fd656300b782822
Author: Matthias Bläsing
AuthorDate: Tue Jun 7 19:28:44 2022 +0200
X
---
.github/workflows/main.yml | 246 +---
.travis.yml| 700 -
.../src/org/netbeans/core/startup/Main.java| 2 +-
.../src/org/openide/filesystems/Repository.java| 3 +
4 files changed, 5 insertions(+), 946 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 72aaf8e9c1..1e5aa05f70 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -113,255 +113,11 @@ jobs:
path:
/home/runner/work/netbeans/netbeans/nbbuild/build/test/commit-validation/results/
retention-days: 1
- linux-build-system-test:
-needs: base-build
-name: Build-System Test on Linux/JDK ${{ matrix.java }}
-runs-on: ubuntu-latest
-env:
- ANT_OPTS:
-Dmetabuild.jsonurl=https://raw.githubusercontent.com/apache/netbeans-jenkins-lib/master/meta/netbeansrelease.json
-strategy:
- matrix:
-java: [ '11' ]
-steps:
-
- - name: Set up JDK ${{ matrix.java }}
-uses: actions/setup-java@v2
-with:
- java-version: ${{ matrix.java }}
- distribution: 'zulu'
-
- - name: Download Build
-uses: actions/download-artifact@v3
-with:
- name: build
-
- - name: Extract
-run: tar --zstd -xf build.tar.zst
-
- - name: Test Netbeans Build System
-run: ant -Dcluster.config=release localtest
-
- linux-javadoc:
-needs: base-build
-name: Build NBMs, Source zips and Javadoc on JDK ${{ matrix.java }}
-runs-on: ubuntu-latest
-strategy:
- matrix:
-java: [ '11' ]
-env:
- ANT_OPTS:
-Dmetabuild.jsonurl=https://raw.githubusercontent.com/apache/netbeans-jenkins-lib/master/meta/netbeansrelease.json
-steps:
-
- - name: Set up JDK ${{ matrix.java }}
-uses: actions/setup-java@v2
-with:
- java-version: ${{ matrix.java }}
- distribution: 'zulu'
-
- - name: Download Build
-uses: actions/download-artifact@v3
-with:
- name: build
-
- - name: Extract
-run: tar --zstd -xf build.tar.zst
-
- - name: Get maven coordinates
-run: ant getallmavencoordinates
-
- - name: Build nbms
-run: ant build-nbms
-
- - name: Build source zips
-run: ant build-source-zips
-
- - name: Build javadoc
-run: ant build-javadoc
-
- macos:
-needs: base-build
-name: Tests on MacOS/JDK ${{ matrix.java }}
-runs-on: macos-11
-env:
- ANT_OPTS:
-Dmetabuild.jsonurl=https://raw.githubusercontent.com/apache/netbeans-jenkins-lib/master/meta/netbeansrelease.json
-strategy:
- matrix:
-java: [ '11' ]
-steps:
-
- - name: Set up JDK ${{ matrix.java }}
-uses: actions/setup-java@v2
-with:
- java-version: ${{ matrix.java }}
- distribution: 'zulu'
-
- - uses: actions/cache@v2
-with:
- path: ~/Library/Caches/Homebrew
- key: ${{ runner.os }}-homebrew
- restore-keys: ${{ runner.os }}-homebrew
-
- - name: Download Build
-uses: actions/download-artifact@v3
-with:
- name: build
-
- # tar on MacOS is not aware of zstd "tar --zstd -xf build.tar.zst" isn't
working
- - name: Extract
-run: unzstd -c build.tar.zst | tar -x
-
- - run: brew install ant
-
- - name: Test platform/masterfs.macosx
-run: ant -f platform/masterfs.macosx test
-
- - name: Test platform/core.network
-run: ant -f platform/core.network test
-
- - name: Commit Validation tests
-run: ant -Dcluster.config=release commit-validation
-
- php:
-needs: base-build
-name: PHP on ${{ matrix.os }}/JDK ${{ matrix.java }}
-runs-on: ${{ matrix.os }}
-defaults:
- run:
-shell: bash
-env:
- DISPLAY: ":99.0"
- ANT_OPTS:
-Dmetabuild.jsonurl=https://raw.githubusercontent.com/apache/netbeans-jenkins-lib/master/meta/netbeansrelease.json
- OPTS: -Dtest-unit-sys-prop.ignore.random.failures=true
-strategy:
- matrix:
-java: [ '8' ]
-os: [ 'windows-2022', 'ubuntu-20.04' ]
- fail-fast: false
-steps:
-
- - name: Set up JDK ${{ matrix.java }}
-uses: actions/setup-java@v2
-with:
- java-version: ${{ matrix.java }}
- distribution: 'zulu'
-
- # linux specific setup
- - name: Setup PHP
-if: contains(matrix.os, 'ubuntu')
-uses: shivammathur/setup-php@2.8.0
-with:
- php-version: '7.4'
- tools: pecl
-
[netbeans] 01/01: X
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch fix_unittests
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 624046821ccf021088c556851e6c0d124ece3a5a
Author: Matthias Bläsing
AuthorDate: Tue Jun 7 19:28:44 2022 +0200
X
---
.github/workflows/main.yml | 246 +---
.travis.yml| 700 -
.../src/org/netbeans/core/startup/Main.java| 2 +-
.../src/org/openide/filesystems/Repository.java| 3 +
4 files changed, 5 insertions(+), 946 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 72aaf8e9c1..1e5aa05f70 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -113,255 +113,11 @@ jobs:
path:
/home/runner/work/netbeans/netbeans/nbbuild/build/test/commit-validation/results/
retention-days: 1
- linux-build-system-test:
-needs: base-build
-name: Build-System Test on Linux/JDK ${{ matrix.java }}
-runs-on: ubuntu-latest
-env:
- ANT_OPTS:
-Dmetabuild.jsonurl=https://raw.githubusercontent.com/apache/netbeans-jenkins-lib/master/meta/netbeansrelease.json
-strategy:
- matrix:
-java: [ '11' ]
-steps:
-
- - name: Set up JDK ${{ matrix.java }}
-uses: actions/setup-java@v2
-with:
- java-version: ${{ matrix.java }}
- distribution: 'zulu'
-
- - name: Download Build
-uses: actions/download-artifact@v3
-with:
- name: build
-
- - name: Extract
-run: tar --zstd -xf build.tar.zst
-
- - name: Test Netbeans Build System
-run: ant -Dcluster.config=release localtest
-
- linux-javadoc:
-needs: base-build
-name: Build NBMs, Source zips and Javadoc on JDK ${{ matrix.java }}
-runs-on: ubuntu-latest
-strategy:
- matrix:
-java: [ '11' ]
-env:
- ANT_OPTS:
-Dmetabuild.jsonurl=https://raw.githubusercontent.com/apache/netbeans-jenkins-lib/master/meta/netbeansrelease.json
-steps:
-
- - name: Set up JDK ${{ matrix.java }}
-uses: actions/setup-java@v2
-with:
- java-version: ${{ matrix.java }}
- distribution: 'zulu'
-
- - name: Download Build
-uses: actions/download-artifact@v3
-with:
- name: build
-
- - name: Extract
-run: tar --zstd -xf build.tar.zst
-
- - name: Get maven coordinates
-run: ant getallmavencoordinates
-
- - name: Build nbms
-run: ant build-nbms
-
- - name: Build source zips
-run: ant build-source-zips
-
- - name: Build javadoc
-run: ant build-javadoc
-
- macos:
-needs: base-build
-name: Tests on MacOS/JDK ${{ matrix.java }}
-runs-on: macos-11
-env:
- ANT_OPTS:
-Dmetabuild.jsonurl=https://raw.githubusercontent.com/apache/netbeans-jenkins-lib/master/meta/netbeansrelease.json
-strategy:
- matrix:
-java: [ '11' ]
-steps:
-
- - name: Set up JDK ${{ matrix.java }}
-uses: actions/setup-java@v2
-with:
- java-version: ${{ matrix.java }}
- distribution: 'zulu'
-
- - uses: actions/cache@v2
-with:
- path: ~/Library/Caches/Homebrew
- key: ${{ runner.os }}-homebrew
- restore-keys: ${{ runner.os }}-homebrew
-
- - name: Download Build
-uses: actions/download-artifact@v3
-with:
- name: build
-
- # tar on MacOS is not aware of zstd "tar --zstd -xf build.tar.zst" isn't
working
- - name: Extract
-run: unzstd -c build.tar.zst | tar -x
-
- - run: brew install ant
-
- - name: Test platform/masterfs.macosx
-run: ant -f platform/masterfs.macosx test
-
- - name: Test platform/core.network
-run: ant -f platform/core.network test
-
- - name: Commit Validation tests
-run: ant -Dcluster.config=release commit-validation
-
- php:
-needs: base-build
-name: PHP on ${{ matrix.os }}/JDK ${{ matrix.java }}
-runs-on: ${{ matrix.os }}
-defaults:
- run:
-shell: bash
-env:
- DISPLAY: ":99.0"
- ANT_OPTS:
-Dmetabuild.jsonurl=https://raw.githubusercontent.com/apache/netbeans-jenkins-lib/master/meta/netbeansrelease.json
- OPTS: -Dtest-unit-sys-prop.ignore.random.failures=true
-strategy:
- matrix:
-java: [ '8' ]
-os: [ 'windows-2022', 'ubuntu-20.04' ]
- fail-fast: false
-steps:
-
- - name: Set up JDK ${{ matrix.java }}
-uses: actions/setup-java@v2
-with:
- java-version: ${{ matrix.java }}
- distribution: 'zulu'
-
- # linux specific setup
- - name: Setup PHP
-if: contains(matrix.os, 'ubuntu')
-uses: shivammathur/setup-php@2.8.0
-with:
- php-version: '7.4'
- tools: pecl
-
[netbeans] branch fix_unittests created (now 624046821c)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch fix_unittests in repository https://gitbox.apache.org/repos/asf/netbeans.git at 624046821c X This branch includes the following new commits: new 624046821c X The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch try_fix_commit_validation2 updated: Skip maven action template in instanceablity check
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch try_fix_commit_validation2
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/try_fix_commit_validation2 by
this push:
new 40a60e3110 Skip maven action template in instanceablity check
40a60e3110 is described below
commit 40a60e311000977b490935c6bf762464d3ddaa96
Author: Matthias Bläsing
AuthorDate: Sun May 29 17:10:54 2022 +0200
Skip maven action template in instanceablity check
---
.../org/netbeans/core/validation/ValidateLayerConsistencyTest.java | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/platform/o.n.core/test/qa-functional/src/org/netbeans/core/validation/ValidateLayerConsistencyTest.java
b/platform/o.n.core/test/qa-functional/src/org/netbeans/core/validation/ValidateLayerConsistencyTest.java
index 1b6d38658f..e0f5b553aa 100755
---
a/platform/o.n.core/test/qa-functional/src/org/netbeans/core/validation/ValidateLayerConsistencyTest.java
+++
b/platform/o.n.core/test/qa-functional/src/org/netbeans/core/validation/ValidateLayerConsistencyTest.java
@@ -71,6 +71,8 @@ import org.openide.util.Lookup;
import org.openide.util.Mutex;
import org.openide.util.NbCollections;
+import static java.util.Arrays.asList;
+
/** Checks consistency of System File System contents.
*/
public class ValidateLayerConsistencyTest extends NbTestCase {
@@ -344,7 +346,7 @@ public class ValidateLayerConsistencyTest extends
NbTestCase {
public void testInstantiateAllInstances () {
List errors = new ArrayList();
-
+
Enumeration files =
FileUtil.getConfigRoot().getChildren(true);
while (files.hasMoreElements()) {
FileObject fo = files.nextElement();
@@ -881,6 +883,7 @@ public class ValidateLayerConsistencyTest extends
NbTestCase {
"EnvironmentProviders/ProfileTypes/Execution/nb-j2ee-deployment.instance",
"Shortcuts/D-BACK_QUOTE.shadow",
"Windows2/Components/", // cannot be loaded with a headless toolkit,
so we have to skip these for now
+"Maven/actionTemplate.instance", // From:
java/maven/src/org/netbeans/modules/maven/layer.xml"
};
private boolean skipFile(FileObject fo) {
String s = fo.getPath();
-
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 try_fix_commit_validation2 updated: Add debug statements to pin-point validation problem
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch try_fix_commit_validation2
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/try_fix_commit_validation2 by
this push:
new 51abe34f9c Add debug statements to pin-point validation problem
51abe34f9c is described below
commit 51abe34f9cb22fc8109ab71e7a0699713b28e8ee
Author: Matthias Bläsing
AuthorDate: Sun May 29 15:39:52 2022 +0200
Add debug statements to pin-point validation problem
---
.../src/org/netbeans/modules/maven/actions/RunCustomMavenAction.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/java/maven/src/org/netbeans/modules/maven/actions/RunCustomMavenAction.java
b/java/maven/src/org/netbeans/modules/maven/actions/RunCustomMavenAction.java
index 20ad3071dc..a3d9d390cd 100644
---
a/java/maven/src/org/netbeans/modules/maven/actions/RunCustomMavenAction.java
+++
b/java/maven/src/org/netbeans/modules/maven/actions/RunCustomMavenAction.java
@@ -122,9 +122,9 @@ public class RunCustomMavenAction extends AbstractAction
implements ContextAware
public static Action create(FileObject fo) {
String mapp = (String) fo.getAttribute(MAVEN_ATTR);
-assert mapp != null;
+assert mapp != null : "Failed to fetch maven-goal for " + fo;
String imagePath = (String)fo.getAttribute("imagePath");
-assert imagePath != null;
+assert imagePath != null : "Failed to fetch imagePath for " + fo;
RunCustomMavenAction act = new RunCustomMavenAction(mapp);
String name = mapp;
if (name.startsWith("CUSTOM-")) {
-
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 try_fix_commit_validation2 updated: X
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch try_fix_commit_validation2
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/try_fix_commit_validation2 by
this push:
new cee6e16873 X
cee6e16873 is described below
commit cee6e16873924fd550a9cadf3b74afb06bd63df7
Author: Matthias Bläsing
AuthorDate: Sun May 29 12:16:45 2022 +0200
X
---
platform/o.n.core/nbproject/project.properties | 3 +++
1 file changed, 3 insertions(+)
diff --git a/platform/o.n.core/nbproject/project.properties
b/platform/o.n.core/nbproject/project.properties
index bde3bf3df3..d1c2854c4b 100644
--- a/platform/o.n.core/nbproject/project.properties
+++ b/platform/o.n.core/nbproject/project.properties
@@ -24,6 +24,9 @@ javadoc.apichanges=${basedir}/apichanges.xml
jnlp.verify.excludes=config/ModuleAutoDeps/org-netbeans-core.xml
+# timeout 100 minutes
+test.timeout=600
+
test.excludes=\
gui/propertyeditors/PropertiesTest.class,\
gui/propertyeditors/PropertyEditorsTest.class,\
-
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: X
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch try_fix_commit_validation2
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit bd3285e97f34e7264dc141e9d52ab4fe31b97fa9
Author: Matthias Bläsing
AuthorDate: Sun May 29 11:29:30 2022 +0200
X
---
.github/workflows/main.yml | 246 +---
.travis.yml| 700 -
2 files changed, 1 insertion(+), 945 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 72aaf8e9c1..1e5aa05f70 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -113,255 +113,11 @@ jobs:
path:
/home/runner/work/netbeans/netbeans/nbbuild/build/test/commit-validation/results/
retention-days: 1
- linux-build-system-test:
-needs: base-build
-name: Build-System Test on Linux/JDK ${{ matrix.java }}
-runs-on: ubuntu-latest
-env:
- ANT_OPTS:
-Dmetabuild.jsonurl=https://raw.githubusercontent.com/apache/netbeans-jenkins-lib/master/meta/netbeansrelease.json
-strategy:
- matrix:
-java: [ '11' ]
-steps:
-
- - name: Set up JDK ${{ matrix.java }}
-uses: actions/setup-java@v2
-with:
- java-version: ${{ matrix.java }}
- distribution: 'zulu'
-
- - name: Download Build
-uses: actions/download-artifact@v3
-with:
- name: build
-
- - name: Extract
-run: tar --zstd -xf build.tar.zst
-
- - name: Test Netbeans Build System
-run: ant -Dcluster.config=release localtest
-
- linux-javadoc:
-needs: base-build
-name: Build NBMs, Source zips and Javadoc on JDK ${{ matrix.java }}
-runs-on: ubuntu-latest
-strategy:
- matrix:
-java: [ '11' ]
-env:
- ANT_OPTS:
-Dmetabuild.jsonurl=https://raw.githubusercontent.com/apache/netbeans-jenkins-lib/master/meta/netbeansrelease.json
-steps:
-
- - name: Set up JDK ${{ matrix.java }}
-uses: actions/setup-java@v2
-with:
- java-version: ${{ matrix.java }}
- distribution: 'zulu'
-
- - name: Download Build
-uses: actions/download-artifact@v3
-with:
- name: build
-
- - name: Extract
-run: tar --zstd -xf build.tar.zst
-
- - name: Get maven coordinates
-run: ant getallmavencoordinates
-
- - name: Build nbms
-run: ant build-nbms
-
- - name: Build source zips
-run: ant build-source-zips
-
- - name: Build javadoc
-run: ant build-javadoc
-
- macos:
-needs: base-build
-name: Tests on MacOS/JDK ${{ matrix.java }}
-runs-on: macos-11
-env:
- ANT_OPTS:
-Dmetabuild.jsonurl=https://raw.githubusercontent.com/apache/netbeans-jenkins-lib/master/meta/netbeansrelease.json
-strategy:
- matrix:
-java: [ '11' ]
-steps:
-
- - name: Set up JDK ${{ matrix.java }}
-uses: actions/setup-java@v2
-with:
- java-version: ${{ matrix.java }}
- distribution: 'zulu'
-
- - uses: actions/cache@v2
-with:
- path: ~/Library/Caches/Homebrew
- key: ${{ runner.os }}-homebrew
- restore-keys: ${{ runner.os }}-homebrew
-
- - name: Download Build
-uses: actions/download-artifact@v3
-with:
- name: build
-
- # tar on MacOS is not aware of zstd "tar --zstd -xf build.tar.zst" isn't
working
- - name: Extract
-run: unzstd -c build.tar.zst | tar -x
-
- - run: brew install ant
-
- - name: Test platform/masterfs.macosx
-run: ant -f platform/masterfs.macosx test
-
- - name: Test platform/core.network
-run: ant -f platform/core.network test
-
- - name: Commit Validation tests
-run: ant -Dcluster.config=release commit-validation
-
- php:
-needs: base-build
-name: PHP on ${{ matrix.os }}/JDK ${{ matrix.java }}
-runs-on: ${{ matrix.os }}
-defaults:
- run:
-shell: bash
-env:
- DISPLAY: ":99.0"
- ANT_OPTS:
-Dmetabuild.jsonurl=https://raw.githubusercontent.com/apache/netbeans-jenkins-lib/master/meta/netbeansrelease.json
- OPTS: -Dtest-unit-sys-prop.ignore.random.failures=true
-strategy:
- matrix:
-java: [ '8' ]
-os: [ 'windows-2022', 'ubuntu-20.04' ]
- fail-fast: false
-steps:
-
- - name: Set up JDK ${{ matrix.java }}
-uses: actions/setup-java@v2
-with:
- java-version: ${{ matrix.java }}
- distribution: 'zulu'
-
- # linux specific setup
- - name: Setup PHP
-if: contains(matrix.os, 'ubuntu')
-uses: shivammathur/setup-php@2.8.0
-with:
- php-version: '7.4'
- tools: pecl
- extensions: xdebug
- ini-values: xdebug.mode=debug
-
- - name: Launch Xvfb
-if: contains(matrix.os, 'u
[netbeans] branch try_fix_commit_validation2 created (now bd3285e97f)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch try_fix_commit_validation2 in repository https://gitbox.apache.org/repos/asf/netbeans.git at bd3285e97f X This branch includes the following new commits: new bd3285e97f X The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated: Update graaljs parser to handle optional chaining (?.) for indexing and function calls
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 c193d9e4d2 Update graaljs parser to handle optional chaining (?.) for
indexing and function calls
new 798fa57c95 Merge pull request #4115 from
matthiasblaesing/graal_js_parser_update
c193d9e4d2 is described below
commit c193d9e4d27dc313cc5af952997e0916f778b3c0
Author: Matthias Bläsing
AuthorDate: Fri May 13 22:58:17 2022 +0200
Update graaljs parser to handle optional chaining (?.) for indexing and
function calls
Optional function calls: base?.(arg1, arg2)
Optional indexing calls: base?.[idx]
---
webcommon/javascript2.doc/manifest.mf | 2 +-
webcommon/javascript2.doc/nbproject/project.xml | 2 +-
webcommon/javascript2.editor/manifest.mf | 2 +-
webcommon/javascript2.editor/nbproject/project.xml| 2 +-
webcommon/javascript2.model/manifest.mf | 2 +-
webcommon/javascript2.model/nbproject/project.xml | 2 +-
webcommon/libs.nashorn/external/binaries-list | 2 +-
...{graaljs-parser-1.0-license.txt => graaljs-parser-1.1-license.txt} | 2 +-
webcommon/libs.nashorn/manifest.mf| 2 +-
webcommon/libs.nashorn/nbproject/project.properties | 2 +-
webcommon/libs.nashorn/nbproject/project.xml | 4 ++--
11 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/webcommon/javascript2.doc/manifest.mf
b/webcommon/javascript2.doc/manifest.mf
index 74d1b8ece3..7dda6b4d42 100644
--- a/webcommon/javascript2.doc/manifest.mf
+++ b/webcommon/javascript2.doc/manifest.mf
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.javascript2.doc/1
OpenIDE-Module-Localizing-Bundle:
org/netbeans/modules/javascript2/doc/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.16
+OpenIDE-Module-Specification-Version: 1.17
diff --git a/webcommon/javascript2.doc/nbproject/project.xml
b/webcommon/javascript2.doc/nbproject/project.xml
index e233b2a9a2..a8a89c49c5 100644
--- a/webcommon/javascript2.doc/nbproject/project.xml
+++ b/webcommon/javascript2.doc/nbproject/project.xml
@@ -40,7 +40,7 @@
2
-2.0
+2.2
diff --git a/webcommon/javascript2.editor/manifest.mf
b/webcommon/javascript2.editor/manifest.mf
index 02e44153a1..f979ce0427 100644
--- a/webcommon/javascript2.editor/manifest.mf
+++ b/webcommon/javascript2.editor/manifest.mf
@@ -3,5 +3,5 @@ OpenIDE-Module: org.netbeans.modules.javascript2.editor/1
OpenIDE-Module-Install:
org/netbeans/modules/javascript2/editor/ModuleInstaller.class
OpenIDE-Module-Layer:
org/netbeans/modules/javascript2/editor/resources/layer.xml
OpenIDE-Module-Localizing-Bundle:
org/netbeans/modules/javascript2/editor/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.91
+OpenIDE-Module-Specification-Version: 0.92
OpenIDE-Module-Recommends: cnb.org.netbeans.modules.html.editor
diff --git a/webcommon/javascript2.editor/nbproject/project.xml
b/webcommon/javascript2.editor/nbproject/project.xml
index 35cc47ca8e..6b9a33626b 100644
--- a/webcommon/javascript2.editor/nbproject/project.xml
+++ b/webcommon/javascript2.editor/nbproject/project.xml
@@ -66,7 +66,7 @@
2
-2.0
+2.2
diff --git a/webcommon/javascript2.model/manifest.mf
b/webcommon/javascript2.model/manifest.mf
index 0a524972cd..221f44a113 100644
--- a/webcommon/javascript2.model/manifest.mf
+++ b/webcommon/javascript2.model/manifest.mf
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.javascript2.model/1
OpenIDE-Module-Localizing-Bundle:
org/netbeans/modules/javascript2/model/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.21
+OpenIDE-Module-Specification-Version: 1.22
diff --git a/webcommon/javascript2.model/nbproject/project.xml
b/webcommon/javascript2.model/nbproject/project.xml
index ed5adb4a2c..43adaab751 100644
--- a/webcommon/javascript2.model/nbproject/project.xml
+++ b/webcommon/javascript2.model/nbproject/project.xml
@@ -48,7 +48,7 @@
2
-2.0
+2.2
diff --git a/webcommon/libs.nashorn/external/binaries-list
b/webcommon/libs.nashorn/external/binar
[netbeans] branch master updated: Fix maven groupId completion
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 d13544ef96 Fix maven groupId completion
new 7cb6c63cc5 Merge pull request #4136 from
matthiasblaesing/maven_group_list
d13544ef96 is described below
commit d13544ef964b8e7bbe7c2707c41247cf5089ddda
Author: Matthias Bläsing
AuthorDate: Fri May 20 20:15:27 2022 +0200
Fix maven groupId completion
MavenIndexer dropped the caching of the allGroups and rootGroups
properties in the index:
https://github.com/apache/maven-indexer/commit/c231db602b5cea9ed20eba617de5a5a846ef5faa
After the index is loaded there are two options:
a) rebuild the groups list from the index
b) cache the group list after indexing
NetBeans expects the index to be readily be available and thus option
a is not an option (rebuilding the group list runs over the full index
and is in the minute range). As there are only a few entrypoints that
modify the index caching the group list looks like a viable option.
Closes: #4102
---
.../maven/indexer/NexusRepositoryIndexerImpl.java | 123 ++---
1 file changed, 105 insertions(+), 18 deletions(-)
diff --git
a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java
b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java
index aeb8ac648e..3545f7c23f 100644
---
a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java
+++
b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/NexusRepositoryIndexerImpl.java
@@ -32,6 +32,7 @@ import java.net.URI;
import java.nio.file.FileStore;
import java.nio.file.Files;
import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
@@ -131,6 +132,11 @@ public class NexusRepositoryIndexerImpl implements
RepositoryIndexerImplementati
private static final Logger LOGGER =
Logger.getLogger(NexusRepositoryIndexerImpl.class.getName());
+private static final String GROUP_CACHE_ALL_PREFIX =
"nb-groupcache-all-v1"; // NOI18N
+private static final String GROUP_CACHE_ALL_SUFFIX = "txt"; // NOI18N
+private static final String GROUP_CACHE_ROOT_PREFIX =
"nb-groupcache-root-v1"; // NOI18N
+private static final String GROUP_CACHE_ROOT_SUFFIX = "txt"; // NOI18N
+
private PlexusContainer embedder;
private Indexer indexer;
private org.apache.maven.index.Scanner scanner;
@@ -257,14 +263,50 @@ public class NexusRepositoryIndexerImpl implements
RepositoryIndexerImplementati
}
//TODO try to experiment with the non-forced version of the context
addition
-public IndexingContext addIndexingContextForced(String id, String
repositoryId, File repository,
-File indexDirectory, String repositoryUrl, String indexUpdateUrl,
List indexers) throws IOException {
-
-IndexingContext context = indexer.createIndexingContext(id,
repositoryId, repository, indexDirectory, repositoryUrl, indexUpdateUrl, true,
true, indexers);
+private IndexingContext addIndexingContextForced(
+RepositoryInfo repo,
+List indexers
+) throws IOException {
+
+IndexingContext context = indexer.createIndexingContext(
+/* id */ repo.getId(),
+/* repositoryId */ repo.getId(),
+/* repository */ repo.isLocal() ? new
File(repo.getRepositoryPath()) : null,
+/* indexDirectory */ getIndexDirectory(repo),
+/* repositoryUrl */ repo.isRemoteDownloadable() ?
repo.getRepositoryUrl() : null,
+/* indexUpdateUrl */ repo.isRemoteDownloadable() ?
repo.getIndexUpdateUrl() : null,
+/* searchable */ true,
+/* reclaim */ true,
+/* indexers */ indexers);
+
+// The allGroups and rootGroups properties of the IndexingContext are
+// not persistent anymore, so need to be save outside the context
+boolean needGroupCacheRebuild = false;
+try {
+
context.setAllGroups(Files.readAllLines(getAllGroupCacheFile(repo)));
+} catch (IOException ex) {
+needGroupCacheRebuild = true;
+}
+try {
+
context.setRootGroups(Files.readAllLines(getRootGroupCacheFile(repo)));
+} catch (IOException ex) {
+needGroupCacheRebuild = true;
+}
+// At least one of the group caches could not be loaded, so rebuild it
+if(needGroupCacheRebuild) {
+RP.submit(() -> {
+try {
+context.rebuildGroups();
+
[netbeans] branch master updated: Adds 'Open in Terminal' action to project root node's context menu. fixes #3922
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 16af755e93 Adds 'Open in Terminal' action to project root node's
context menu. fixes #3922
new de59faf9a1 Merge pull request #4026 from
Atrament666/add_open_in_terminal_for_project
16af755e93 is described below
commit 16af755e938b9bb2194710fcc71f4b5336150b77
Author: Vladimír Machat
AuthorDate: Sat Apr 23 22:27:56 2022 +0100
Adds 'Open in Terminal' action to project root node's context menu. fixes
#3922
---
.../netbeans/modules/dlight/terminal/action/OpenInTerminalAction.java| 1 +
1 file changed, 1 insertion(+)
diff --git
a/ide/dlight.terminal/src/org/netbeans/modules/dlight/terminal/action/OpenInTerminalAction.java
b/ide/dlight.terminal/src/org/netbeans/modules/dlight/terminal/action/OpenInTerminalAction.java
index 39a5cb26d3..1984c6d854 100644
---
a/ide/dlight.terminal/src/org/netbeans/modules/dlight/terminal/action/OpenInTerminalAction.java
+++
b/ide/dlight.terminal/src/org/netbeans/modules/dlight/terminal/action/OpenInTerminalAction.java
@@ -49,6 +49,7 @@ import org.openide.util.actions.NodeAction;
)
@ActionReferences({
@ActionReference(path = "UI/ToolActions/Files", position = 2050),
+@ActionReference(path = "Projects/Actions", position = 100),
@ActionReference(path = "Shortcuts", name = "SO-K")
})
public class OpenInTerminalAction extends NodeAction {
-
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: [3921] Correctly handling opens directive in package rename.
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 c843263140 [3921] Correctly handling opens directive in package rename.
new 14c9f20d97 Merge pull request #3993 from jlahoda/3921
c843263140 is described below
commit c8432631406191aefa40ad511189361901de57a3
Author: Jan Lahoda
AuthorDate: Sun Apr 17 19:02:44 2022 +0200
[3921] Correctly handling opens directive in package rename.
---
.../refactoring/java/plugins/MoveTransformer.java | 18 +++
.../refactoring/java/test/RenamePackageTest.java | 26 +-
2 files changed, 39 insertions(+), 5 deletions(-)
diff --git
a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/MoveTransformer.java
b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/MoveTransformer.java
index 201267a16e..05f7baee3b 100644
---
a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/MoveTransformer.java
+++
b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/MoveTransformer.java
@@ -449,16 +449,26 @@ public class MoveTransformer extends RefactoringVisitor {
@Override
public Tree visitExports(ExportsTree node, Element p) {
+renamePackage(node.getPackageName());
+return super.visitExports(node, p);
+}
+
+@Override
+public Tree visitOpens(OpensTree node, Element p) {
+renamePackage(node.getPackageName());
+return super.visitOpens(node, p);
+}
+
+private void renamePackage(ExpressionTree packageName) {
if (!workingCopy.getTreeUtilities().isSynthetic(getCurrentPath())) {
-final Element el = workingCopy.getTrees().getElement(new
TreePath(getCurrentPath(), node.getPackageName()));
+final Element el = workingCopy.getTrees().getElement(new
TreePath(getCurrentPath(), packageName));
if (el != null && el.getKind() == ElementKind.PACKAGE &&
isThisPackageMoving((PackageElement)el)) {
Tree nju = make.Identifier(getTargetPackageName(el));
-rewrite(node.getPackageName(), nju);
+rewrite(packageName, nju);
}
}
-return super.visitExports(node, p);
}
-
+
private boolean containsAnyOf(Element el, EnumSet neededMods) {
for (Modifier mod : neededMods) {
if(el.getModifiers().contains(mod)) {
diff --git
a/java/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/RenamePackageTest.java
b/java/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/RenamePackageTest.java
index bbbd4d1b19..1cb717f488 100644
---
a/java/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/RenamePackageTest.java
+++
b/java/refactoring.java/test/unit/src/org/netbeans/modules/refactoring/java/test/RenamePackageTest.java
@@ -20,8 +20,10 @@
package org.netbeans.modules.refactoring.java.test;
import java.util.Arrays;
+import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
+import java.util.Set;
import org.netbeans.modules.java.source.parsing.JavacParser;
import org.netbeans.modules.refactoring.api.Problem;
import org.netbeans.modules.refactoring.api.RefactoringSession;
@@ -37,8 +39,10 @@ import org.openide.util.lookup.Lookups;
*/
public class RenamePackageTest extends RefactoringTestBase {
+private static final Set MODULAR_TESTS = new
HashSet<>(Arrays.asList("testModuleOpens"));
+
public RenamePackageTest(String name) {
-super(name, "1.8");
+super(name, MODULAR_TESTS.contains(name) ? "9" : "1.8");
}
static {
@@ -129,6 +133,26 @@ public class RenamePackageTest extends RefactoringTestBase
{
+ "}"));
}
+public void testModuleOpens() throws Exception {
+writeFilesAndWaitForScan(src,
+new File("module-info.java", "module m {\n"
++ "exports t;\n"
++ "opens t;\n"
++ "}"),
+new File("t/A.java", "package t;\n"
++ "public class A {\n"
++ "}"));
+performRenameFolder(src.getFileObject("t"), "u", false);
+verifyContent(src,
+new File("module-info.java", "module m {\n"
++ "exports u;\n"
++ "opens u;\n"
++ "}"),
+new File("u/A.java", "package u;\n"
++ "public class A {\n"
[netbeans] branch master updated: Optimize MimePath#validate by first querying the MimePath cache before attempting to parse
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 7775ab1ebf Optimize MimePath#validate by first querying the MimePath
cache before attempting to parse
new e623b46231 Merge pull request #3976 from
matthiasblaesing/mime_parser_performance
7775ab1ebf is described below
commit 7775ab1ebf2839b895c4300a4e8b8013a5225ca9
Author: Matthias Bläsing
AuthorDate: Sat Apr 2 10:35:13 2022 +0200
Optimize MimePath#validate by first querying the MimePath cache before
attempting to parse
For the changes regarding the switch from a synchronized access to a
HashMap to a ConcurrentHashMap:
The existing synchronisation only protected the get and set operations
on the map and not some secondary functionality (iteration for example).
Using a ConcurrentHashMap should thus improve performance and not
change the semantics.
---
.../netbeans/api/editor/mimelookup/MimePath.java | 48 --
1 file changed, 26 insertions(+), 22 deletions(-)
diff --git
a/platform/editor.mimelookup/src/org/netbeans/api/editor/mimelookup/MimePath.java
b/platform/editor.mimelookup/src/org/netbeans/api/editor/mimelookup/MimePath.java
index 7a6b3cd487..50f9598006 100644
---
a/platform/editor.mimelookup/src/org/netbeans/api/editor/mimelookup/MimePath.java
+++
b/platform/editor.mimelookup/src/org/netbeans/api/editor/mimelookup/MimePath.java
@@ -29,12 +29,12 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Pattern;
import org.netbeans.modules.editor.mimelookup.APIAccessor;
import org.netbeans.modules.editor.mimelookup.MimeLookupCacheSPI;
import org.netbeans.modules.editor.mimelookup.MimePathLookup;
import org.openide.util.Lookup;
-import org.openide.util.lookup.Lookups;
/**
* The mime path is a concatenation of one or more mime types. The purpose of
@@ -112,14 +112,14 @@ public final class MimePath {
private static final Object LOCK = new Object();
/** The List of Recently Used mime paths. */
-private static final ArrayList LRU = new ArrayList();
+private static final ArrayList LRU = new ArrayList<>();
/** The maximum size of the List of Recently Used mime paths.
/* package */ static final int MAX_LRU_SIZE = 3;
private static final Pattern REG_NAME_PATTERN =
Pattern.compile("^[[\\p{Alnum}][!#$&.+\\-^_]]{1,127}$"); //NOI18N
-private static final Set WELL_KNOWN_TYPES = new
HashSet(Arrays.asList(
+private static final Set WELL_KNOWN_TYPES = new
HashSet<>(Arrays.asList(
"application", //NOI18N
"audio", //NOI18N
"content", //NOI18N for content/unknown mime type
@@ -131,7 +131,7 @@ public final class MimePath {
"video" //NOI18N
));
-private static final Map> string2mimePath = new
HashMap>();
+private static final Map> string2mimePath = new
ConcurrentHashMap<>();
/**
* Gets the mime path for the given mime type. The returned
MimePath
@@ -199,14 +199,12 @@ public final class MimePath {
*/
public static MimePath parse(String path) {
assert path != null : "path cannot be null"; // NOI18N
-
-synchronized (string2mimePath) {
-Reference mpRef = string2mimePath.get(path);
-MimePath mimePath = mpRef != null ? mpRef.get() : null;
-
-if (mimePath != null) {
-return mimePath;
-}
+
+Reference mpRef = string2mimePath.get(path);
+MimePath mimePath = mpRef != null ? mpRef.get() : null;
+
+if (mimePath != null) {
+return mimePath;
}
// Parse the path
@@ -214,16 +212,14 @@ public final class MimePath {
if (!(o instanceof MimePath)) {
throw new IllegalArgumentException((String) o);
}
-
-synchronized (string2mimePath) {
-MimePath mimePath = (MimePath) o;
-
-// Intern the path since the language path's string path is also
interned
-// and thus they can be matched by identity
-string2mimePath.put(path.intern(), new
WeakReference(mimePath));
-
-return mimePath;
-}
+
+mimePath = (MimePath) o;
+
+// Intern the path since the language path's string path is also
interned
+// and thus they can be matched by identity
+string2mimePath.put(path.intern(), new WeakReference<>(mimePath));
+
+return mimePath;
}
/**
@@ -278,6 +274,14 @@ public final class MimePath {
* @since 1.7
*/
public s
[netbeans] branch master updated: [3803]Fixing printing of type names for captured types with type variables.
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 b2dbf811bd [3803]Fixing printing of type names for captured types with
type variables.
new a6433d1de9 Merge pull request #3877 from jlahoda/3803
b2dbf811bd is described below
commit b2dbf811bd78ddbfbcab2f6cec595917e50dcb43
Author: Jan Lahoda
AuthorDate: Sun Mar 27 13:41:50 2022 +0200
[3803]Fixing printing of type names for captured types with type variables.
---
.../netbeans/modules/editor/java/AutoImport.java | 2 --
.../editor/java/JavaCodeTemplateProcessorTest.java | 22 ++
.../netbeans/api/java/source/TypeUtilities.java| 2 --
.../api/java/source/TypeUtilitiesTest.java | 13 -
4 files changed, 34 insertions(+), 5 deletions(-)
diff --git
a/java/java.editor/src/org/netbeans/modules/editor/java/AutoImport.java
b/java/java.editor/src/org/netbeans/modules/editor/java/AutoImport.java
index e365ded940..07dd17bd49 100644
--- a/java/java.editor/src/org/netbeans/modules/editor/java/AutoImport.java
+++ b/java/java.editor/src/org/netbeans/modules/editor/java/AutoImport.java
@@ -144,8 +144,6 @@ public class AutoImport extends SimpleTypeVisitor6 {
bound = type.getUpperBound();
if (bound != null && bound.getKind() != TypeKind.NULL) {
builder.append(" extends "); //NOI18N
-if (bound.getKind() == TypeKind.TYPEVAR)
-bound = ((TypeVariable)bound).getLowerBound();
visit(bound);
}
}
diff --git
a/java/java.editor/test/unit/src/org/netbeans/modules/editor/java/JavaCodeTemplateProcessorTest.java
b/java/java.editor/test/unit/src/org/netbeans/modules/editor/java/JavaCodeTemplateProcessorTest.java
index e4843ca98b..4313b46eb9 100644
---
a/java/java.editor/test/unit/src/org/netbeans/modules/editor/java/JavaCodeTemplateProcessorTest.java
+++
b/java/java.editor/test/unit/src/org/netbeans/modules/editor/java/JavaCodeTemplateProcessorTest.java
@@ -203,6 +203,28 @@ public class JavaCodeTemplateProcessorTest extends
NbTestCase {
"}");
}
+public void testInfiteLoop() throws Exception {
+ doTestTemplateInsert("for (${IT_TYPE rightSideType
type=\"java.util.Iterator\" default=\"Iterator\" editable=false} ${IT
newVarName default=\"it\"} = ${COL instanceof=\"java.util.Collection\"
default=\"col\"}.iterator(); ${IT}.hasNext();) {\n" +
+ "${TYPE rightSideType default=\"Object\"}
${ELEM newVarName default=\"elem\"} = ${TYPE_CAST cast default=\"\"
editable=false}${IT}.next();\n" +
+ "${selection}${cursor}\n" +
+ "}\n",
+ "import java.util.Collection;\n" +
+ "public class Test {\n" +
+ "private void t(Collection c)
{\n" +
+ "|\n" +
+ "}\n" +
+ "}",
+ "import java.util.Collection;\n" +
+ "public class Test {\n" +
+ "private void t(Collection c)
{\n" +
+ "for (Iterator iterator| =
c.iterator(); iterator.hasNext();) {\n" +
+ "E next = iterator.next();\n" +
+ "\n" +
+ "}\n" +
+ "}\n" +
+ "}");
+}
+
private void assertFileObjectTextMatchesRegex(String regex) throws
IOException {
String text = testFile.asText();
assertTrue("The file text must match the regular expression",
text.matches(regex));
diff --git
a/java/java.source.base/src/org/netbeans/api/java/source/TypeUtilities.java
b/java/java.source.base/src/org/netbeans/api/java/source/TypeUtilities.java
index a2b892adf5..0c8071efca 100644
--- a/java/java.source.base/src/org/netbeans/api/java/source/TypeUtilities.java
+++ b/java/java.source.base/src/org/netbeans/api/java/source/TypeUtilities.java
@@ -424,8 +424,6 @@ public final class TypeUtilities {
bound = t.getUpperBound();
if (bound != null && bound.getKind() != TypeKind.NULL) {
DEFAULT_VALUE.append(" extends "); //NOI18N
-if (bound.getKin
[netbeans] branch master updated (c2e5944e6c -> cb7af487ca)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from c2e5944e6c Corrected array and String inspection for various versions
of GDB.
new 9341ccdea1 apache felix 7.0.3
new df7958f93f update notice file
new cb7af487ca Merge pull request #3618 from sjaenick/master
The 6907 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:
platform/libs.felix/external/binaries-list | 2 +-
...ain-7.0.0-license.txt => org.apache.felix.main-7.0.3-license.txt} | 4 ++--
main-7.0.0-notice.txt => org.apache.felix.main-7.0.3-notice.txt} | 5 +++--
platform/libs.felix/nbproject/project.properties | 2 +-
platform/libs.felix/nbproject/project.xml| 4 ++--
5 files changed, 9 insertions(+), 8 deletions(-)
rename platform/libs.felix/external/{org.apache.felix.main-7.0.0-license.txt
=> org.apache.felix.main-7.0.3-license.txt} (99%)
rename platform/libs.felix/external/{org.apache.felix.main-7.0.0-notice.txt =>
org.apache.felix.main-7.0.3-notice.txt} (78%)
-
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 (190ffcb -> 19c5520)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git.
from 190ffcb Cleanup the use of Float primitive wrapper. As of Java 9, the
VM can do a better job of handling the (#3890)
new 7bc17f5 Enable running commit-validation on JDK 8, 11 and 18 and
ensure VerifySimpleTemplatesTest is actually ran
new 6e91633 Remove environment setup (enable security manager, add-opens)
from github workflow
new 19c5520 Merge pull request #3862 from
matthiasblaesing/fix-commit-validation-jdk16+
The 6856 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 | 8 ---
.../ide.ergonomics/nbproject/project.properties| 1 -
ide/ide.kit/nbproject/project.properties | 10
.../modules/ide/kit/VerifySimpleTemplatesTest.java | 5 --
ide/libs.graalsdk/nbproject/project.properties | 2 -
java/java.hints/nbproject/project.properties | 6 ++
.../org/netbeans/nbbuild/extlibs/ignored-overlaps | 1 +
nbbuild/build.xml | 36
nbbuild/default.xml| 64 +-
nbbuild/jdk.xml| 33 +++
nbbuild/templates/common.xml | 25 +
nbbuild/templates/projectized.xml | 9 +--
platform/libs.batik.read/external/binaries-list| 1 +
04-license.txt => xml-apis-1.4.01-license.txt} | 2 +-
3.04-notice.txt => xml-apis-1.4.01-notice.txt} | 0
.../libs.batik.read/nbproject/project.properties | 2 +
platform/libs.batik.read/nbproject/project.xml | 4 ++
platform/o.n.core/nbproject/project.properties | 2 -
18 files changed, 136 insertions(+), 75 deletions(-)
copy platform/libs.batik.read/external/{xml-apis-ext-1.3.04-license.txt =>
xml-apis-1.4.01-license.txt} (99%)
copy platform/libs.batik.read/external/{xml-apis-ext-1.3.04-notice.txt =>
xml-apis-1.4.01-notice.txt} (100%)
-
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: Parameterize Tomcat startup/shutdown timeouts.
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 39c1a97 Parameterize Tomcat startup/shutdown timeouts.
new f47ca71 Merge pull request #3915 from
peedeeboy/feature/tomcat_startup_timeout_parameter
39c1a97 is described below
commit 39c1a97d2f879669121b081d73c82bc71b14b89a
Author: Pete Whelpton
AuthorDate: Fri Apr 1 17:53:48 2022 +0100
Parameterize Tomcat startup/shutdown timeouts.
Closes: #3898
---
.../modules/tomcat5/customizer/Bundle.properties | 4 +
.../tomcat5/customizer/CustomizerDataSupport.java | 40
.../tomcat5/customizer/CustomizerStartup.form | 102 ++---
.../tomcat5/customizer/CustomizerStartup.java | 71 --
.../modules/tomcat5/optional/StartTomcat.java | 17 +++-
.../modules/tomcat5/util/TomcatProperties.java | 40
6 files changed, 250 insertions(+), 24 deletions(-)
diff --git
a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/customizer/Bundle.properties
b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/customizer/Bundle.properties
index bd8889b..91c7be4 100644
---
a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/customizer/Bundle.properties
+++
b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/customizer/Bundle.properties
@@ -237,3 +237,7 @@
CustomizerDeployment.deplolymentTimeoutSpinner.accessible.description=Deployment
CustomizerDeployment.deplolymentTimeoutLabel.tooltip=Time to wait before
assuming a deployment has failed
CustomizerDeployment.deplolymentTimeoutSpinner.tooltip=Time to wait before
assuming a deployment has failed
+
+CustomizerStartup.timeoutsLabel.txt=Timeouts [s]\:
+CustomizerStartup.startupTimeout.label=Startup:
+CustomizerStartup.shutdownTimeout.label=Shutdown:
\ No newline at end of file
diff --git
a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/customizer/CustomizerDataSupport.java
b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/customizer/CustomizerDataSupport.java
index 32b311c..87f03ee 100644
---
a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/customizer/CustomizerDataSupport.java
+++
b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/customizer/CustomizerDataSupport.java
@@ -74,6 +74,8 @@ public class CustomizerDataSupport {
private SpinnerNumberModel shutdownPortModel;
private SpinnerNumberModel debugPortModel;
private SpinnerNumberModel deploymentTimeoutModel;
+private SpinnerNumberModel startupTimeoutModel;
+private SpinnerNumberModel shutdownTimeoutModel;
private ButtonModel driverDeploymentModel;
// model dirty flags
@@ -97,6 +99,8 @@ public class CustomizerDataSupport {
private boolean debugPortModelFlag;
private boolean deploymentTimeoutModelFlag;
private boolean driverDeploymentModelFlag;
+private boolean startupTimeoutModelFlag;
+private boolean shutdownTimeoutModelFlag;
private TomcatProperties tp;
private TomcatManager tm;
@@ -315,6 +319,24 @@ public class CustomizerDataSupport {
store(); // This is just temporary until the server manager
has OK and Cancel buttons
}
});
+
+// startupTimeoutModel
+startupTimeoutModel = new SpinnerNumberModel(tp.getStartupTimeout(),
1, Integer.MAX_VALUE, 1);
+startupTimeoutModel.addChangeListener(new ModelChangeAdapter() {
+public void modelChanged() {
+startupTimeoutModelFlag = true;
+store(); // This is just temporary until the server manager
has OK and Cancel buttons
+}
+});
+
+// shutdownTimeoutModel
+shutdownTimeoutModel = new SpinnerNumberModel(tp.getShutdownTimeout(),
1, Integer.MAX_VALUE, 1);
+shutdownTimeoutModel.addChangeListener(new ModelChangeAdapter() {
+public void modelChanged() {
+shutdownTimeoutModelFlag = true;
+store(); // This is just temporary until the server manager
has OK and Cancel buttons
+}
+});
}
@@ -444,6 +466,14 @@ public class CustomizerDataSupport {
return deploymentTimeoutModel;
}
+public SpinnerNumberModel getStartupTimeoutModel() {
+return startupTimeoutModel;
+}
+
+public SpinnerNumberModel getShutdownTimeoutModel() {
+return shutdownTimeoutModel;
+}
+
public ButtonModel getDriverDeploymentModel() {
return driverDeploymentModel;
}
@@ -554,6 +584,16 @@ public class CustomizerDataSupport {
tp.setDriverDeployment(driverDeploymentModel.isSelected());
driverDeploymentModelFlag = false;
}
+
+if (startupTimeoutModelFlag
[netbeans] branch master updated: [#3728] Only enable VerifyPartialReparse if assertions are enabled
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 d029a01 [#3728] Only enable VerifyPartialReparse if assertions are
enabled
new b855a82 Merge pull request #3850 from
matthiasblaesing/vanilla_reparser_assertions
d029a01 is described below
commit d029a01097cf8c3f8c3da838319c4bcc3c813050
Author: Matthias Bläsing
AuthorDate: Thu Mar 24 16:57:29 2022 +0100
[#3728] Only enable VerifyPartialReparse if assertions are enabled
It was observed, that NetBeans can create an excessive number of source
dump files in situations, where the partial reparse verifier bails out.
The VanillaPartialReparser already suppresses dumping of source files
in case of exceptions if assertions are not enabled. The same logic is
now applied to the activation of VerifyPartialReparse.
VerifyPartialReparse has no side effects and thus can be disabled if
dumping should be turned off.
---
.../java/source/parsing/VanillaPartialReparser.java | 16
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git
a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/VanillaPartialReparser.java
b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/VanillaPartialReparser.java
index e4f7c0f..3c3f1e6 100644
---
a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/VanillaPartialReparser.java
+++
b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/VanillaPartialReparser.java
@@ -163,6 +163,7 @@ public class VanillaPartialReparser implements
PartialReparser {
}
@Override
+@SuppressWarnings({"AssertWithSideEffects", "NestedAssignment"})
public boolean reparseMethod (final CompilationInfoImpl ci,
final Snapshot snapshot,
final MethodTree orig,
@@ -328,9 +329,9 @@ public class VanillaPartialReparser implements
PartialReparser {
if (t instanceof ThreadDeath) {
throw (ThreadDeath) t;
}
-boolean a = false;
-assert a = true;
-if (a) {
+boolean enableDumpSource = false;
+assert enableDumpSource = true; // Only dump sources with
assertions enabled
+if (enableDumpSource) {
JavacParser.dumpSource(ci, t);
}
t.printStackTrace();
@@ -607,8 +608,15 @@ public class VanillaPartialReparser implements
PartialReparser {
public static final class FactoryImpl extends TaskFactory {
@Override
+@SuppressWarnings({"AssertWithSideEffects", "NestedAssignment"})
public Collection create(Snapshot
snapshot) {
-return Collections.singletonList(new VerifyPartialReparse());
+boolean enableVerifier = false;
+assert enableVerifier = true; // Only enable verifier if
assertions are enabled
+if (enableVerifier) {
+return Collections.singletonList(new
VerifyPartialReparse());
+} else {
+return Collections.emptyList();
+}
}
}
-
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: Include exports to can execute macOs 'Show In Finder' action in jdk17
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing 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 9ea5c04 Include exports to can execute macOs 'Show In Finder' action in jdk17 new 3fea7d8 Merge pull request #3866 from dyorgio/master 9ea5c04 is described below commit 9ea5c047567c8fc5529045c4b5a0a76b0be63d49 Author: Dyorgio Nascimento AuthorDate: Fri Mar 25 14:55:22 2022 -0300 Include exports to can execute macOs 'Show In Finder' action in jdk17 --- nbbuild/jms-config/desktop.flags | 1 + 1 file changed, 1 insertion(+) diff --git a/nbbuild/jms-config/desktop.flags b/nbbuild/jms-config/desktop.flags index 4853f10..711ccf5 100644 --- a/nbbuild/jms-config/desktop.flags +++ b/nbbuild/jms-config/desktop.flags @@ -14,3 +14,4 @@ --add-exports=java.desktop/sun.swing=ALL-UNNAMED --add-exports=java.desktop/sun.awt.im=ALL-UNNAMED --add-exports=java.desktop/com.sun.java.swing.plaf.motif=ALL-UNNAMED +--add-exports=java.desktop/com.apple.eio=ALL-UNNAMED - 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: Save cause of download error for BuildException
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 6dce67c Save cause of download error for BuildException
new 73fb19b Merge pull request #3873 from jgneff/save-first-problem
6dce67c is described below
commit 6dce67cbce77f04677bda01f4b853064b4d4c5c3
Author: John Neffenger
AuthorDate: Fri Mar 25 12:21:13 2022 -0700
Save cause of download error for BuildException
When downloading external binaries, save any IOException for the
'cause' parameter of the BuildException. Otherwise, the root cause
of the build failure is always null.
---
nbbuild/antsrc/org/netbeans/nbbuild/extlibs/DownloadBinaries.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/DownloadBinaries.java
b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/DownloadBinaries.java
index bb1b352..4f666e9 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/DownloadBinaries.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/DownloadBinaries.java
@@ -312,7 +312,8 @@ public class DownloadBinaries extends Task {
log("Trying: " + url, Project.MSG_VERBOSE);
return downloadFromServer(this, url);
} catch (IOException ex) {
-//Try the next URL
+// Saves the exception and tries the next URL, if present
+firstProblem = ex;
}
}
throw new BuildException("Could not download " + cacheName + " from "
+ server + ": " + firstProblem, firstProblem, getLocation());
-
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 (96bd7c3 -> d195a05)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 96bd7c3 SQL History loss: Reimplement atomatic saving by writing to tempfile and moving to target (#3868) new 74118b0 Report errors from libsecret as RuntimeException so that errors connecting disable it new 5f13dde Fix naming of application for GnomeKeyring and LibSecret new d195a05 Merge pull request #3869 from matthiasblaesing/keyring_optimization The 6814 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../modules/keyring/gnome/GnomeProvider.java | 13 + .../gnome/libsecret/GnomeLibSecretProvider.java| 18 ++- .../modules/keyring/impl/KeyringSupport.java | 14 +++--- .../modules/keyring/kde/CommonKWalletProvider.java | 56 +++--- .../netbeans/modules/keyring/mac/MacProvider.java | 17 +-- 5 files changed, 54 insertions(+), 64 deletions(-) copy java/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/Interface.java => platform/keyring.impl/src/org/netbeans/modules/keyring/impl/KeyringSupport.java (79%) - 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: SQL History loss: Reimplement atomatic saving by writing to tempfile and moving to target (#3868)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 96bd7c3 SQL History loss: Reimplement atomatic saving by writing to
tempfile and moving to target (#3868)
96bd7c3 is described below
commit 96bd7c3e50c041b4666241776f9a257923018f43
Author: Matthias Bläsing
AuthorDate: Sat Mar 26 17:52:04 2022 +0100
SQL History loss: Reimplement atomatic saving by writing to tempfile and
moving to target (#3868)
It was observed, that sometimes the sql history was lost and it is
assumed, that writing the new history began (emptying the file as the
first step) and was not completed. By using a temporary file, the file
is either written completely or not. It is assumed, that a move
operation inside the same directory is atomic on all OSes.
---
.../modules/db/sql/history/SQLHistoryManager.java | 108 +++--
1 file changed, 56 insertions(+), 52 deletions(-)
diff --git
a/ide/db.core/src/org/netbeans/modules/db/sql/history/SQLHistoryManager.java
b/ide/db.core/src/org/netbeans/modules/db/sql/history/SQLHistoryManager.java
index 836a47a..251b16c 100644
--- a/ide/db.core/src/org/netbeans/modules/db/sql/history/SQLHistoryManager.java
+++ b/ide/db.core/src/org/netbeans/modules/db/sql/history/SQLHistoryManager.java
@@ -22,6 +22,9 @@ import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.io.IOException;
import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.xml.parsers.DocumentBuilder;
@@ -32,7 +35,6 @@ import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
import org.netbeans.modules.db.sql.execute.ui.SQLHistoryPanel;
import org.openide.filesystems.FileObject;
-import org.openide.filesystems.FileSystem;
import org.openide.filesystems.FileUtil;
import org.openide.util.NbPreferences;
import org.openide.util.RequestProcessor;
@@ -50,9 +52,11 @@ public class SQLHistoryManager {
public static final int DEFAULT_SQL_STATEMENTS_SAVED_FOR_HISTORY = 100;
public static final int MAX_SQL_STATEMENTS_SAVED_FOR_HISTORY = 1;
public static final String PROP_SAVED = "saved"; //NOI18N
-
+
private static final String SQL_HISTORY_DIRECTORY =
"Databases/SQLHISTORY"; // NOI18N
-private static final String SQL_HISTORY_FILE = "sql_history.xml"; // NOI18N
+private static final String SQL_HISTORY_BASE = "sql_history"; // NOI18N
+private static final String SQL_HISTORY_EXT = "xml"; // NOI18N
+private static final String SQL_HISTORY_FILE = SQL_HISTORY_BASE + "." +
SQL_HISTORY_EXT; // NOI18N
private static final String TAG_HISTORY = "history"; // NOI18N
private static final String TAG_SQL = "sql"; // NOI18N
private static final String ATTR_DATE = "date"; // NOI18N
@@ -62,14 +66,14 @@ public class SQLHistoryManager {
private static final RequestProcessor RP = new RequestProcessor(
SQLHistoryManager.class.getName(), 1, false, false);
// Time between call to save and real save - usefull to accumulate before
save
-private static final int SAVE_DELAY = 5 * 1000;
-
-private static SQLHistoryManager _instance = null;
-
+private static final int SAVE_DELAY = 5 * 1000;
+
+private static SQLHistoryManager _instance = null;
+
private final RequestProcessor.Task SAVER = RP.create(new Saver());
private final PropertyChangeSupport PROPERTY_CHANGE_SUPPORT =
new PropertyChangeSupport(this);
-
+
private SQLHistory sqlHistory;
protected SQLHistoryManager() {
@@ -85,11 +89,11 @@ public class SQLHistoryManager {
}
});
}
-
+
public static synchronized SQLHistoryManager getInstance() {
if (_instance == null) {
-_instance = new SQLHistoryManager();
-}
+_instance = new SQLHistoryManager();
+}
return _instance;
}
@@ -115,18 +119,18 @@ public class SQLHistoryManager {
}
return result;
}
-
+
protected FileObject getConfigRoot() {
return FileUtil.getConfigRoot();
}
-
+
protected String getRelativeHistoryPath() {
return SQL_HISTORY_DIRECTORY;
}
protected String getHistoryFilename() {
return SQL_HISTORY_FILE;
-}
+}
public void setListSize(int listSize) {
NbPreferences.forModule(SQLHistoryPanel.class).putInt("OPT_SQL_STATEMENTS_SAVED_FOR_HISTORY",
listSize);
@@ -157,15 +161,1
[netbeans] branch master updated: Fix console encoding on JDK 18 (Maven + general execution)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 f02e4ec Fix console encoding on JDK 18 (Maven + general execution)
new f3c412e Merge pull request #3836 from
matthiasblaesing/native_encoding_jdk18
f02e4ec is described below
commit f02e4ecd04667539c6e25841529e3090201f356c
Author: Matthias Bläsing
AuthorDate: Tue Mar 22 20:46:16 2022 +0100
Fix console encoding on JDK 18 (Maven + general execution)
With JDK 18 the default charset for java was changed. Before this
change, the default charset (exposed as the system property
file.encoding) was platform specific. After the change the default
charset was unified to UTF-8 on all platforms.
Code that interacts with native APIs can use the system property
native.encoding to query the platform encoding and use that. And related
to this the same is true for applications interacting with the system
console.
The primarly affected platform is windows, as both mac OS and Linux
already default to UTF-8 as file encoding.
In this PR two areas are covered:
- General execution (using "External Execution API"): The module already
allows users to specify the encoding to use. It used the default
enconding as a fallback, if none was specified. This fallback was
enhanced to query the native.encoding system property first. If it is
present, it will be used as default encoding (JDK 18+), if it is
missing, the original behavior using the default file encoding is
activated.
- Maven target execution: maven target execution is basicly an external
execution, so the same considerations apply. In contrast to the
general execution API, the encoding for maven execution can't be
overriden, so both code path (input + output) are configured to use
the native.enconfig property if present or fallback to the default
file encoding.
---
.../extexecution/base/BaseExecutionService.java| 22 +++-
.../maven/execute/CommandLineOutputHandler.java| 29 --
2 files changed, 48 insertions(+), 3 deletions(-)
diff --git
a/ide/extexecution.base/src/org/netbeans/api/extexecution/base/BaseExecutionService.java
b/ide/extexecution.base/src/org/netbeans/api/extexecution/base/BaseExecutionService.java
index 890fd29..f84e958 100644
---
a/ide/extexecution.base/src/org/netbeans/api/extexecution/base/BaseExecutionService.java
+++
b/ide/extexecution.base/src/org/netbeans/api/extexecution/base/BaseExecutionService.java
@@ -210,7 +210,27 @@ public final class BaseExecutionService {
Charset charset = descriptor.getCharset();
if (charset == null) {
-charset = Charset.defaultCharset();
+// If charset is not set for the descriptor, the
+// BaseExecutionService used the default charset to
convert
+// output from command line invocations to strings.
That encoding is
+// derived from the system file.encoding. From JDK 18
onwards its
+// default value changed to UTF-8.
+// JDK 18+ exposes the native encoding as the new
system property
+// native.encoding, prior versions don't have that
property and will
+// report NULL for it.
+// The algorithm is simple: If native.encoding is set,
it will be used
+// else the old default will be queried via
Charset#defaultCharset.
+String nativeEncoding =
System.getProperty("native.encoding");
+if (nativeEncoding != null) {
+try {
+charset = Charset.forName(nativeEncoding);
+} catch (Exception ex) {
+LOGGER.log(java.util.logging.Level.WARNING,
"Failed to get charset for native.encoding value : '" + nativeEncoding + "'",
ex);
+}
+}
+if (charset == null) {
+charset = Charset.defaultCharset();
+}
}
tasks.add(InputReaderTask.newDrainingTask(
diff --git
a/java/maven/src/org/netbeans/modules/maven/execute/CommandLineOutputHandler.java
b/java/maven/src/org/netbeans/modules/maven/execute/CommandLineOutputHandler.java
index d9d0cea..3b73f5f 100644
---
a/java/maven/src/org/netbeans/modules/maven/execute/CommandLineOutputHandler.java
+++
b/java/maven/src/org/netbeans/modules/maven/execute/CommandLineOut
[netbeans] branch master updated: [3731] Fixing unused import handling for module-infos.
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 be7c9bf [3731] Fixing unused import handling for module-infos.
new d4d9d64 Merge pull request #3770 from jlahoda/3731
be7c9bf is described below
commit be7c9bf9dd38a9887f42b2e130abac749c928fc8
Author: Jan Lahoda
AuthorDate: Sat Mar 12 15:59:26 2022 +0100
[3731] Fixing unused import handling for module-infos.
---
.../java/editor/base/imports/UnusedImports.java| 1 +
.../editor/base/semantic/UnusedImportsTest.java| 42 +-
2 files changed, 42 insertions(+), 1 deletion(-)
diff --git
a/java/java.editor.base/src/org/netbeans/modules/java/editor/base/imports/UnusedImports.java
b/java/java.editor.base/src/org/netbeans/modules/java/editor/base/imports/UnusedImports.java
index bb6ff12..fd40b6a 100644
---
a/java/java.editor.base/src/org/netbeans/modules/java/editor/base/imports/UnusedImports.java
+++
b/java/java.editor.base/src/org/netbeans/modules/java/editor/base/imports/UnusedImports.java
@@ -166,6 +166,7 @@ public class UnusedImports {
scan(tree.getImports(), d);
scan(tree.getPackageAnnotations(), d);
scan(tree.getTypeDecls(), d);
+ scan(tree.getModule(), d);
return null;
}
diff --git
a/java/java.editor.base/test/unit/src/org/netbeans/modules/java/editor/base/semantic/UnusedImportsTest.java
b/java/java.editor.base/test/unit/src/org/netbeans/modules/java/editor/base/semantic/UnusedImportsTest.java
index 069767e..e956717 100644
---
a/java/java.editor.base/test/unit/src/org/netbeans/modules/java/editor/base/semantic/UnusedImportsTest.java
+++
b/java/java.editor.base/test/unit/src/org/netbeans/modules/java/editor/base/semantic/UnusedImportsTest.java
@@ -41,6 +41,7 @@ import org.netbeans.api.lexer.Language;
import org.netbeans.core.startup.Main;
import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.java.editor.base.imports.UnusedImports;
+import org.netbeans.modules.java.source.parsing.JavacParser;
import org.netbeans.modules.parsing.impl.indexing.CacheFolder;
import org.netbeans.modules.parsing.impl.indexing.RepositoryUpdater;
import org.netbeans.spi.java.classpath.support.ClassPathSupport;
@@ -333,8 +334,44 @@ public class UnusedImportsTest extends NbTestCase {
"}\n"));
}
+public void testModuleInfo() throws Exception {
+SourceUtilsTestUtil.setSourceLevel(src, "11");
+writeFilesAndWaitForScan(src,
+ new File("module-info.java",
+ "import java.util.List;\n" +
+ "import test.Ann;\n" +
+ "import test.Service1;\n" +
+ "import test.Service2;\n" +
+ "import test.Service2Impl;\n" +
+ "@Ann\n" +
+ "module m {\n" +
+ "uses Service1;\n" +
+ "uses Service2;\n" +
+ "provides Service2 with
Service2Impl;\n" +
+ "}\n"),
+ new File("test/Ann.java",
+ "package test;\n" +
+ "public @interface Ann { }"),
+ new File("test/Service1.java",
+ "package test;\n" +
+ "public interface Service1 { }"),
+ new File("test/Service2.java",
+ "package test;\n" +
+ "public interface Service2 { }"),
+ new File("test/Service2Impl.java",
+ "package test;\n" +
+ "public class Service2Impl
implements Service2 { }"));
+
+performUnusedImportsTestForFile("module-info.java",
+"import java.util.List;\n");
+}
+
private void performUnusedImportsTest(String... golden) throws Exception {
-CompilationInfo ci =
SourceUtilsTestUtil.getCompilationInfo(JavaSource.forFileObject(src.getFileObject("tes
[netbeans] branch master updated: Fix maven daemon detection on windows platform
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 8f756d5 Fix maven daemon detection on windows platform
new 9899586 Merge pull request #3767 from philippefichet/master
8f756d5 is described below
commit 8f756d5a90138c636095a1ae3a0edca3d5194ab0
Author: FICHET Philippe
AuthorDate: Fri Mar 11 17:02:12 2022 +
Fix maven daemon detection on windows platform
---
.../src/org/netbeans/modules/maven/execute/cmd/ShellConstructor.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/java/maven/src/org/netbeans/modules/maven/execute/cmd/ShellConstructor.java
b/java/maven/src/org/netbeans/modules/maven/execute/cmd/ShellConstructor.java
index 4555162..d1d6615 100644
---
a/java/maven/src/org/netbeans/modules/maven/execute/cmd/ShellConstructor.java
+++
b/java/maven/src/org/netbeans/modules/maven/execute/cmd/ShellConstructor.java
@@ -44,7 +44,9 @@ public class ShellConstructor implements Constructor {
public List construct() {
// use mvnd if its the home of a daemon
-String ex = Files.exists(Paths.get(mavenHome.getPath(), "bin",
"mvnd")) ? "mvnd" : "mvn"; //NOI18N
+String mavenDaemonSuffixDetection = Utilities.isWindows() ? ".exe" :
"";
+String ex = Files.exists(Paths.get(mavenHome.getPath(), "bin", "mvnd"
+ mavenDaemonSuffixDetection)) ? "mvnd" : "mvn"; //NOI18N
+
List command = new ArrayList<>();
if (Utilities.isWindows()) {
-
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 (c94c756 -> 13458c8)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git.
from c94c756 Merge pull request #3696 from
matthiasblaesing/3669_recursive_js_models
new 5573b9c [NETBEANS-6067] Update JSch to 0.1.72 and junixsocket to 2.4.0
new 1789e05 Enable logging of AgentConnector produced by ConnectorFactory
new 13458c8 Merge pull request #3713 from matthiasblaesing/update-jsch
The 6736 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ide/c.jcraft.jsch/build.xml| 11 +-
ide/c.jcraft.jsch/external/binaries-list | 2 +-
...-0.1.55-license.txt => jsch-0.1.72-license.txt} | 4 +-
ide/c.jcraft.jsch/nbproject/project.properties | 2 +-
ide/c.jcraft.jsch/nbproject/project.xml| 34 +-
.../external/binaries-list | 5 +-
.../external/junixsocket-2.2.1-notice.txt | 6 -
...1-license.txt => junixsocket-2.4.0-license.txt} | 4 +-
.../external/junixsocket-2.4.0-notice.txt | 15 +
ide/libs.c.kohlschutter.junixsocket/manifest.mf| 2 +-
.../nbproject/libs-c-kohlschutter-junixsocket.sig | 548 -
.../nbproject/project.properties | 5 +-
.../nbproject/project.xml | 12 +-
ide/libs.git/manifest.mf | 2 +-
ide/libs.git/nbproject/project.xml | 4 +-
.../libs/git/jgit/JGitSshSessionFactory.java | 118 +
ide/libs.jsch.agentproxy/external/binaries-list| 20 -
.../external/jsch.agentproxy-0.0.7-license.txt | 34 --
ide/libs.jsch.agentproxy/manifest.mf | 4 +-
.../nbproject/project.properties | 6 +-
ide/libs.jsch.agentproxy/nbproject/project.xml | 32 +-
.../libs/jsch/agentproxy/ConnectorFactory.java | 55 ++-
php/php.project/manifest.mf| 2 +-
php/php.project/nbproject/project.xml | 4 +-
.../php/project/connections/sftp/SftpClient.java | 140 +-
25 files changed, 681 insertions(+), 390 deletions(-)
rename ide/c.jcraft.jsch/external/{jsch-0.1.55-license.txt =>
jsch-0.1.72-license.txt} (95%)
delete mode 100644
ide/libs.c.kohlschutter.junixsocket/external/junixsocket-2.2.1-notice.txt
rename
ide/libs.c.kohlschutter.junixsocket/external/{junixsocket-2.2.1-license.txt =>
junixsocket-2.4.0-license.txt} (99%)
create mode 100644
ide/libs.c.kohlschutter.junixsocket/external/junixsocket-2.4.0-notice.txt
delete mode 100644 ide/libs.jsch.agentproxy/external/binaries-list
delete mode 100644
ide/libs.jsch.agentproxy/external/jsch.agentproxy-0.0.7-license.txt
-
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: Improve handling of recursive JS structures
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 6a5ba4b Improve handling of recursive JS structures
new c94c756 Merge pull request #3696 from
matthiasblaesing/3669_recursive_js_models
6a5ba4b is described below
commit 6a5ba4bfa24b870f82f2bbafaae176e98d2d18c4
Author: Matthias Bläsing
AuthorDate: Fri Mar 4 23:01:12 2022 +0100
Improve handling of recursive JS structures
JS structures, that reference themselves can cause unlimited recursion
in several places. In this changeset the JsIndexer and
OccurrencesSupport are modified, so that recursive structures can be
scanned without causing a StackOverflowError.
Closes: #3669
---
.../javascript2/editor/index/JsIndexer.java| 35 +++--
.../editor/navigation/OccurrencesSupport.java | 41 ++
.../testfiles/indexer/SelfreferencingFunction.js | 25 ++
.../indexer/SelfreferencingFunction.js.indexed | 74 ++
.../testfiles/indexer/SelfreferencingObject.js | 24 ++
.../indexer/SelfreferencingObject.js.indexed | 45 +++
.../modules/javascript2/editor/JsTestBase.java | 11 ++-
.../editor/index/RecursiveStructuresTest.java | 88 ++
8 files changed, 319 insertions(+), 24 deletions(-)
diff --git
a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/index/JsIndexer.java
b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/index/JsIndexer.java
index 3d4332e..d75680e 100644
---
a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/index/JsIndexer.java
+++
b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/index/JsIndexer.java
@@ -22,6 +22,7 @@ import
org.netbeans.modules.javascript2.model.api.IndexedElement;
import java.io.IOException;
import java.net.URL;
import java.util.Collection;
+import java.util.IdentityHashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.logging.Level;
@@ -96,14 +97,16 @@ public class JsIndexer extends EmbeddingIndexer {
JsObject globalObject = model.getGlobalObject();
for (JsObject object : globalObject.getProperties().values()) {
if (object.getParent() != null) {
-storeObject(object, object.getName(), support, indexable);
+IdentityHashMap visited = new
IdentityHashMap<>();
+storeObject(object, object.getName(), support, indexable,
visited);
}
}
IndexDocument document = support.createDocument(indexable);
for (JsObject object : globalObject.getProperties().values()) {
if (object.getParent() != null) {
-storeUsages(object, object.getName(), document);
+IdentityHashMap visited = new
IdentityHashMap<>();
+storeUsages(object, object.getName(), document, visited);
}
}
support.addDocument(document);
@@ -214,7 +217,15 @@ public class JsIndexer extends EmbeddingIndexer {
return elementDocument;
}
-private void storeObject(JsObject object, String fqn, IndexingSupport
support, Indexable indexable) {
+private void storeObject(JsObject object, String fqn, IndexingSupport
support, Indexable indexable, IdentityHashMap visited) {
+// @todo: This prevents unlimited recursion when self referencing
strucures
+//are scanned. It is necessary to rework the index users so
that
+//this is not necessary
+if(visited.containsKey(object)) {
+return;
+}
+IdentityHashMap childVisited = new
IdentityHashMap<>(visited);
+childVisited.compute(object, (k, v) -> v == null ? 1 : v+1);
if (!isInvisibleFunction(object) && object != null && object.getName()
!= null) {
if (object.isDeclared() ||
ModelUtils.PROTOTYPE.equals(object.getName())) {
// if it's delcared, then store in the index as new document.
@@ -226,7 +237,7 @@ public class JsIndexer extends EmbeddingIndexer {
// there can be declared it's properties or methods
for (JsObject property : object.getProperties().values()) {
if (!(property instanceof JsReference &&
!((JsReference)property).getOriginal().isAnonymous())) {
-storeObject(property, fqn + '.' + property.getName(),
support, indexable);
+storeObject(property, fqn + '.' + property.getName(),
support, indexable, childVisited);
} else {
IndexDocument document =
createDocumentForReference((JsReference)property, fqn +
[netbeans] branch master updated (b3d3266 -> 2494ac2)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from b3d3266 Merge pull request #3642 from matthiasblaesing/css_ext new 10f4f12 Update GraalJS Parser new 9ee75b4 Update lexer to handle ecmascript 7-13 lexer changes new 19d61b2 Tollerate missing documentation from node.js documentation new ba79ee6 Use correct invocation for new parser new 3383cf4 Remove libs.oracle.jsparser is succeeded by libs.nashorn new 3507e8a Adjust to new language constructs in updated JS parser new da227c0 Add enums for ES8 - ES.Next and make ES.Next the default new 3c17c11 Fix code completion for private members (should be visible inside class and invisible outside) new 05d936c Implement JS hints to warn about new features new 9fb28c7 Fix empty catch new 2494ac2 Merge pull request #3599 from matthiasblaesing/update-js The 6682 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: contrib/libs.oracle.jsparser/.gitignore|1 - contrib/libs.oracle.jsparser/LICENSE | 347 - contrib/libs.oracle.jsparser/build.xml | 70 - .../libs.oracle.jsparser/external/binaries-list| 17 - .../com.oracle.js.parser-ba7a8bc42268-license.txt | 355 - contrib/libs.oracle.jsparser/manifest.mf |7 - .../nbproject/project.properties | 24 - contrib/libs.oracle.jsparser/nbproject/project.xml | 37 - .../libs/oracle/jsparser/Bundle.properties | 20 - .../foreach/index.html.testForEach.completion | 20 +- .../index.html.testForEachAlias.completion | 20 +- .../index.html.testIssue231569.completion | 20 +- .../template/index.html.testTemplate.completion| 20 +- .../index.html.testTemplateForEach.completion | 20 +- .../index.html.testTemplateInner.completion| 20 +- .../completion/with/index.html.testWith.completion | 20 +- webcommon/javascript2.doc/nbproject/project.xml|4 +- webcommon/javascript2.editor/nbproject/project.xml |4 +- .../editor/CompletionContextFinder.java| 108 +- .../javascript2/editor/JsCamelCaseInterceptor.java |2 +- .../javascript2/editor/JsCodeCompletion.java | 333 ++-- .../javascript2/editor/JsCompletionItem.java |2 +- .../modules/javascript2/editor/JsPreferences.java | 11 +- .../javascript2/editor/JsSemanticAnalyzer.java | 10 +- .../javascript2/editor/JsStructureScanner.java |4 +- .../javascript2/editor/JsTypedTextInterceptor.java |2 +- .../modules/javascript2/editor/JsVersion.java | 45 +- .../editor/formatter/FormatTokenStream.java|1 + .../javascript2/editor/hints/Ecma10Rule.java | 106 ++ .../javascript2/editor/hints/Ecma11Rule.java | 109 ++ .../javascript2/editor/hints/Ecma12Rule.java | 136 ++ .../javascript2/editor/hints/Ecma6Rule.java| 54 +- .../javascript2/editor/hints/Ecma7Rule.java| 54 +- .../javascript2/editor/hints/EcmaLevelRule.java|7 + .../javascript2/editor/hints/OperatorRule.java | 147 ++ .../javascript2/editor/hints/SwitchToEcmaXFix.java | 71 + .../editor/navigation/DeclarationFinderImpl.java |4 +- .../javascript2/editor/parser/JsParser.java|2 +- .../modules/javascript2/editor/resources/layer.xml |4 + ...01.js.testOfferingCallbackFunction01.completion | 20 +- .../completion/classPrivateMembersInside.js| 35 + ...side.js.testCompletionPrivateMembers.completion | 11 + .../completion/classPrivateMembersOutside.js | 38 + ...side.js.testCompletionPrivateMembers.completion |9 + .../constructors.js.testConstructors_01.completion | 20 +- .../issue215863.js.testIssue215863_04.completion |4 +- .../issue215863.js.testIssue215863_05.completion |2 +- .../issue215863.js.testIssue215863_06.completion |2 +- .../issue225986.js.testIssue225986_01.completion |2 +- .../issue269609.js.testIssue269609_01.completion |2 +- .../issue269609.js.testIssue269609_02.completion |2 +- .../issue269609.js.testIssue269609_03.completion |2 +- .../issue269609.js.testIssue269609_04.completion |2 +- .../issue269609.js.testIssue269609_05.completion |2 +- .../issue226650.html.testIssue226650.completion| 20 +- .../issue232178.js.testIssue232178_01.completion | 20 +- .../issue240914.js.testIssue240914_01.completion | 20 +- .../issue240914.js.testIssue240914_04.completion | 20 +- ...ferenceNew.js.testTypeInferenceNew01.completion | 20 +- .../completion/with/with1.js.testWith1.completion | 2
[netbeans] branch master updated (6538d5e -> b3d3266)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git.
from 6538d5e Merge pull request #3561 from mbien/robust-hints
new 46b7c20 Update antlr3 runtime to 3.5.2 and simplify CSS parse
generation
new 7cde6b4 Introduce partitial support for CSS Selector Level 4 (:not,
:where, :is)
new 7639dc8 Improve parsing of @page declarations with embedded margin
declarations
new b3d3266 Merge pull request #3642 from matthiasblaesing/css_ext
The 6671 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ide/css.lib/build.xml | 6 +-
.../modules/css/lib/AbstractParseTreeNode.java | 3 +-
.../src/org/netbeans/modules/css/lib/Css3.g|26 +-
.../org/netbeans/modules/css/lib/Css3Lexer.java| 2956 +--
.../org/netbeans/modules/css/lib/Css3Parser.java | 17939 ++-
.../modules/css/lib/NbParseTreeBuilder.java| 2 +-
.../netbeans/modules/css/lib/Css3ParserTest.java |27 +
...license.txt => antlr-runtime-3.5.2-license.txt} |11 +-
ide/libs.antlr3.runtime/external/binaries-list | 3 +-
.../nbproject/project.properties | 4 +-
ide/libs.antlr3.runtime/nbproject/project.xml | 4 +-
.../netbeans/libs/antlr3/runtime/Bundle.properties | 2 +-
java/java.api.common/build.xml |16 +
.../project/ui/customizer/vmo/gen/CommandLine.g|88 +-
.../ui/customizer/vmo/gen/CommandLine.tokens |11 -
.../ui/customizer/vmo/gen/CommandLineLexer.java| 690 +-
.../ui/customizer/vmo/gen/CommandLineParser.java | 2379 ++-
.../ui/customizer/vmo/VmOptionsGrammarTest.java|76 +-
nbbuild/licenses/BSD-antlr-runtime3| 6 -
19 files changed, 12223 insertions(+), 12026 deletions(-)
rename ide/libs.antlr3.runtime/external/{antlr-runtime-3.4-license.txt =>
antlr-runtime-3.5.2-license.txt} (93%)
delete mode 100644
java/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/gen/CommandLine.tokens
-
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: Larger icon sizes missing in platform branding UI #3544
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 83a929c Larger icon sizes missing in platform branding UI #3544
new 76be2da Merge pull request #3551 from
aldobrucale/branding-larger-icons
83a929c is described below
commit 83a929c1310440c38846d421acefd8b17d37ddcb
Author: Aldo Brucale
AuthorDate: Mon Jan 31 20:33:15 2022 +0100
Larger icon sizes missing in platform branding UI #3544
---
.../apisupport/project/spi/BrandingModel.java | 44 ++-
.../project/ui/branding/BasicBrandingPanel.form| 250 +
.../project/ui/branding/BasicBrandingPanel.java| 390 +
.../project/ui/branding/Bundle.properties | 3 -
4 files changed, 300 insertions(+), 387 deletions(-)
diff --git
a/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/BrandingModel.java
b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/BrandingModel.java
index 936225f..7f438dc 100644
---
a/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/BrandingModel.java
+++
b/apisupport/apisupport.project/src/org/netbeans/modules/apisupport/project/spi/BrandingModel.java
@@ -68,6 +68,9 @@ public abstract class BrandingModel {
private @NullAllowed BrandingSupport.BrandedFile icon48 = null;
private BrandingSupport.BrandedFile icon16 = null;
private BrandingSupport.BrandedFile icon32 = null;
+private BrandingSupport.BrandedFile icon256 = null;
+private BrandingSupport.BrandedFile icon512 = null;
+private BrandingSupport.BrandedFile icon1024 = null;
/** representation of bundle keys depending on app.title */
private BrandingSupport.BundleKey productInformation = null;
@@ -195,6 +198,12 @@ public abstract class BrandingModel {
return icon32 != null ? icon32.getBrandingSource() : null;
case 48:
return icon48 != null ? icon48.getBrandingSource() : null;
+case 256:
+return icon256 != null ? icon256.getBrandingSource() : null;
+case 512:
+return icon512 != null ? icon512.getBrandingSource() : null;
+case 1024:
+return icon1024 != null ? icon1024.getBrandingSource() : null;
}
throw new IllegalArgumentException("Invalid icon size: " + size);
}
@@ -212,6 +221,15 @@ public abstract class BrandingModel {
case 48:
icon = icon48;
break;
+case 256:
+icon = icon256;
+break;
+case 512:
+icon = icon512;
+break;
+case 1024:
+icon = icon1024;
+break;
default:
throw new IllegalArgumentException("Invalid icon size: " +
size);
}
@@ -258,6 +276,18 @@ public abstract class BrandingModel {
if (icon32 != null) {
getBranding().brandFile(icon32,
getScaleAndStoreIconTask(icon32, 32, 32));
}
+
+if (icon256 != null) {
+getBranding().brandFile(icon256,
getScaleAndStoreIconTask(icon256, 256, 256));
+}
+
+if (icon512 != null) {
+getBranding().brandFile(icon512,
getScaleAndStoreIconTask(icon512, 512, 512));
+}
+
+if (icon1024 != null) {
+getBranding().brandFile(icon1024,
getScaleAndStoreIconTask(icon1024, 1024, 1024));
+}
getBranding().brandBundleKeys(splashKeys);
if (splash != null) {
@@ -444,6 +474,18 @@ public abstract class BrandingModel {
icon32 = getBranding().getBrandedFile(
"org.netbeans.core.startup",//NOI18N
"org/netbeans/core/startup/frame32.gif");//NOI18N
+
+icon256 = getBranding().getBrandedFile(
+"org.netbeans.core.startup",//NOI18N
+"org/netbeans/core/startup/frame256.png");//NOI18N
+
+icon512 = getBranding().getBrandedFile(
+"org.netbeans.core.startup",//NOI18N
+"org/netbeans/core/startup/frame512.png");//NOI18N
+
+icon1024 = getBranding().getBrandedFile(
+"org.netbeans.core.startup",//NOI18N
+"org/netbeans/core/startup/frame1024.png");//NOI18N
splash = getBranding().getBrandedFile(
"org.netbeans.core.startup",//NOI18N
@@ -657,7 +699,7 @@ public abstract class BrandingModel {
generalResour
[netbeans] branch master updated: JSF: Declaration of the xmlns namespace is reported as missing library
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 7e1d4d2 JSF: Declaration of the xmlns namespace is reported as
missing library
new 18b85fb Merge pull request #3636 from matthiasblaesing/jsf_fix
7e1d4d2 is described below
commit 7e1d4d2fa2e38b700759eb37513bfd231544ec8d
Author: Matthias Bläsing
AuthorDate: Thu Feb 17 21:19:53 2022 +0100
JSF: Declaration of the xmlns namespace is reported as missing library
---
.../modules/web/jsf/editor/hints/LibraryDeclarationChecker.java | 5 +
1 file changed, 5 insertions(+)
diff --git
a/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/hints/LibraryDeclarationChecker.java
b/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/hints/LibraryDeclarationChecker.java
index 3b49bcb..9e21cc6 100644
---
a/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/hints/LibraryDeclarationChecker.java
+++
b/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/hints/LibraryDeclarationChecker.java
@@ -69,6 +69,7 @@ import org.openide.util.NbBundle;
* @author marekfukala
*/
public class LibraryDeclarationChecker extends HintsProvider {
+private static final String SCHEMA_INSTANCE =
"http://www.w3.org/2001/XMLSchema-instance;; //NOI18N
private static final Logger LOG =
Logger.getLogger(LibraryDeclarationChecker.class.getName());
@@ -204,6 +205,10 @@ public class LibraryDeclarationChecker extends
HintsProvider {
}
for (String namespace : declaredNamespaces) {
+if(SCHEMA_INSTANCE.equals(namespace)) {
+continue;
+}
+
Library lib = NamespaceUtils.getForNs(libs, namespace);
if (lib != null) {
// http://java.sun.com/jsf/passthrough usage needs to be
resolved on base of all declared libraries
-
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 (b645e98 -> 9c08a45)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a change to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git.
from b645e98 Merge pull request #3521 from junichi11/gh-3486
new 607de01 Micronaut Project: Inform user about execution of downloaded
code
new 43cda59 [NETBEANS-6401] Ensure mwnv and gradlew are executable after
extraction from generated ZIP
new 9c08a45 Merge pull request #3506 from matthiasblaesing/micronaut_fix
The 6522 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:
.../micronaut}/licenseinfo.xml | 3 +-
.../micronaut/newproject/BasePropertiesVisual.form | 102 +
.../micronaut/newproject/BasePropertiesVisual.java | 77 +---
.../modules/micronaut/newproject/Bundle.properties | 1 +
.../newproject/MicronautProjectWizardIterator.java | 17
.../modules/micronaut}/resources/warning.png | Bin
.../modules/micronaut}/resources/warning.svg | 0
7 files changed, 131 insertions(+), 69 deletions(-)
copy {harness/apisupport.harness => enterprise/micronaut}/licenseinfo.xml (86%)
copy {websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui =>
enterprise/micronaut/src/org/netbeans/modules/micronaut}/resources/warning.png
(100%)
copy {websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui =>
enterprise/micronaut/src/org/netbeans/modules/micronaut}/resources/warning.svg
(100%)
-
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: failsafe:integration-test from contextual menu
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 15a98c1 failsafe:integration-test from contextual menu
new 75b32e0 Merge pull request #3470 from
abourree/feature/failsafe_integration-test
15a98c1 is described below
commit 15a98c1a2ce88769536d5a511ba0df6bde501e37
Author: Arnaud BOURRÉE
AuthorDate: Mon Jan 17 22:30:49 2022 +0100
failsafe:integration-test from contextual menu
---
.../org/netbeans/modules/maven/TestChecker.java| 21 ++-
.../maven/execute/DefaultReplaceTokenProvider.java | 31 ++
2 files changed, 51 insertions(+), 1 deletion(-)
diff --git a/java/maven/src/org/netbeans/modules/maven/TestChecker.java
b/java/maven/src/org/netbeans/modules/maven/TestChecker.java
index 7e971ea..af6282a 100644
--- a/java/maven/src/org/netbeans/modules/maven/TestChecker.java
+++ b/java/maven/src/org/netbeans/modules/maven/TestChecker.java
@@ -59,6 +59,17 @@ public class TestChecker implements PrerequisitesChecker {
config.setProperty("test", test + '#' + method);
}
}
+if (ActionProviderImpl.COMMAND_INTEGRATION_TEST_SINGLE.equals(action)
||
+
ActionProviderImpl.COMMAND_DEBUG_INTEGRATION_TEST_SINGLE.equals(action) ||
+"profile-tests".equals(action)) //NOI18N - profile-tests is not
really nice but well.
+{
+String test = config.getProperties().get("it.test"); //NOI18N
+String method =
config.getProperties().get(DefaultReplaceTokenProvider.METHOD_NAME);
+if (test != null && method != null) {
+
config.setProperty(DefaultReplaceTokenProvider.METHOD_NAME, null);
+config.setProperty("it.test", test + '#' + method);
//NOI18N
+}
+}
if (MavenSettings.getDefault().isSkipTests()) {
if (!String.valueOf(config.getGoals()).contains("test")) { //
incl. integration-test
if (config.getProperties().get(PROP_SKIP_TEST) == null) {
@@ -67,9 +78,17 @@ public class TestChecker implements PrerequisitesChecker {
}
}
if (ActionProvider.COMMAND_TEST_SINGLE.equals(action) ||
+ActionProviderImpl.COMMAND_INTEGRATION_TEST_SINGLE.equals(action)
||
ActionProvider.COMMAND_DEBUG_TEST_SINGLE.equals(action) ||
+
ActionProviderImpl.COMMAND_DEBUG_INTEGRATION_TEST_SINGLE.equals(action) ||
ActionProvider.COMMAND_PROFILE_TEST_SINGLE.equals(action)) {
-String test = config.getProperties().get("test");
+String test;
+if
(ActionProviderImpl.COMMAND_INTEGRATION_TEST_SINGLE.equals(action) ||
+
ActionProviderImpl.COMMAND_DEBUG_INTEGRATION_TEST_SINGLE.equals(action)) {
+test = config.getProperties().get("it.test"); //NOI18N
+} else {
+test = config.getProperties().get("test"); //NOI18N
+}
if (test != null) {
//#213783 when running tests validate that the test file
exists
FileObject origFile = config.getSelectedFileObject();
diff --git
a/java/maven/src/org/netbeans/modules/maven/execute/DefaultReplaceTokenProvider.java
b/java/maven/src/org/netbeans/modules/maven/execute/DefaultReplaceTokenProvider.java
index 18591d8..32d272c 100644
---
a/java/maven/src/org/netbeans/modules/maven/execute/DefaultReplaceTokenProvider.java
+++
b/java/maven/src/org/netbeans/modules/maven/execute/DefaultReplaceTokenProvider.java
@@ -29,6 +29,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import javax.swing.ActionMap;
import org.netbeans.api.annotations.common.CheckForNull;
import org.netbeans.api.java.project.JavaProjectConstants;
import org.netbeans.api.java.queries.UnitTestForSourceQuery;
@@ -38,6 +39,7 @@ import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectUtils;
import org.netbeans.api.project.SourceGroup;
import org.netbeans.api.project.Sources;
+import org.netbeans.modules.maven.ActionProviderImpl;
import org.netbeans.modules.maven.NbMavenProjectImpl;
import org.netbeans.modules.maven.api.NbMavenProject;
import org.netbeans.modules.maven.classpath.MavenSourcesImpl;
@@ -207,6 +209,7 @@ public class DefaultReplaceTokenProvider implements
ReplaceTokenProvider, Action
// not all of the selected files are under one source root, so
maybe they were
// selected from both source and test packages and "Test Files"
action was invoked on them?
if (ActionProvider.COMMAND_TEST_SINGLE.equals(act
[netbeans] branch master updated: Enable building on JDK17 (bump source to 1.8 in web.client.rest and profiler.j2ee)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing 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 2d337d0 Enable building on JDK17 (bump source to 1.8 in web.client.rest and profiler.j2ee) new 1b27f3b Merge pull request #3482 from matthiasblaesing/enable_building_jdk17 2d337d0 is described below commit 2d337d02c4bb6b8e6e4d1da1c8e9f171b6ad72fe Author: Matthias Bläsing AuthorDate: Thu Jan 20 20:35:23 2022 +0100 Enable building on JDK17 (bump source to 1.8 in web.client.rest and profiler.j2ee) --- enterprise/profiler.j2ee/nbproject/project.properties | 2 +- enterprise/web.client.rest/nbproject/project.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/enterprise/profiler.j2ee/nbproject/project.properties b/enterprise/profiler.j2ee/nbproject/project.properties index be3c351..b19cd08 100644 --- a/enterprise/profiler.j2ee/nbproject/project.properties +++ b/enterprise/profiler.j2ee/nbproject/project.properties @@ -16,7 +16,7 @@ # under the License. is.eager=true -javac.source=1.6 +javac.source=1.8 requires.nb.javac=true test-unit-sys-prop.java.awt.headless=true diff --git a/enterprise/web.client.rest/nbproject/project.properties b/enterprise/web.client.rest/nbproject/project.properties index a1d3d63..c9c500b 100644 --- a/enterprise/web.client.rest/nbproject/project.properties +++ b/enterprise/web.client.rest/nbproject/project.properties @@ -14,6 +14,6 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -javac.source=1.6 +javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial requires.nb.javac=true \ No newline at end of file - 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: Fix cluster splitting of RAT errors
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 bdc2106 Fix cluster splitting of RAT errors
new 4d4f09b Merge pull request #3404 from matthiasblaesing/fix_rat_report
bdc2106 is described below
commit bdc2106aa1168060b2d0802c0ceaa8bfe9fe9d72
Author: Matthias Bläsing
AuthorDate: Mon Jan 3 22:18:27 2022 +0100
Fix cluster splitting of RAT errors
Since the module directories were moved from the toplevel into
per-cluster folders, alls RAT violations were reported in the
"not cluster" cluster.
---
.../antsrc/org/netbeans/nbbuild/RatReportTask.java | 27 +-
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/RatReportTask.java
b/nbbuild/antsrc/org/netbeans/nbbuild/RatReportTask.java
index e32b247..88ab551 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/RatReportTask.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/RatReportTask.java
@@ -20,6 +20,7 @@ package org.netbeans.nbbuild;
import java.io.BufferedReader;
import java.io.File;
+import java.io.FileFilter;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -58,6 +59,13 @@ import org.xml.sax.SAXException;
*/
public class RatReportTask extends Task {
+private static final FileFilter DIRECTORY_FILTER = new FileFilter() {
+@Override
+public boolean accept(File file) {
+return file.isDirectory() && (! file.isHidden());
+}
+};
+
private File sourceFile;
private File root;
// not nice but to be last
@@ -92,8 +100,8 @@ public class RatReportTask extends Task {
@Override
public void execute() throws BuildException {
root = sourceFile.getParentFile().getParentFile().getParentFile();
-File[] modulesFolder = root.listFiles();
-String repository = "";
+File[] clusterFolders = root.listFiles(DIRECTORY_FILTER);
+String repository = null;
// get repository information from git
//try {
List commandAndArgs = new ArrayList<>();
@@ -123,8 +131,8 @@ public class RatReportTask extends Task {
// build map to get cluster and module related from cluster.properties
Set moduleDB = new HashSet<>();
Map> modulebycluster = new TreeMap<>();
-for (File module : modulesFolder) {
-if (module.isDirectory() && !module.isHidden()) {
+for (File clusterFolder : clusterFolders) {
+for(File module: clusterFolder.listFiles(DIRECTORY_FILTER)) {
moduleDB.add(module.getName());
moduleRATInfo.put(module.getName(), new ModuleInfo(module));
}
@@ -259,22 +267,19 @@ public class RatReportTask extends Task {
private String getModuleName(String resource) {
String moduleName;
-if (!resource.contains(File.separator)) {
+int firstSeparator = resource.indexOf(File.separator);
+int secondSeparator = resource.indexOf(File.separator, firstSeparator
+ 1);
+if (firstSeparator == -1 || secondSeparator == -1) {
moduleName = NOT_CLUSTER;
} else {
-moduleName = resource.substring(0,
resource.indexOf(File.separator));
+moduleName = resource.substring(firstSeparator + 1,
secondSeparator);
}
return moduleName;
}
class ModuleInfo {
-// approved resource list
-// very simple string for now.
-
private final Set approved = new HashSet<>();
-// unapproved resource list
private final Set unapproved = new HashSet<>();
-
private final Set external = new HashSet<>();
private final File folder;
-
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: Follow LSP specification for null value for startCharacter in FoldingRange
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 9ad251f Follow LSP specification for null value for startCharacter in
FoldingRange
new d528cc4 Merge pull request #3397 from matthiasblaesing/pr-3385
9ad251f is described below
commit 9ad251f671d0f6fd3a6f9d2d3fde28eb80dbc7f3
Author: Matthias Bläsing
AuthorDate: Wed Dec 29 21:33:37 2021 +0100
Follow LSP specification for null value for startCharacter in FoldingRange
The LSP specification specifies for the startCharacter:
The zero-based character offset from where the folded range starts. If
not defined, defaults to the length of the start line.
In contrast to the specification the first character was choosen as the
start of the fold, hiding for example the function name.
---
.../org/netbeans/modules/lsp/client/bindings/FoldManagerImpl.java | 8 +++-
.../netbeans/modules/lsp/client/bindings/FoldManagerImplTest.java | 6 +++---
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git
a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/FoldManagerImpl.java
b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/FoldManagerImpl.java
index f9fd065..427070c 100644
---
a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/FoldManagerImpl.java
+++
b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/FoldManagerImpl.java
@@ -136,7 +136,13 @@ public class FoldManagerImpl implements FoldManager,
BackgroundTask {
List infos = new ArrayList<>();
if (ranges != null) {
for (FoldingRange r : ranges) {
-int start = Utils.getOffset(doc, new
Position(r.getStartLine(), r.getStartCharacter() != null ?
r.getStartCharacter() : 0));
+int start;
+if(r.getStartCharacter() == null) {
+int endCharacter = Utils.getEndCharacter(doc,
r.getStartLine());
+start = Utils.getOffset(doc, new
Position(r.getStartLine(), endCharacter));
+} else {
+start = Utils.getOffset(doc, new
Position(r.getStartLine(), r.getStartCharacter()));
+}
int end;
if (r.getEndCharacter() == null) {
int endCharacter = Utils.getEndCharacter(doc,
r.getEndLine());
diff --git
a/ide/lsp.client/test/unit/src/org/netbeans/modules/lsp/client/bindings/FoldManagerImplTest.java
b/ide/lsp.client/test/unit/src/org/netbeans/modules/lsp/client/bindings/FoldManagerImplTest.java
index 449cbe0..d0c7b22 100644
---
a/ide/lsp.client/test/unit/src/org/netbeans/modules/lsp/client/bindings/FoldManagerImplTest.java
+++
b/ide/lsp.client/test/unit/src/org/netbeans/modules/lsp/client/bindings/FoldManagerImplTest.java
@@ -65,7 +65,7 @@ public class FoldManagerImplTest {
List infos = FoldManagerImpl.computeInfos(doc, ranges);
assertEquals(1, infos.size());
-assertEquals(0, infos.get(0).getStart());
+assertEquals(6, infos.get(0).getStart());
assertEquals(20, infos.get(0).getEnd());
}
@@ -121,10 +121,10 @@ public class FoldManagerImplTest {
assertNotNull(infos);
assertEquals(2, infos.size());
// first fold
-assertEquals(31, infos.get(0).getStart());
+assertEquals(51, infos.get(0).getStart());
assertEquals(103, infos.get(0).getEnd());
// second fold
-assertEquals(52, infos.get(1).getStart());
+assertEquals(59, infos.get(1).getStart());
assertEquals(67, infos.get(1).getEnd());
}
-
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated: [NETBEANS-6328] avoid IllegalArgumentException in FoldManagerImpl
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 b9590a7 [NETBEANS-6328] avoid IllegalArgumentException in
FoldManagerImpl
new 5b265f9 Merge pull request #3385 from MKuettner/lsp-improvements
b9590a7 is described below
commit b9590a77f48d51847d78d12695910a59948b3269
Author: MKuettner
AuthorDate: Wed Dec 22 11:02:30 2021 +0100
[NETBEANS-6328] avoid IllegalArgumentException in FoldManagerImpl
Extracts FoldInfo list computation into a new method in order to be
testable in unit tests. Adds some unit tests.
Introduces Utils.getEndCharacter(..) that gets last character index of
given line.
Changes FoldInfo calculation in case of FoldingRanges endCharacter is
NULL.
---
.../src/org/netbeans/modules/lsp/client/Utils.java | 10 ++
.../lsp/client/bindings/FoldManagerImpl.java | 41 +++---
.../lsp/client/bindings/FoldManagerImplTest.java | 150 +
3 files changed, 184 insertions(+), 17 deletions(-)
diff --git a/ide/lsp.client/src/org/netbeans/modules/lsp/client/Utils.java
b/ide/lsp.client/src/org/netbeans/modules/lsp/client/Utils.java
index d8f36fb..746eff4 100644
--- a/ide/lsp.client/src/org/netbeans/modules/lsp/client/Utils.java
+++ b/ide/lsp.client/src/org/netbeans/modules/lsp/client/Utils.java
@@ -79,6 +79,16 @@ public class Utils {
public static int getOffset(Document doc, Position pos) {
return LineDocumentUtils.getLineStartFromIndex((LineDocument) doc,
pos.getLine()) + pos.getCharacter();
}
+
+public static int getEndCharacter(Document doc, int line) {
+int start = LineDocumentUtils.getLineStartFromIndex((LineDocument)
doc, line);
+try {
+return LineDocumentUtils.getLineEnd((LineDocument) doc, start) -
start;
+} catch (BadLocationException ex) {
+Exceptions.printStackTrace(ex);
+}
+return 0;
+}
public static void applyWorkspaceEdit(WorkspaceEdit edit) {
if (edit.getDocumentChanges() != null) {
diff --git
a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/FoldManagerImpl.java
b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/FoldManagerImpl.java
index 168a009..f9fd065 100644
---
a/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/FoldManagerImpl.java
+++
b/ide/lsp.client/src/org/netbeans/modules/lsp/client/bindings/FoldManagerImpl.java
@@ -113,23 +113,40 @@ public class FoldManagerImpl implements FoldManager,
BackgroundTask {
EditorCookie ec = file.getLookup().lookup(EditorCookie.class);
Document doc = ec != null ? ec.getDocument() : null;
if (doc == null) {
-return ;
+return;
}
-Set foldingRangesSeen = new HashSet<>();
+
List ranges = computeRanges(bindings, file);
+List infos = computeInfos(doc, ranges);
+SwingUtilities.invokeLater(() -> {
+doc.render(() -> {
+operation.getHierarchy().render(() -> {
+try {
+operation.update(infos, null, null);
+} catch (BadLocationException ex) {
+LOG.log(Level.FINE, null, ex);
+}
+});
+});
+});
+}
+
+static List computeInfos(Document doc, List
ranges) {
+Set foldingRangesSeen = new HashSet<>();
List infos = new ArrayList<>();
if (ranges != null) {
for (FoldingRange r : ranges) {
int start = Utils.getOffset(doc, new
Position(r.getStartLine(), r.getStartCharacter() != null ?
r.getStartCharacter() : 0));
int end;
if (r.getEndCharacter() == null) {
-end = Utils.getOffset(doc, new Position(r.getEndLine() +
1, 0)) - 1;
+int endCharacter = Utils.getEndCharacter(doc,
r.getEndLine());
+end = Utils.getOffset(doc, new Position(r.getEndLine(),
endCharacter));
} else {
end = Utils.getOffset(doc, new Position(r.getEndLine(),
r.getEndCharacter()));
}
// Map the fold range type to netbeans as far as possible
FoldType foldType;
-if("comment".equals(r.getKind())) {
+if ("comment".equals(r.getKind())) {
foldType = FoldType.COMMENT;
} else if ("imports".equals(r.getKind())) {
foldType = FoldType.IMPORT;
@@ -137,25 +154,15 @@ public class FoldManagerImpl implements FoldManager,
BackgroundTask {
foldType = FoldType.CODE_BLOCK;
}
FoldingRang
[netbeans] branch master updated: [NETBEANS-5901] Handling of FileObjects not backed by j.i.File when sorting by full path is requested.
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 923c632 [NETBEANS-5901] Handling of FileObjects not backed by
j.i.File when sorting by full path is requested.
new dcc34cd Merge pull request #3134 from jlahoda/NETBEANS-5901
923c632 is described below
commit 923c6327932632ee50959b082eac828c97d679db
Author: Jan Lahoda
AuthorDate: Fri Aug 27 18:06:14 2021 +0200
[NETBEANS-5901] Handling of FileObjects not backed by j.i.File when sorting
by full path is requested.
---
.../netbeans/core/windows/model/DefaultModeModel.java | 19 ++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git
a/platform/core.windows/src/org/netbeans/core/windows/model/DefaultModeModel.java
b/platform/core.windows/src/org/netbeans/core/windows/model/DefaultModeModel.java
index 9b9bda1..124b876 100644
---
a/platform/core.windows/src/org/netbeans/core/windows/model/DefaultModeModel.java
+++
b/platform/core.windows/src/org/netbeans/core/windows/model/DefaultModeModel.java
@@ -22,6 +22,7 @@ package org.netbeans.core.windows.model;
import java.awt.*;
+import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -232,7 +233,23 @@ final class DefaultModeModel implements ModeModel {
}
private int compareFullFilePath(FileObject f1, FileObject f2) {
-return FileUtil.toFile(f1).compareTo(FileUtil.toFile(f2));
+return toFullFilePath(f1).compareToIgnoreCase(toFullFilePath(f2));
+}
+
+private String toFullFilePath(FileObject fo) {
+File f = FileUtil.toFile(fo);
+
+if (f != null) {
+return f.getAbsolutePath();
+}
+
+FileObject rootFO = FileUtil.getArchiveFile(fo);
+
+if (rootFO != null) {
+return toFullFilePath(rootFO) + "/" + fo.getPath();
+}
+
+return fo.toURL().getPath();
}
private int compareFileName(FileObject f1, FileObject f2) {
-
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: Fix html.angular, js2.editor, js2.nodejs and js2.requirejs tests
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 94b143d Fix html.angular, js2.editor, js2.nodejs and js2.requirejs
tests
new 3f5ad07 Merge pull request #3389 from matthiasblaesing/js_test
94b143d is described below
commit 94b143d8bc06e689bf5f0253f76017ac3dc316ec
Author: Matthias Bläsing
AuthorDate: Mon Dec 27 15:35:53 2021 +0100
Fix html.angular, js2.editor, js2.nodejs and js2.requirejs tests
1) The tests, that rely on information from the JS classpath (stub
definitions fail if classpath scanning is still in progress, so this
change forces repository updates to happen and delay test running
until scanning is done.
2) Changes to test input cause golden files to be out of sync. Align
input and golden files to match.
Tests were not actives for travis or github as execution takes to long.
---
.../test/unit/data/testfiles/with/test01.js| 4 +-
.../with/test01.js.testWith_01.occurrences | 2 +-
.../with/test01.js.testWith_02.occurrences | 4 +-
.../with/test01.js.testWith_03.occurrences | 4 +-
.../modules/javascript2/editor/JsTestBase.java | 72 +-
.../modules/javascript2/editor/JsWithFastTest.java | 6 +-
.../modules/javascript2/editor/JsWithTest.java | 2 +-
7 files changed, 82 insertions(+), 12 deletions(-)
diff --git
a/webcommon/javascript2.editor/test/unit/data/testfiles/with/test01.js
b/webcommon/javascript2.editor/test/unit/data/testfiles/with/test01.js
index 9dc3298..5707a9f 100644
--- a/webcommon/javascript2.editor/test/unit/data/testfiles/with/test01.js
+++ b/webcommon/javascript2.editor/test/unit/data/testfiles/with/test01.js
@@ -1,7 +1,7 @@
var roman = new Man("Roman", "Php");
roman.getFirstName();
-console.log();
+console.log();
with(roman) {
- console.log(getFirstName());
+console.log(getFirstName());
}
\ No newline at end of file
diff --git
a/webcommon/javascript2.editor/test/unit/data/testfiles/with/test01.js.testWith_01.occurrences
b/webcommon/javascript2.editor/test/unit/data/testfiles/with/test01.js.testWith_01.occurrences
index 0dda9bb..9e2e8b6 100644
---
a/webcommon/javascript2.editor/test/unit/data/testfiles/with/test01.js.testWith_01.occurrences
+++
b/webcommon/javascript2.editor/test/unit/data/testfiles/with/test01.js.testWith_01.occurrences
@@ -1,2 +1,2 @@
roman.|>MARK_OCCURRENCES:getFirstName<|();
- console.log(|>MARK_OCCURRENCES:getFirst^Name<|());
+console.log(|>MARK_OCCURRENCES:getFirst^Name<|());
diff --git
a/webcommon/javascript2.editor/test/unit/data/testfiles/with/test01.js.testWith_02.occurrences
b/webcommon/javascript2.editor/test/unit/data/testfiles/with/test01.js.testWith_02.occurrences
index 00ea534..34297ad 100644
---
a/webcommon/javascript2.editor/test/unit/data/testfiles/with/test01.js.testWith_02.occurrences
+++
b/webcommon/javascript2.editor/test/unit/data/testfiles/with/test01.js.testWith_02.occurrences
@@ -1,2 +1,2 @@
-console.|>MARK_OCCURRENCES:log<|();
- console.|>MARK_OCCURRENCES:l^og<|(getFirstName());
+console.|>MARK_OCCURRENCES:log<|();
+console.|>MARK_OCCURRENCES:l^og<|(getFirstName());
\ No newline at end of file
diff --git
a/webcommon/javascript2.editor/test/unit/data/testfiles/with/test01.js.testWith_03.occurrences
b/webcommon/javascript2.editor/test/unit/data/testfiles/with/test01.js.testWith_03.occurrences
index 50fa5a8..1383b45 100644
---
a/webcommon/javascript2.editor/test/unit/data/testfiles/with/test01.js.testWith_03.occurrences
+++
b/webcommon/javascript2.editor/test/unit/data/testfiles/with/test01.js.testWith_03.occurrences
@@ -1,2 +1,2 @@
-|>MARK_OCCURRENCES:console<|.log();
- |>MARK_OCCURRENCES:conso^le<|.log(getFirstName());
+|>MARK_OCCURRENCES:console<|.log();
+|>MARK_OCCURRENCES:conso^le<|.log(getFirstName());
diff --git
a/webcommon/javascript2.editor/test/unit/src/org/netbeans/modules/javascript2/editor/JsTestBase.java
b/webcommon/javascript2.editor/test/unit/src/org/netbeans/modules/javascript2/editor/JsTestBase.java
index f6c548c..679e9b7 100644
---
a/webcommon/javascript2.editor/test/unit/src/org/netbeans/modules/javascript2/editor/JsTestBase.java
+++
b/webcommon/javascript2.editor/test/unit/src/org/netbeans/modules/javascript2/editor/JsTestBase.java
@@ -19,12 +19,15 @@
package org.netbeans.modules.javascript2.editor;
+import java.net.URL;
import java.util.Collections;
import java.util.Set;
import org.netbeans.lib.lexer.test.TestLanguageProvider;
import org.netbeans.modules.csl.api.test.CslTestBase;
import org.netbeans.modules.csl.spi.DefaultLanguageConfig;
import org.netbeans.modules.javascript2.lexer.ap
[netbeans] branch master updated (5c7b739 -> a08e35c)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git.
from 5c7b739 Merge pull request #3383 from
sdedic/vscode/projectview-action-fixes
new 128eeb5 Fixing the configure hint sub-fix to work more properly for
per-project hint settings.
new e4b621e Merge branch 'master' into pr-3147
new a08e35c Merge pull request #3388 from matthiasblaesing/pr-3147
The 6351 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:
.../settings/FileHintPreferencesProviderImpl.java | 31 ++
.../settings/OpenGlobalPreferencesImpl.java} | 21 +--
ide/spi.editor.hints/apichanges.xml| 12 +
ide/spi.editor.hints/manifest.mf | 2 +-
.../friend/FileHintPreferencesProvider.java| 3 ++-
...cesProvider.java => OpenGlobalPreferences.java} | 10 ++-
.../editor/hints/settings/FileHintPreferences.java | 25 +
.../spi/java/hints/ErrorDescriptionFactory.java| 17 +++-
8 files changed, 96 insertions(+), 25 deletions(-)
copy
ide/{spi.editor.hints/src/org/netbeans/modules/editor/hints/settings/friend/FileHintPreferencesProvider.java
=>
spi.editor.hints.projects/src/org/netbeans/modules/editor/hints/projects/settings/OpenGlobalPreferencesImpl.java}
(59%)
copy
ide/spi.editor.hints/src/org/netbeans/modules/editor/hints/settings/friend/{FileHintPreferencesProvider.java
=> OpenGlobalPreferences.java} (77%)
-
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: Removed obsolete permgen flags.
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 afc6dff Removed obsolete permgen flags.
new e3711b1 Merge pull request #3372 from mbien/permgen
afc6dff is described below
commit afc6dff353704a56314b5ae23c12831e1348764f
Author: Michael Bien
AuthorDate: Wed Dec 15 05:00:51 2021 +0100
Removed obsolete permgen flags.
---
.../modules/glassfish/tooling/GlassFish.properties-dist | 2 +-
.../glassfish/tooling/server/ServerTasksTest.java| 2 +-
.../netbeans/modules/payara/tooling/Payara.properties| 2 +-
enterprise/performance.javaee/build.xml | 2 +-
enterprise/performance.scripting/build.xml | 2 +-
enterprise/performance.web/build.xml | 2 +-
ide/ide.kit/test/whitelist/build.xml | 6 +++---
java/java.kit/nbproject/project.properties | 2 +-
.../modules/maven/api/customizer/ModelHandle2Test.java | 6 +++---
java/performance.java/build.xml | 2 +-
.../src/folders/xmlFolder100/build.xml | 2 +-
.../src/folders/xmlFolder100/build_1.xml | 2 +-
.../src/folders/xmlFolder100/build_1_1.xml | 2 +-
.../src/folders/xmlFolder100/build_1_1_1.xml | 2 +-
.../src/folders/xmlFolder100/build_1_2.xml | 2 +-
.../src/folders/xmlFolder100/build_2.xml | 2 +-
.../src/folders/xmlFolder100/build_2_1.xml | 2 +-
.../src/folders/xmlFolder100/build_3.xml | 2 +-
java/performance/build.xml | 2 +-
java/performance/cnd/build.xml | 2 +-
java/performance/enterprise/build.xml| 2 +-
java/performance/hudson/netbeans.conf| 16 +---
java/performance/mobility/build.xml | 2 +-
.../netbeans/modules/performance/resources/netbeans.conf | 10 ++
nbbuild/hudson/round-robin-push | 2 +-
.../installer/utils/applications/NetBeansUtils.java | 2 +-
nbbuild/newbuild/init.sh | 2 +-
nbbuild/templates/projectized.xml| 2 +-
nbbuild/testdist/release/one-module.xml | 6 +-
platform/o.n.core/nbproject/project.properties | 4 +---
.../core/validation/ValidateClassLinkageTest.java| 1 -
profiler/profiler/build.xml | 2 +-
32 files changed, 40 insertions(+), 59 deletions(-)
diff --git
a/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/GlassFish.properties-dist
b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/GlassFish.properties-dist
index 09cf219..abe9788 100644
---
a/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/GlassFish.properties-dist
+++
b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/GlassFish.properties-dist
@@ -19,4 +19,4 @@ adminUser=admin
adminPassword=admin123
domainName=test
glassFishArgs=-domain test
-javaArgs=-XX:MaxPermSize=192m -XX:PermSize=64m -client
+javaArgs=
diff --git
a/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/ServerTasksTest.java
b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/ServerTasksTest.java
index de54181..ff8ba20 100644
---
a/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/ServerTasksTest.java
+++
b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/server/ServerTasksTest.java
@@ -51,7 +51,7 @@ public class ServerTasksTest extends CommonTest {
gfServer = createGlassfishServer();
args = new StartupArgs() {
-private List javaArgs = Arrays.asList("-Xms128m",
"-XX:PermSize=96m", "-Dtest=true");
+private List javaArgs = Arrays.asList("-Xms128m",
"-Dtest=true");
private List glassfishArgs = Arrays.asList("--domaindir "
+ gfServer.getDomainsFolder() + File.separator + gfServer.getDomainName(),
"--domain " + gfServer.getDomainName());
private HashMap envVars;
diff --git
a/enterprise/payara.tooling/test/unit/src/org/netbeans/modules/payara/tooling/Payara.properties
b/enterprise/payara.tooling/test/unit/src/org/netbeans/modules/payara/tooling/Payara.properties
index 698f568..3f04743 100644
---
a/enterprise/payara.tooling/test/unit/src/org/netbeans/modules/payara/tooling/Payara.properties
+++
b/enterprise/payara.tooling/test/unit/src/org/netbeans/modules/payara/tool
[netbeans] branch master updated (72fc8f3 -> 6432134)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git.
from 72fc8f3 Merge pull request #3359 from matthiasblaesing/css_parser_fix
new 3c2281e Upgrade to Apache Maven 3.8.4
new b5b45e3 Upgrade to Apache Maven 3.8.4: Adjust to DefaultModelBuilder
changes
new d4b4f5f Stabilize ShellConstructorTest and RunJarStartupArgsTest on
JDK 9+
new 6432134 Merge pull request #3328 from ebarboni/maven384
The 6327 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../external/apache-maven-3.6.3-jsoup-license.txt | 28 --
.../apache-maven-3.6.3-jsr-250-license.txt | 390 -
...ense.txt => apache-maven-3.8.4-bin-license.txt} | 2 +-
...otice.txt => apache-maven-3.8.4-bin-notice.txt} | 4 +-
...ense.txt => apache-maven-3.8.4-epl-license.txt} | 6 +-
...se.txt => apache-maven-3.8.4-slf4j-license.txt} | 4 +-
java/maven.embedder/external/binaries-list | 2 +-
java/maven.embedder/external/binariesembedded-list | 72 ++--
java/maven.embedder/nbproject/project.properties | 2 +-
java/maven.embedder/nbproject/project.xml | 78 ++---
.../maven/embedder/impl/NBModelBuilder.java| 34 +-
.../maven/execute/cmd/ShellConstructorTest.java| 89 ++---
.../maven/runjar/RunJarStartupArgsTest.java| 4 +-
.../org/netbeans/nbbuild/extlibs/ignored-overlaps | 9 +-
14 files changed, 158 insertions(+), 566 deletions(-)
delete mode 100644
java/maven.embedder/external/apache-maven-3.6.3-jsoup-license.txt
delete mode 100644
java/maven.embedder/external/apache-maven-3.6.3-jsr-250-license.txt
rename java/maven.embedder/external/{apache-maven-3.6.3-bin-license.txt =>
apache-maven-3.8.4-bin-license.txt} (99%)
rename java/maven.embedder/external/{apache-maven-3.6.3-bin-notice.txt =>
apache-maven-3.8.4-bin-notice.txt} (97%)
rename java/maven.embedder/external/{apache-maven-3.6.3-epl-license.txt =>
apache-maven-3.8.4-epl-license.txt} (97%)
rename java/maven.embedder/external/{apache-maven-3.6.3-slf4j-license.txt =>
apache-maven-3.8.4-slf4j-license.txt} (92%)
-
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated (2388352 -> 72fc8f3)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git.
from 2388352 Merge pull request #3373 from t-oster/feature-sass-default
new d5149f3 [NETBEANS-5449] Support namespaced variables in SCSS files
new 64a623e [NETBEANS-2005] Add definitions from CSS Box Alignment module
new f1b3e72 [NETBEANS-6063] Fix property mapping for CSS Fragmentation
module
new 72fc8f3 Merge pull request #3359 from matthiasblaesing/css_parser_fix
The 6323 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ide/css.editor/external/binaries-list |2 +-
ide/css.editor/external/css3-spec-howtocreate.txt |4 +-
.../css/editor/module/main/Bundle.properties |4 +-
.../editor/module/main/DefaultCssEditorModule.java | 46 +-
.../module/main/properties/alignment.properties| 55 +
.../properties/backgrounds_and_borders.properties |6 +-
.../main/properties/flexible_box_layout.properties | 10 -
...d_media.properties => fragmentation.properties} | 21 +-
.../main/properties/multi-column_layout.properties | 20 +-
.../module/main/properties/paged_media.properties |7 -
.../editor/module/main/AlignmentModuleTest.java| 44 +
.../module/main/FlexibleBoxLayoutModuleTest.java |1 +
.../editor/module/main/MultiColumnLayoutTest.java | 29 +-
.../src/org/netbeans/modules/css/lib/Css3.g|4 +-
.../org/netbeans/modules/css/lib/Css3Lexer.java| 1162 +--
.../org/netbeans/modules/css/lib/Css3Parser.java | 8578 ++--
.../css/lib/api/properties/PropertyCategory.java | 30 +-
.../modules/css/lib/Css3ParserScssTest.java| 140 +-
18 files changed, 5288 insertions(+), 4875 deletions(-)
create mode 100644
ide/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/alignment.properties
copy
ide/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/{paged_media.properties
=> fragmentation.properties} (65%)
create mode 100644
ide/css.editor/test/unit/src/org/netbeans/modules/css/editor/module/main/AlignmentModuleTest.java
-
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated: Change default value of nb.sass.libsass to TRUE, so modern dart sass can be used by default. #1234
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 baaefd5 Change default value of nb.sass.libsass to TRUE, so modern
dart sass can be used by default. #1234
new 2388352 Merge pull request #3373 from t-oster/feature-sass-default
baaefd5 is described below
commit baaefd56828170f1c01db16ae3406c1e971f67e1
Author: Thomas Oster
AuthorDate: Wed Dec 15 11:20:16 2021 +0100
Change default value of nb.sass.libsass to TRUE, so modern dart sass can be
used by default. #1234
---
ide/css.prep/src/org/netbeans/modules/css/prep/sass/SassCli.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/ide/css.prep/src/org/netbeans/modules/css/prep/sass/SassCli.java
b/ide/css.prep/src/org/netbeans/modules/css/prep/sass/SassCli.java
index 69bd892..0a97f22 100644
--- a/ide/css.prep/src/org/netbeans/modules/css/prep/sass/SassCli.java
+++ b/ide/css.prep/src/org/netbeans/modules/css/prep/sass/SassCli.java
@@ -51,9 +51,10 @@ public abstract class SassCli {
// #247890
/**
- * System property to be set to "true" if libsass should be used.
+ * System property to be set to "false" if libsass should be not
be used
+ * for legacy RubySass implementation
(https://github.com/apache/netbeans/pull/1234)
*/
-private static final boolean USE_LIBSASS =
Boolean.getBoolean("nb.sass.libsass"); // NOI18N
+private static final boolean USE_LIBSASS =
Boolean.parseBoolean(System.getProperty("nb.sass.libsass", "true")); // NOI18N
// version of the compiler set in ide options
@NullAllowed
-
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: Changes required to build the java cluster on JDK 17.
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing 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 bf8c26d Changes required to build the java cluster on JDK 17. new b5329ca Merge pull request #3278 from mbien/jdk17 bf8c26d is described below commit bf8c26d91ea20cb7bf29b4510938f572f2202034 Author: Michael Bien AuthorDate: Tue Nov 30 22:57:16 2021 +0100 Changes required to build the java cluster on JDK 17. - java cluster source version bump to 1.8 in properties. - java cluster source version bump to release=8 in ant files. - keystore command requires "-keyalg" to be set on modern JDKs. - fixed NPE in nb-javac ant task when only 'release' is specified. - updated test, 1.8 is now the default. --- .../project/queries/SourceLevelQueryImplTest.java | 2 +- extide/o.apache.tools.ant.module/build.xml | 2 +- harness/apisupport.harness/build.xml | 2 +- .../nbproject/project.properties | 2 +- harness/jemmy/nbproject/project.properties | 2 +- harness/libs.nbi.ant/nbproject/project.properties | 4 ++- .../libs.nbi.engine/nbproject/project.properties | 2 +- ide/csl.api/anttask/build.xml | 2 +- ide/db/build.xml | 4 +-- java/ant.browsetask/build.xml | 2 +- java/debugger.jpda.ant/build.xml | 2 +- java/form.nb/nbproject/project.properties | 2 +- java/form.refactoring/nbproject/project.properties | 2 +- java/form/nbproject/project.properties | 2 +- java/i18n/nbproject/project.properties | 2 +- java/j2ee.metadata/nbproject/project.properties| 2 +- java/java.source.ant/build.xml | 2 +- .../nbproject/project.properties | 2 +- java/java.testrunner/nbproject/project.properties | 2 +- .../AntTasks/nbproject/project.properties | 2 +- java/javawebstart/nbproject/project.properties | 2 +- java/junit/nbproject/project.properties| 2 +- java/maven.checkstyle/nbproject/project.properties | 2 +- java/maven.coverage/nbproject/project.properties | 2 +- java/maven.hints/nbproject/project.properties | 2 +- java/maven.indexer.ui/nbproject/project.properties | 2 +- java/maven.junit/nbproject/project.properties | 2 +- java/maven.kit/nbproject/project.properties| 2 +- java/maven.osgi/nbproject/project.properties | 2 +- .../maven.persistence/nbproject/project.properties | 2 +- .../maven.refactoring/nbproject/project.properties | 2 +- java/maven.search/nbproject/project.properties | 3 +- java/maven.spring/nbproject/project.properties | 3 +- java/websvc.jaxws21/nbproject/project.properties | 2 +- .../websvc.jaxws21api/nbproject/project.properties | 2 +- java/xml.jaxb/nbproject/project.properties | 2 +- .../javafx2.platform/nbproject/project.properties | 3 +- .../nbproject/project.properties | 5 ++- nb/updatecenters/build.xml | 2 +- .../antsrc/org/netbeans/nbbuild/CustomJavac.java | 41 +- nbi/engine/build.xml | 9 ++--- .../build/.ant-lib/nbproject/project.properties| 2 +- .../nbproject/project.properties | 2 +- .../file-renamer/nbproject/project.properties | 2 +- .../port-occupation/nbproject/project.properties | 2 +- platform/applemenu/nbproject/project.properties| 5 +-- .../nbproject/project.properties | 2 +- .../nbproject/project.properties | 3 +- .../maven.profiler/nbproject/project.properties| 2 +- profiler/profiler.api/nbproject/project.properties | 2 +- .../profiler.freeform/nbproject/project.properties | 3 +- .../profiler.j2se/nbproject/project.properties | 2 +- profiler/profiler.kit/nbproject/project.properties | 3 +- profiler/profiler.nbimpl/build.xml | 2 +- .../profiler.nbimpl/nbproject/project.properties | 2 +- .../profiler.nbmodule/nbproject/project.properties | 3 +- .../nbproject/project.properties | 3 +- .../profiler.ppoints/nbproject/project.properties | 2 +- .../nbproject/project.properties | 3 +- .../nbproject/project.properties | 3 +- .../nbproject/project.properties | 2 +- .../nbproject/project.properties | 2 +- .../javascript2.react/nbproject/project.properties | 2 +- webcommon/libs.jstestdriver/build.xml | 2 +- .../libs.jstestdriver/nbproject/project.properties | 2 +- webcommon/netserver/nbproject/project.properties | 2 +- .../web.client.kit/nbproject/project.properties| 2 +- webcommon/web.inspect
[netbeans] branch master updated: Deactivate broken xmlretriever test (client cert expired and a new one is not yet issued)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 8f4019e Deactivate broken xmlretriever test (client cert expired and
a new one is not yet issued)
new 25f3d12 Merge pull request #3339 from
matthiasblaesing/broken_xmlretriever_test
8f4019e is described below
commit 8f4019ecd262c6c7776bf4844887c09a3394b903
Author: Matthias Bläsing
AuthorDate: Sat Nov 27 18:13:35 2021 +0100
Deactivate broken xmlretriever test (client cert expired and a new one is
not yet issued)
---
.../modules/xml/retriever/impl/SecureURLResourceRetrieverTest.java | 2 ++
1 file changed, 2 insertions(+)
diff --git
a/ide/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/impl/SecureURLResourceRetrieverTest.java
b/ide/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/impl/SecureURLResourceRetrieverTest.java
index c774386..cac3f8f 100644
---
a/ide/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/impl/SecureURLResourceRetrieverTest.java
+++
b/ide/xml.retriever/test/unit/src/org/netbeans/modules/xml/retriever/impl/SecureURLResourceRetrieverTest.java
@@ -22,6 +22,7 @@ import javax.net.ssl.SSLHandshakeException;
import static junit.framework.TestCase.assertFalse;
import static junit.framework.TestCase.assertTrue;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
import org.netbeans.junit.MockServices;
import org.openide.util.Lookup;
@@ -77,6 +78,7 @@ public class SecureURLResourceRetrieverTest {
}
@Test
+@Ignore("Client certificate expired and administrator of badssl.com has
not issued updated certificates")
public void shouldUseKeyStoreFromSystemProperties() throws Exception {
System.setProperty("javax.net.debug", "ssl,keystore");
System.setProperty("javax.net.ssl.keyStore",
SecureURLResourceRetrieverTest.class.getResource("badssl.com-client.p12").getPath());
-
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated: [NETBEANS-5783] Testcase checking Gradle ProjectInfo never return null
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 7f5ee38 [NETBEANS-5783] Testcase checking Gradle ProjectInfo never
return null
new 72bd08f Merge pull request #3319 from lkishalmi/NETBEANS-5783-2
7f5ee38 is described below
commit 7f5ee387711ddb9262fb05802dff41467a55db04
Author: Laszlo Kishalmi
AuthorDate: Sat Nov 13 07:34:41 2021 -0800
[NETBEANS-5783] Testcase checking Gradle ProjectInfo never return null
---
.../netbeans/modules/gradle/queries/InfoTest.java | 62 ++
1 file changed, 62 insertions(+)
diff --git
a/extide/gradle/test/unit/src/org/netbeans/modules/gradle/queries/InfoTest.java
b/extide/gradle/test/unit/src/org/netbeans/modules/gradle/queries/InfoTest.java
new file mode 100644
index 000..b3d524e
--- /dev/null
+++
b/extide/gradle/test/unit/src/org/netbeans/modules/gradle/queries/InfoTest.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.gradle.queries;
+
+import org.junit.Test;
+import org.netbeans.api.project.ProjectManager;
+import org.netbeans.api.project.ProjectUtils;
+import org.netbeans.modules.gradle.AbstractGradleProjectTestCase;
+import org.netbeans.modules.gradle.NbGradleProjectImpl;
+import org.openide.filesystems.FileObject;
+
+/**
+ *
+ * @author lkishalmi
+ */
+public class InfoTest extends AbstractGradleProjectTestCase {
+
+public InfoTest(String name) {
+super(name);
+}
+
+/**
+ * Test of getName method, of class Info.
+ */
+@Test
+public void testGetName() throws Exception {
+FileObject f = createGradleProject(null, "", "rootProjectName =
'test'");
+NbGradleProjectImpl p = (NbGradleProjectImpl)
ProjectManager.getDefault().findProject(f);
+dumpProject(p);
+assertFalse(p.isGradleProjectLoaded());
+assertNotNull(ProjectUtils.getInformation(p).getName());
+}
+
+/**
+ * Test of getDisplayName method, of class Info.
+ */
+@Test
+public void testGetDisplayName() throws Exception {
+FileObject f = createGradleProject(null, "", "rootProjectName =
'test'");
+NbGradleProjectImpl p = (NbGradleProjectImpl)
ProjectManager.getDefault().findProject(f);
+dumpProject(p);
+assertFalse(p.isGradleProjectLoaded());
+assertNotNull(ProjectUtils.getInformation(p).getDisplayName());
+}
+
+}
-
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: Rewrote "String::replaceAll with dot" inspection to apply to more methods and regex control characters.
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 ddf958d Rewrote "String::replaceAll with dot" inspection to apply to
more methods and regex control characters.
new 23437da Merge pull request #3218 from mbien/split
ddf958d is described below
commit ddf958dac900f776afeb8d1d19e93755c5e4212c
Author: Michael Bien
AuthorDate: Wed Oct 6 23:50:44 2021 +0200
Rewrote "String::replaceAll with dot" inspection to apply to more methods
and regex control characters.
---
.../modules/java/hints/bugs/Bundle.properties | 9 ++--
.../org/netbeans/modules/java/hints/bugs/Tiny.java | 52 ++
.../modules/java/hints/bugs/Bundle_test.properties | 4 +-
.../netbeans/modules/java/hints/bugs/TinyTest.java | 32 +++--
4 files changed, 79 insertions(+), 18 deletions(-)
diff --git
a/java/java.hints/src/org/netbeans/modules/java/hints/bugs/Bundle.properties
b/java/java.hints/src/org/netbeans/modules/java/hints/bugs/Bundle.properties
index aca26e7..aa59c26 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/bugs/Bundle.properties
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/bugs/Bundle.properties
@@ -25,10 +25,11 @@ DN_AnnotationsNotRuntime_instanceof={0} does not have
runtime Retention, the con
DN_org.netbeans.modules.java.hints.bugs.AnnotationsNotRuntime=Annotations
without runtime Retention
DESC_org.netbeans.modules.java.hints.bugs.AnnotationsNotRuntime=Warns about
reflective access to annotations with CLASS or SOURCE retentions
-DN_org.netbeans.modules.java.hints.bugs.Tiny.stringReplaceAllDot=String.replaceAll(".",
)
-DESC_org.netbeans.modules.java.hints.bugs.Tiny.stringReplaceAllDot=Finds
occurrences of calls to String.replaceAll(".", $target), which would replace
all characters of the source string with $target.
-ERR_string-replace-all-dot=Call to String.replaceAll(".", $target) is probably
undesired
-FIX_string-replace-all-dot=Replace with call to String.replaceAll("\\.",
$target)
+DN_org.netbeans.modules.java.hints.bugs.Tiny.singleCharRegex=Single Char Regex
+DESC_org.netbeans.modules.java.hints.bugs.Tiny.singleCharRegex=Finds
occurrences of single regex control characters \
+used as parameter for methods expecting regular expressions and quotes
those.
+ERR_single-char-regex=Using a single regex control character as regex is
probably undesired
+FIX_single-char-regex=Escape character for regex usage
DN_org.netbeans.modules.java.hints.bugs.CastVSInstanceOf=Incompatible
cast/instanceof
DESC_org.netbeans.modules.java.hints.bugs.CastVSInstanceOf=Incompatible cast
surrounded with incompatible instanceof
diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/bugs/Tiny.java
b/java/java.hints/src/org/netbeans/modules/java/hints/bugs/Tiny.java
index fcd1eb2..149bf3c 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/bugs/Tiny.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/bugs/Tiny.java
@@ -29,6 +29,7 @@ import com.sun.source.tree.ForLoopTree;
import com.sun.source.tree.IfTree;
import com.sun.source.tree.LabeledStatementTree;
import com.sun.source.tree.LineMap;
+import com.sun.source.tree.LiteralTree;
import com.sun.source.tree.MemberSelectTree;
import com.sun.source.tree.MethodInvocationTree;
import com.sun.source.tree.SwitchTree;
@@ -91,18 +92,53 @@ import org.openide.util.NbBundle.Messages;
})
public class Tiny {
-@Hint(displayName =
"#DN_org.netbeans.modules.java.hints.bugs.Tiny.stringReplaceAllDot",
description =
"#DESC_org.netbeans.modules.java.hints.bugs.Tiny.stringReplaceAllDot",
category="bugs", suppressWarnings="ReplaceAllDot")
-@TriggerPattern(value="$str.replaceAll(\".\", $to)",
-constraints=@ConstraintVariableType(variable="$str",
type="java.lang.String"))
-public static ErrorDescription stringReplaceAllDot(HintContext ctx) {
+@Hint(displayName =
"#DN_org.netbeans.modules.java.hints.bugs.Tiny.singleCharRegex", description =
"#DESC_org.netbeans.modules.java.hints.bugs.Tiny.singleCharRegex",
category="bugs", suppressWarnings="SingleCharRegex")
+@TriggerPatterns({
+@TriggerPattern(value="$str.replaceAll($pattern, $to)",
+constraints = {
+@ConstraintVariableType(variable="$str",
type="java.lang.String"),
+@ConstraintVariableType(variable="$pattern",
type="java.lang.String") }),
+@TriggerPattern(value = "$str.replaceFirst($pattern, $repl)",
+constraints = {
+@ConstraintVariable
[netbeans] branch master updated: Handle invalid package.json only containing a single string
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 6b6b6f9 Handle invalid package.json only containing a single string
new 735dcf7 Merge pull request #3318 from
matthiasblaesing/client_project_catch_exception
6b6b6f9 is described below
commit 6b6b6f9d8e8fe3ab9c2f849f855f2095d21b500c
Author: Matthias Bläsing
AuthorDate: Fri Nov 12 22:18:41 2021 +0100
Handle invalid package.json only containing a single string
If package.json is a string (invalid format) a ClassCastException is
raised and not a ParseException. The ClassCastException should be
handled identically to the other fatal exceptions.
---
.../netbeans/modules/web/clientproject/ClientSideProjectConvertor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/webcommon/web.clientproject/src/org/netbeans/modules/web/clientproject/ClientSideProjectConvertor.java
b/webcommon/web.clientproject/src/org/netbeans/modules/web/clientproject/ClientSideProjectConvertor.java
index f694a57..b2fc53e 100644
---
a/webcommon/web.clientproject/src/org/netbeans/modules/web/clientproject/ClientSideProjectConvertor.java
+++
b/webcommon/web.clientproject/src/org/netbeans/modules/web/clientproject/ClientSideProjectConvertor.java
@@ -109,7 +109,7 @@ public final class ClientSideProjectConvertor implements
ProjectConvertor {
if (name instanceof String) {
return (String) name;
}
-} catch (ParseException | IOException ex) {
+} catch (ParseException | IOException | ClassCastException ex) {
LOGGER.log(Level.FINE, jsonFile.getPath(), ex);
}
return null;
-
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated: Exclude less (@{}) and scss (#{}) string interpolation from formatting
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 94fa014 Exclude less (@{}) and scss (#{}) string interpolation from
formatting
new a92befa Merge pull request #3314 from matthiasblaesing/css_formatting2
94fa014 is described below
commit 94fa014e810fe0f153bb951a3a0ac1bfe6f3b2cf
Author: Matthias Bläsing
AuthorDate: Wed Nov 10 21:12:02 2021 +0100
Exclude less (@{}) and scss (#{}) string interpolation from formatting
---
ide/css.editor/nbproject/project.properties| 4 +-
.../modules/css/editor/indent/CssIndentTask.java | 124 -
.../test/unit/data/testfiles/case005.less | 1 +
.../unit/data/testfiles/case005.less.formatted | 5 +
.../test/unit/data/testfiles/case006.scss | 6 +
.../unit/data/testfiles/case006.scss.formatted | 8 ++
.../modules/css/editor/indent/CssIndenterTest.java | 6 +-
.../css/editor/indent/LessIndenterTest.java| 55 +
.../css/editor/indent/ScssIndenterTest.java| 58 ++
9 files changed, 213 insertions(+), 54 deletions(-)
diff --git a/ide/css.editor/nbproject/project.properties
b/ide/css.editor/nbproject/project.properties
index ca4bfda..91a7d02 100644
--- a/ide/css.editor/nbproject/project.properties
+++ b/ide/css.editor/nbproject/project.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+auxiliary.org-netbeans-modules-css-prep.less_2e_configured=true
+auxiliary.org-netbeans-modules-css-prep.sass_2e_configured=true
release.external/css21-spec.zip=docs/css21-spec.zip
release.external/css3-spec.zip=docs/css3-spec.zip
@@ -33,4 +35,4 @@ test.config.stableBTD.excludes=\
**/properties/parser/PropertyValueTest.class,\
**/CssBracketCompleterTest.class
-test-unit-sys-prop.netbeans.dirs=${netbeans.dest.dir}/${nb.cluster.ide.dir}
\ No newline at end of file
+test-unit-sys-prop.netbeans.dirs=${netbeans.dest.dir}/${nb.cluster.ide.dir}
diff --git
a/ide/css.editor/src/org/netbeans/modules/css/editor/indent/CssIndentTask.java
b/ide/css.editor/src/org/netbeans/modules/css/editor/indent/CssIndentTask.java
index e6bf851..dfb9977 100644
---
a/ide/css.editor/src/org/netbeans/modules/css/editor/indent/CssIndentTask.java
+++
b/ide/css.editor/src/org/netbeans/modules/css/editor/indent/CssIndentTask.java
@@ -21,6 +21,7 @@ package org.netbeans.modules.css.editor.indent;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.LinkedList;
import javax.swing.text.BadLocationException;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.lexer.TokenHierarchy;
@@ -94,37 +95,76 @@ public class CssIndentTask implements IndentTask,
Lookup.Provider {
.get(context.document())
.embeddedTokenSequences(reg.getStartOffset(), false);
TokenSequence ts = tslist.get(tslist.size() - 1);
-int blockLevel = determineBlocklevel(ts);
+
+LinkedList blockLevel = new LinkedList<>();
+
+// Initialize blockLevel with the indentions created by the
+// outside context
+ts.moveStart();
+Token lastToken = null;
+if (ts.moveNext()) {
+List> tokenSequences = TokenHierarchy
+.get(context.document())
+.tokenSequenceList(ts.languagePath(), 0, ts.offset());
+OUTER:
+for (TokenSequence tsX : tokenSequences) {
+tsX.moveStart();
+while (tsX.moveNext()) {
+if (tsX.offset() >= ts.offset()) {
+break OUTER;
+}
+if (tsX.token().id() == CssTokenId.LBRACE) {
+if (isStringInterpolation(lastToken)) {
+// The sequence "@{" and "#{" lead in a strong
interpolation
+// in LESS (former) and SCSS (latter).
+blockLevel.addLast(IndentType.NONE);
+} else {
+blockLevel.addLast(IndentType.BLOCK);
+}
+} else if (tsX.token().id() == CssTokenId.RBRACE) {
+blockLevel.pollLast();
+}
+lastToken = tsX.token();
+}
+}
+}
+
ts.moveStart();
while(ts.moveNext()) {
if(ts.token().id() == CssTokenId.LBRACE) {
-blockLevel++;
-// Ensure, that there is a newline after an block openi
[netbeans] branch master updated (9dc09a1 -> d29bc86)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 9dc09a1 Merge pull request #3305 from matthiasblaesing/mavenprotocolhandler_urlescapes new 797163f [jackpot] added missing rule to IteratorToFor inspection which understands generics. new f1f6ca2 [jackpot] added test for while-with-generic-iterator case. new d29bc86 Merge pull request #3284 from mbien/generic_iterator The 6123 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../modules/java/hints/jdk/IteratorToFor.java | 17 +-- .../modules/java/hints/jdk/IteratorToForTest.java | 25 ++ 2 files changed, 35 insertions(+), 7 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated: m2 URL components need to be URL decoded before being used to create the artifact
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing 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 1950640 m2 URL components need to be URL decoded before being used to create the artifact new 9dc09a1 Merge pull request #3305 from matthiasblaesing/mavenprotocolhandler_urlescapes 1950640 is described below commit 1950640659375c9de8b96afd5c1dc6a1a4885c27 Author: Matthias Bläsing AuthorDate: Fri Nov 5 22:51:09 2021 +0100 m2 URL components need to be URL decoded before being used to create the artifact Consider this URL: m2:/com.dukescript.nbjavac:nb-javac:jdk-17%2B35:jar it refers to the artifact with the components: groupId:com.dukescript.nbjavac artifactId: nb-javac version:jdk-17+35 type: jar In the version string jdk-17%2B35, the + character is URL encoded and needs to be decoded before used in the maven resolver to create the artifact. --- .travis.yml| 2 +- java/maven.embedder/nbproject/project.xml | 14 -- .../maven/embedder/impl/MavenProtocolHandler.java | 47 ++- .../embedder/impl/MavenProtocolHandlerTest.java| 53 ++ .../maven/embedder/impl/NbRepositoryCacheTest.java | 4 +- 5 files changed, 101 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index 904f8c6..e673cfa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -390,7 +390,7 @@ matrix: - ant $OPTS -f java/junit.ant.ui test - ant $OPTS -f java/lib.nbjavac test - ant $OPTS -f java/maven test -#- ant $OPTS -f java/maven.embedder test +- ant $OPTS -f java/maven.embedder test - ant $OPTS -f java/maven.grammar test #- ant $OPTS -f java/maven.hints test #- ant $OPTS -f java/maven.htmlui test diff --git a/java/maven.embedder/nbproject/project.xml b/java/maven.embedder/nbproject/project.xml index 65554c9..ff4513c 100644 --- a/java/maven.embedder/nbproject/project.xml +++ b/java/maven.embedder/nbproject/project.xml @@ -110,6 +110,10 @@ unit +org.netbeans.bootstrap + + + org.netbeans.libs.junit4 @@ -125,12 +129,12 @@ org.netbeans.modules.projectapi.nb -org.openide.util.ui + org.openide.util.lookup - org.openide.util.lookup +org.openide.util.ui @@ -180,7 +184,7 @@ javax.inject com.google.inject -com.google.common.base +com.google.common.base org.apache.maven org.apache.maven.artifact org.apache.maven.artifact.factory @@ -264,7 +268,7 @@ org.sonatype.plexus.components.cipher org.sonatype.plexus.components.sec.dispatcher org.slf4j -org.slf4j.impl +org.slf4j.impl org.apache.maven.wagon.shared.http4 org.apache.maven.wagon.providers.http.wagon.shared @@ -277,7 +281,7 @@ external/jdom-1.0.jar - + ../maven/boot/plexus-classworlds-2.6.0.jar diff --git a/java/maven.embedder/src/org/netbeans/modules/maven/embedder/impl/MavenProtocolHandler.java b/java/maven.embedder/src/org/netbeans/modules/maven/embedder/impl/MavenProtocolHandler.java index d03e114..d9a7332 100644 --- a/java/maven.embedder/src/org/netbeans/modules/maven/embedder/impl/MavenProtocolHandler.java +++ b/java/maven.embedder/src/org/netbeans/modules/maven/embedder/impl/MavenProtocolHandler.java @@ -21,14 +21,20 @@ package org.netbeans.modules.maven.embedder.impl; import java.io.File; import java.io.IOException; +import java.io.UnsupportedEncodingException; import java.net.URL; import java.net.URLConnection; +import java.net.URLDecoder; import java.net.URLStreamHandler; +import java.util.Arrays; import java.util.Collections; import java.util.logging.Level; import java.util.logging.Logger; +import java.util.stream.Collectors; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.repository.ArtifactRepository; +import
[netbeans] branch master updated (391fdcd -> 4ae010f)
This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git. from 391fdcd An attempt to fix unstable test for java.mx.projects (#3301) new c0adef2 JDK 17 requires explicit keyalg selection new d97dfff Consider the reported trustlevel of the KeyStoreProvider when querying KeyStores new 4ae010f Merge pull request #3303 from matthiasblaesing/truststore_level The 6118 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: platform/autoupdate.services/build.xml | 8 +- .../modules/autoupdate/services/Utilities.java | 8 +- .../modules/autoupdate/services/UtilitiesTest.java | 86 +- 3 files changed, 95 insertions(+), 7 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
