(netbeans-tools) branch master updated (ecef48c -> 2f37acb)
This is an automated email from the ASF dual-hosted git repository. lkishalmi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-tools.git from ecef48c Upgraded Snap built from source to core22 and Java 17 new 6b95dd9 Enable arm64, armhf and i386 architecture on snap from zip packages new 2f37acb Upgraded to Ubuntu Core 22, and Snapcraft 8, kept only arm64 The 2 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: snap-packages/from-zip/build.xml | 12 ++-- snap-packages/from-zip/snapcraft-template.yaml | 16 ++-- 2 files changed, 16 insertions(+), 12 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) 01/02: Enable arm64, armhf and i386 architecture on snap from zip packages
This is an automated email from the ASF dual-hosted git repository. lkishalmi pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-tools.git commit 6b95dd9ca0f8d5ff470ed4a83e09414167a40da0 Author: Laszlo Kishalmi AuthorDate: Mon Apr 10 23:18:08 2023 -0700 Enable arm64, armhf and i386 architecture on snap from zip packages --- snap-packages/from-zip/build.xml | 8 snap-packages/from-zip/snapcraft-template.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/snap-packages/from-zip/build.xml b/snap-packages/from-zip/build.xml index 426dfcf..cb28801 100644 --- a/snap-packages/from-zip/build.xml +++ b/snap-packages/from-zip/build.xml @@ -29,8 +29,8 @@ - - + +
(netbeans-tools) 02/02: Upgraded to Ubuntu Core 22, and Snapcraft 8, kept only arm64
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-tools.git
commit 2f37acb09b9eb718303e7e5c937e51fd7c9bd835
Author: Laszlo Kishalmi
AuthorDate: Fri Mar 1 23:05:20 2024 -0800
Upgraded to Ubuntu Core 22, and Snapcraft 8, kept only arm64
---
snap-packages/from-zip/build.xml | 4 ++--
snap-packages/from-zip/snapcraft-template.yaml | 16 ++--
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/snap-packages/from-zip/build.xml b/snap-packages/from-zip/build.xml
index cb28801..16093e8 100644
--- a/snap-packages/from-zip/build.xml
+++ b/snap-packages/from-zip/build.xml
@@ -125,14 +125,14 @@
-
+
-
+
diff --git a/snap-packages/from-zip/snapcraft-template.yaml
b/snap-packages/from-zip/snapcraft-template.yaml
index 560dfd4..8a27cc7 100644
--- a/snap-packages/from-zip/snapcraft-template.yaml
+++ b/snap-packages/from-zip/snapcraft-template.yaml
@@ -25,13 +25,17 @@ description: |@SNAP_DISCLAIMER@
It is free and open source and has a large community of users and developers
around the world.
- It requires Java 8 or later Java Development Kit installed.
+ It requires Java 11 or later Java Development Kit installed.
icon: snap/gui/frame512.png
confinement: classic
grade: @SNAP_GRADE@
-base: core20
-architectures: [ amd64, arm64, armhf, i386 ]
+base: core22
+architectures:
+ - build-on: [ amd64 ]
+build-for: [ amd64 ]
+ - build-on: [ amd64 ]
+build-for: [ arm64 ]
compression: lzo
assumes:
- command-chain
@@ -44,8 +48,6 @@ parts:
build-attributes: [ no-patchelf ]
plugin: dump
source: @SNAP_SOURCE@
-filesets:
-netbeans: [ netbeans/*, -netbeans/*.built ]
override-build: |
mv netbeans $SNAPCRAFT_PART_INSTALL/netbeans
# Make the default cache and data directory relative to Snap user
directory
@@ -57,7 +59,9 @@ parts:
chmod a+r $SNAPCRAFT_PART_INSTALL/netbeans/etc/netbeans.conf
find $SNAPCRAFT_PART_INSTALL/netbeans -type f -name *.sh -exec chmod
a+rx {} \;
stage:
-- $netbeans
+- netbeans/*
+- -netbeans/*.built
+- -netbeans/extra
launchers:
source: snap/local/launchers
-
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: HCL added Scoped Function name support (Terraform 1.8)
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 8c75f2df42 HCL added Scoped Function name support (Terraform 1.8)
8c75f2df42 is described below
commit 8c75f2df4215223866aceb88fe9981c5c2ac8e81
Author: Laszlo Kishalmi
AuthorDate: Sun Apr 14 19:50:16 2024 -0700
HCL added Scoped Function name support (Terraform 1.8)
---
.../netbeans/modules/languages/hcl/HCLTokenId.java| 1 +
.../modules/languages/hcl/ast/HCLElementFactory.java | 8
.../languages/hcl/ast/HCLExpressionFactory.java | 19 +--
.../modules/languages/hcl/ast/HCLIdentifier.java | 2 ++
.../languages/hcl/grammar/g4/HCLExpressionParser.g4 | 10 --
.../modules/languages/hcl/grammar/g4/HCLLexer.g4 | 9 +++--
6 files changed, 39 insertions(+), 10 deletions(-)
diff --git
a/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/HCLTokenId.java
b/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/HCLTokenId.java
index f214a20c06..afd23ae588 100644
--- a/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/HCLTokenId.java
+++ b/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/HCLTokenId.java
@@ -56,6 +56,7 @@ public enum HCLTokenId implements TokenId {
INTERPOLATION_START("${", "separator"),
INTERPOLATION_END("}", "separator"),
RARROW("=>", "separator"),
+SCOPE("::", "separator"),
TEMPLATE_START("%{", "separator"),
TEMPLATE_END("}", "separator"),
diff --git
a/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/HCLElementFactory.java
b/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/HCLElementFactory.java
index 3b84857a1f..03058ff880 100644
---
a/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/HCLElementFactory.java
+++
b/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/HCLElementFactory.java
@@ -23,6 +23,7 @@ import org.antlr.v4.runtime.ParserRuleContext;
import org.antlr.v4.runtime.Token;
import org.antlr.v4.runtime.tree.TerminalNode;
import org.netbeans.modules.languages.hcl.grammar.HCLLexer;
+import org.netbeans.modules.languages.hcl.grammar.HCLParser;
/**
*
@@ -41,6 +42,13 @@ public sealed abstract class HCLElementFactory permits
HCLBlockFactory, HCLExpre
return tn != null ? id(tn.getSymbol()) : null;
}
+protected final HCLIdentifier id(HCLParser.ScopedIdContext ctx) {
+HCLIdentifier parent = ctx.target != null
+? id(ctx.target)
+: id(ctx.scopedId());
+return created(new HCLIdentifier.ScopedId(parent, ctx.ref.getText()),
ctx);
+}
+
protected final HCLIdentifier id(Token t) {
return (t != null) && (t.getType() == HCLLexer.IDENTIFIER) ?
created(new HCLIdentifier.SimpleId(t.getText()), t) : null;
}
diff --git
a/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/HCLExpressionFactory.java
b/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/HCLExpressionFactory.java
index 455ae4806b..cca7c87026 100644
---
a/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/HCLExpressionFactory.java
+++
b/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/HCLExpressionFactory.java
@@ -27,6 +27,7 @@ import java.util.function.Consumer;
import org.antlr.v4.runtime.NoViableAltException;
import org.antlr.v4.runtime.ParserRuleContext;
import org.antlr.v4.runtime.tree.ParseTree;
+import org.antlr.v4.runtime.tree.TerminalNode;
import org.netbeans.modules.languages.hcl.grammar.HCLLexer;
import static org.netbeans.modules.languages.hcl.grammar.HCLLexer.*;
import org.netbeans.modules.languages.hcl.grammar.HCLParser;
@@ -175,16 +176,22 @@ public final class HCLExpressionFactory extends
HCLElementFactory {
if (ctx == null) {
return null;
}
-List args = Collections.emptyList();
+if (ctx.exception != null) {
+return null;
+}
+List args = List.of();
boolean expand = false;
if (ctx.arguments() != null) {
-args = new ArrayList<>(ctx.arguments().expression().size());
-for (HCLParser.ExpressionContext ectx :
ctx.arguments().expression()) {
-args.add(expr(ectx));
-}
+args = ctx.arguments().expression().stream()
+.map(this::expr)
+.toList();
expand = ctx.arguments().ELLIPSIS() != null;
}
-return created(new HCLFunction(id(ctx.IDENTIFIER()), args, expand),
ctx);
+HCLIdentifier name = ctx.IDENTIFIER() != null
+? id(ctx.IDENTIFIER())
+: id(ctx.scopedId());
+
+r
(netbeans) branch master updated: Better Gradle Project Creation Wizard
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 e7545a9284 Better Gradle Project Creation Wizard
e7545a9284 is described below
commit e7545a928426991d6120f4609266c1b2f6f2c023
Author: Laszlo Kishalmi
AuthorDate: Wed Apr 10 19:37:33 2024 -0700
Better Gradle Project Creation Wizard
---
extide/gradle/manifest.mf | 1 +
extide/gradle/nbproject/project.properties | 3 +-
.../execute/EscapeProcessingOutputStream.java | 2 +-
.../gradle/execute/GradlePlainEscapeProcessor.java | 67 +---
.../modules/gradle/newproject/Bundle.properties| 10 +
.../modules/gradle/newproject/GradleInitPanel.java | 69
.../gradle/newproject/GradleInitPanelVisual.form | 236 +
.../gradle/newproject/GradleInitPanelVisual.java | 384 +
.../gradle/newproject/NewProjectSettings.java | 76
.../gradle/output/GradleProcessorFactory.java | 132 ---
.../spi/newproject/BaseGradleWizardIterator.java | 7 +-
.../gradle/spi/newproject/GradleInitWizard.java| 231 +
.../gradle/spi/newproject/TemplateOperation.java | 45 ++-
.../gradle/output/GradleProcessorFactoryTest.java | 52 +--
java/gradle.java/nbproject/project.xml | 2 +-
.../newproject/SimpleApplicationProjectWizard.java | 83 -
.../newproject/SimpleLibraryProjectWizard.java | 57 ---
.../modules/gradle/java/newproject/Wizards.java| 78 +
18 files changed, 1254 insertions(+), 281 deletions(-)
diff --git a/extide/gradle/manifest.mf b/extide/gradle/manifest.mf
index 4588b852e9..396a65a814 100644
--- a/extide/gradle/manifest.mf
+++ b/extide/gradle/manifest.mf
@@ -3,4 +3,5 @@ AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.modules.gradle/2
OpenIDE-Module-Layer: org/netbeans/modules/gradle/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/gradle/Bundle.properties
+OpenIDE-Module-Java-Dependencies: Java > 17
OpenIDE-Module-Specification-Version: 2.40
diff --git a/extide/gradle/nbproject/project.properties
b/extide/gradle/nbproject/project.properties
index 54dab6898e..8666db6808 100644
--- a/extide/gradle/nbproject/project.properties
+++ b/extide/gradle/nbproject/project.properties
@@ -17,7 +17,8 @@
file.reference.netbeans-gradle-tooling.jar=release/modules/gradle/netbeans-gradle-tooling.jar
is.autoload=true
-javac.source=1.8
+javac.source=17
+javac.target=17
javac.compilerargs=-Xlint -Xlint:-serial
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
diff --git
a/extide/gradle/src/org/netbeans/modules/gradle/execute/EscapeProcessingOutputStream.java
b/extide/gradle/src/org/netbeans/modules/gradle/execute/EscapeProcessingOutputStream.java
index b6deb583b2..98e60c67cb 100644
---
a/extide/gradle/src/org/netbeans/modules/gradle/execute/EscapeProcessingOutputStream.java
+++
b/extide/gradle/src/org/netbeans/modules/gradle/execute/EscapeProcessingOutputStream.java
@@ -32,7 +32,7 @@ import org.openide.util.RequestProcessor;
*
* @author Laszlo Kishalmi
*/
-class EscapeProcessingOutputStream extends OutputStream {
+public class EscapeProcessingOutputStream extends OutputStream {
private static final RequestProcessor RP = new
RequestProcessor(EscapeProcessingOutputStream.class);
diff --git
a/extide/gradle/src/org/netbeans/modules/gradle/execute/GradlePlainEscapeProcessor.java
b/extide/gradle/src/org/netbeans/modules/gradle/execute/GradlePlainEscapeProcessor.java
index 924b5ad290..ccd562fdfb 100644
---
a/extide/gradle/src/org/netbeans/modules/gradle/execute/GradlePlainEscapeProcessor.java
+++
b/extide/gradle/src/org/netbeans/modules/gradle/execute/GradlePlainEscapeProcessor.java
@@ -28,9 +28,8 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
import org.netbeans.api.project.Project;
+import org.netbeans.modules.gradle.output.GradleProcessorFactory;
import org.openide.util.Lookup;
import org.openide.windows.IOColorPrint;
import org.openide.windows.IOColors;
@@ -57,13 +56,20 @@ public class GradlePlainEscapeProcessor implements
EscapeProcessor {
public GradlePlainEscapeProcessor(InputOutput io, RunConfig cfg, boolean
error) {
this.io = io;
output = new IODisplayer();
-Project prj = cfg.getProject();
-if (prj != null) {
-processorsFromLookup(prj.getLookup(), cfg);
+if (cfg != null) {
+Project prj = cfg.getProject();
+if (prj != null) {
+processorsFromLookup(prj.getLookup(), cfg);
+}
}
outType = error ? ERROR : OUTPUT;
-processors.add(TASK_LINE_PROCES
(netbeans) branch master updated: Upgrade Gradle Tooling API to 8.7
This is an automated email from the ASF dual-hosted git repository. lkishalmi 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 9bc649bac0 Upgrade Gradle Tooling API to 8.7 9bc649bac0 is described below commit 9bc649bac0bdd83d51a71cce80759252dd213b00 Author: Laszlo Kishalmi AuthorDate: Sun Mar 31 09:40:35 2024 -0700 Upgrade Gradle Tooling API to 8.7 --- extide/gradle/apichanges.xml | 16 extide/gradle/manifest.mf | 2 +- .../nbproject/org-netbeans-modules-gradle.sig | 4 +- extide/gradle/nbproject/project.xml| 2 +- .../gradle/api/execute/GradleCommandLine.java | 4 +- .../api/execute/GradleDistributionManager.java | 2 +- .../gradle/spi/newproject/TemplateOperation.java | 46 +- extide/libs.gradle/external/binaries-list | 2 +- ...ense.txt => gradle-tooling-api-8.7-license.txt} | 4 +- ...otice.txt => gradle-tooling-api-8.7-notice.txt} | 0 extide/libs.gradle/manifest.mf | 2 +- extide/libs.gradle/nbproject/project.properties| 2 +- extide/libs.gradle/nbproject/project.xml | 2 +- 13 files changed, 75 insertions(+), 13 deletions(-) diff --git a/extide/gradle/apichanges.xml b/extide/gradle/apichanges.xml index 946a17b5c5..72ff79bef6 100644 --- a/extide/gradle/apichanges.xml +++ b/extide/gradle/apichanges.xml @@ -83,6 +83,22 @@ is the proper place. + + +Gradle InitOperation now Supports --java-version and --comments flags + + + + + + +Added comments(Boolean comments) and javaVersion(String version) to +TemplateOperation.InitOperation +allowing more detailed project creation. + + + + Gradle project problems have severity and stacktraces diff --git a/extide/gradle/manifest.mf b/extide/gradle/manifest.mf index 9eb04c0d0a..4588b852e9 100644 --- a/extide/gradle/manifest.mf +++ b/extide/gradle/manifest.mf @@ -3,4 +3,4 @@ AutoUpdate-Show-In-Client: true OpenIDE-Module: org.netbeans.modules.gradle/2 OpenIDE-Module-Layer: org/netbeans/modules/gradle/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/gradle/Bundle.properties -OpenIDE-Module-Specification-Version: 2.39 +OpenIDE-Module-Specification-Version: 2.40 diff --git a/extide/gradle/nbproject/org-netbeans-modules-gradle.sig b/extide/gradle/nbproject/org-netbeans-modules-gradle.sig index 86da56daf6..195048149f 100644 --- a/extide/gradle/nbproject/org-netbeans-modules-gradle.sig +++ b/extide/gradle/nbproject/org-netbeans-modules-gradle.sig @@ -1,5 +1,5 @@ #Signature file v4.1 -#Version 2.38 +#Version 2.40 CLSS public abstract interface java.io.Serializable @@ -1100,7 +1100,9 @@ hcls BaseOperationStep,ConfigureProjectStep,CopyFromFileTemplate,CopyFromTemplat CLSS public abstract org.netbeans.modules.gradle.spi.newproject.TemplateOperation$InitOperation outer org.netbeans.modules.gradle.spi.newproject.TemplateOperation meth public abstract org.netbeans.modules.gradle.spi.newproject.TemplateOperation$InitOperation basePackage(java.lang.String) +meth public abstract org.netbeans.modules.gradle.spi.newproject.TemplateOperation$InitOperation comments(java.lang.Boolean) meth public abstract org.netbeans.modules.gradle.spi.newproject.TemplateOperation$InitOperation dsl(java.lang.String) +meth public abstract org.netbeans.modules.gradle.spi.newproject.TemplateOperation$InitOperation javaVersion(java.lang.String) meth public abstract org.netbeans.modules.gradle.spi.newproject.TemplateOperation$InitOperation projectName(java.lang.String) meth public abstract org.netbeans.modules.gradle.spi.newproject.TemplateOperation$InitOperation testFramework(java.lang.String) meth public final void add() diff --git a/extide/gradle/nbproject/project.xml b/extide/gradle/nbproject/project.xml index 47e0d7e2e7..7a4f37f85e 100644 --- a/extide/gradle/nbproject/project.xml +++ b/extide/gradle/nbproject/project.xml @@ -100,7 +100,7 @@ 8 -8.0.1 +8.7 diff --git a/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleCommandLine.java b/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleCommandLine.java index 9b61766af6..9fbe14cb08 100644 --- a/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleCommandLine.java +++ b/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleCommandLine.java @@ -135,7 +135,7 @@ public final class GradleCommandLine implements Serial
(netbeans) branch master updated: Gradle Project shall use the Java from the tooling not runtime.
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 d13f34ba74 Gradle Project shall use the Java from the tooling not
runtime.
d13f34ba74 is described below
commit d13f34ba7422948db84075f7772e15be4274e02b
Author: Laszlo Kishalmi
AuthorDate: Sun Feb 4 07:23:37 2024 -0800
Gradle Project shall use the Java from the tooling not runtime.
---
.../gradle/tooling/NbProjectInfoBuilder.java | 23 ++
.../modules/gradle/cache/ProjectInfoDiskCache.java | 2 +-
java/gradle.java/apichanges.xml| 22 ++
java/gradle.java/manifest.mf | 1 +
java/gradle.java/nbproject/project.properties | 3 +-
java/gradle.java/nbproject/project.xml | 1 +
.../gradle/java/api/GradleJavaProjectBuilder.java | 9 +-
.../gradle/java/api/GradleJavaSourceSet.java | 17 ++
.../classpath/AbstractGradleClassPathImpl.java | 7 +-
.../gradle/java/classpath/BootClassPathImpl.java | 43 ++--
.../java/classpath/ClassPathProviderImpl.java | 4 +-
.../classpath/GlobalClassPathProviderImpl.java | 44 ++--
.../gradle/java/customizer/Bundle.properties | 1 +
.../gradle/java/customizer/SourceSetPanel.form | 45 +++-
.../gradle/java/customizer/SourceSetPanel.java | 49 +++-
.../gradle/java/nodes/BootCPNodeFactory.java | 280 +
.../java/spi/support/JavaToolchainSupport.java | 122 +
17 files changed, 371 insertions(+), 302 deletions(-)
diff --git
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
index 0362bf0e2f..332c5360d0 100644
---
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
+++
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
@@ -105,9 +105,13 @@ import org.gradle.api.tasks.bundling.Jar;
import org.gradle.api.tasks.testing.Test;
import org.gradle.internal.resolve.ArtifactResolveException;
import org.gradle.jvm.JvmLibrary;
+import org.gradle.jvm.toolchain.JavaCompiler;
import org.gradle.language.base.artifact.SourcesArtifact;
import org.gradle.language.java.artifact.JavadocArtifact;
import org.gradle.plugin.use.PluginId;
+import org.gradle.api.provider.Property;
+import org.gradle.jvm.toolchain.JavaInstallationMetadata;
+import org.gradle.jvm.toolchain.JavaLauncher;
import org.gradle.util.GradleVersion;
import org.netbeans.modules.gradle.tooling.internal.NbProjectInfo;
import org.netbeans.modules.gradle.tooling.internal.NbProjectInfo.Report;
@@ -1205,6 +1209,13 @@ class NbProjectInfoBuilder {
o.toString()
);
}
+
+sinceGradle("6.7", () -> {
+
fetchJavaInstallationMetadata(compileTask).ifPresent(
+(meta) -> model.getInfo().put(propBase
+ lang + "_compiler_java_home", meta.getInstallationPath().getAsFile())
+);
+});
+
List compilerArgs;
compilerArgs = (List)
getProperty(compileTask, "options", "allCompilerArgs");
@@ -1311,6 +1322,18 @@ class NbProjectInfoBuilder {
}
}
+private Optional
fetchJavaInstallationMetadata(Task task) {
+Property launcherProperty = (Property)
getProperty(task, "javaLauncher");
+if (launcherProperty != null && launcherProperty.isPresent()) {
+return Optional.of(launcherProperty.get().getMetadata());
+}
+Property compilerProperty = (Property)
getProperty(task, "javaCompiler");
+if (compilerProperty != null && compilerProperty.isPresent()) {
+return Optional.of(compilerProperty.get().getMetadata());
+}
+return Optional.empty();
+}
+
private void detectArtifacts(NbProjectInfoModel model) {
if (project.getPlugins().hasPlugin("java")) {
model.getInfo().put("main_jar", getProperty(project, "jar",
"archivePath"));
diff --git
a/extide/gradle/src/org/netbeans/modules/gradle/cache/ProjectInfoDiskCache.java
b/extide/gradle/src/org/netbeans/modules/gradle/cache/ProjectInfoDiskCache.java
index 5718378b2d..a195c37523 100644
---
a/extide/gradle/src/org/netbeans/modules/gradle/cache/ProjectInfoDi
(netbeans) branch master updated: Java Code Templates for records and sealed types
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 ffec3dd80c Java Code Templates for records and sealed types
ffec3dd80c is described below
commit ffec3dd80c13af9c9489b7f943115b36269679f3
Author: Laszlo Kishalmi
AuthorDate: Tue Feb 20 10:50:46 2024 -0800
Java Code Templates for records and sealed types
---
.../java/editor/resources/DefaultAbbrevs.xml | 29 --
1 file changed, 27 insertions(+), 2 deletions(-)
diff --git
a/java/java.editor/src/org/netbeans/modules/java/editor/resources/DefaultAbbrevs.xml
b/java/java.editor/src/org/netbeans/modules/java/editor/resources/DefaultAbbrevs.xml
index 6ba5bf8ea9..3255d35139 100644
---
a/java/java.editor/src/org/netbeans/modules/java/editor/resources/DefaultAbbrevs.xml
+++
b/java/java.editor/src/org/netbeans/modules/java/editor/resources/DefaultAbbrevs.xml
@@ -45,8 +45,10 @@
-
+
+
+
@@ -54,7 +56,9 @@
+
+
@@ -497,6 +501,27 @@ ${cursor}]]>
}
}
]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
]]>
-
(netbeans) branch master updated: Made HCL AST on records Use TextBlocks in formatting test, minor enhancements
This is an automated email from the ASF dual-hosted git repository. lkishalmi 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 b1f2e5b4a0 Made HCL AST on records Use TextBlocks in formatting test, minor enhancements b1f2e5b4a0 is described below commit b1f2e5b4a0e78b2194d59b7560d369ebb77f59ee Author: Laszlo Kishalmi AuthorDate: Sun Mar 17 07:30:39 2024 -0700 Made HCL AST on records Use TextBlocks in formatting test, minor enhancements --- ide/languages.hcl/manifest.mf | 2 +- ide/languages.hcl/nbproject/project.properties | 4 +- .../modules/languages/hcl/HCLSemanticAnalyzer.java | 71 +- .../modules/languages/hcl/HCLStructureItem.java| 17 ++- .../netbeans/modules/languages/hcl/SourceRef.java | 9 +- .../languages/hcl/ast/HCLAddressableElement.java | 47 --- .../languages/hcl/ast/HCLArithmeticOperation.java | 42 ++ .../modules/languages/hcl/ast/HCLAttribute.java| 35 + .../modules/languages/hcl/ast/HCLBlock.java| 37 +++-- .../modules/languages/hcl/ast/HCLBlockFactory.java | 74 -- .../modules/languages/hcl/ast/HCLCollection.java | 81 +++ .../languages/hcl/ast/HCLConditionalOperation.java | 14 +- .../modules/languages/hcl/ast/HCLContainer.java| 55 +++- .../modules/languages/hcl/ast/HCLDocument.java | 23 +++- .../modules/languages/hcl/ast/HCLElement.java | 75 +-- .../languages/hcl/ast/HCLElementFactory.java | 75 +++ .../modules/languages/hcl/ast/HCLExpression.java | 35 +++-- .../languages/hcl/ast/HCLExpressionFactory.java| 123 ++--- .../languages/hcl/ast/HCLForExpression.java| 49 ++- .../modules/languages/hcl/ast/HCLFunction.java | 28 +--- .../modules/languages/hcl/ast/HCLIdentifier.java | 45 ++- .../modules/languages/hcl/ast/HCLLiteral.java | 41 +- .../languages/hcl/ast/HCLResolveOperation.java | 64 ++--- .../modules/languages/hcl/ast/HCLTemplate.java | 89 +++- .../modules/languages/hcl/ast/HCLTreeWalker.java | 58 .../modules/languages/hcl/ast/HCLVariable.java | 18 +-- .../hcl/terraform/TerraformParserResult.java | 79 ++- .../hcl/terraform/TerraformSemanticAnalyzer.java | 41 ++ .../languages/hcl/tfvars/TFVarsParserResult.java | 6 +- .../modules/languages/hcl/HCLIndenterTest.java | 149 +++-- .../modules/languages/hcl/ReferenceTest.java | 7 +- .../modules/languages/hcl/ast/HCLLiteralsTest.java | 8 +- .../languages/hcl/ast/HCLOperationsTest.java | 34 ++--- 33 files changed, 640 insertions(+), 895 deletions(-) diff --git a/ide/languages.hcl/manifest.mf b/ide/languages.hcl/manifest.mf index ac658e5249..642080e4ed 100644 --- a/ide/languages.hcl/manifest.mf +++ b/ide/languages.hcl/manifest.mf @@ -3,5 +3,5 @@ OpenIDE-Module: org.netbeans.modules.languages.hcl OpenIDE-Module-Layer: org/netbeans/modules/languages/hcl/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/languages/hcl/Bundle.properties OpenIDE-Module-Specification-Version: 1.4 -OpenIDE-Module-Java-Dependencies: Java > 11 +OpenIDE-Module-Java-Dependencies: Java > 17 AutoUpdate-Show-In-Client: true diff --git a/ide/languages.hcl/nbproject/project.properties b/ide/languages.hcl/nbproject/project.properties index 5163ac1bd4..9d38ead391 100644 --- a/ide/languages.hcl/nbproject/project.properties +++ b/ide/languages.hcl/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=11 -javac.target=11 +javac.source=17 +javac.target=17 diff --git a/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/HCLSemanticAnalyzer.java b/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/HCLSemanticAnalyzer.java index 86581df92b..a320de27f4 100644 --- a/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/HCLSemanticAnalyzer.java +++ b/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/HCLSemanticAnalyzer.java @@ -29,11 +29,10 @@ import org.netbeans.modules.csl.api.SemanticAnalyzer; import org.netbeans.modules.languages.hcl.ast.HCLAttribute; import org.netbeans.modules.languages.hcl.ast.HCLBlock; import org.netbeans.modules.languages.hcl.ast.HCLCollection; -import org.netbeans.modules.languages.hcl.ast.HCLDocument; import org.netbeans.modules.languages.hcl.ast.HCLElement; -import org.netbeans.modules.languages.hcl.ast.HCLExpression; import org.netbeans.modules.languages.hcl.ast.HCLFunction; import org.netbeans.modules.languages.hcl.ast.HCLIdentifier; +import org.netbeans.modules.languages.hcl.ast.HCLTreeWalker; import org.netbeans.modules.languages.hcl.ast.HCLVariable; import org.netbeans.modules.parsing.spi.Sch
(netbeans-tools) branch master updated: Upgraded Snap built from source to core22 and Java 17
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 ecef48c Upgraded Snap built from source to core22 and Java 17
ecef48c is described below
commit ecef48c931acee418c79aa3a359cad55db47e471
Author: Laszlo Kishalmi
AuthorDate: Sat Feb 17 22:28:04 2024 -0800
Upgraded Snap built from source to core22 and Java 17
---
snap-packages/from-source/build.xml | 4 +--
snap-packages/from-source/snapcraft-template.yaml | 36 ---
2 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/snap-packages/from-source/build.xml
b/snap-packages/from-source/build.xml
index c0be86f..aa0f4d8 100644
--- a/snap-packages/from-source/build.xml
+++ b/snap-packages/from-source/build.xml
@@ -121,14 +121,14 @@
-
+
-
+
diff --git a/snap-packages/from-source/snapcraft-template.yaml
b/snap-packages/from-source/snapcraft-template.yaml
index 3381452..a89b865 100644
--- a/snap-packages/from-source/snapcraft-template.yaml
+++ b/snap-packages/from-source/snapcraft-template.yaml
@@ -30,7 +30,7 @@ description: |@SNAP_DISCLAIMER@
icon: snap/gui/frame512.png
confinement: classic
grade: @SNAP_GRADE@
-base: core18
+base: core22
architectures: [ amd64 ]
compression: lzo
assumes:
@@ -44,26 +44,28 @@ parts:
build-packages:
- git
- unzip
- - openjdk-11-jdk-headless
-plugin: ant
+ - openjdk-17-jdk-headless
+ - ant
+plugin: nil
source: https://github.com/apache/netbeans.git
source-branch: "@SNAP_BRANCH@"
-filesets:
-netbeans: [ netbeans/*, -netbeans/*.built, -netbeans/extra ]
override-build: |
-export JAVA_HOME="/usr/lib/jvm/java-11-openjdk-amd64"
-ant -Djavac.compilerargs=-nowarn -Dbuild.compiler.deprecation=false
@BUILD_NUMBER@
-Dmetabuild.jsonurl=https://raw.githubusercontent.com/apache/netbeans-jenkins-lib/master/meta/netbeansrelease.json
-mv nbbuild/netbeans $SNAPCRAFT_PART_INSTALL/netbeans
-# Make the default cache and data directory relative to Snap user
directory
-sed -i 's/${HOME}\/.netbeans/${SNAP_USER_DATA}/'
$SNAPCRAFT_PART_INSTALL/netbeans/bin/netbeans
-sed -i
's/${HOME}\/.cache\/netbeans/${SNAP_USER_COMMON}\/${SNAP_REVISION}/'
$SNAPCRAFT_PART_INSTALL/netbeans/bin/netbeans
-sed -i 's/"${DEFAULT_USERDIR_ROOT}\/.*"/"${DEFAULT_USERDIR_ROOT}"/g'
$SNAPCRAFT_PART_INSTALL/netbeans/etc/netbeans.conf
-sed -i 's/"${DEFAULT_CACHEDIR_ROOT}\/.*"/"${DEFAULT_CACHEDIR_ROOT}"/g'
$SNAPCRAFT_PART_INSTALL/netbeans/etc/netbeans.conf
-sed -i
's/-J-Dapple.laf.useScreenMenuBar=true/-J-Dplugin.manager.install.global=false/'
$SNAPCRAFT_PART_INSTALL/netbeans/etc/netbeans.conf
-chmod a+r $SNAPCRAFT_PART_INSTALL/netbeans/etc/netbeans.conf
-find $SNAPCRAFT_PART_INSTALL/netbeans -type f -name *.sh -exec chmod
a+rx {} \;
+set -x
+export JAVA_HOME="/usr/lib/jvm/java-17-openjdk-amd64"
+export ANT_OPTS="-Djavac.compilerargs=-nowarn
-Dbuild.compiler.deprecation=false @BUILD_NUMBER@
-Dmetabuild.jsonurl=https://raw.githubusercontent.com/apache/netbeans-jenkins-lib/master/meta/netbeansrelease.json;
+ant build \
+&& mv nbbuild/netbeans $SNAPCRAFT_PART_INSTALL/netbeans \
+&& sed -i 's/${HOME}\/.netbeans/${SNAP_USER_DATA}/'
$SNAPCRAFT_PART_INSTALL/netbeans/bin/netbeans \
+&& sed -i
's/${HOME}\/.cache\/netbeans/${SNAP_USER_COMMON}\/${SNAP_REVISION}/'
$SNAPCRAFT_PART_INSTALL/netbeans/bin/netbeans \
+&& sed -i
's/"${DEFAULT_USERDIR_ROOT}\/.*"/"${DEFAULT_USERDIR_ROOT}"/g'
$SNAPCRAFT_PART_INSTALL/netbeans/etc/netbeans.conf \
+&& sed -i
's/"${DEFAULT_CACHEDIR_ROOT}\/.*"/"${DEFAULT_CACHEDIR_ROOT}"/g'
$SNAPCRAFT_PART_INSTALL/netbeans/etc/netbeans.conf \
+&& sed -i
's/-J-Dapple.laf.useScreenMenuBar=true/-J-Dplugin.manager.install.global=false/'
$SNAPCRAFT_PART_INSTALL/netbeans/etc/netbeans.conf \
+&& chmod a+r $SNAPCRAFT_PART_INSTALL/netbeans/etc/netbeans.conf \
+&& find $SNAPCRAFT_PART_INSTALL/netbeans -type f -name *.sh -exec
chmod a+rx {} \;
stage:
-- $netbeans
+- netbeans/*
+- -netbeans/*.built
+- -netbeans/extra
launchers:
source: snap/local/launchers
-
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 (da1da73661 -> acd617c16d)
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from da1da73661 Merge pull request #7077 from mbien/fix-inner-class-hints
add c377e87813 Made Parsing API a bit more Functional
add acd617c16d Removed unused private static field
No new revisions were added by this update.
Summary of changes:
ide/parsing.api/apichanges.xml | 16
.../modules/parsing/api/ParserManager.java | 86 +-
.../modules/parsing/api/ResultProcessor.java} | 25 +--
.../org/netbeans/modules/parsing/api/UserTask.java | 18 +
.../netbeans/modules/parsing/api/SourceTest.java | 12 +--
5 files changed, 122 insertions(+), 35 deletions(-)
copy
ide/{xml.xam/src/org/netbeans/modules/xml/xam/dom/DocumentModelAccess2.java =>
parsing.api/src/org/netbeans/modules/parsing/api/ResultProcessor.java} (61%)
-
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: Java Code Templates for List.of(), Map.of(), and Set.of()
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 94555c4f55a Java Code Templates for List.of(), Map.of(), and Set.of()
94555c4f55a is described below
commit 94555c4f55a1089167ee9208f73ffe7abb6ae689
Author: Laszlo Kishalmi
AuthorDate: Fri Feb 23 19:23:26 2024 -0800
Java Code Templates for List.of(), Map.of(), and Set.of()
---
.../org/netbeans/modules/java/editor/resources/DefaultAbbrevs.xml | 8
1 file changed, 8 insertions(+)
diff --git
a/java/java.editor/src/org/netbeans/modules/java/editor/resources/DefaultAbbrevs.xml
b/java/java.editor/src/org/netbeans/modules/java/editor/resources/DefaultAbbrevs.xml
index b9b61d01396..6ba5bf8ea96 100644
---
a/java/java.editor/src/org/netbeans/modules/java/editor/resources/DefaultAbbrevs.xml
+++
b/java/java.editor/src/org/netbeans/modules/java/editor/resources/DefaultAbbrevs.xml
@@ -375,6 +375,14 @@ ${cursor}]]>
+
+
+
+
+
+
+
+
-
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: Fix using old NB16u1 Gradle Tooling after installing NB17 via Snap
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 4df803d Fix using old NB16u1 Gradle Tooling after installing NB17 via
Snap
4df803d is described below
commit 4df803d37031f6c52b748421cc49614392405a90
Author: Laszlo Kishalmi
AuthorDate: Tue Mar 7 11:43:32 2023 -0800
Fix using old NB16u1 Gradle Tooling after installing NB17 via Snap
---
snap-packages/from-source/snapcraft-template.yaml| 2 +-
snap-packages/from-zip/snapcraft-template.yaml | 2 +-
snap-packages/launchers/{nbjavac-cleanup => userdir-cleanup} | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/snap-packages/from-source/snapcraft-template.yaml
b/snap-packages/from-source/snapcraft-template.yaml
index 83dafc8..3381452 100644
--- a/snap-packages/from-source/snapcraft-template.yaml
+++ b/snap-packages/from-source/snapcraft-template.yaml
@@ -73,6 +73,6 @@ parts:
apps:
netbeans:
command-chain:
- - launchers/nbjavac-cleanup
+ - launchers/userdir-cleanup
command: netbeans/bin/netbeans
diff --git a/snap-packages/from-zip/snapcraft-template.yaml
b/snap-packages/from-zip/snapcraft-template.yaml
index b595731..be75175 100644
--- a/snap-packages/from-zip/snapcraft-template.yaml
+++ b/snap-packages/from-zip/snapcraft-template.yaml
@@ -68,6 +68,6 @@ parts:
apps:
netbeans:
command-chain:
- - launchers/nbjavac-cleanup
+ - launchers/userdir-cleanup
command: netbeans/bin/netbeans
diff --git a/snap-packages/launchers/nbjavac-cleanup
b/snap-packages/launchers/userdir-cleanup
old mode 100644
new mode 100755
similarity index 58%
rename from snap-packages/launchers/nbjavac-cleanup
rename to snap-packages/launchers/userdir-cleanup
index 1bb7fef..6c30a70
--- a/snap-packages/launchers/nbjavac-cleanup
+++ b/snap-packages/launchers/userdir-cleanup
@@ -4,5 +4,7 @@
find ${SNAP_USER_DATA} -name '*nbjavac.*' -delete || true
find ${SNAP_USER_DATA} -name '*nbjavac-*' -delete || true
+# Remove NetBeans Gradle Tooling if that was patched between releases.
+find ${SNAP_USER_DATA} -name netbeans-gradle-tooling.jar -delete || true
exec $@
-
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
(netbeans) branch master updated: Let NetBeans know that Gradle 8.5 is good with Java 21
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 b2db3a6941 Let NetBeans know that Gradle 8.5 is good with Java 21
b2db3a6941 is described below
commit b2db3a6941e9c324e22cb435d1a66eead78ec668
Author: Laszlo Kishalmi
AuthorDate: Wed Dec 6 15:35:34 2023 -0800
Let NetBeans know that Gradle 8.5 is good with Java 21
---
.../gradle/api/execute/GradleDistributionManager.java | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git
a/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java
b/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java
index 1cc156d0f6..c903160774 100644
---
a/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java
+++
b/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java
@@ -100,6 +100,7 @@ public final class GradleDistributionManager {
GradleVersion.version("7.5"), // JDK-18
GradleVersion.version("7.6"), // JDK-19
GradleVersion.version("8.3"), // JDK-20
+GradleVersion.version("8.5"), // JDK-21
};
final File gradleUserHome;
@@ -484,12 +485,22 @@ public final class GradleDistributionManager {
* Checks if this Gradle distribution is compatible with the given
* major version of Java. Java 1.6, 1.7 and 1.8 are treated as major
* version 6, 7, and 8.
- *
+ *
+ * NetBeans uses a built in fixed list of compatibility matrix. That
+ * means it might not know about the compatibility of newer Gradle
+ * versions. Optimistic bias would return {@code true} on these
+ * versions form 2.37.
+ *
* @param jdkMajorVersion the major version of the JDK
* @return true if this version is supported with that
JDK.
*/
public boolean isCompatibleWithJava(int jdkMajorVersion) {
-return jdkMajorVersion <= lastSupportedJava();
+
+GradleVersion lastKnown = JDK_COMPAT[JDK_COMPAT.length - 1];
+// Optimistic bias, if the GradleVersion is newer than the last NB
+// knows, we say it's compatible with any JDK
+return lastKnown.compareTo(version.getBaseVersion()) < 0
+|| jdkMajorVersion <= lastSupportedJava();
}
/**
-
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: Use Ant for building NetBeans Gradle Tooling
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 b6a064d591 Use Ant for building NetBeans Gradle Tooling
b6a064d591 is described below
commit b6a064d59155831e87e3bfb8f4ece9ee878d9361
Author: Laszlo Kishalmi
AuthorDate: Thu Dec 7 20:31:21 2023 -0800
Use Ant for building NetBeans Gradle Tooling
---
.github/workflows/main.yml | 7 ---
README.md | 2 -
extide/gradle/build.xml | 6 +--
extide/gradle/netbeans-gradle-tooling/build.xml | 61 +
4 files changed, 62 insertions(+), 14 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 718c2e4bc4..48f33b525d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -133,13 +133,6 @@ jobs:
key: ${{ runner.os }}-${{ hashFiles('*/external/binaries-list',
'*/*/external/binaries-list') }}
restore-keys: ${{ runner.os }}-
- - name: Setup Gradle Daemon to run on JDK 11
-if: ${{ matrix.java == '21' }}
-run: |
- mkdir -p ~/.gradle
- #uses a preinstalled JDK 11 from the runner
- echo "org.gradle.java.home=$JAVA_HOME_11_X64" >>
~/.gradle/gradle.properties
-
- name: Build NetBeans
run: ant $OPTS -quiet -Dcluster.config=$CLUSTER_CONFIG build-nozip
diff --git a/README.md b/README.md
index 3c11b06327..dc60be0cef 100644
--- a/README.md
+++ b/README.md
@@ -72,8 +72,6 @@ $ ant -q clean
Notes:
* You can also use `php`, `enterprise`, etc. See the
[cluster.properties](https://github.com/apache/netbeans/blob/master/nbbuild/cluster.properties)
file.
* Once built, you can simply open individual modules of interest with NetBeans
and run/rebuild/debug them like any other project
-* Building the gradle modules on recent JDKs might fail with "Unsupported
class file major version" errors. In that case the gradle daemon must be
- configured to run on a compatible JDK (for example add
`org.gradle.java.home=/home/duke/jdk17` to your `~/.gradle/gradle.properties`,
see [gradle
doc](https://docs.gradle.org/current/userguide/build_environment.html)).
Generating Javadoc
diff --git a/extide/gradle/build.xml b/extide/gradle/build.xml
index d89c48782b..8159212a04 100644
--- a/extide/gradle/build.xml
+++ b/extide/gradle/build.xml
@@ -58,11 +58,7 @@
-
-
-
-
-
+
diff --git a/extide/gradle/netbeans-gradle-tooling/build.xml
b/extide/gradle/netbeans-gradle-tooling/build.xml
new file mode 100644
index 00..c9a38495b1
--- /dev/null
+++ b/extide/gradle/netbeans-gradle-tooling/build.xml
@@ -0,0 +1,61 @@
+
+
+
+Builds, tests, and runs the project
org.netbeans.modules.gradle
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
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 (0625641ec3 -> 8cbb672170)
This is an automated email from the ASF dual-hosted git repository. lkishalmi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 0625641ec3 Merge pull request #6548 from sdedic/gradle/detect-offline-stack-overflow new 86da2eb8be Removed a few defunct Gradle Settings new 8a1ea98ac6 Use Default Java Runtime Selector for Gradle instead of Gradle Version Selector. new 5538a4f8a2 Calling setters on deprecated Gradle settings logs warning. new 0d84dd23f3 Minor layout tweaks in Gradle settings UI. new ce558a9ae0 Removed the option for the Gradle execution customizer new 8cbb672170 Merge pull request #6516 from lkishalmi/deprecate-a-few-gradle-setting The 9194 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: extide/gradle/apichanges.xml | 20 + extide/gradle/manifest.mf | 2 +- .../gradle/api/execute/GradleCommandLine.java | 1 - .../modules/gradle/api/execute/RunUtils.java | 23 +- .../gradle/customizer/GradleExecutionPanel.form| 2 +- .../gradle/customizer/GradleExecutionPanel.java| 4 +- .../gradle/customizer/ProjectInfoPanel.form| 82 ++-- .../gradle/customizer/ProjectInfoPanel.java| 62 +-- .../modules/gradle/execute/Bundle.properties | 1 - .../gradle/execute/ExecutionOptionsPanel.form | 17 +- .../gradle/execute/ExecutionOptionsPanel.java | 18 +- .../execute/GradleDistributionProviderImpl.java| 9 +- .../gradle/execute/GradleExecutorOptionsPanel.form | 19 +- .../gradle/execute/GradleExecutorOptionsPanel.java | 14 +- .../execute/GradleJavaPlatformProviderImpl.java| 2 +- .../modules/gradle/loaders/GradleDaemon.java | 16 - .../modules/gradle/options/Bundle.properties | 13 +- .../gradle/options/GradleExperimentalSettings.java | 21 + .../gradle/options/GradleOptionsController.java| 6 - .../modules/gradle/options/SettingsPanel.form | 211 - .../modules/gradle/options/SettingsPanel.java | 473 ++--- .../modules/gradle/spi/GradleSettings.java | 58 ++- 22 files changed, 524 insertions(+), 550 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: Update Gradle Tooling API to 8.4
This is an automated email from the ASF dual-hosted git repository. lkishalmi 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 e010ac1140 Update Gradle Tooling API to 8.4 e010ac1140 is described below commit e010ac1140cc4dc521b54ad25964c1a9d297c4c3 Author: Laszlo Kishalmi AuthorDate: Tue Oct 10 23:34:50 2023 +0200 Update Gradle Tooling API to 8.4 --- extide/libs.gradle/external/binaries-list | 2 +- ...ng-api-8.3-rc-1-license.txt => gradle-tooling-api-8.4-license.txt} | 4 ++-- ...ling-api-8.3-rc-1-notice.txt => gradle-tooling-api-8.4-notice.txt} | 0 extide/libs.gradle/manifest.mf| 2 +- extide/libs.gradle/nbproject/project.properties | 2 +- extide/libs.gradle/nbproject/project.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/extide/libs.gradle/external/binaries-list b/extide/libs.gradle/external/binaries-list index 909e0bc2d8..a66dfd10f6 100644 --- a/extide/libs.gradle/external/binaries-list +++ b/extide/libs.gradle/external/binaries-list @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. -AEBBC4E42C325572B12B6CCE22AE30902037603A https://repo.gradle.org/artifactory/libs-releases/org/gradle/gradle-tooling-api/8.3-rc-1/gradle-tooling-api-8.3-rc-1.jar gradle-tooling-api-8.3-rc-1.jar +ADAA3E825C608D242126CF4D1DDD5B5203D6 https://repo.gradle.org/artifactory/libs-releases/org/gradle/gradle-tooling-api/8.4/gradle-tooling-api-8.4.jar gradle-tooling-api-8.4.jar diff --git a/extide/libs.gradle/external/gradle-tooling-api-8.3-rc-1-license.txt b/extide/libs.gradle/external/gradle-tooling-api-8.4-license.txt similarity index 99% rename from extide/libs.gradle/external/gradle-tooling-api-8.3-rc-1-license.txt rename to extide/libs.gradle/external/gradle-tooling-api-8.4-license.txt index 4b01033df4..297bca2f3d 100644 --- a/extide/libs.gradle/external/gradle-tooling-api-8.3-rc-1-license.txt +++ b/extide/libs.gradle/external/gradle-tooling-api-8.4-license.txt @@ -1,7 +1,7 @@ Name: Gradle Tooling API Description: Gradle Tooling API -Version: 8.3-rc-1 -Files: gradle-tooling-api-8.3-rc-1.jar +Version: 8.4 +Files: gradle-tooling-api-8.4.jar License: Apache-2.0 Origin: Gradle Inc. URL: https://gradle.org/ diff --git a/extide/libs.gradle/external/gradle-tooling-api-8.3-rc-1-notice.txt b/extide/libs.gradle/external/gradle-tooling-api-8.4-notice.txt similarity index 100% rename from extide/libs.gradle/external/gradle-tooling-api-8.3-rc-1-notice.txt rename to extide/libs.gradle/external/gradle-tooling-api-8.4-notice.txt diff --git a/extide/libs.gradle/manifest.mf b/extide/libs.gradle/manifest.mf index 6e57bb9829..da67596109 100644 --- a/extide/libs.gradle/manifest.mf +++ b/extide/libs.gradle/manifest.mf @@ -2,4 +2,4 @@ Manifest-Version: 1.0 AutoUpdate-Show-In-Client: false OpenIDE-Module: org.netbeans.modules.libs.gradle/8 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/libs/gradle/Bundle.properties -OpenIDE-Module-Specification-Version: 8.3 +OpenIDE-Module-Specification-Version: 8.4 diff --git a/extide/libs.gradle/nbproject/project.properties b/extide/libs.gradle/nbproject/project.properties index ab89a246ff..57bf8681b6 100644 --- a/extide/libs.gradle/nbproject/project.properties +++ b/extide/libs.gradle/nbproject/project.properties @@ -22,4 +22,4 @@ javac.compilerargs=-Xlint -Xlint:-serial # For more information, please see http://wiki.netbeans.org/SignatureTest sigtest.gen.fail.on.error=false -release.external/gradle-tooling-api-8.3-rc-1.jar=modules/gradle/gradle-tooling-api.jar +release.external/gradle-tooling-api-8.4.jar=modules/gradle/gradle-tooling-api.jar diff --git a/extide/libs.gradle/nbproject/project.xml b/extide/libs.gradle/nbproject/project.xml index 20b1d1455c..5539f821a2 100644 --- a/extide/libs.gradle/nbproject/project.xml +++ b/extide/libs.gradle/nbproject/project.xml @@ -39,7 +39,7 @@ gradle/gradle-tooling-api.jar - external/gradle-tooling-api-8.3-rc-1.jar + external/gradle-tooling-api-8.4.jar - 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 (b386c4ec5b -> fbdda86a51)
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from b386c4ec5b Merge pull request #3215 from
sworisbreathing/NETBEANS-4997-fix-open-url-in-edge
add fbdda86a51 Work on HCL Expression AST
No new revisions were added by this update.
Summary of changes:
ide/languages.hcl/manifest.mf |1 +
ide/languages.hcl/nbproject/project.properties |3 +-
ide/languages.hcl/nbproject/project.xml|9 +
.../modules/languages/hcl/HCLLanguage.java |6 +
.../modules/languages/hcl/HCLParserResult.java | 35 +-
.../modules/languages/hcl/HCLSemanticAnalyzer.java | 161 +++
.../modules/languages/hcl/HCLStructureItem.java|7 +-
.../modules/languages/hcl/{ast => }/SourceRef.java | 48 +-
.../languages/hcl/ast/ASTBuilderListener.java | 108 --
...{HCLElement.java => HCLAddressableElement.java} | 17 +-
.../languages/hcl/ast/HCLArithmeticOperation.java | 111 ++
.../modules/languages/hcl/ast/HCLAttribute.java| 27 +-
.../modules/languages/hcl/ast/HCLBlock.java|6 +-
.../modules/languages/hcl/ast/HCLBlockFactory.java | 155 +++
.../modules/languages/hcl/ast/HCLCollection.java | 125 ++
...{HCLBlock.java => HCLConditionalOperation.java} | 35 +-
.../modules/languages/hcl/ast/HCLContainer.java| 14 +-
.../modules/languages/hcl/ast/HCLDocument.java |1 +
.../modules/languages/hcl/ast/HCLElement.java | 78 +-
.../modules/languages/hcl/ast/HCLExpression.java | 57 +
.../languages/hcl/ast/HCLExpressionFactory.java| 407 ++
.../languages/hcl/ast/HCLForExpression.java| 113 ++
.../ast/{HCLAttribute.java => HCLFunction.java}| 39 +-
.../modules/languages/hcl/ast/HCLIdentifier.java | 21 +-
.../modules/languages/hcl/ast/HCLLiteral.java | 93 ++
.../languages/hcl/ast/HCLResolveOperation.java | 109 ++
.../modules/languages/hcl/ast/HCLTemplate.java | 136 ++
.../ast/{HCLAttribute.java => HCLVariable.java}| 25 +-
.../hcl/grammar/g4/HCLExpressionParser.g4 | 40 +-
.../languages/hcl/grammar/g4/HCLLexerBasics.g4 |5 +-
.../modules/languages/hcl/grammar/g4/HCLParser.g4 |3 -
.../hcl/terraform/TerraformParserResult.java | 99 +-
.../hcl/terraform/TerraformSemanticAnalyzer.java | 142 +-
.../modules/languages/hcl/terraform/snippets.xml |6 +
.../hcl/terraform/terraform-functions-1.4.json | 1439
.../languages/hcl/tfvars/TFVarsParserResult.java | 16 +-
.../modules/languages/hcl/ReferenceTest.java | 139 ++
.../modules/languages/hcl/ast/HCLLiteralsTest.java | 74 +
.../languages/hcl/ast/HCLOperationsTest.java | 82 ++
.../languages/hcl/grammar/HCLParserTest.java |9 +-
40 files changed, 3641 insertions(+), 360 deletions(-)
create mode 100644
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/HCLSemanticAnalyzer.java
rename ide/languages.hcl/src/org/netbeans/modules/languages/hcl/{ast =>
}/SourceRef.java (51%)
delete mode 100644
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/ASTBuilderListener.java
copy
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/{HCLElement.java
=> HCLAddressableElement.java} (79%)
create mode 100644
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/HCLArithmeticOperation.java
create mode 100644
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/HCLBlockFactory.java
create mode 100644
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/HCLCollection.java
copy
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/{HCLBlock.java =>
HCLConditionalOperation.java} (56%)
create mode 100644
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/HCLExpression.java
create mode 100644
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/HCLExpressionFactory.java
create mode 100644
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/HCLForExpression.java
copy
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/{HCLAttribute.java
=> HCLFunction.java} (55%)
create mode 100644
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/HCLLiteral.java
create mode 100644
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/HCLResolveOperation.java
create mode 100644
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/HCLTemplate.java
copy
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/{HCLAttribute.java
=> HCLVariable.java} (69%)
create mode 100644
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/terraform/terraform-functions-1.4.json
create mode 100644
ide/languages.hcl/test/unit/src/org/netbeans/modules/languages/hcl/ReferenceTest.java
create mode 100644
ide/languages.hcl/test/unit/src/org/netbeans/modules/language
[netbeans] branch master updated: Rust: More precise parser error markings in the Editor
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 9bc15b1fd0 Rust: More precise parser error markings in the Editor
9bc15b1fd0 is described below
commit 9bc15b1fd039fdf08eda7ea81fe1ce5c5a33eaa2
Author: Laszlo Kishalmi
AuthorDate: Wed Jul 26 17:55:02 2023 -0700
Rust: More precise parser error markings in the Editor
---
.../src/org/netbeans/modules/rust/grammar/ast/RustAST.java| 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
a/rust/rust.grammar/src/org/netbeans/modules/rust/grammar/ast/RustAST.java
b/rust/rust.grammar/src/org/netbeans/modules/rust/grammar/ast/RustAST.java
index 52eb050961..5ed3b9f750 100644
--- a/rust/rust.grammar/src/org/netbeans/modules/rust/grammar/ast/RustAST.java
+++ b/rust/rust.grammar/src/org/netbeans/modules/rust/grammar/ast/RustAST.java
@@ -103,9 +103,9 @@ public final class RustAST {
if (offendingSymbol instanceof Token) {
Token offendingToken = (Token) offendingSymbol;
errorStartIndex = offendingToken.getStartIndex();
-errorStopIndex = offendingToken.getStopIndex();
+errorStopIndex = offendingToken.getStopIndex() + 1;
}
-errors.add(new DefaultError(null, msg, null, fileObject,
errorStartIndex, errorStopIndex, Severity.ERROR));
+errors.add(new DefaultError(null, msg, null, fileObject,
errorStartIndex, errorStopIndex, errorStartIndex != errorStopIndex,
Severity.ERROR));
}
}
@@ -127,8 +127,8 @@ public final class RustAST {
String msg = sb.toString();
RecognitionException ex = new RecognitionException(msg,
recognizer, recognizer.getInputStream(), recognizer.getContext());
int start = e.getOffendingToken().getStartIndex();
-int stop = e.getOffendingToken().getStopIndex();
-errors.add(new DefaultError(null, msg, null, fileObject, start,
stop, Severity.ERROR));
+int stop = e.getOffendingToken().getStopIndex() + 1;
+errors.add(new DefaultError(null, msg, null, fileObject, start,
stop, false, Severity.ERROR));
}
}
-
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: Rework Janitor, try to use real version numbers, in the future
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 fcab7a1923 Rework Janitor, try to use real version numbers, in the
future
fcab7a1923 is described below
commit fcab7a1923361bc2db40ef1a6f85bcef183b2311
Author: Laszlo Kishalmi
AuthorDate: Mon Jul 3 18:19:51 2023 -0700
Rework Janitor, try to use real version numbers, in the future
---
.../src/org/netbeans/modules/janitor/Janitor.java | 392 +
.../modules/janitor/JanitorOptionsPanel.java | 6 +-
2 files changed, 254 insertions(+), 144 deletions(-)
diff --git a/platform/janitor/src/org/netbeans/modules/janitor/Janitor.java
b/platform/janitor/src/org/netbeans/modules/janitor/Janitor.java
index 0fa2e56456..91763d194a 100644
--- a/platform/janitor/src/org/netbeans/modules/janitor/Janitor.java
+++ b/platform/janitor/src/org/netbeans/modules/janitor/Janitor.java
@@ -20,7 +20,9 @@ package org.netbeans.modules.janitor;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.io.BufferedReader;
import java.io.File;
+import java.io.FileWriter;
import java.io.IOException;
import java.nio.file.FileVisitResult;
import java.nio.file.Files;
@@ -29,7 +31,6 @@ import java.nio.file.SimpleFileVisitor;
import java.nio.file.attribute.BasicFileAttributes;
import java.time.Duration;
import java.time.Instant;
-import java.time.temporal.ChronoUnit;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
@@ -37,6 +38,8 @@ import java.util.Map;
import java.util.Set;
import java.util.WeakHashMap;
import java.util.concurrent.atomic.AtomicLong;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import java.util.prefs.Preferences;
import javax.swing.Icon;
import org.netbeans.api.annotations.common.StaticResource;
@@ -58,36 +61,31 @@ import org.openide.windows.OnShowing;
"# {1} - the days of abandonement",
"# {2} - the disk space can be reclaimed (in megabytes)",
"TIT_ABANDONED_USERDIR=NetBeans {0} was last used {1} days ago.",
-
"# {0} - the name of the abandoned cache dir.",
"# {1} - the disk space can be reclaimed (in megabytes)",
"TIT_ABANDONED_CACHEDIR=NetBeans cache directory {0} seems to be
abandoned.",
-
"# {0} - is the user directory name",
"# {1} - the days of abandonement",
"# {2} - the disk space can be reclaimed (in megabytes)",
"DESC_ABANDONED_USERDIR=Remove unused data and cache directories of
NetBeans {0}. "
-+ "Free up {2} MB of disk space.",
-
++ "Free up {2} MB of disk space.",
"# {0} - is the cache directory name",
"# {1} - the disk space can be reclaimed (in megabytes)",
"DESC_ABANDONED_CACHEDIR=NetBeans could not find a user dir for cache dir
{0}, so it is probably abandoned. "
-+ "Remove abandoned cache dir, "
-+ "free up {1} MB of disk space.",
-
++ "Remove abandoned cache dir, "
++ "free up {1} MB of disk space.",
"TIT_CONFIRM_CLEANUP=Confirm Cleanup",
-
"# {0} - the dirname to be cleaned up",
"TXT_CONFIRM_CLEANUP=Remove user and cache data for NetBeans {0}?",
-
-"# {0} - the dirname to be cleaned up",
+"# {0} - the dirname to be cleaned up",
"TXT_CONFIRM_CACHE_CLEANUP=Remove abandoned cache dir?",
-
"# {0} - the dirname to be cleaned up",
"LBL_CLEANUP=Removing unused/abandoned user and/or cache dirs."
})
public class Janitor {
+private static final Logger LOG =
Logger.getLogger(Janitor.class.getName());
+
private static final int UNUSED_DAYS = 30;
public static final String PROP_JANITOR_ENABLED = "janitorEnabled";
//NOI18N
@@ -96,39 +94,60 @@ public class Janitor {
private static final String LOGFILE_NAME = "var/log/messages.log"; //NOI18N
private static final String ALL_CHECKSUM_NAME =
"lastModified/all-checksum.txt"; //NOI18N
+private static final String LAST_VERSION_NAME = ".lastUsedVersion";
//NOI18N
+
+private static final String NB_VERSION;
+
@StaticResource
private static final String CLEAN_ICON =
"org/netbeans/modules/janitor/resources/clean.gif"; //NOI18N
static final RequestProcessor JANITOR_RP = new RequestProcessor("janitor",
1); //NOI18N
static final Map CLEANUP_TASKS = new
WeakHashMap<>();
+static {
+String version = System.getProperty("netbeans.buildnumber"); //NOI18N
+if (version != null) {
+// remove git hash from the bu
[netbeans] branch master updated (d0793acdbd -> faf308b4da)
This is an automated email from the ASF dual-hosted git repository. lkishalmi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from d0793acdbd Merge pull request #6054 from mbien/update-min-jdk-warning add faf308b4da Added basic line indenting to HCL languages. (#6127) No new revisions were added by this update. Summary of changes: ide/languages.hcl/nbproject/project.xml| 35 ++-- .../modules/languages/hcl/BasicHCLLexer.java | 124 --- .../modules/languages/hcl/HCLIndenter.java | 231 + .../modules/languages/hcl/HCLLanguage.java | 4 +- .../netbeans/modules/languages/hcl/HCLTokenId.java | 98 +++-- .../languages/hcl/ast/ASTBuilderListener.java | 10 +- .../hcl/grammar/g4/HCLExpressionParser.g4 | 3 +- .../modules/languages/hcl/grammar/g4/HCLLexer.g4 | 10 +- .../languages/hcl/grammar/g4/HCLLexerBasics.g4 | 10 +- .../modules/languages/hcl/HCLIndenterTest.java | 184 10 files changed, 584 insertions(+), 125 deletions(-) create mode 100644 ide/languages.hcl/src/org/netbeans/modules/languages/hcl/HCLIndenter.java create mode 100644 ide/languages.hcl/test/unit/src/org/netbeans/modules/languages/hcl/HCLIndenterTest.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 (868f28a0d9 -> aee53d5558)
This is an automated email from the ASF dual-hosted git repository. lkishalmi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 868f28a0d9 Filtering symbols by query prefix. (#6136) add aee53d5558 Flyweight Token support for ANTLR4 Lexer Bridge No new revisions were added by this update. Summary of changes: ide/lexer.antlr4/apichanges.xml| 144 + ide/lexer.antlr4/nbproject/project.properties | 4 +- .../spi/lexer/antlr4/AbstractAntlrLexerBridge.java | 24 +++- .../spi/lexer/antlr4/LexerInputCharStream.java | 8 +- .../netbeans/spi/lexer/antlr4/package-info.java| 22 5 files changed, 197 insertions(+), 5 deletions(-) create mode 100644 ide/lexer.antlr4/apichanges.xml create mode 100644 ide/lexer.antlr4/src/org/netbeans/spi/lexer/antlr4/package-info.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: Languages.hcl terraform semantic highlights (#6081)
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 fb9e029bda Languages.hcl terraform semantic highlights (#6081)
fb9e029bda is described below
commit fb9e029bda8d4aa5e1e4c69b86304102a049f147
Author: Laszlo Kishalmi
AuthorDate: Tue Jun 20 13:05:43 2023 -0700
Languages.hcl terraform semantic highlights (#6081)
* Initial Semantic Highlights for Terraform
* Add `check` block (new in Terraform 1.5)
* Added more highlighting options and code samples for the Options dialog
---
ide/languages.hcl/build.xml| 1 -
ide/languages.hcl/licenseinfo.xml | 5 +
.../modules/languages/hcl/BasicHCLLexer.java | 7 +-
.../modules/languages/hcl/Bundle.properties| 5 +
.../modules/languages/hcl/FontAndColors.xml| 9 ++
.../netbeans/modules/languages/hcl/HCLTokenId.java | 1 +
.../languages/hcl/grammar/g4/TerraformLexer.g4 | 93 --
.../org/netbeans/modules/languages/hcl/layer.xml | 30 +
.../languages/hcl/terraform/TerraformHCLLexer.java | 138 -
.../languages/hcl/terraform/TerraformLanguage.java | 9 +-
.../hcl/terraform/TerraformParserResult.java | 15 ++-
.../hcl/terraform/TerraformSemanticAnalyzer.java | 110
.../modules/languages/hcl/terraform/example.tf | 42 +++
.../modules/languages/hcl/tfvars/example.tfvars| 14 +++
14 files changed, 241 insertions(+), 238 deletions(-)
diff --git a/ide/languages.hcl/build.xml b/ide/languages.hcl/build.xml
index 6966927cb7..c31b46ddab 100644
--- a/ide/languages.hcl/build.xml
+++ b/ide/languages.hcl/build.xml
@@ -39,7 +39,6 @@
-
diff --git a/ide/languages.hcl/licenseinfo.xml
b/ide/languages.hcl/licenseinfo.xml
index 80c4dbaeea..e13e2e886e 100644
--- a/ide/languages.hcl/licenseinfo.xml
+++ b/ide/languages.hcl/licenseinfo.xml
@@ -24,4 +24,9 @@
src/org/netbeans/modules/languages/hcl/resources/terraform.png
+
+
src/org/netbeans/modules/languages/hcl/terraform/example.tf
+
src/org/netbeans/modules/languages/hcl/tfvars/example.tfvars
+
+
diff --git
a/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/BasicHCLLexer.java
b/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/BasicHCLLexer.java
index 141cdaa899..e763877374 100644
---
a/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/BasicHCLLexer.java
+++
b/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/BasicHCLLexer.java
@@ -44,6 +44,7 @@ public final class BasicHCLLexer extends AbstractHCLLexer {
case BOOL_LIT:
return token(BOOLEAN);
+case LEGACY_INDEX:
case NUMERIC_LIT:
return token(NUMBER);
@@ -60,10 +61,14 @@ public final class BasicHCLLexer extends AbstractHCLLexer {
case RBRACE:
case LBRACK:
case RBRACK:
+return token(GROUP_SEPARATOR);
+
case LPAREN:
case RPAREN:
+case COLON:
case COMMA:
case DOT:
+case EQUAL:
case INTERPOLATION_START:
case INTERPOLATION_END:
case RARROW:
@@ -72,9 +77,7 @@ public final class BasicHCLLexer extends AbstractHCLLexer {
return token(SEPARATOR);
case AND:
-case COLON:
case ELLIPSIS:
-case EQUAL:
case EQUALS:
case GT:
case GTE:
diff --git
a/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/Bundle.properties
b/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/Bundle.properties
index e9a35a6348..2e76a88c13 100644
--- a/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/Bundle.properties
+++ b/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/Bundle.properties
@@ -23,6 +23,7 @@ OpenIDE-Module-Long-Description=Support for editing Terraform
files.
boolean=Boolean
comment=Comment
error=Error
+group-separator=Group Separator
heredoc-guard=HereDoc Guard
heredoc=HereDoc
interpolation=Interpolation
@@ -33,3 +34,7 @@ operator=Operator
separator=Separator
string=String
whitespace=Whitespace
+
+mod-class=Declaration Type
+mod-constructor=Declaration Identifier
+mod-field=Attribute
\ No newline at end of file
diff --git
a/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/FontAndColors.xml
b/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/FontAndColors.xml
index e73a8b1466..e341ee2755 100644
--- a/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/FontAndColors.xml
+++ b/ide/languages.hcl/src/org/netbeans/modules/languages/hcl
[netbeans] branch master updated (5193dfabc5 -> e7a5419c00)
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from 5193dfabc5 Merge pull request #5936 from mbien/maven-392
add e7a5419c00 Navigator Support for HCL Files (#5954)
No new revisions were added by this update.
Summary of changes:
ide/languages.hcl/build.xml| 1 -
ide/languages.hcl/nbproject/project.xml| 44 +-
.../modules/languages/hcl/BasicHCLLexer.java | 2 +-
.../modules/languages/hcl/HCLParserResult.java | 17 ++-
.../modules/languages/hcl/HCLStructureItem.java| 152 +
.../modules/languages/hcl/HCLStructureScanner.java | 13 +-
.../languages/hcl/ast/ASTBuilderListener.java | 86
.../modules/languages/hcl/ast/HCLAttribute.java| 11 +-
.../modules/languages/hcl/ast/HCLBlock.java| 9 +-
.../modules/languages/hcl/ast/HCLContainer.java| 22 ++-
.../modules/languages/hcl/ast/HCLDocument.java | 5 +-
.../modules/languages/hcl/ast/HCLElement.java | 30 ++--
.../modules/languages/hcl/ast/HCLIdentifier.java | 12 +-
.../modules/languages/hcl/ast/SourceRef.java | 38 +-
.../hcl/grammar/g4/HCLExpressionParser.g4 | 18 ++-
.../languages/hcl/terraform/TerraformHCLLexer.java | 2 +-
.../languages/hcl/terraform/TerraformLanguage.java | 11 ++
.../hcl/terraform/TerraformParserResult.java | 47 +--
.../languages/hcl/tfvars/TFVarsLanguage.java | 11 ++
.../languages/hcl/tfvars/TFVarsParserResult.java | 27 ++--
.../test/unit/data/testfiles/attributes.hcl| 3 +
.../unit/data/testfiles/attributes.hcl.structure | 3 +
.../test/unit/data/testfiles/blocks.hcl| 16 +++
.../test/unit/data/testfiles/blocks.hcl.structure | 8 ++
.../test/unit/data/testfiles/empty.hcl | 0
.../test/unit/data/testfiles/empty.hcl.structure | 0
.../modules/languages/hcl/HCLStructureTest.java} | 39 +++---
.../modules/languages/hcl/HCLTestBase.java}| 53 ---
.../hcl/grammar/HCLExpressionParserTest.java | 6 +-
.../languages/hcl/grammar/HCLParserTest.java | 80 +++
30 files changed, 607 insertions(+), 159 deletions(-)
create mode 100644
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/HCLStructureItem.java
create mode 100644 ide/languages.hcl/test/unit/data/testfiles/attributes.hcl
create mode 100644
ide/languages.hcl/test/unit/data/testfiles/attributes.hcl.structure
create mode 100644 ide/languages.hcl/test/unit/data/testfiles/blocks.hcl
create mode 100644
ide/languages.hcl/test/unit/data/testfiles/blocks.hcl.structure
copy
contrib/groovy.grailsproject/test/unit/data/projects/completion/stacktrace.log
=> ide/languages.hcl/test/unit/data/testfiles/empty.hcl (100%)
copy
contrib/groovy.grailsproject/test/unit/data/projects/completion/stacktrace.log
=> ide/languages.hcl/test/unit/data/testfiles/empty.hcl.structure (100%)
copy
ide/languages.hcl/{src/org/netbeans/modules/languages/hcl/ast/HCLBlock.java =>
test/unit/src/org/netbeans/modules/languages/hcl/HCLStructureTest.java} (56%)
copy
ide/languages.hcl/{src/org/netbeans/modules/languages/hcl/ast/HCLIdentifier.java
=> test/unit/src/org/netbeans/modules/languages/hcl/HCLTestBase.java} (52%)
create mode 100644
ide/languages.hcl/test/unit/src/org/netbeans/modules/languages/hcl/grammar/HCLParserTest.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 (5d5a120584 -> 86fb03e37f)
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from 5d5a120584 Merge pull request #4999 from mbien/indexer7
add 86fb03e37f Markdown viewer links (#5898)
No new revisions were added by this update.
Summary of changes:
ide/libs.flexmark/external/binaries-list | 20 ++-
36-license.txt => flexmark-0.62.2-license.txt} | 6 +-
ide/libs.flexmark/nbproject/project.properties | 20 ++-
ide/libs.flexmark/nbproject/project.xml| 60 ++--
ide/markdown/nbproject/project.xml | 2 +-
.../modules/markdown/MarkdownViewerElement.java| 171 ++---
nbbuild/licenses/BSD-flexmark | 2 +-
7 files changed, 234 insertions(+), 47 deletions(-)
rename ide/libs.flexmark/external/{flexmark-0.50.36-license.txt =>
flexmark-0.62.2-license.txt} (72%)
-
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 (0cd2d79096 -> 690b427102)
This is an automated email from the ASF dual-hosted git repository. lkishalmi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 0cd2d79096 Try to enable Java when no other Java support extension is currently installed. (#5889) add 690b427102 A very minimal, but functional viewer for Markdown files. No new revisions were added by this update. Summary of changes: ide/markdown/nbproject/project.xml | 8 + .../modules/markdown/MarkdownDataObject.java | 2 +- .../modules/markdown/MarkdownViewerElement.java| 165 + 3 files changed, 174 insertions(+), 1 deletion(-) create mode 100644 ide/markdown/src/org/netbeans/modules/markdown/MarkdownViewerElement.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 delivery updated: Fix HCL Lexer heredoc error on trailing space.
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new 2eb467f10c Fix HCL Lexer heredoc error on trailing space.
2eb467f10c is described below
commit 2eb467f10ce624d5900781234ab87eac59a21bc5
Author: Laszlo Kishalmi
AuthorDate: Tue Apr 18 15:24:11 2023 -0700
Fix HCL Lexer heredoc error on trailing space.
---
.../org/netbeans/modules/languages/hcl/HCLHereDocAdaptor.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git
a/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/HCLHereDocAdaptor.java
b/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/HCLHereDocAdaptor.java
index 9773e53472..ebbdc6 100644
---
a/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/HCLHereDocAdaptor.java
+++
b/ide/languages.hcl/src/org/netbeans/modules/languages/hcl/HCLHereDocAdaptor.java
@@ -51,14 +51,14 @@ public abstract class HCLHereDocAdaptor extends Lexer {
protected boolean heredocEndAhead(String partialHeredoc) {
int n = 1;
int c = _input.LA(1);
+// NewLines are part of heredoc content, but
+// heredoc marker and it's leading space are not
+while (Character.isWhitespace(c) && c != '\n') {
+c = _input.LA(++n);
+}
if (c == '\n') {
-//NewLines are part of heredoc content
return false;
}
-// heredoc marker and it's leading space are not part of the heredoc
content
-while (Character.isWhitespace(c)) {
-c = _input.LA(++n);
-}
for (int v = 0; v < currentHereDocVar.length(); v++) {
if (this._input.LA(n + v) != currentHereDocVar.charAt(v)) {
return false;
-
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated: Retain SOURCE annotations inside the intenal model. (#4882)
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 fd9bab3c99 Retain SOURCE annotations inside the intenal model. (#4882)
fd9bab3c99 is described below
commit fd9bab3c991ede9acb5caddbaf3193943a7814a1
Author: Jan Lahoda
AuthorDate: Mon Apr 17 20:29:15 2023 +0200
Retain SOURCE annotations inside the intenal model. (#4882)
---
.../lib/nbjavac/services/NBClassReader.java| 60 +-
.../lib/nbjavac/services/NBClassWriter.java| 133 -
.../lib/nbjavac/services/NBClassWriterTest.java| 81 +++--
.../netbeans/lib/nbjavac/services/Utilities.java | 1 +
4 files changed, 263 insertions(+), 12 deletions(-)
diff --git
a/java/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBClassReader.java
b/java/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBClassReader.java
index 9bad23cc29..d8d1722e1c 100644
--- a/java/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBClassReader.java
+++ b/java/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBClassReader.java
@@ -33,6 +33,8 @@ import com.sun.tools.javac.util.Names;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -45,6 +47,8 @@ import javax.tools.JavaFileObject;
*/
public class NBClassReader extends ClassReader {
+private static final Logger LOG =
Logger.getLogger(NBClassReader.class.getName());
+
public static void preRegister(Context context) {
context.put(classReaderKey, new Context.Factory() {
@Override
@@ -73,6 +77,24 @@ public class NBClassReader extends ClassReader {
bp = newbp;
}
},
+new
NBAttributeReader(nbNames._org_netbeans_SourceLevelAnnotations, Version.V49,
CLASS_OR_MEMBER_ATTRIBUTE) {
+protected void read(Symbol sym, int attrLen) {
+attachAnnotations(sym);
+}
+
+},
+new
NBAttributeReader(nbNames._org_netbeans_SourceLevelParameterAnnotations,
Version.V49, CLASS_OR_MEMBER_ATTRIBUTE) {
+protected void read(Symbol sym, int attrLen) {
+attachParameterAnnotations(sym);
+}
+
+},
+new
NBAttributeReader(nbNames._org_netbeans_SourceLevelTypeAnnotations,
Version.V52, CLASS_OR_MEMBER_ATTRIBUTE) {
+protected void read(Symbol sym, int attrLen) {
+attachTypeAnnotations(sym);
+}
+
+},
};
for (NBAttributeReader r: readers)
@@ -109,7 +131,7 @@ public class NBClassReader extends ClassReader {
}
}
} catch (IOException ex) {
-
Logger.getLogger(NBClassReader.class.getName()).log(Level.FINE, null, ex);
+LOG.log(Level.FINE, null, ex);
} finally {
c.classfile = origFile;
}
@@ -131,6 +153,42 @@ public class NBClassReader extends ClassReader {
return Arrays.copyOf(data, off);
}
+private void attachAnnotations(Symbol sym) {
+try {
+Method m =
ClassReader.class.getDeclaredMethod("attachAnnotations", Symbol.class);
+m.setAccessible(true);
+m.invoke(this, sym);
+} catch (NoSuchMethodException | SecurityException |
+ IllegalAccessException | IllegalArgumentException |
+ InvocationTargetException ex) {
+LOG.log(Level.SEVERE, null, ex);
+}
+}
+
+private void attachParameterAnnotations(Symbol sym) {
+try {
+Method m =
ClassReader.class.getDeclaredMethod("readParameterAnnotations", Symbol.class);
+m.setAccessible(true);
+m.invoke(this, sym);
+} catch (NoSuchMethodException | SecurityException |
+ IllegalAccessException | IllegalArgumentException |
+ InvocationTargetException ex) {
+LOG.log(Level.SEVERE, null, ex);
+}
+}
+
+private void attachTypeAnnotations(Symbol sym) {
+try {
+Method m =
ClassReader.class.getDeclaredMethod("attachTypeAnnotations", Symbol.class);
+m.setAccessible(true);
+m.invoke(this, sym);
+} catch (NoSuchMethodException | SecurityException |
+ IllegalAccessException | IllegalArgumentException |
+ InvocationTargetException ex) {
+LOG.log(Level.SEVERE, null, ex);
+}
+}
+
private abstract c
[netbeans] branch master updated (ac3b904000 -> d55aadc378)
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from ac3b904000 Merge pull request #5637 from
mbien/jdk-detector-improvements
add d55aadc378 Initial HCL Support (#5612)
No new revisions were added by this update.
Summary of changes:
.gitignore | 1 +
ide/editor.kit/nbproject/project.xml | 6 +
ide/languages.hcl/build.xml| 50
ide/languages.hcl/licenseinfo.xml | 27 ++
ide/languages.hcl/manifest.mf | 6 +
ide/languages.hcl/nbproject/project.properties | 18 ++
.../nbproject/project.xml | 225 +
.../modules/languages/hcl/AbstractHCLLexer.java| 103
.../modules/languages/hcl/BasicHCLLexer.java | 117 +
.../modules/languages/hcl/Bundle.properties| 35 +++
.../modules/languages/hcl/FontAndColors.xml| 39 +++
.../modules/languages/hcl/HCLHereDocAdaptor.java | 79 ++
.../modules/languages/hcl/HCLLanguage.java | 252 +++
.../modules/languages/hcl/HCLParserResult.java | 214
.../modules/languages/hcl/HCLStructureScanner.java | 56 +
.../netbeans/modules/languages/hcl/HCLTokenId.java | 54
.../modules/languages/hcl/NbHCLParser.java | 62 +
.../languages/hcl/ast/ASTBuilderListener.java | 80 ++
.../modules/languages/hcl/ast/HCLAttribute.java| 39 +++
.../modules/languages/hcl/ast/HCLBlock.java| 49
.../modules/languages/hcl/ast/HCLContainer.java| 54
.../modules/languages/hcl/ast/HCLDocument.java | 32 +++
.../modules/languages/hcl/ast/HCLElement.java | 54
.../modules/languages/hcl/ast/HCLIdentifier.java | 63 +
.../modules/languages/hcl/ast/SourceRef.java | 37 +++
.../hcl/grammar/g4/HCLExpressionParser.g4 | 191 ++
.../modules/languages/hcl/grammar/g4/HCLLexer.g4 | 278 +
.../languages/hcl/grammar/g4/HCLLexerBasics.g4 | 250 ++
.../modules/languages/hcl/grammar/g4/HCLParser.g4 | 42
.../languages/hcl/grammar/g4/TerraformLexer.g4 | 93 +++
.../org/netbeans/modules/languages/hcl/layer.xml | 75 ++
.../modules/languages/hcl/resources/terraform.png | Bin 0 -> 525 bytes
.../modules/languages/hcl/resources/terraform.svg | 57 +
.../languages/hcl/terraform}/Bundle.properties | 0
.../languages/hcl/terraform/TerraformHCLLexer.java | 136 ++
.../languages/hcl/terraform/TerraformLanguage.java | 105
.../hcl/terraform/TerraformParserResult.java | 113 +
.../languages/hcl/terraform/preferences.xml| 27 ++
.../modules/languages/hcl/terraform/snippets.xml | 93 +++
.../languages/hcl/tfvars}/Bundle.properties| 0
.../languages/hcl/tfvars/TFVarsLanguage.java | 106
.../languages/hcl/tfvars/TFVarsParserResult.java | 56 +
.../modules/languages/hcl/tfvars/preferences.xml | 27 ++
nbbuild/cluster.properties | 1 +
nbbuild/licenses/MIT-vscode-material-icon-theme| 21 ++
45 files changed, 3320 insertions(+), 103 deletions(-)
create mode 100644 ide/languages.hcl/build.xml
create mode 100644 ide/languages.hcl/licenseinfo.xml
create mode 100644 ide/languages.hcl/manifest.mf
create mode 100644 ide/languages.hcl/nbproject/project.properties
copy ide/{editor.kit => languages.hcl}/nbproject/project.xml (52%)
create mode 100644
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/AbstractHCLLexer.java
create mode 100644
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/BasicHCLLexer.java
create mode 100644
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/Bundle.properties
create mode 100644
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/FontAndColors.xml
create mode 100644
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/HCLHereDocAdaptor.java
create mode 100644
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/HCLLanguage.java
create mode 100644
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/HCLParserResult.java
create mode 100644
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/HCLStructureScanner.java
create mode 100644
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/HCLTokenId.java
create mode 100644
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/NbHCLParser.java
create mode 100644
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/ASTBuilderListener.java
create mode 100644
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/HCLAttribute.java
create mode 100644
ide/languages.hcl/src/org/netbeans/modules/languages/hcl/ast/HCLBlock.java
create mode 100644
ide/languages.hcl/src/org/netbeans/m
[netbeans] branch master updated: Upgrade Gradle Tooling API to 8.1 GA
This is an automated email from the ASF dual-hosted git repository. lkishalmi 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 b9e9aa2ab5 Upgrade Gradle Tooling API to 8.1 GA b9e9aa2ab5 is described below commit b9e9aa2ab5b637a5e16f0fb25e0f4d8030d40500 Author: Laszlo Kishalmi AuthorDate: Sat Apr 15 07:40:47 2023 -0700 Upgrade Gradle Tooling API to 8.1 GA --- extide/libs.gradle/external/binaries-list | 2 +- ...ng-api-8.1-rc-2-license.txt => gradle-tooling-api-8.1-license.txt} | 4 ++-- ...ling-api-8.1-rc-2-notice.txt => gradle-tooling-api-8.1-notice.txt} | 0 extide/libs.gradle/nbproject/project.properties | 2 +- extide/libs.gradle/nbproject/project.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/extide/libs.gradle/external/binaries-list b/extide/libs.gradle/external/binaries-list index d5d8652419..22ac09dde5 100644 --- a/extide/libs.gradle/external/binaries-list +++ b/extide/libs.gradle/external/binaries-list @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. -9BDE23C249C496F22A15B6202219170C5BCEF825 https://repo.gradle.org/artifactory/libs-releases/org/gradle/gradle-tooling-api/8.1-rc-2/gradle-tooling-api-8.1-rc-2.jar gradle-tooling-api-8.1-rc-2.jar +3A673551814ABB3934516344F025B394C9BF7BD6 https://repo.gradle.org/artifactory/libs-releases/org/gradle/gradle-tooling-api/8.1/gradle-tooling-api-8.1.jar gradle-tooling-api-8.1.jar diff --git a/extide/libs.gradle/external/gradle-tooling-api-8.1-rc-2-license.txt b/extide/libs.gradle/external/gradle-tooling-api-8.1-license.txt similarity index 99% rename from extide/libs.gradle/external/gradle-tooling-api-8.1-rc-2-license.txt rename to extide/libs.gradle/external/gradle-tooling-api-8.1-license.txt index 6c71fd7075..17972b70bd 100644 --- a/extide/libs.gradle/external/gradle-tooling-api-8.1-rc-2-license.txt +++ b/extide/libs.gradle/external/gradle-tooling-api-8.1-license.txt @@ -1,7 +1,7 @@ Name: Gradle Wrapper Description: Gradle Tooling API -Version: 8.1-rc-2 -Files: gradle-tooling-api-8.1-rc-2.jar +Version: 8.1 +Files: gradle-tooling-api-8.1.jar License: Apache-2.0 Origin: Gradle Inc. URL: https://gradle.org/ diff --git a/extide/libs.gradle/external/gradle-tooling-api-8.1-rc-2-notice.txt b/extide/libs.gradle/external/gradle-tooling-api-8.1-notice.txt similarity index 100% rename from extide/libs.gradle/external/gradle-tooling-api-8.1-rc-2-notice.txt rename to extide/libs.gradle/external/gradle-tooling-api-8.1-notice.txt diff --git a/extide/libs.gradle/nbproject/project.properties b/extide/libs.gradle/nbproject/project.properties index 98f01b2184..ea5cdea54f 100644 --- a/extide/libs.gradle/nbproject/project.properties +++ b/extide/libs.gradle/nbproject/project.properties @@ -22,4 +22,4 @@ javac.compilerargs=-Xlint -Xlint:-serial # For more information, please see http://wiki.netbeans.org/SignatureTest sigtest.gen.fail.on.error=false -release.external/gradle-tooling-api-8.1-rc-2.jar=modules/gradle/gradle-tooling-api.jar +release.external/gradle-tooling-api-8.1.jar=modules/gradle/gradle-tooling-api.jar diff --git a/extide/libs.gradle/nbproject/project.xml b/extide/libs.gradle/nbproject/project.xml index 3940a19b1c..dfb3b608dc 100644 --- a/extide/libs.gradle/nbproject/project.xml +++ b/extide/libs.gradle/nbproject/project.xml @@ -39,7 +39,7 @@ gradle/gradle-tooling-api.jar - external/gradle-tooling-api-8.1-rc-2.jar + external/gradle-tooling-api-8.1.jar - 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: Show antlr, go, tom, yaml languages in auto-update, moved them to 'Editing' category
This is an automated email from the ASF dual-hosted git repository. lkishalmi 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 fcc8ad1e30 Show antlr, go, tom, yaml languages in auto-update, moved them to 'Editing' category fcc8ad1e30 is described below commit fcc8ad1e30296899ecb9d9c2a2084db9a76752c1 Author: Laszlo Kishalmi AuthorDate: Sat Apr 15 07:05:50 2023 -0700 Show antlr, go, tom, yaml languages in auto-update, moved them to 'Editing' category --- ide/languages.go/manifest.mf| 2 +- .../src/org/netbeans/modules/languages/go/Bundle.properties | 2 +- ide/languages.toml/manifest.mf | 2 +- .../src/org/netbeans/modules/languages/toml/Bundle.properties | 2 +- ide/languages.yaml/manifest.mf | 2 +- .../src/org/netbeans/modules/languages/yaml/Bundle.properties | 2 +- java/languages.antlr/manifest.mf| 2 +- .../src/org/netbeans/modules/languages/antlr/Bundle.properties | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ide/languages.go/manifest.mf b/ide/languages.go/manifest.mf index 7d17a14e09..817a8e1366 100644 --- a/ide/languages.go/manifest.mf +++ b/ide/languages.go/manifest.mf @@ -3,4 +3,4 @@ OpenIDE-Module: org.netbeans.modules.languages.go OpenIDE-Module-Layer: org/netbeans/modules/languages/go/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/languages/go/Bundle.properties OpenIDE-Module-Specification-Version: 1.0 -AutoUpdate-Show-In-Client: false +AutoUpdate-Show-In-Client: true diff --git a/ide/languages.go/src/org/netbeans/modules/languages/go/Bundle.properties b/ide/languages.go/src/org/netbeans/modules/languages/go/Bundle.properties index 4c6ab6a3f5..46ef1c95c6 100644 --- a/ide/languages.go/src/org/netbeans/modules/languages/go/Bundle.properties +++ b/ide/languages.go/src/org/netbeans/modules/languages/go/Bundle.properties @@ -16,7 +16,7 @@ # under the License. OpenIDE-Module-Name=Go Language Editor Support -OpenIDE-Module-Display-Category=IDE +OpenIDE-Module-Display-Category=Editing OpenIDE-Module-Short-Description=Support for editing Go Language Files. OpenIDE-Module-Long-Description=Support for editing Go Language files. diff --git a/ide/languages.toml/manifest.mf b/ide/languages.toml/manifest.mf index 8abf953e66..33f66fdd73 100644 --- a/ide/languages.toml/manifest.mf +++ b/ide/languages.toml/manifest.mf @@ -3,4 +3,4 @@ OpenIDE-Module: org.netbeans.modules.languages.toml OpenIDE-Module-Layer: org/netbeans/modules/languages/toml/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/languages/toml/Bundle.properties OpenIDE-Module-Specification-Version: 1.2 -AutoUpdate-Show-In-Client: false +AutoUpdate-Show-In-Client: true diff --git a/ide/languages.toml/src/org/netbeans/modules/languages/toml/Bundle.properties b/ide/languages.toml/src/org/netbeans/modules/languages/toml/Bundle.properties index be2e5b3206..0ffa8111a3 100644 --- a/ide/languages.toml/src/org/netbeans/modules/languages/toml/Bundle.properties +++ b/ide/languages.toml/src/org/netbeans/modules/languages/toml/Bundle.properties @@ -16,7 +16,7 @@ # under the License. OpenIDE-Module-Name=TOML Editor Support -OpenIDE-Module-Display-Category=Base IDE +OpenIDE-Module-Display-Category=Editing OpenIDE-Module-Short-Description=Support for editing TOML files. OpenIDE-Module-Long-Description=Support for editing TOML files. diff --git a/ide/languages.yaml/manifest.mf b/ide/languages.yaml/manifest.mf index 58e22f58a8..9f5a987f71 100644 --- a/ide/languages.yaml/manifest.mf +++ b/ide/languages.yaml/manifest.mf @@ -3,4 +3,4 @@ OpenIDE-Module: org.netbeans.modules.languages.yaml OpenIDE-Module-Layer: org/netbeans/modules/languages/yaml/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/languages/yaml/Bundle.properties OpenIDE-Module-Specification-Version: 2.52 -AutoUpdate-Show-In-Client: false +AutoUpdate-Show-In-Client: true diff --git a/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/Bundle.properties b/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/Bundle.properties index 97c2f15d29..a53422a53c 100644 --- a/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/Bundle.properties +++ b/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/Bundle.properties @@ -16,7 +16,7 @@ # under the License. OpenIDE-Module-Name=YAML Editor Support -OpenIDE-Module-Display-Category=Ruby +OpenIDE-Module-Display-Category=Editing OpenIDE-Module-Short-Description=Support for editing YAML files. OpenIDE-Module-Long-Description=Support for editing YAML files. diff --git a/java/languages.antlr/manifest.mf b/java/languages.antlr/manifest.mf index c211f5cc94..fe36ad96b5 100644 --- a/java
[netbeans] branch master updated: YAML: Step right curly and brackets when they are right to the caret
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 7f8dfdeb60 YAML: Step right curly and brackets when they are right to
the caret
7f8dfdeb60 is described below
commit 7f8dfdeb60ce3bec5554fc19ddb40fac0388d885
Author: Laszlo Kishalmi
AuthorDate: Tue Apr 11 07:55:58 2023 -0700
YAML: Step right curly and brackets when they are right to the caret
---
.../modules/languages/yaml/YamlKeystrokeHandler.java | 7 +++
.../modules/languages/yaml/YamlKeystrokeHandlerTest.java | 16
2 files changed, 23 insertions(+)
diff --git
a/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/YamlKeystrokeHandler.java
b/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/YamlKeystrokeHandler.java
index d547ff19a6..a6c1e8f288 100644
---
a/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/YamlKeystrokeHandler.java
+++
b/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/YamlKeystrokeHandler.java
@@ -115,6 +115,13 @@ public class YamlKeystrokeHandler implements
KeystrokeHandler {
return true;
}
+if (((c == '}') || (c == ']')) && dotPos < doc.getLength()) {
+if (String.valueOf(c).equals(doc.getText(dotPos, 1))) {
+caret.setDot(dotPos + 1);
+return true;
+}
+}
+
if ((c == '\'') || (c == '"')) {
int sstart = target.getSelectionStart();
int send = target.getSelectionEnd();
diff --git
a/ide/languages.yaml/test/unit/src/org/netbeans/modules/languages/yaml/YamlKeystrokeHandlerTest.java
b/ide/languages.yaml/test/unit/src/org/netbeans/modules/languages/yaml/YamlKeystrokeHandlerTest.java
index fa2793ff20..5529f2c792 100644
---
a/ide/languages.yaml/test/unit/src/org/netbeans/modules/languages/yaml/YamlKeystrokeHandlerTest.java
+++
b/ide/languages.yaml/test/unit/src/org/netbeans/modules/languages/yaml/YamlKeystrokeHandlerTest.java
@@ -189,6 +189,22 @@ public class YamlKeystrokeHandlerTest extends YamlTestBase
{
insertChar("foo: '^'", '\'', "foo: ''^");
}
+public void testStepCurly1() throws Exception {
+insertChar("foo: {^}", '}', "foo: {}^");
+}
+
+public void testStepCurly2() throws Exception {
+insertChar("foo: {{^}}", '}', "foo: {{}^}");
+}
+
+public void testStepBracket1() throws Exception {
+insertChar("foo: [^]", ']', "foo: []^");
+}
+
+public void testStepBracket2() throws Exception {
+insertChar("foo: [[^]]", ']', "foo: [[]^]");
+}
+
public void testDeleteSingle1() throws Exception {
deleteChar("foo: '^'", "foo: ^");
}
-
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: Upgraded Gradle Tooling to 8.1-rc-2 with JDK 20 Support
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 edb1d8e008 Upgraded Gradle Tooling to 8.1-rc-2 with JDK 20 Support
edb1d8e008 is described below
commit edb1d8e008c10f73e57f4d60e806b442e574a87a
Author: Laszlo Kishalmi
AuthorDate: Thu Mar 30 16:16:25 2023 -0700
Upgraded Gradle Tooling to 8.1-rc-2 with JDK 20 Support
---
.../modules/gradle/api/execute/GradleDistributionManager.java| 5 -
extide/libs.gradle/external/binaries-list| 2 +-
...-8.0-rc-1-license.txt => gradle-tooling-api-8.1-rc-2-license.txt} | 4 ++--
...pi-8.0-rc-1-notice.txt => gradle-tooling-api-8.1-rc-2-notice.txt} | 4 ++--
extide/libs.gradle/nbproject/project.properties | 2 +-
extide/libs.gradle/nbproject/project.xml | 2 +-
6 files changed, 11 insertions(+), 8 deletions(-)
diff --git
a/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java
b/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java
index 28ec81b85a..96d972734c 100644
---
a/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java
+++
b/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java
@@ -99,6 +99,7 @@ public final class GradleDistributionManager {
GradleVersion.version("7.3"), // JDK-17
GradleVersion.version("7.5"), // JDK-18
GradleVersion.version("7.6"), // JDK-19
+GradleVersion.version("8.1"), // JDK-20
};
final File gradleUserHome;
@@ -500,7 +501,9 @@ public final class GradleDistributionManager {
*/
public int lastSupportedJava() {
int i = JDK_COMPAT.length - 1;
-while ((i >= 0) && version.compareTo(JDK_COMPAT[i]) < 0) {
+//Make sure that even RC-s are considered to be compatible.
+GradleVersion baseVersion = version.getBaseVersion();
+while ((i >= 0) && baseVersion.compareTo(JDK_COMPAT[i]) < 0) {
i--;
}
return i + 9;
diff --git a/extide/libs.gradle/external/binaries-list
b/extide/libs.gradle/external/binaries-list
index f65a3e12be..d5d8652419 100644
--- a/extide/libs.gradle/external/binaries-list
+++ b/extide/libs.gradle/external/binaries-list
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-21A1F0E6F9FB1A08D06602737FF2010288F9E934
https://repo.gradle.org/artifactory/libs-releases/org/gradle/gradle-tooling-api/8.0-rc-1/gradle-tooling-api-8.0-rc-1.jar
gradle-tooling-api-8.0-rc-1.jar
+9BDE23C249C496F22A15B6202219170C5BCEF825
https://repo.gradle.org/artifactory/libs-releases/org/gradle/gradle-tooling-api/8.1-rc-2/gradle-tooling-api-8.1-rc-2.jar
gradle-tooling-api-8.1-rc-2.jar
diff --git
a/extide/libs.gradle/external/gradle-tooling-api-8.0-rc-1-license.txt
b/extide/libs.gradle/external/gradle-tooling-api-8.1-rc-2-license.txt
similarity index 99%
rename from extide/libs.gradle/external/gradle-tooling-api-8.0-rc-1-license.txt
rename to extide/libs.gradle/external/gradle-tooling-api-8.1-rc-2-license.txt
index f616b4a769..6c71fd7075 100644
--- a/extide/libs.gradle/external/gradle-tooling-api-8.0-rc-1-license.txt
+++ b/extide/libs.gradle/external/gradle-tooling-api-8.1-rc-2-license.txt
@@ -1,7 +1,7 @@
Name: Gradle Wrapper
Description: Gradle Tooling API
-Version: 8.0-rc-1
-Files: gradle-tooling-api-8.0-rc-1.jar
+Version: 8.1-rc-2
+Files: gradle-tooling-api-8.1-rc-2.jar
License: Apache-2.0
Origin: Gradle Inc.
URL: https://gradle.org/
diff --git a/extide/libs.gradle/external/gradle-tooling-api-8.0-rc-1-notice.txt
b/extide/libs.gradle/external/gradle-tooling-api-8.1-rc-2-notice.txt
similarity index 73%
rename from extide/libs.gradle/external/gradle-tooling-api-8.0-rc-1-notice.txt
rename to extide/libs.gradle/external/gradle-tooling-api-8.1-rc-2-notice.txt
index c8fac0a5a4..cb6a8aa687 100644
--- a/extide/libs.gradle/external/gradle-tooling-api-8.0-rc-1-notice.txt
+++ b/extide/libs.gradle/external/gradle-tooling-api-8.1-rc-2-notice.txt
@@ -1,8 +1,8 @@
Gradle Inc.'s Gradle Tooling API
-Copyright 2007-2022 Gradle Inc.
+Copyright 2007-2023 Gradle Inc.
This product includes software developed at
Gradle Inc. (https://gradle.org/).
This product includes/uses SLF4J (https://www.slf4j.org/)
-developed by QOS.ch, 2004-2022
+developed by QOS.ch, 2004-2023
diff --git a/extide/libs.gradle/nbproject/project.properties
b/extide/libs.gradle/nbproject/project.properties
index 41aa7d08a1..98f01b2184 100644
--- a/extide/libs.gradle/nbproject/project.properties
+++ b/extide/libs.gradle/nbproject/project.properties
@@ -22,4 +22,4 @@ javac.c
[netbeans] branch master updated: Save/restore the ANTLR RustLexer specific internals. (#5624)
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 12f20e87a7 Save/restore the ANTLR RustLexer specific internals. (#5624)
12f20e87a7 is described below
commit 12f20e87a763cfa033ab614d7069c006e1c84174
Author: Laszlo Kishalmi
AuthorDate: Wed Mar 8 11:54:49 2023 -0800
Save/restore the ANTLR RustLexer specific internals. (#5624)
* Save/restore the ANTLR RustLexer specific internals.
* Use just the token type in RustLexerBase
---
.../modules/rust/grammar/RustLanguageLexer.java| 27 --
.../modules/rust/grammar/antlr4/RustLexerBase.java | 10
2 files changed, 30 insertions(+), 7 deletions(-)
diff --git
a/rust/rust.grammar/src/org/netbeans/modules/rust/grammar/RustLanguageLexer.java
b/rust/rust.grammar/src/org/netbeans/modules/rust/grammar/RustLanguageLexer.java
index 8d1892e6f2..80f365b70d 100644
---
a/rust/rust.grammar/src/org/netbeans/modules/rust/grammar/RustLanguageLexer.java
+++
b/rust/rust.grammar/src/org/netbeans/modules/rust/grammar/RustLanguageLexer.java
@@ -21,7 +21,6 @@ package org.netbeans.modules.rust.grammar;
import java.util.BitSet;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.antlr.v4.runtime.ANTLRErrorListener;
import org.antlr.v4.runtime.BaseErrorListener;
import org.antlr.v4.runtime.CharStream;
import org.antlr.v4.runtime.Parser;
@@ -75,7 +74,7 @@ public class RustLanguageLexer extends
AbstractAntlrLexerBridge {
+final Integer lt1;
+final Integer lt2;
+
+LexerState(RustLexer lexer) {
+super(lexer);
+
+this.lt1 = lexer.lt1;
+this.lt2 = lexer.lt2;
+}
+
+@Override
+public void restore(RustLexer lexer) {
+super.restore(lexer);
+
+lexer.lt1 = lt1;
+lexer.lt2 = lt2;
+}
+}
}
diff --git
a/rust/rust.grammar/src/org/netbeans/modules/rust/grammar/antlr4/RustLexerBase.java
b/rust/rust.grammar/src/org/netbeans/modules/rust/grammar/antlr4/RustLexerBase.java
index 39c5919663..cefd4b7a5d 100644
---
a/rust/rust.grammar/src/org/netbeans/modules/rust/grammar/antlr4/RustLexerBase.java
+++
b/rust/rust.grammar/src/org/netbeans/modules/rust/grammar/antlr4/RustLexerBase.java
@@ -54,8 +54,8 @@ public abstract class RustLexerBase extends Lexer {
super(input);
}
-Token lt1;
-Token lt2;
+public Integer lt1;
+public Integer lt2;
@Override
public Token nextToken() {
@@ -85,7 +85,7 @@ public abstract class RustLexerBase extends Lexer {
if (next.getChannel() == Token.DEFAULT_CHANNEL) {
// Keep track of the last token on the default channel.
this.lt2 = this.lt1;
-this.lt1 = next;
+this.lt1 = next.getType();
}
return next;
@@ -130,10 +130,10 @@ public abstract class RustLexerBase extends Lexer {
if (this.lt1 == null || this.lt2 == null) {
return true;
}
-if (this.lt1.getType() != RustLexer.DOT) {
+if (this.lt1 != RustLexer.DOT) {
return true;
}
-switch (this.lt2.getType()) {
+switch (this.lt2) {
case RustLexer.CHAR_LITERAL:
case RustLexer.STRING_LITERAL:
case RustLexer.RAW_STRING_LITERAL:
-
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 case when ANTLR getText() causes assertion in LexerInput.
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 34f880e181 Fix case when ANTLR getText() causes assertion in
LexerInput.
34f880e181 is described below
commit 34f880e181ea29855cf41771573f77be42ca73ec
Author: Laszlo Kishalmi
AuthorDate: Mon Mar 6 17:57:45 2023 -0800
Fix case when ANTLR getText() causes assertion in LexerInput.
---
.../netbeans/spi/lexer/antlr4/LexerInputCharStream.java| 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git
a/ide/lexer.antlr4/src/org/netbeans/spi/lexer/antlr4/LexerInputCharStream.java
b/ide/lexer.antlr4/src/org/netbeans/spi/lexer/antlr4/LexerInputCharStream.java
index 2f782bb275..3a2f672262 100644
---
a/ide/lexer.antlr4/src/org/netbeans/spi/lexer/antlr4/LexerInputCharStream.java
+++
b/ide/lexer.antlr4/src/org/netbeans/spi/lexer/antlr4/LexerInputCharStream.java
@@ -45,14 +45,14 @@ final class LexerInputCharStream implements CharStream {
}
int start = intrvl.a - tokenMark;
int end = intrvl.b - tokenMark + 1;
-int toread = end - start - input.readLength();
-for (int i = 0; i < toread; i++) {
-input.read();
-}
-String ret = String.valueOf(input.readText(start, end));
-if (toread > 0) {
-input.backup(toread);
+int readCount = 0;
+int next = 0;
+while ((end > input.readLength()) && (next != EOF)) {
+next = input.read();
+readCount++;
}
+String ret = String.valueOf(input.readText(start, Math.min(end,
input.readLength(;
+input.backup(readCount);
return ret;
}
-
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: New rt and rf abbrevations for return true; and return false;
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 aad6dd6577 New rt and rf abbrevations for return true; and return
false;
aad6dd6577 is described below
commit aad6dd65776bc721b799aab63d35631fc78a30db
Author: Anthony Goubard
AuthorDate: Thu Feb 16 13:59:14 2023 +0100
New rt and rf abbrevations for return true; and return false;
---
.../org/netbeans/modules/java/editor/resources/DefaultAbbrevs.xml | 2 ++
.../editor/codetemplates/CodeTemplatesTest/testDumpTemplates.pass | 8
2 files changed, 10 insertions(+)
diff --git
a/java/java.editor/src/org/netbeans/modules/java/editor/resources/DefaultAbbrevs.xml
b/java/java.editor/src/org/netbeans/modules/java/editor/resources/DefaultAbbrevs.xml
index 199d0a0e30..b9b61d0139 100644
---
a/java/java.editor/src/org/netbeans/modules/java/editor/resources/DefaultAbbrevs.xml
+++
b/java/java.editor/src/org/netbeans/modules/java/editor/resources/DefaultAbbrevs.xml
@@ -380,6 +380,8 @@ ${cursor}]]>
+
+
diff --git
a/java/java.editor/test/qa-functional/data/goldenfiles/org/netbeans/test/java/editor/codetemplates/CodeTemplatesTest/testDumpTemplates.pass
b/java/java.editor/test/qa-functional/data/goldenfiles/org/netbeans/test/java/editor/codetemplates/CodeTemplatesTest/testDumpTemplates.pass
index eaadd1b131..d647c37422 100644
---
a/java/java.editor/test/qa-functional/data/goldenfiles/org/netbeans/test/java/editor/codetemplates/CodeTemplatesTest/testDumpTemplates.pass
+++
b/java/java.editor/test/qa-functional/data/goldenfiles/org/netbeans/test/java/editor/codetemplates/CodeTemplatesTest/testDumpTemplates.pass
@@ -664,6 +664,14 @@ rn
${no-indent}return null;
null
---
+rt
+${no-indent}return true;
+null
+---
+rf
+${no-indent}return false;
+null
+---
rp
${rp type="org.openide.util.RequestProcessor" default="RequestProcessor"
editable="false"}.getDefault().post(${toRun instanceof="java.lang.Runnable"
default="new Runnable() {
public void run() {
-
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: Minimal Lexing Support for Go Language (#5297)
This is an automated email from the ASF dual-hosted git repository. lkishalmi 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 9be61e9ae8 Minimal Lexing Support for Go Language (#5297) 9be61e9ae8 is described below commit 9be61e9ae8815b31303e3609b6586ab16423e1ae Author: Laszlo Kishalmi AuthorDate: Sat Feb 11 08:35:35 2023 -0800 Minimal Lexing Support for Go Language (#5297) * Added ANTLR based Go Parser module * Added Go Syntax Lexer * Add Editor Preferences for Go * Fixed Go Lexer EOS token * Made a few polishment on the Go preferences * Registered languages.go as an editor.kit dependency * Exclude Go example files from RAT * Added minimal Go parser based error feedback * Added fold support for Go * Replace logo with custom painted one * Fix position registration for GoLanguage (clashed with antlr3 grammar) * Remove some cruft on languages.go module - Co-authored-by: Matthias Bläsing --- ide/editor.kit/nbproject/project.xml | 6 + ide/go.lang/manifest.mf| 3 +- ide/languages.go/build.xml | 29 ide/languages.go/licenseinfo.xml | 28 ide/languages.go/manifest.mf | 6 + ide/languages.go/nbproject/project.properties | 17 ++ ide/languages.go/nbproject/project.xml | 142 + .../modules/languages/go/Bundle.properties | 33 .../modules/languages/go/FontAndColors.xml | 33 .../org/netbeans/modules/languages/go/GoExample.go | 24 +++ .../netbeans/modules/languages/go/GoLangLexer.java | 153 ++ .../modules/languages/go/GoLangParser.java | 54 +++ .../modules/languages/go/GoLangParserResult.java | 152 ++ .../languages/go/GoLangStructureScanner.java | 51 ++ .../netbeans/modules/languages/go/GoLanguage.java | 174 + .../netbeans/modules/languages/go/GoTokenId.java | 50 ++ .../org/netbeans/modules/languages/go/layer.xml| 73 + .../netbeans/modules/languages/go/preferences.xml | 29 .../netbeans/modules/languages/go/resources/go.png | Bin 0 -> 438 bytes .../netbeans/modules/languages/go/resources/go.svg | 78 + nbbuild/cluster.properties | 1 + nbbuild/rat-exclusions.txt | 24 +-- 22 files changed, 1147 insertions(+), 13 deletions(-) diff --git a/ide/editor.kit/nbproject/project.xml b/ide/editor.kit/nbproject/project.xml index e95b7975fd..e93cd896cc 100644 --- a/ide/editor.kit/nbproject/project.xml +++ b/ide/editor.kit/nbproject/project.xml @@ -93,6 +93,12 @@ 1.4 + + org.netbeans.modules.languages.go + +1.0 + + org.netbeans.modules.languages.manifest diff --git a/ide/go.lang/manifest.mf b/ide/go.lang/manifest.mf index c2a4a59a87..37388df915 100644 --- a/ide/go.lang/manifest.mf +++ b/ide/go.lang/manifest.mf @@ -2,4 +2,5 @@ Manifest-Version: 1.0 OpenIDE-Module: org.netbeans.modules.go.lang OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/go/lang/Bundle.properties OpenIDE-Module-Specification-Version: 1.1 -AutoUpdate-Show-In-Client: true +AutoUpdate-Show-In-Client: false + diff --git a/ide/languages.go/build.xml b/ide/languages.go/build.xml new file mode 100644 index 00..60824c66be --- /dev/null +++ b/ide/languages.go/build.xml @@ -0,0 +1,29 @@ + + + + + + +Builds, tests, and runs the project org.netbeans.modules.languages.go + + + diff --git a/ide/languages.go/licenseinfo.xml b/ide/languages.go/licenseinfo.xml new file mode 100644 index 00..e9e61f6fce --- /dev/null +++ b/ide/languages.go/licenseinfo.xml @@ -0,0 +1,28 @@ + + + + +src/org/netbeans/modules/languages/go/GoExample.go +src/org/netbeans/modules/languages/go/resources/go.png + + + diff --git a/ide/languages.go/manifest.mf b/ide/languages.go/manifest.mf new file mode 100644 index 00..7d17a14e09 --- /dev/null +++ b/ide/languages.go/manifest.mf @@ -0,0 +1,6 @@ +Manifest-Version: 1.0 +OpenIDE-Module: org.netbeans.modules.languages.go +OpenIDE-Module-Layer: org/netbeans/modules/languages/go/layer.xml +OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/languages/go/Bundle.properties +OpenIDE-Module-Specification-Version: 1.0 +AutoUpdate-Show-In-Client: false diff --git a/ide/languages.go/nbproject/project.properties b/ide/languages.go/nbproject/project.properties new file mode 100644 index 00..c216e1f049 --- /dev/null ++
[netbeans] branch master updated: Made FileUtil to copy POSIX permissions
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 b0d67bcd69 Made FileUtil to copy POSIX permissions
b0d67bcd69 is described below
commit b0d67bcd6925dc6efcf33058c6379873dd55aec2
Author: Laszlo Kishalmi
AuthorDate: Sun Sep 18 23:07:44 2022 -0700
Made FileUtil to copy POSIX permissions
---
platform/openide.filesystems/apichanges.xml| 24 +
platform/openide.filesystems/manifest.mf | 2 +-
.../src/org/openide/filesystems/FileObject.java| 3 +-
.../src/org/openide/filesystems/FileUtil.java | 57 --
.../src/org/openide/filesystems/FileUtilTest.java | 25 ++
5 files changed, 104 insertions(+), 7 deletions(-)
diff --git a/platform/openide.filesystems/apichanges.xml
b/platform/openide.filesystems/apichanges.xml
index c21da31428..eb98834fa5 100644
--- a/platform/openide.filesystems/apichanges.xml
+++ b/platform/openide.filesystems/apichanges.xml
@@ -25,6 +25,30 @@
Filesystems API
+
+
+FileObject copy preserves source posix
permissions.
+
+
+
+
+
+FileUtil.copyFile(...)
now preserve ATTRIBUTES and POSIX permissions.
+
+
+
+
+
+FileUtil can convert FileObject to/from
java.nio.file.Path.
+
+
+
+
+
+FileUtil has a
toPath(FileObject fo) and toFileObject(Path path)
utility methods.
+
+
+
Allow to filter or transform attribute values during
copying.
diff --git a/platform/openide.filesystems/manifest.mf
b/platform/openide.filesystems/manifest.mf
index 14c80d034d..2016034220 100644
--- a/platform/openide.filesystems/manifest.mf
+++ b/platform/openide.filesystems/manifest.mf
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
OpenIDE-Module: org.openide.filesystems
OpenIDE-Module-Localizing-Bundle: org/openide/filesystems/Bundle.properties
OpenIDE-Module-Layer: org/openide/filesystems/resources/layer.xml
-OpenIDE-Module-Specification-Version: 9.31
+OpenIDE-Module-Specification-Version: 9.32
diff --git
a/platform/openide.filesystems/src/org/openide/filesystems/FileObject.java
b/platform/openide.filesystems/src/org/openide/filesystems/FileObject.java
index 66bc740c23..7587619039 100644
--- a/platform/openide.filesystems/src/org/openide/filesystems/FileObject.java
+++ b/platform/openide.filesystems/src/org/openide/filesystems/FileObject.java
@@ -114,7 +114,8 @@ public abstract class FileObject extends Object implements
Serializable, Lookup.
/** Copies this file. This allows the filesystem to perform any additional
* operation associated with the copy. But the default implementation is
simple
-* copy of the file and its attributes
+* copy of the file and its attributes Since version 9.32, the file POSIX
+* permissions are copied as well.
*
* @param target target folder to move this file to
* @param name new basename of file
diff --git
a/platform/openide.filesystems/src/org/openide/filesystems/FileUtil.java
b/platform/openide.filesystems/src/org/openide/filesystems/FileUtil.java
index 8aa969d573..59c8524690 100644
--- a/platform/openide.filesystems/src/org/openide/filesystems/FileUtil.java
+++ b/platform/openide.filesystems/src/org/openide/filesystems/FileUtil.java
@@ -35,9 +35,11 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLStreamHandler;
+import java.nio.file.Files;
import java.nio.file.InvalidPathException;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.nio.file.attribute.PosixFilePermission;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -538,7 +540,8 @@ public final class FileUtil extends Object {
}
/** Copies file to the selected folder.
- * This implementation simply copies the file by stream content.
+* This implementation simply copies the file by stream content. Since
version
+* 9.32, the file POSIX permissions are copied as well.
* @param source source file object
* @param destFolder destination folder
* @param newName file name (without extension) of destination file
@@ -567,6 +570,7 @@ public final class FileUtil extends Object {
}
copy(bufIn, bufOut);
+copyPosixPerms(source, dest);
copyAttributes(source, dest);
} finally {
if (bufIn != null) {
@@ -584,6 +588,17 @@ public final class FileUtil extends Object {
return dest;
}
+
+static void copyPosixPerms(FileObject source, FileObject dest) throws
[netbeans] branch master updated: Gradle Execution Customizer with Runtime (#5158)
This is an automated email from the ASF dual-hosted git repository. lkishalmi 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 051f55d21b Gradle Execution Customizer with Runtime (#5158) 051f55d21b is described below commit 051f55d21ba2edba562787482beaaa5b6a29b3d3 Author: Laszlo Kishalmi AuthorDate: Sun Jan 15 14:02:52 2023 -0800 Gradle Execution Customizer with Runtime (#5158) * Moved Gradle Java Runtime Selection into Gradle Projects * GradleJavaPlatformProviderImpl uses the JavaRuntimeManager now. * Moved GradleJavaProjectProblemProvider to Gradle Project * Added change aware bridge between JavaRuntime and JavaPlatform * Removed unloadable project warning from customizer, other fixes * Polishing the code according suggestions. * Adjusted Bundle.properties for the customizers. * Added API documentation. * Mage JavaRuntime on top of Gradle Execution Customizer --- extide/gradle/apichanges.xml | 25 ++ extide/gradle/manifest.mf | 4 +- .../gradle/GradleBrokenRuntimeProblemProvider.java | 24 +- .../gradle/GradleJavaCompatProblemsProvider.java | 2 +- .../modules/gradle/api/execute/RunUtils.java | 64 +++- .../modules/gradle/customizer/Bundle.properties| 28 +- .../customizer/GradleCustomizerProvider.java | 23 +- .../gradle/customizer/GradleExecutionPanel.form| 147 +++- .../gradle/customizer/GradleExecutionPanel.java| 378 .../gradle/execute/DefaultJavaRuntimeManager.java | 54 +++ .../execute/GradleJavaPlatformProviderImpl.java| 23 +- .../gradle/spi/execute/JavaRuntimeManager.java | 176 + .../gradle/java/JavaRuntimePlatformBridge.java | 100 ++ .../modules/gradle/java/LookupProviders.java | 1 - .../gradle/java/customizer/Bundle.properties | 6 - .../java/customizer/CompileOptionsPanel.form | 156 .../java/customizer/CompileOptionsPanel.java | 394 - .../modules/gradle/java/execute/JavaRunUtils.java | 40 +-- .../gradle/java/execute/LookupProviders.java | 11 - 19 files changed, 927 insertions(+), 729 deletions(-) diff --git a/extide/gradle/apichanges.xml b/extide/gradle/apichanges.xml index 2c6e7e1fb9..87efe7764f 100644 --- a/extide/gradle/apichanges.xml +++ b/extide/gradle/apichanges.xml @@ -83,6 +83,31 @@ is the proper place. + + +Adding JavaRuntimeManager abstracting the Gradle Runtime from Java Platform + + + + + + +Introduced a JavaRuntimeManager to +create abstraction between the necessary runtime that Gradle needs (just a Java home) and the actual JavaPlatform which is provided by +the modules in the Java cluster. + + +JavaRuntime is bound to be the root project of a project tree from now. The ID of the active rintime is stored in the gradle.properties +of the root project under the property name netbeans.hint.jdkPlatform. + + +There are two new methods provided in RunUtils to get and set the +active runtime of a project. + + + + + Representing external tasks diff --git a/extide/gradle/manifest.mf b/extide/gradle/manifest.mf index 03eafb6fbd..0f214efc51 100644 --- a/extide/gradle/manifest.mf +++ b/extide/gradle/manifest.mf @@ -1,6 +1,6 @@ Manifest-Version: 1.0 -AutoUpdate-Show-In-Client: false +AutoUpdate-Show-In-Client: true OpenIDE-Module: org.netbeans.modules.gradle/2 OpenIDE-Module-Layer: org/netbeans/modules/gradle/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/gradle/Bundle.properties -OpenIDE-Module-Specification-Version: 2.31 +OpenIDE-Module-Specification-Version: 2.32 diff --git a/java/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaProjectProblemProvider.java b/extide/gradle/src/org/netbeans/modules/gradle/GradleBrokenRuntimeProblemProvider.java similarity index 73% rename from java/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaProjectProblemProvider.java rename to extide/gradle/src/org/netbeans/modules/gradle/GradleBrokenRuntimeProblemProvider.java index 231a00a875..3a993f59c1 100644 --- a/java/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaProjectProblemProvider.java +++ b/extide/gradle/src/org/netbeans/modules/gradle/GradleBrokenRuntimeProblemProvider.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package
[netbeans] branch master updated: Made ANTLR Token LexerInputCharStream Friendly
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 595660f081 Made ANTLR Token LexerInputCharStream Friendly
595660f081 is described below
commit 595660f0811b0d24846ea91bd0a41060dcd652d7
Author: Laszlo Kishalmi
AuthorDate: Fri Jan 13 10:31:19 2023 -0800
Made ANTLR Token LexerInputCharStream Friendly
---
.../netbeans/modules/languages/toml/TomlLexer.java | 4 +-
.../spi/lexer/antlr4/AbstractAntlrLexerBridge.java | 74 --
.../modules/languages/antlr/v3/Antlr3Lexer.java| 4 +-
.../modules/languages/antlr/v4/Antlr4Lexer.java| 4 +-
4 files changed, 75 insertions(+), 11 deletions(-)
diff --git
a/ide/languages.toml/src/org/netbeans/modules/languages/toml/TomlLexer.java
b/ide/languages.toml/src/org/netbeans/modules/languages/toml/TomlLexer.java
index 451242b8f0..e4fc2f6b2e 100644
--- a/ide/languages.toml/src/org/netbeans/modules/languages/toml/TomlLexer.java
+++ b/ide/languages.toml/src/org/netbeans/modules/languages/toml/TomlLexer.java
@@ -37,8 +37,8 @@ public final class TomlLexer extends
AbstractAntlrLexerBridge mapToken(int antlrTokenType) {
-switch (antlrTokenType) {
+protected Token mapToken(org.antlr.v4.runtime.Token
antlrToken) {
+switch (antlrToken.getType()) {
case EOF:
return null;
diff --git
a/ide/lexer.antlr4/src/org/netbeans/spi/lexer/antlr4/AbstractAntlrLexerBridge.java
b/ide/lexer.antlr4/src/org/netbeans/spi/lexer/antlr4/AbstractAntlrLexerBridge.java
index 45ba32978d..1fdf66ab5c 100644
---
a/ide/lexer.antlr4/src/org/netbeans/spi/lexer/antlr4/AbstractAntlrLexerBridge.java
+++
b/ide/lexer.antlr4/src/org/netbeans/spi/lexer/antlr4/AbstractAntlrLexerBridge.java
@@ -20,10 +20,14 @@ package org.netbeans.spi.lexer.antlr4;
import java.util.function.Function;
import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CommonToken;
import org.antlr.v4.runtime.misc.IntegerList;
import org.netbeans.api.lexer.Token;
import org.antlr.v4.runtime.Lexer;
import static org.antlr.v4.runtime.Recognizer.EOF;
+import org.antlr.v4.runtime.TokenSource;
+import org.antlr.v4.runtime.misc.Interval;
+import org.antlr.v4.runtime.misc.Pair;
import org.netbeans.api.lexer.TokenId;
import org.netbeans.spi.lexer.LexerRestartInfo;
import org.netbeans.spi.lexer.TokenFactory;
@@ -58,6 +62,8 @@ public abstract class AbstractAntlrLexerBridge) info.state()).restore(lexer);
}
@@ -77,15 +83,15 @@ public abstract class AbstractAntlrLexerBridge{@code
- * switch (antlrTokenType) {
+ * switch (antlrToken.getType()) {
* case DOC_COMMENT:
* case BLOCK_COMMENT:
* case LINE_COMMENT:
@@ -97,11 +103,11 @@ public abstract class AbstractAntlrLexerBridge
- * @param antlrTokenType the token type from the ANTLR Lexer
+ * @param antlrToken the token from the ANTLR Lexer
*
* @return a NetBeans lexer token.
*/
-protected abstract Token mapToken(int antlrTokenType);
+protected abstract Token mapToken(org.antlr.v4.runtime.Token
antlrToken);
@Override
/**
@@ -182,4 +188,62 @@ public abstract class AbstractAntlrLexerBridge
FIXED_TOKEN_FACTORY = new org.antlr.v4.runtime.TokenFactory() {
+@Override
+public FixedToken create(Pair source, int
type, String text,
+int channel, int start, int stop, int line, int
charPositionInLine) {
+
+FixedToken token = new FixedToken(source, type, channel, start,
stop);
+token.setLine(line);
+token.setCharPositionInLine(charPositionInLine);
+token.setText(text);
+return token;
+}
+
+@Override
+public FixedToken create(int type, String text) {
+return new FixedToken(type, text);
+}
+
+};
+
+private static final class FixedToken extends CommonToken {
+
+public FixedToken(Pair source, int type, int
channel, int start, int stop) {
+super(source, type, channel, start, stop);
+}
+
+public FixedToken(int type, String text) {
+super(type, text);
+}
+
+ @Override
+public String getText() {
+if (text != null ) {
+return text;
+}
+
+CharStream input = getInputStream();
+if (input != null ) {
+// The original implementation in CommonToken does not honor
the
+// contract with UnsupportedOperationException on
CharStream.size()
+// and CharStream.getText which renders CommonToken broken on
+// getText() calls. That makes toString() unusable when using
+// LexerInputCharStream as well.
+//
+// While the stream size is unknown
[netbeans] branch master updated: Catch IAE when Gradle error getLocation cannot be called.
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 b1192bacba Catch IAE when Gradle error getLocation cannot be called.
b1192bacba is described below
commit b1192bacba56f3d5c165400f229f0bbc00ce9d92
Author: Laszlo Kishalmi
AuthorDate: Tue Jan 10 20:45:34 2023 -0800
Catch IAE when Gradle error getLocation cannot be called.
---
.../gradle/loaders/LegacyProjectLoader.java| 26 +++---
1 file changed, 8 insertions(+), 18 deletions(-)
diff --git
a/extide/gradle/src/org/netbeans/modules/gradle/loaders/LegacyProjectLoader.java
b/extide/gradle/src/org/netbeans/modules/gradle/loaders/LegacyProjectLoader.java
index 9406a19764..fcdd052f6b 100644
---
a/extide/gradle/src/org/netbeans/modules/gradle/loaders/LegacyProjectLoader.java
+++
b/extide/gradle/src/org/netbeans/modules/gradle/loaders/LegacyProjectLoader.java
@@ -362,39 +362,29 @@ public class LegacyProjectLoader extends
AbstractProjectLoader {
return Collections.singletonList(createReport(t.getCause()));
}
-/**
- * Accessor for the 'location' property on LocationAwareException
- */
-private static Method locationAccessor;
-
-/**
- * Accessor for the 'lineNumber' property on LocationAwareException
- */
-private static Method lineNumberAccessor;
-
private static String getLocation(Throwable locationAwareEx) {
try {
-if (locationAccessor == null) {
-locationAccessor =
locationAwareEx.getClass().getMethod("getLocation"); // NOI18N
-}
+Method locationAccessor =
locationAwareEx.getClass().getMethod("getLocation"); // NOI18N
return (String)locationAccessor.invoke(locationAwareEx);
} catch (ReflectiveOperationException ex) {
LOG.log(Level.FINE,"Error getting location", ex);
-return null;
+} catch (IllegalArgumentException iae) {
+LOG.log(Level.FINE, "This probably should not happen: " +
locationAwareEx.getClass().getName(), iae);
}
+return null;
}
private static int getLineNumber(Throwable locationAwareEx) {
try {
-if (lineNumberAccessor == null) {
-lineNumberAccessor =
locationAwareEx.getClass().getMethod("getLineNumber"); // NOI18N
-}
+Method lineNumberAccessor =
locationAwareEx.getClass().getMethod("getLineNumber"); // NOI18N
Integer i = (Integer)lineNumberAccessor.invoke(locationAwareEx);
return i != null ? i : -1;
} catch (ReflectiveOperationException ex) {
LOG.log(Level.FINE,"Error getting line number", ex);
-return -1;
+} catch (IllegalArgumentException iae) {
+LOG.log(Level.FINE, "This probably should not happen: " +
locationAwareEx.getClass().getName(), iae);
}
+return -1;
}
/**
-
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated: Fix Java version detection in GradleJavaCompatProblemProvider
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 8e16f7ce81 Fix Java version detection in
GradleJavaCompatProblemProvider
8e16f7ce81 is described below
commit 8e16f7ce81d5e5290dd7922b9ce7fa7bb8c13f47
Author: Laszlo Kishalmi
AuthorDate: Tue Jan 10 23:13:54 2023 -0800
Fix Java version detection in GradleJavaCompatProblemProvider
---
.../netbeans/modules/gradle/GradleJavaCompatProblemsProvider.java | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git
a/extide/gradle/src/org/netbeans/modules/gradle/GradleJavaCompatProblemsProvider.java
b/extide/gradle/src/org/netbeans/modules/gradle/GradleJavaCompatProblemsProvider.java
index 66711bb0bd..e62a85e2aa 100644
---
a/extide/gradle/src/org/netbeans/modules/gradle/GradleJavaCompatProblemsProvider.java
+++
b/extide/gradle/src/org/netbeans/modules/gradle/GradleJavaCompatProblemsProvider.java
@@ -143,8 +143,13 @@ public final class GradleJavaCompatProblemsProvider
implements ProjectProblemsPr
}
String javaVersion = releasePros.getProperty("JAVA_VERSION");
//NOI18N
+// This should look like "17" or "17.0.9"
+//TODO: Use Runtime.Version (when we move to Java 11)
if ((javaVersion != null) && javaVersion.startsWith("\"") &&
javaVersion.endsWith("\"")) {
-javaVersion = javaVersion.substring(1,
javaVersion.indexOf('.'));
+int dot = javaVersion.indexOf('.');
+javaVersion = dot > 0
+? javaVersion.substring(1, javaVersion.indexOf('.'))
+: javaVersion.substring(1, javaVersion.length() - 1);
try {
ret = Integer.parseInt(javaVersion);
} catch (NumberFormatException 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: Made runSingle Gradle task work on Gradle 8.0
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 6f94fffca7 Made runSingle Gradle task work on Gradle 8.0
6f94fffca7 is described below
commit 6f94fffca7ebf6e449f62fb7ab5aed0689edd384
Author: Laszlo Kishalmi
AuthorDate: Tue Jan 10 20:34:01 2023 -0800
Made runSingle Gradle task work on Gradle 8.0
---
.../modules/gradle/tooling/NetBeansRunSinglePlugin.java | 11 +--
1 file changed, 9 insertions(+), 2 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 2ca9b4335d..13cc06e64b 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
@@ -28,11 +28,13 @@ import org.gradle.api.Project;
import org.gradle.api.tasks.JavaExec;
import org.gradle.api.tasks.SourceSetContainer;
import org.gradle.process.CommandLineArgumentProvider;
+import org.gradle.util.GradleVersion;
/**
*
* @author Laszlo Kishalmi
*/
class NetBeansRunSinglePlugin implements Plugin {
+private static final GradleVersion GRADLE_VERSION =
GradleVersion.current().getBaseVersion();
private static final Logger LOG =
Logging.getLogger(NetBeansRunSinglePlugin.class);
private static final String RUN_SINGLE_TASK = "runSingle";
@@ -81,8 +83,13 @@ class NetBeansRunSinglePlugin implements Plugin {
SourceSetContainer sourceSets =
project.getExtensions().findByType(SourceSetContainer.class);
project.getTasks().register(RUN_SINGLE_TASK, JavaExec.class, (je) -> {
-// Using setMain to keep the backward compatibility
-je.setMain(project.property(RUN_SINGLE_MAIN).toString());
+String mainClass = project.property(RUN_SINGLE_MAIN).toString();
+if (GRADLE_VERSION.compareTo(GradleVersion.version("6.4")) < 0) {
+// Using setMain to keep the backward compatibility before
Gradle 6.4
+je.setMain(mainClass);
+} else {
+je.getMainClass().set(mainClass);
+}
je.setClasspath(sourceSets.findByName("main").getRuntimeClasspath());
if (project.hasProperty(RUN_SINGLE_ARGS)) {
je.setArgs(asList(project.property(RUN_SINGLE_ARGS).toString().split(" ")));
-
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: Upgraded Gradle Tooling API to 8.0-rc-1 (#5240)
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 bc4d6fbb4b Upgraded Gradle Tooling API to 8.0-rc-1 (#5240)
bc4d6fbb4b is described below
commit bc4d6fbb4bd1425c763c9569c47c64e2d9110c2f
Author: Laszlo Kishalmi
AuthorDate: Tue Jan 10 07:13:27 2023 -0800
Upgraded Gradle Tooling API to 8.0-rc-1 (#5240)
* Upgraded Gradle Tooling API to 8.0-rc-1
* Fixed jar task property removal in Gradle 8.0
* Deprecate no-rebuild Gradle option.
* Use Gradle 7.5 for micronaut tests
* Set Gradle 7.5 for some sensitive test projects
* Use Gradle 7.5 for Micronaut tests
---
.gitignore | 8
.../multi/gradle/wrapper/gradle-wrapper.properties | 5 +
.../simple/gradle/wrapper/gradle-wrapper.properties| 5 +
extide/gradle/nbproject/project.properties | 3 +++
extide/gradle/nbproject/project.xml| 4 ++--
.../modules/gradle/tooling/NbProjectInfoBuilder.java | 13 +++--
.../modules/gradle/api/execute/GradleCommandLine.java | 2 +-
.../netbeans/modules/gradle/execute/Bundle.properties | 2 +-
.../modules/gradle/execute/ExecutionOptionsPanel.java | 2 +-
.../netbeans/modules/gradle/options/Bundle.properties | 4 ++--
.../netbeans/modules/gradle/options/SettingsPanel.java | 4 ++--
.../netbeans/modules/gradle/spi/GradleSettings.java| 18 ++
.../micronaut/gradle/wrapper/gradle-wrapper.properties | 5 +
extide/libs.gradle/external/binaries-list | 2 +-
...nse.txt => gradle-tooling-api-8.0-rc-1-license.txt} | 4 ++--
...tice.txt => gradle-tooling-api-8.0-rc-1-notice.txt} | 0
extide/libs.gradle/manifest.mf | 4 ++--
.../nbproject/org-netbeans-modules-libs-gradle.sig | 4 +++-
extide/libs.gradle/nbproject/project.properties| 2 +-
extide/libs.gradle/nbproject/project.xml | 2 +-
.../shadowed/gradle/wrapper/gradle-wrapper.properties | 5 +
.../withTests/gradle/wrapper/gradle-wrapper.properties | 5 +
.../micronaut/gradle/wrapper/gradle-wrapper.properties | 5 +
java/gradle.test/nbproject/project.xml | 4 ++--
24 files changed, 91 insertions(+), 21 deletions(-)
diff --git a/.gitignore b/.gitignore
index ce62816eb0..23afeae768 100644
--- a/.gitignore
+++ b/.gitignore
@@ -109,6 +109,14 @@ derby.log
/extide/gradle/release/modules/gradle/daemon-loader/.gradle/
/nbbuild/misc/prepare-bundles/target/
+# Gradle Unittest Data
+/extide/gradle/test/unit/data/**/build/
+/extide/gradle/test/unit/data/**/.gradle/
+/java/gradle.java/test/unit/data/**/build/
+/java/gradle.java/test/unit/data/**/.gradle/
+/enterprise/micronaut/test/unit/data/**/build/
+/enterprise/micronaut/test/unit/data/**/.gradle/
+
# ANTLR v4 Grammar
##
/java/languages.antlr/external/*.g4
diff --git
a/enterprise/micronaut/test/unit/data/gradle/artifacts/multi/gradle/wrapper/gradle-wrapper.properties
b/enterprise/micronaut/test/unit/data/gradle/artifacts/multi/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00..8049c684f0
--- /dev/null
+++
b/enterprise/micronaut/test/unit/data/gradle/artifacts/multi/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git
a/enterprise/micronaut/test/unit/data/gradle/artifacts/simple/gradle/wrapper/gradle-wrapper.properties
b/enterprise/micronaut/test/unit/data/gradle/artifacts/simple/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00..8049c684f0
--- /dev/null
+++
b/enterprise/micronaut/test/unit/data/gradle/artifacts/simple/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/extide/gradle/nbproject/project.properties
b/extide/gradle/nbproject/project.properties
index ea39a75038..54dab6898e 100644
--- a/extide/gradle/nbproject/project.properties
+++ b/extide/gradle/nbproject/project.properties
@@ -28,6 +28,9 @@
source.reference.netbeans-gradle-tooling.jar=netbeans-gradle-tooling/src/main/gr
test-unit-sys-prop.test.netbeans.dest.dir=${netbeans.dest.dir}
test-unit-sys-prop.java.awt.headless=true
+# Enable Gradle execution exception logging during tests
+#test-unit-sys-prop.org.netbeans.modules.gradle.level=FINE
+
release.build/tooling/netbeans-gradle-tooling.jar=modules/gradle/netbeans-gradle-tooli
[netbeans] branch master updated: Do not expose LexerInputCharSteeam as an API.
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 d1c39135a8 Do not expose LexerInputCharSteeam as an API.
d1c39135a8 is described below
commit d1c39135a852a579f32344e486d72d5e0647317b
Author: Laszlo Kishalmi
AuthorDate: Mon Jan 9 10:44:20 2023 -0800
Do not expose LexerInputCharSteeam as an API.
---
.../src/org/netbeans/modules/languages/toml/TomlLexer.java | 5 +++--
.../org/netbeans/modules/languages/toml/TomlTokenId.java | 3 +--
.../spi/lexer/antlr4/AbstractAntlrLexerBridge.java | 14 --
.../netbeans/spi/lexer/antlr4/LexerInputCharStream.java| 2 +-
.../netbeans/modules/languages/antlr/v3/Antlr3Lexer.java | 3 +--
.../netbeans/modules/languages/antlr/v4/Antlr4Lexer.java | 3 +--
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git
a/ide/languages.toml/src/org/netbeans/modules/languages/toml/TomlLexer.java
b/ide/languages.toml/src/org/netbeans/modules/languages/toml/TomlLexer.java
index 6b2414749c..451242b8f0 100644
--- a/ide/languages.toml/src/org/netbeans/modules/languages/toml/TomlLexer.java
+++ b/ide/languages.toml/src/org/netbeans/modules/languages/toml/TomlLexer.java
@@ -32,8 +32,8 @@ import org.netbeans.spi.lexer.antlr4.AbstractAntlrLexerBridge;
*/
public final class TomlLexer extends
AbstractAntlrLexerBridge {
-public TomlLexer(LexerRestartInfo info,
org.tomlj.internal.TomlLexer lexer) {
-super(info, lexer);
+public TomlLexer(LexerRestartInfo info) {
+super(info, org.tomlj.internal.TomlLexer::new);
}
@Override
@@ -122,6 +122,7 @@ public final class TomlLexer extends
AbstractAntlrLexerBridge createLexer(LexerRestartInfo
info) {
-return new TomlLexer(info, new org.tomlj.internal.TomlLexer(new
LexerInputCharStream(info.input(;
+return new TomlLexer(info);
}
@Override
diff --git
a/ide/lexer.antlr4/src/org/netbeans/spi/lexer/antlr4/AbstractAntlrLexerBridge.java
b/ide/lexer.antlr4/src/org/netbeans/spi/lexer/antlr4/AbstractAntlrLexerBridge.java
index 112936af59..45ba32978d 100644
---
a/ide/lexer.antlr4/src/org/netbeans/spi/lexer/antlr4/AbstractAntlrLexerBridge.java
+++
b/ide/lexer.antlr4/src/org/netbeans/spi/lexer/antlr4/AbstractAntlrLexerBridge.java
@@ -18,6 +18,8 @@
*/
package org.netbeans.spi.lexer.antlr4;
+import java.util.function.Function;
+import org.antlr.v4.runtime.CharStream;
import org.antlr.v4.runtime.misc.IntegerList;
import org.netbeans.api.lexer.Token;
import org.antlr.v4.runtime.Lexer;
@@ -38,24 +40,24 @@ public abstract class AbstractAntlrLexerBridge tokenFactory;
protected final L lexer;
-protected final LexerInputCharStream input;
+private final LexerInputCharStream input;
/**
* Constructor for the lexer bridge, usually used as:
* {@code
* public SomeLexer(LexerRestartInfo info) {
- * super(info, new SomeANTLRLexer(new
LexerInputCharStream(info.input(;
+ * super(info, SomeANTLRLexer::new);
* }
* }
*
* @param info The lexer restart info
- * @param lexer The ANTLR generated Lexer
+ * @param lexerCreator A function to create an ANTLR from a {@code
CharSteram}.
*/
@SuppressWarnings("unchecked")
-public AbstractAntlrLexerBridge(LexerRestartInfo info, L lexer) {
+public AbstractAntlrLexerBridge(LexerRestartInfo info,
Function lexerCreator) {
this.tokenFactory = info.tokenFactory();
-this.lexer = lexer;
-this.input = (LexerInputCharStream) lexer.getInputStream();
+this.input = new LexerInputCharStream(info.input());
+this.lexer = lexerCreator.apply(input);
if (info.state() != null) {
((LexerState) info.state()).restore(lexer);
}
diff --git
a/ide/lexer.antlr4/src/org/netbeans/spi/lexer/antlr4/LexerInputCharStream.java
b/ide/lexer.antlr4/src/org/netbeans/spi/lexer/antlr4/LexerInputCharStream.java
index a0853ba63a..2f782bb275 100644
---
a/ide/lexer.antlr4/src/org/netbeans/spi/lexer/antlr4/LexerInputCharStream.java
+++
b/ide/lexer.antlr4/src/org/netbeans/spi/lexer/antlr4/LexerInputCharStream.java
@@ -28,7 +28,7 @@ import org.netbeans.spi.lexer.*;
*
* @author Laszlo Kishalmi
*/
-public class LexerInputCharStream implements CharStream {
+final class LexerInputCharStream implements CharStream {
private final LexerInput input;
private int tokenMark = Integer.MAX_VALUE;
diff --git
a/java/languages.antlr/src/org/netbeans/modules/languages/antlr/v3/Antlr3Lexer.java
b/java/languages.antlr/src/org/netbeans/modules/languages/antlr/v3/Antlr3Lexer.java
index 5238858e17..876c59f57c 100644
---
a/java/languages.antlr/src/org/netbeans/modules/languages/antlr/v3/Antlr3Lexer.java
+++
b/java/languages.antlr/src/org/netbeans/modules
[netbeans] branch master updated: Fix possible NPE in Tiny.java
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 dea562a6a8 Fix possible NPE in Tiny.java
dea562a6a8 is described below
commit dea562a6a83ff4814f9693bb41f92f0b3976b587
Author: Laszlo Kishalmi
AuthorDate: Sun Jan 8 22:25:10 2023 -0800
Fix possible NPE in Tiny.java
---
java/java.hints/src/org/netbeans/modules/java/hints/perf/Tiny.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/perf/Tiny.java
b/java/java.hints/src/org/netbeans/modules/java/hints/perf/Tiny.java
index 0e158c4bc8..7373f01ba7 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/perf/Tiny.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/perf/Tiny.java
@@ -534,7 +534,7 @@ public class Tiny {
List type =
CreateElementUtilities.resolveType(
EnumSet.noneOf(ElementKind.class), ctx.getInfo(), parent,
leaf, pos, new TypeMirror[1], new int[1]);
-if (!type.isEmpty()) {
+if ((type != null) && !type.isEmpty()) {
return type.get(0);
}
}
-
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: TOML uses ANTLR4 Lexer Support
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 88c0c39f20 TOML uses ANTLR4 Lexer Support
88c0c39f20 is described below
commit 88c0c39f203c0815a0547ecbfba4d8d420615a17
Author: Laszlo Kishalmi
AuthorDate: Sun Jan 8 16:33:29 2023 -0800
TOML uses ANTLR4 Lexer Support
---
ide/languages.toml/nbproject/project.xml | 8 ++
.../languages/toml/LexerInputCharStream.java | 135 -
.../netbeans/modules/languages/toml/TomlLexer.java | 83 ++---
.../modules/languages/toml/TomlTokenId.java| 3 +-
4 files changed, 22 insertions(+), 207 deletions(-)
diff --git a/ide/languages.toml/nbproject/project.xml
b/ide/languages.toml/nbproject/project.xml
index ea7fe01d03..309960c9b0 100644
--- a/ide/languages.toml/nbproject/project.xml
+++ b/ide/languages.toml/nbproject/project.xml
@@ -114,6 +114,14 @@
1.80
+
+
org.netbeans.modules.lexer.antlr4
+
+
+
+1.0
+
+
org.netbeans.modules.parsing.api
diff --git
a/ide/languages.toml/src/org/netbeans/modules/languages/toml/LexerInputCharStream.java
b/ide/languages.toml/src/org/netbeans/modules/languages/toml/LexerInputCharStream.java
deleted file mode 100644
index 7f2c2877ed..00
---
a/ide/languages.toml/src/org/netbeans/modules/languages/toml/LexerInputCharStream.java
+++ /dev/null
@@ -1,135 +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 org.netbeans.modules.languages.toml;
-
-import org.antlr.v4.runtime.CharStream;
-import static org.antlr.v4.runtime.IntStream.UNKNOWN_SOURCE_NAME;
-import org.antlr.v4.runtime.misc.Interval;
-import org.netbeans.spi.lexer.*;
-
-/**
- *
- * @author lkishalmi
- */
-public class LexerInputCharStream implements CharStream {
-private final LexerInput input;
-
-private int tokenMark = Integer.MAX_VALUE;
-private int index = 0;
-
-public LexerInputCharStream(LexerInput input) {
-this.input = input;
-}
-
-@Override
-public String getText(Interval intrvl) {
-if (intrvl.a < tokenMark) {
-throw new UnsupportedOperationException("Can't read before the
last token end: " + tokenMark);
-}
-int start = intrvl.a - tokenMark;
-int end = intrvl.b - tokenMark + 1;
-int toread = end - start - input.readLength();
-for (int i = 0; i < toread; i++) {
-input.read();
-}
-String ret = String.valueOf(input.readText(start, end));
-if (toread > 0) {
-input.backup(toread);
-}
-return ret;
-}
-
-@Override
-public void consume() {
-read();
-}
-
-@Override
-public int LA(int count) {
-if (count == 0) {
-return 0; //the behaviour is not defined
-}
-
-int c = 0;
-if (count > 0) {
-for (int i = 0; i < count; i++) {
-c = read();
-}
-backup(count);
-} else {
-backup(count);
-c = read();
-}
-return c;
-}
-
-//Marks are for buffering in ANTLR4, we do not really need them
-@Override
-public int mark() {
-return -1;
-}
-
-public void markToken() {
-tokenMark = index;
-}
-
-@Override
-public void release(int marker) {
-}
-
-@Override
-public int index() {
-return index;
-}
-
-@Override
-public void seek(int i) {
-if (i < index()) {
-backup(index() - i);
-} else {
-while (index() < i) {
-if (read() == LexerInput.EOF) {
-break;
-}
-}
-}
-}
-
-
-private int read() {
-int ret =
[netbeans] branch master updated: Move ANTLR Lexers to lexer.antlr4
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 6f472b51ca Move ANTLR Lexers to lexer.antlr4
6f472b51ca is described below
commit 6f472b51caa5ae24ddcb63c4ca5965c3404253dd
Author: Laszlo Kishalmi
AuthorDate: Sun Jan 8 19:26:52 2023 -0800
Move ANTLR Lexers to lexer.antlr4
---
java/languages.antlr/nbproject/project.xml | 22 +--
.../languages/antlr/AbstractAntlrLexer.java| 82 --
.../languages/antlr/AntlrTokenSequence.java| 172 -
.../languages/antlr/LexerInputCharStream.java | 134
.../modules/languages/antlr/v3/Antlr3Lexer.java| 40 ++---
.../antlr/v4/Antlr4CompletionProvider.java | 3 +-
.../modules/languages/antlr/v4/Antlr4Lexer.java| 40 ++---
.../languages/antlr/v4/Antlr4ParserResult.java | 3 +
.../languages/antlr/AntlrTokenSequenceTest.java| 162 ---
9 files changed, 35 insertions(+), 623 deletions(-)
diff --git a/java/languages.antlr/nbproject/project.xml
b/java/languages.antlr/nbproject/project.xml
index 73729c3315..05c1ef1db2 100644
--- a/java/languages.antlr/nbproject/project.xml
+++ b/java/languages.antlr/nbproject/project.xml
@@ -141,6 +141,14 @@
1.80
+
+
org.netbeans.modules.lexer.antlr4
+
+
+
+1.0
+
+
org.netbeans.modules.parsing.api
@@ -231,20 +239,6 @@
-
-
-unit
-
-
org.netbeans.libs.junit4
-
-
-
-
org.netbeans.modules.nbjunit
-
-
-
-
-
diff --git
a/java/languages.antlr/src/org/netbeans/modules/languages/antlr/AbstractAntlrLexer.java
b/java/languages.antlr/src/org/netbeans/modules/languages/antlr/AbstractAntlrLexer.java
deleted file mode 100644
index 9f76582b2e..00
---
a/java/languages.antlr/src/org/netbeans/modules/languages/antlr/AbstractAntlrLexer.java
+++ /dev/null
@@ -1,82 +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 org.netbeans.modules.languages.antlr;
-
-import org.antlr.v4.runtime.misc.IntegerList;
-import org.netbeans.api.lexer.Token;
-import org.netbeans.spi.lexer.Lexer;
-import org.netbeans.spi.lexer.LexerRestartInfo;
-import org.netbeans.spi.lexer.TokenFactory;
-
-
-/**
- *
- * @author lkishalmi
- */
-public abstract class AbstractAntlrLexer
implements Lexer {
-
-private final TokenFactory tokenFactory;
-protected final T lexer;
-private final LexerInputCharStream input;
-
-public AbstractAntlrLexer(LexerRestartInfo info, T lexer) {
-this.tokenFactory = info.tokenFactory();
-this.lexer = lexer;
-this.input = (LexerInputCharStream) lexer.getInputStream();
-if (info.state() != null) {
-((LexerState) info.state()).restore(lexer);
-}
-input.markToken();
-}
-
-
-@Override
-public void release() {
-}
-
-protected final Token token(AntlrTokenId id) {
-input.markToken();
-return tokenFactory.createToken(id);
-}
-
-public static class LexerState {
-final int state;
-final int mode;
-final IntegerList modes;
-
-public LexerState(T lexer) {
-this.state= lexer.getState();
-
-this.mode = lexer._mode;
-this.modes = new IntegerList(lexer._modeStack);
-}
-
-public void restore(T lexer) {
-lexer.setState(state);
-lexer._modeStack.addAll(modes);
-lexer._mode = mode;
-}
[netbeans] branch master updated: Initial implementation of ANTLR4 Lexer Support (#5206)
This is an automated email from the ASF dual-hosted git repository. lkishalmi 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 89b7a0930d Initial implementation of ANTLR4 Lexer Support (#5206) 89b7a0930d is described below commit 89b7a0930dcf453bba5a0512baaf47de9fd42ed8 Author: Laszlo Kishalmi AuthorDate: Sun Jan 8 15:56:13 2023 -0800 Initial implementation of ANTLR4 Lexer Support (#5206) * Initial implementation of ANTLR4 Lexer Support * More documentation on AbstractAntlrLexerBridge * Added lexer.antlr4 test to GH Workflows * Removed System.out.println from tests --- .github/workflows/main.yml |3 + ide/lexer.antlr4/arch.xml | 1063 ide/lexer.antlr4/build.xml | 41 + ide/lexer.antlr4/manifest.mf |3 + ide/lexer.antlr4/nbproject/project.properties | 22 + ide/lexer.antlr4/nbproject/project.xml | 61 ++ .../spi/lexer/antlr4/AbstractAntlrLexerBridge.java | 183 .../spi/lexer/antlr4/AntlrTokenSequence.java | 249 + .../netbeans/spi/lexer/antlr4/Bundle.properties| 23 + .../spi/lexer/antlr4/LexerInputCharStream.java | 136 +++ .../src/org/antlr/grammars/dummy/DummyLexer.g4 | 67 ++ .../src/org/antlr/grammars/dummy/DummyLexer.java | 175 .../spi/lexer/antlr4}/AntlrTokenSequenceTest.java | 26 +- .../languages/antlr/AntlrTokenSequenceTest.java|9 - nbbuild/cluster.properties |1 + 15 files changed, 2040 insertions(+), 22 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6c94c85813..431442ba04 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -523,6 +523,9 @@ jobs: - name: ide/lexer run: ant $OPTS -f ide/lexer test + - name: ide/lexer.antlr4 +run: ant $OPTS -f ide/lexer.antlr4 test + - name: ide/lib.terminalemulator run: ant $OPTS -f ide/lib.terminalemulator test diff --git a/ide/lexer.antlr4/arch.xml b/ide/lexer.antlr4/arch.xml new file mode 100644 index 00..ea212512fb --- /dev/null +++ b/ide/lexer.antlr4/arch.xml @@ -0,0 +1,1063 @@ + + + +]> + + + + + + + + + + + + + This module provides a bridge between ANTLRv4 Lexers and NetBeans Lexer + infrastructure. + + + + + + + + + + + + + + + New language support with ANTLRv4 Grammar. + + + + + + + + + None. + + + + + + + None. + + + + + + None. + + + + + + + + + + XXX no answer for arch-quality + + + + + + + + + XXX no answer for arch-time + + + + + + + + + XXX no answer for arch-what + + + + + + + + + + + + + + + + XXX no answer for compat-deprecation + + + + + + + + + XXX no answer for compat-i18n + + + + + + + + + XXX no answer for compat-standards + + + + + + + + + XXX no answer for compat-version + + + + + + + + + XXX no answer for dep-jre + + + + + + + + + XXX no answer for dep-jrejdk + + + + + + + + + + + + + + + + XXX no answer for dep-non-nb + + + + + + + + + XXX no answer for dep-platform + + + + + + + + + XXX no answer for deploy-dependencies + + + + + + + + + XXX no answer for deploy-jar + + + + + + + + + XXX no answer for deploy-nbm + + + + + + + + + XXX no answer for deploy-packages + + + + + + + + + XXX no answer for deploy-shared + + + + + + + + + XXX no answer for exec-ant-tasks + + + + + + + + + XXX no answer for exec-classloader + + + + + + + + + XXX no answer for exec-component + + + + + + + + + XXX no answer for exec-introspection + + + + + + + + + XXX no answer for exec-privateaccess + + + + + + + + + XXX no answer for exec-process + + + + + + + + + XXX no answer for exec-reflection + + + + + + + + + XXX no answer for exec-threading + + + + + + + + + XXX no answer for format-clipboard + + + + + + + + + XXX no answer for format-dnd + + + + + + + + + XXX no answer for format-types + + + + + + + + + None. + + + + + + + + + XXX no answer for lookup-register + + + + + + + + + XXX no answer for lookup-remove + + + + + + + + + XXX no answer for perf-exit + + + + + + + + + XXX no answer for perf-huge_dialogs + + + + + + + + + XXX no answer for perf-limit + + + + + + + + + XXX no answer for perf-mem + + + + + + + + + XXX no answer for perf-menus + + + + + + + + + XXX no answer for perf-progress + + + + + + + + + XXX no answer for perf-scale + + + + + + + + + XXX no answer for perf-spi + + + + + + + + + XXX no answer for perf-star
[netbeans] annotated tag 16-u1 updated (73dbc4e7f7 -> 21d2a89fbd)
This is an automated email from the ASF dual-hosted git repository. lkishalmi pushed a change to annotated tag 16-u1 in repository https://gitbox.apache.org/repos/asf/netbeans.git *** WARNING: tag 16-u1 was modified! *** from 73dbc4e7f7 (commit) to 21d2a89fbd (tag) tagging 73dbc4e7f761295839396d66021475e5802e2db3 (commit) replaces 16 by Laszlo Kishalmi on Mon Jan 2 12:39:26 2023 -0800 - Log - Apache NetBeans 16-u1. --- No new revisions were added by this update. Summary of changes: - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
svn commit: r59067 - /dev/netbeans/netbeans/16-u1/ /release/netbeans/netbeans/16-u1/
Author: lkishalmi Date: Mon Jan 2 20:32:59 2023 New Revision: 59067 Log: Apache NetBeans 16-u1 Release Added: release/netbeans/netbeans/16-u1/ - copied from r59066, dev/netbeans/netbeans/16-u1/ Removed: dev/netbeans/netbeans/16-u1/ - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
svn commit: r58966 - in /dev/netbeans/netbeans/16-u1: ./ nbms/ nbms/extide/ nbms/java/
Author: lkishalmi Date: Sat Dec 24 23:35:31 2022 New Revision: 58966 Log: Apache NetBeans 16-u1. Added: dev/netbeans/netbeans/16-u1/ dev/netbeans/netbeans/16-u1/nbms/ dev/netbeans/netbeans/16-u1/nbms/extide/ dev/netbeans/netbeans/16-u1/nbms/extide/org-netbeans-modules-gradle.nbm (with props) dev/netbeans/netbeans/16-u1/nbms/extide/org-netbeans-modules-gradle.nbm.asc dev/netbeans/netbeans/16-u1/nbms/extide/org-netbeans-modules-gradle.nbm.sha512 dev/netbeans/netbeans/16-u1/nbms/java/ dev/netbeans/netbeans/16-u1/nbms/java/org-netbeans-modules-gradle-java.nbm (with props) dev/netbeans/netbeans/16-u1/nbms/java/org-netbeans-modules-gradle-java.nbm.asc dev/netbeans/netbeans/16-u1/nbms/java/org-netbeans-modules-gradle-java.nbm.sha512 dev/netbeans/netbeans/16-u1/nbms/updates.xml dev/netbeans/netbeans/16-u1/nbms/updates.xml.asc dev/netbeans/netbeans/16-u1/nbms/updates.xml.sha512 dev/netbeans/netbeans/16-u1/netbeans-16-u1-source.zip (with props) dev/netbeans/netbeans/16-u1/netbeans-16-u1-source.zip.asc dev/netbeans/netbeans/16-u1/netbeans-16-u1-source.zip.sha512 Added: dev/netbeans/netbeans/16-u1/nbms/extide/org-netbeans-modules-gradle.nbm == Binary file - no diff available. Propchange: dev/netbeans/netbeans/16-u1/nbms/extide/org-netbeans-modules-gradle.nbm -- svn:mime-type = application/octet-stream Added: dev/netbeans/netbeans/16-u1/nbms/extide/org-netbeans-modules-gradle.nbm.asc == --- dev/netbeans/netbeans/16-u1/nbms/extide/org-netbeans-modules-gradle.nbm.asc (added) +++ dev/netbeans/netbeans/16-u1/nbms/extide/org-netbeans-modules-gradle.nbm.asc Sat Dec 24 23:35:31 2022 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- + +iQJJBAABCgAzFiEEecjwKnJunvU2RtcSsr+BT6FFyy0FAmOnh60VHGxraXNoYWxt +aUBhcGFjaGUub3JnAAoJELK/gU+hRcstBXsP/jl3H2Do6VXB4iE1ee6VQEun1nem +g5tup46kZUEW1NnME88zaOQ8NiyZn6a8F3lVT4UEYk16uMhdknv6AEd2ydjfiMFj +HF/a4I5QHiWzbezaX/SRojDLgcVoxMC9w6QJTl+TsQ1saZA2O4b+Uti+t0x8Ioiw +TUR70i3lEiwuD9iJ0bQ2X0yOVfxwmHL7MoxbHZgnk0qvHclCY1XO8fSkhyJxLq+J +MaaWJSj246+1+dpGpefozRsvwLlZvmdbp+/2eygZOlMloktPSVGLpBCozeL5hLNH +kXF428WJkHVJGTNj/+9EmTCsCLjsgM5L04m7kQzBHe9D8frP/HFLbjPoE91wPBJ6 +pDCDu2/S1ywMVrQgjaV/L4Z15jrmhyYKchUp4PmfzlOH0c6bWHK1m6YXSSQ/Crdi +WbBOe7NSnAZdEJhQZvwrpqXJ9Lc/8MeGSBqDy3rI4F5m3fakDx4k4A8yBds9KdSv +HdhpoDOwhQP7ciPLXVbnPkmZVABNEsBQyoyrVlh9Nt9YqXnfU+o2AN5SlIaH1WqK +4XoVzn8FeSdy1cXctoQPwXUqhvEO+6c4HGCHbVNIqY8juVEvQTtOXT2SL2v1NOmS +/PorHQNoodFsJ/x3lFJJxlhwwpbktBZ5woSaC+JG+HS4JeTnRjv8JMImqZ3EsLTE +NWtFsecnJoimWQXx +=oANk +-END PGP SIGNATURE- Added: dev/netbeans/netbeans/16-u1/nbms/extide/org-netbeans-modules-gradle.nbm.sha512 == --- dev/netbeans/netbeans/16-u1/nbms/extide/org-netbeans-modules-gradle.nbm.sha512 (added) +++ dev/netbeans/netbeans/16-u1/nbms/extide/org-netbeans-modules-gradle.nbm.sha512 Sat Dec 24 23:35:31 2022 @@ -0,0 +1 @@ +b6bb6025ac88906fb77177d9fa881ca5dfe68e8b3b9740f5ae2b0ab4e01bfa0e9d58fa22861b029a1433921f45715b5a4db5b38eca8165fb5cfdcf85fb67a7ff ./org-netbeans-modules-gradle.nbm Added: dev/netbeans/netbeans/16-u1/nbms/java/org-netbeans-modules-gradle-java.nbm == Binary file - no diff available. Propchange: dev/netbeans/netbeans/16-u1/nbms/java/org-netbeans-modules-gradle-java.nbm -- svn:mime-type = application/octet-stream Added: dev/netbeans/netbeans/16-u1/nbms/java/org-netbeans-modules-gradle-java.nbm.asc == --- dev/netbeans/netbeans/16-u1/nbms/java/org-netbeans-modules-gradle-java.nbm.asc (added) +++ dev/netbeans/netbeans/16-u1/nbms/java/org-netbeans-modules-gradle-java.nbm.asc Sat Dec 24 23:35:31 2022 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- + +iQJJBAABCgAzFiEEecjwKnJunvU2RtcSsr+BT6FFyy0FAmOnh60VHGxraXNoYWxt +aUBhcGFjaGUub3JnAAoJELK/gU+hRcstncoP/i+U3VvNvbPk9UF7avR/H2UZEmwC +jWAwIufWR2f3ggUsSZbcBB1pzf2926mWNmULgJ0dssZsePzIzlyF/xuq9Ds190JX +BjMsqkQ/jmBYL4p1Sr/1pUhB1/QDpgmrBvDoBa1cDR9cM+V9cQyEV2G257LQoI9R +BsOraohZA1r3d7A/lHy/D/5ytS5+wRwFDHhNJD87KN8XFtAJr7nzM+urbMOLri23 +laB3wuP0ZIelPT0PjXzDivHk5cw+4jv2OFJl1qm4Byvz3eWsaOmboI95JfR+vKg9 +QQYxuMszvJ6Favdy32MtC7ZlLjXdqbjwBUQKdNzrSwsRDkHuGHr9pcR2jqr6z0C/ +d7MSkuvjpwEz8IftvUo6O7gv31sfcKNHoBywejenl4dU3ZXAiQr5aJ26t85qpx+p +bgK6pn7yumXSrwt0N0dOOOW4hQwptd5bpKiXeV5PxiqUBL2SwREu8sPsw/S5QqNJ +NijdroVFdQkDf3Q5MdtVpJRA0bB8hfuOg2z18mvTelgxf0qvWjL5pqm3gEaJRnC3 +C506neCZzDzyKrnncjN0Nc3evtmWVy1UB9AbxCjUn1jjPOTN7g8s78cMXhGO4f6Y +x3rUQRyvGiXqcVePkWfS2VXwBBkclnfRV5Sd9rorbL2rdKKuGSKsB3fXlhvYDBrd +/CLP602+lNOJhurq +=YIgP
[netbeans-jenkins-lib] branch master updated: Updated manifest for NB16u1
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new bfe35f6 Updated manifest for NB16u1
bfe35f6 is described below
commit bfe35f64b78eaa67b8c8138b5194bd57bc4ce388
Author: Laszlo Kishalmi
AuthorDate: Thu Dec 22 18:44:45 2022 -0800
Updated manifest for NB16u1
---
meta/netbeansrelease.json | 4
1 file changed, 4 insertions(+)
diff --git a/meta/netbeansrelease.json b/meta/netbeansrelease.json
index c30a2de..fee4c97 100644
--- a/meta/netbeansrelease.json
+++ b/meta/netbeansrelease.json
@@ -878,6 +878,10 @@
"321935444b183aea1c4ff255d8d2ab8d50c60606": {
"vote": "1",
"position": "4"
+},
+"73dbc4e7f761295839396d66021475e5802e2db3": {
+"version": "u1",
+"position": "5"
}
},
"releasedate": {
-
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch release160 updated: Fixing project loading issues with micronaut complex project.
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch release160
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/release160 by this push:
new 73dbc4e7f7 Fixing project loading issues with micronaut complex
project.
73dbc4e7f7 is described below
commit 73dbc4e7f761295839396d66021475e5802e2db3
Author: Svata Dedic
AuthorDate: Mon Dec 19 19:15:36 2022 +0100
Fixing project loading issues with micronaut complex project.
---
.../gradle/tooling/NbProjectInfoBuilder.java | 22 ++
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
index 0fd561a2cd..b17933e692 100644
---
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
+++
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
@@ -186,7 +186,7 @@ class NbProjectInfoBuilder {
public ValueAndType(Class type, Object value) {
this.type = type;
-this.value = Optional.of(value);
+this.value = Optional.ofNullable(value);
}
public ValueAndType(Class type) {
@@ -290,7 +290,7 @@ class NbProjectInfoBuilder {
Map taskProperties = new HashMap<>();
Map taskPropertyTypes = new HashMap<>();
-Map taskList = project.getTasks().getAsMap();
+Map taskList = new
HashMap<>(project.getTasks().getAsMap());
for (String s : taskList.keySet()) {
Task task = taskList.get(s);
Class taskClass = task.getClass();
@@ -307,7 +307,7 @@ class NbProjectInfoBuilder {
private void detectTaskDependencies(NbProjectInfoModel model) {
Map tasks = new HashMap<>();
-Map taskList = project.getTasks().getAsMap();
+Map taskList = new
HashMap<>(project.getTasks().getAsMap());
for (String s : taskList.keySet()) {
Task task = taskList.get(s);
Map taskInfo = new HashMap<>();
@@ -684,7 +684,7 @@ class NbProjectInfoBuilder {
}
NamedDomainObjectContainer nc =
(NamedDomainObjectContainer)value;
-Map m = nc.getAsMap();
+Map m = new HashMap<>(nc.getAsMap());
List ss = new ArrayList<>(m.keySet());
propertyTypes.put(prefix + propName +
COLLECTION_KEYS_MARKER, String.join(";;", ss));
for (String k : m.keySet()) {
@@ -1000,14 +1000,12 @@ class NbProjectInfoBuilder {
List compilerArgs;
-try {
-compilerArgs = (List)
getProperty(compileTask, "options", "allCompilerArgs");
-} catch (Throwable ex) {
-try {
-compilerArgs = (List)
getProperty(compileTask, "options", "compilerArgs");
-} catch (Throwable ex2) {
-compilerArgs = (List)
getProperty(compileTask, "kotlinOptions", "freeCompilerArgs");
-}
+compilerArgs = (List)
getProperty(compileTask, "options", "allCompilerArgs");
+if (compilerArgs == null) {
+compilerArgs = (List)
getProperty(compileTask, "options", "compilerArgs");
+}
+if (compilerArgs == null) {
+compilerArgs = (List)
getProperty(compileTask, "kotlinOptions", "freeCompilerArgs");
}
model.getInfo().put(propBase + lang +
"_compiler_args", new ArrayList<>(compilerArgs));
}
-
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 AOBE on empty bad class files.
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 30a8cefa5a Prevent AOBE on empty bad class files.
30a8cefa5a is described below
commit 30a8cefa5a73f258b61939729e845672e66826fe
Author: Laszlo Kishalmi
AuthorDate: Thu Dec 22 10:33:17 2022 -0800
Prevent AOBE on empty bad class files.
---
.../lib/nbjavac/services/NBClassReader.java| 34 --
1 file changed, 18 insertions(+), 16 deletions(-)
diff --git
a/java/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBClassReader.java
b/java/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBClassReader.java
index d1ca38a3c1..9bad23cc29 100644
--- a/java/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBClassReader.java
+++ b/java/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBClassReader.java
@@ -88,23 +88,25 @@ public class NBClassReader extends ClassReader {
JavaFileObject origFile = c.classfile;
try (InputStream in = origFile.openInputStream()) {
byte[] data = readFile(in);
-int major = (Byte.toUnsignedInt(data[6]) << 8) +
Byte.toUnsignedInt(data[7]);
-int maxMajor = ClassFile.Version.MAX().major;
-if (maxMajor < major) {
-if (log.currentSourceFile() != null) {
-log.warning(0, Warnings.BigMajorVersion(origFile,
major, maxMajor));
-}
-data[6] = (byte) (maxMajor >> 8);
-data[7] = (byte) (maxMajor & 0xFF);
-byte[] dataFin = data;
-c.classfile = new ForwardingJavaFileObject(origFile) {
-@Override
-public InputStream openInputStream() throws
IOException {
-return new ByteArrayInputStream(dataFin);
+if (data.length > 8) {
+int major = (Byte.toUnsignedInt(data[6]) << 8) +
Byte.toUnsignedInt(data[7]);
+int maxMajor = ClassFile.Version.MAX().major;
+if (maxMajor < major) {
+if (log.currentSourceFile() != null) {
+log.warning(0,
Warnings.BigMajorVersion(origFile, major, maxMajor));
}
-};
-super.readClassFile(c);
-return ;
+data[6] = (byte) (maxMajor >> 8);
+data[7] = (byte) (maxMajor & 0xFF);
+byte[] dataFin = data;
+c.classfile = new
ForwardingJavaFileObject(origFile) {
+@Override
+public InputStream openInputStream() throws
IOException {
+return new ByteArrayInputStream(dataFin);
+}
+};
+super.readClassFile(c);
+return ;
+}
}
} catch (IOException ex) {
Logger.getLogger(NBClassReader.class.getName()).log(Level.FINE, null, 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] 01/01: Fixing project loading issues with micronaut complex project.
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit fedbbd143b852e8b41f370c7ca769c489f28c569
Author: Svata Dedic
AuthorDate: Mon Dec 19 19:15:36 2022 +0100
Fixing project loading issues with micronaut complex project.
---
.../gradle/tooling/NbProjectInfoBuilder.java | 22 ++
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
index 0fd561a2cd..b17933e692 100644
---
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
+++
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
@@ -186,7 +186,7 @@ class NbProjectInfoBuilder {
public ValueAndType(Class type, Object value) {
this.type = type;
-this.value = Optional.of(value);
+this.value = Optional.ofNullable(value);
}
public ValueAndType(Class type) {
@@ -290,7 +290,7 @@ class NbProjectInfoBuilder {
Map taskProperties = new HashMap<>();
Map taskPropertyTypes = new HashMap<>();
-Map taskList = project.getTasks().getAsMap();
+Map taskList = new
HashMap<>(project.getTasks().getAsMap());
for (String s : taskList.keySet()) {
Task task = taskList.get(s);
Class taskClass = task.getClass();
@@ -307,7 +307,7 @@ class NbProjectInfoBuilder {
private void detectTaskDependencies(NbProjectInfoModel model) {
Map tasks = new HashMap<>();
-Map taskList = project.getTasks().getAsMap();
+Map taskList = new
HashMap<>(project.getTasks().getAsMap());
for (String s : taskList.keySet()) {
Task task = taskList.get(s);
Map taskInfo = new HashMap<>();
@@ -684,7 +684,7 @@ class NbProjectInfoBuilder {
}
NamedDomainObjectContainer nc =
(NamedDomainObjectContainer)value;
-Map m = nc.getAsMap();
+Map m = new HashMap<>(nc.getAsMap());
List ss = new ArrayList<>(m.keySet());
propertyTypes.put(prefix + propName +
COLLECTION_KEYS_MARKER, String.join(";;", ss));
for (String k : m.keySet()) {
@@ -1000,14 +1000,12 @@ class NbProjectInfoBuilder {
List compilerArgs;
-try {
-compilerArgs = (List)
getProperty(compileTask, "options", "allCompilerArgs");
-} catch (Throwable ex) {
-try {
-compilerArgs = (List)
getProperty(compileTask, "options", "compilerArgs");
-} catch (Throwable ex2) {
-compilerArgs = (List)
getProperty(compileTask, "kotlinOptions", "freeCompilerArgs");
-}
+compilerArgs = (List)
getProperty(compileTask, "options", "allCompilerArgs");
+if (compilerArgs == null) {
+compilerArgs = (List)
getProperty(compileTask, "options", "compilerArgs");
+}
+if (compilerArgs == null) {
+compilerArgs = (List)
getProperty(compileTask, "kotlinOptions", "freeCompilerArgs");
}
model.getInfo().put(propBase + lang +
"_compiler_args", new ArrayList<>(compilerArgs));
}
-
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 (fe168e6fb1 -> fedbbd143b)
This is an automated email from the ASF dual-hosted git repository. lkishalmi pushed a change to branch delivery in repository https://gitbox.apache.org/repos/asf/netbeans.git discard fe168e6fb1 Fixing project loading issues with micronaut complex project. omit 83d5a74de1 Upgrade version numbers for the affected modules omit 61c57e2cd3 Make Java Platform available on non-java Gradle Projects omit edb745340d Use Project Dictated JVM for Gradle Discovery (#4985) omit 8fee76adf5 Made Gradle JavaCompilerProcessorFactory work in absence of a ClasspathProvider omit 44ab4540a4 [#4865] Register JDPA and Java Compiler Output on Project level omit bc6c461930 #4965: Fix issues with gradle pre-6.4 (#4995) omit 5d3fe96b33 Fix #5015: Fix Gradle/broken task dependency and serialization (#5022) omit 648564ff47 Fixed some Gradle introspection problems wit pre-6.1 Gradle Versions add df9ce551fb Fixed some Gradle introspection problems wit pre-6.1 Gradle Versions add 182ca8590f Fix #5015: Fix Gradle/broken task dependency and serialization (#5022) add 367ae9dea0 #4965: Fix issues with gradle pre-6.4 (#4995) add 435e86ad7b [#4865] Register JDPA and Java Compiler Output on Project level add c729a4f1b6 Made Gradle JavaCompilerProcessorFactory work in absence of a ClasspathProvider add c7b7d4a09f Use Project Dictated JVM for Gradle Discovery (#4985) add 4a37b3625a Make Java Platform available on non-java Gradle Projects add 6c11e077a6 Upgrade version numbers for the affected modules new fedbbd143b Fixing project loading issues with micronaut complex project. 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 (fe168e6fb1) \ N -- N -- N refs/heads/delivery (fedbbd143b) 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: - 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: Fixing project loading issues with micronaut complex project.
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new fe168e6fb1 Fixing project loading issues with micronaut complex
project.
fe168e6fb1 is described below
commit fe168e6fb17bd96cd0de1447bc3a3b55eaa1de95
Author: Svata Dedic
AuthorDate: Mon Dec 19 19:15:36 2022 +0100
Fixing project loading issues with micronaut complex project.
---
.../gradle/tooling/NbProjectInfoBuilder.java | 22 ++
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
index 0fd561a2cd..b17933e692 100644
---
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
+++
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
@@ -186,7 +186,7 @@ class NbProjectInfoBuilder {
public ValueAndType(Class type, Object value) {
this.type = type;
-this.value = Optional.of(value);
+this.value = Optional.ofNullable(value);
}
public ValueAndType(Class type) {
@@ -290,7 +290,7 @@ class NbProjectInfoBuilder {
Map taskProperties = new HashMap<>();
Map taskPropertyTypes = new HashMap<>();
-Map taskList = project.getTasks().getAsMap();
+Map taskList = new
HashMap<>(project.getTasks().getAsMap());
for (String s : taskList.keySet()) {
Task task = taskList.get(s);
Class taskClass = task.getClass();
@@ -307,7 +307,7 @@ class NbProjectInfoBuilder {
private void detectTaskDependencies(NbProjectInfoModel model) {
Map tasks = new HashMap<>();
-Map taskList = project.getTasks().getAsMap();
+Map taskList = new
HashMap<>(project.getTasks().getAsMap());
for (String s : taskList.keySet()) {
Task task = taskList.get(s);
Map taskInfo = new HashMap<>();
@@ -684,7 +684,7 @@ class NbProjectInfoBuilder {
}
NamedDomainObjectContainer nc =
(NamedDomainObjectContainer)value;
-Map m = nc.getAsMap();
+Map m = new HashMap<>(nc.getAsMap());
List ss = new ArrayList<>(m.keySet());
propertyTypes.put(prefix + propName +
COLLECTION_KEYS_MARKER, String.join(";;", ss));
for (String k : m.keySet()) {
@@ -1000,14 +1000,12 @@ class NbProjectInfoBuilder {
List compilerArgs;
-try {
-compilerArgs = (List)
getProperty(compileTask, "options", "allCompilerArgs");
-} catch (Throwable ex) {
-try {
-compilerArgs = (List)
getProperty(compileTask, "options", "compilerArgs");
-} catch (Throwable ex2) {
-compilerArgs = (List)
getProperty(compileTask, "kotlinOptions", "freeCompilerArgs");
-}
+compilerArgs = (List)
getProperty(compileTask, "options", "allCompilerArgs");
+if (compilerArgs == null) {
+compilerArgs = (List)
getProperty(compileTask, "options", "compilerArgs");
+}
+if (compilerArgs == null) {
+compilerArgs = (List)
getProperty(compileTask, "kotlinOptions", "freeCompilerArgs");
}
model.getInfo().put(propBase + lang +
"_compiler_args", new ArrayList<>(compilerArgs));
}
-
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: Fixing project loading issues with micronaut complex project.
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 861bbffd98 Fixing project loading issues with micronaut complex
project.
861bbffd98 is described below
commit 861bbffd98935fe96149472fef28bba7e7bf01cc
Author: Svata Dedic
AuthorDate: Mon Dec 19 19:15:36 2022 +0100
Fixing project loading issues with micronaut complex project.
---
.../gradle/tooling/NbProjectInfoBuilder.java | 22 ++
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
index 0fd561a2cd..b17933e692 100644
---
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
+++
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
@@ -186,7 +186,7 @@ class NbProjectInfoBuilder {
public ValueAndType(Class type, Object value) {
this.type = type;
-this.value = Optional.of(value);
+this.value = Optional.ofNullable(value);
}
public ValueAndType(Class type) {
@@ -290,7 +290,7 @@ class NbProjectInfoBuilder {
Map taskProperties = new HashMap<>();
Map taskPropertyTypes = new HashMap<>();
-Map taskList = project.getTasks().getAsMap();
+Map taskList = new
HashMap<>(project.getTasks().getAsMap());
for (String s : taskList.keySet()) {
Task task = taskList.get(s);
Class taskClass = task.getClass();
@@ -307,7 +307,7 @@ class NbProjectInfoBuilder {
private void detectTaskDependencies(NbProjectInfoModel model) {
Map tasks = new HashMap<>();
-Map taskList = project.getTasks().getAsMap();
+Map taskList = new
HashMap<>(project.getTasks().getAsMap());
for (String s : taskList.keySet()) {
Task task = taskList.get(s);
Map taskInfo = new HashMap<>();
@@ -684,7 +684,7 @@ class NbProjectInfoBuilder {
}
NamedDomainObjectContainer nc =
(NamedDomainObjectContainer)value;
-Map m = nc.getAsMap();
+Map m = new HashMap<>(nc.getAsMap());
List ss = new ArrayList<>(m.keySet());
propertyTypes.put(prefix + propName +
COLLECTION_KEYS_MARKER, String.join(";;", ss));
for (String k : m.keySet()) {
@@ -1000,14 +1000,12 @@ class NbProjectInfoBuilder {
List compilerArgs;
-try {
-compilerArgs = (List)
getProperty(compileTask, "options", "allCompilerArgs");
-} catch (Throwable ex) {
-try {
-compilerArgs = (List)
getProperty(compileTask, "options", "compilerArgs");
-} catch (Throwable ex2) {
-compilerArgs = (List)
getProperty(compileTask, "kotlinOptions", "freeCompilerArgs");
-}
+compilerArgs = (List)
getProperty(compileTask, "options", "allCompilerArgs");
+if (compilerArgs == null) {
+compilerArgs = (List)
getProperty(compileTask, "options", "compilerArgs");
+}
+if (compilerArgs == null) {
+compilerArgs = (List)
getProperty(compileTask, "kotlinOptions", "freeCompilerArgs");
}
model.getInfo().put(propBase + lang +
"_compiler_args", new ArrayList<>(compilerArgs));
}
-
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: FlatLaf: fix font of window title when using `--fontsize` argument (on Windows) (issue #5041)
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 ceacfe52dc FlatLaf: fix font of window title when using `--fontsize`
argument (on Windows) (issue #5041)
ceacfe52dc is described below
commit ceacfe52dc09478b5d762157afa15ec2611b2403
Author: Karl Tauber
AuthorDate: Sat Dec 3 17:03:22 2022 +0100
FlatLaf: fix font of window title when using `--fontsize` argument (on
Windows) (issue #5041)
---
platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/AllLFCustoms.java | 2 +-
platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/Startup.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/AllLFCustoms.java
b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/AllLFCustoms.java
index c09d9f69ee..e35adc40a3 100644
--- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/AllLFCustoms.java
+++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/AllLFCustoms.java
@@ -112,7 +112,7 @@ final class AllLFCustoms extends LFCustoms {
Map fontTranslation = new HashMap(5);
-if( "Nimbus".equals( UIManager.getLookAndFeel().getID() ) ) { //NOI18N
+if( UIManager.getFont("defaultFont") != null ) { //NOI18N
switchFont("defaultFont", fontTranslation, uiFontSize,
nbDialogPlain); // NOI18N
}
switchFont("controlFont", fontTranslation, uiFontSize, nbDialogPlain);
// NOI18N
diff --git a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/Startup.java
b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/Startup.java
index 3b49194721..2d7c828b48 100644
--- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/Startup.java
+++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/Startup.java
@@ -537,7 +537,7 @@ public final class Startup {
// Modify default font size to the font size passed as a
command-line parameter
if(uiFontSize>0) {
Integer customFontSize = new Integer (uiFontSize);
-UIManager.put ("customFontSize", customFontSize);
+UIManager.put (LFCustoms.CUSTOM_FONT_SIZE, customFontSize);
}
Startup.uiClass = uiClass;
Startup.themeURL = themeURL;
-
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] 03/08: #4965: Fix issues with gradle pre-6.4 (#4995)
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch release160
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 367ae9dea0c01855f8a8eb076e220aa4cd15cff1
Author: Svatopluk Dedic
AuthorDate: Sun Nov 27 03:15:34 2022 +0100
#4965: Fix issues with gradle pre-6.4 (#4995)
* Fix #4965: Avoid NPE: return null for no supplier.
* Improve compatibility for Gradle < 6.4
---
.../org/netbeans/modules/gradle/tooling/GradleInternalAdapter.java | 4 ++--
.../org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java| 4 +++-
.../src/org/netbeans/modules/gradle/api/GradleBaseProjectTest.java | 5 +
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/GradleInternalAdapter.java
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/GradleInternalAdapter.java
index 515cfc7f1b..632321d772 100644
---
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/GradleInternalAdapter.java
+++
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/GradleInternalAdapter.java
@@ -111,7 +111,7 @@ public class GradleInternalAdapter {
}
public ValueAndType findPropertyValueInternal(String propName, Object val)
{
-return safeCall(() -> {
+return sinceGradleOrDefault("6.4",() -> safeCall(() -> {
if (val instanceof ProviderInternal) {
ProviderInternal provided = (ProviderInternal)val;
ValueSupplier.ExecutionTimeValue etv;
@@ -129,7 +129,7 @@ public class GradleInternalAdapter {
} else {
return new ValueAndType(val != null ? val.getClass() : null,
val);
}
-}, "property " + propName).orElse(null);
+}, "property " + propName).orElse(null), null);
}
@SuppressWarnings("unchecked")
diff --git
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
index 0c50fbfd40..0fd561a2cd 100644
---
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
+++
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
@@ -1620,8 +1620,10 @@ class NbProjectInfoBuilder {
sneakyThrow(t);
return null;
}
-} else {
+} else if (def != null) {
return def.get();
+} else {
+return null;
}
}
diff --git
a/extide/gradle/test/unit/src/org/netbeans/modules/gradle/api/GradleBaseProjectTest.java
b/extide/gradle/test/unit/src/org/netbeans/modules/gradle/api/GradleBaseProjectTest.java
index 2fe874a4b1..64778be87b 100644
---
a/extide/gradle/test/unit/src/org/netbeans/modules/gradle/api/GradleBaseProjectTest.java
+++
b/extide/gradle/test/unit/src/org/netbeans/modules/gradle/api/GradleBaseProjectTest.java
@@ -247,6 +247,11 @@ public class GradleBaseProjectTest extends
AbstractGradleProjectTestCase {
return p;
}
+public void testOldGradle611ProjectLoads() throws Exception {
+Project p = makeProjectWithWrapper("projects/oldgradle/basic",
"6.1.1");
+assertProjectLoadedWithNoProblems(p, "6.1.1");
+}
+
public void testOldGradle683ProjectLoads() throws Exception {
Project p = makeProjectWithWrapper("projects/oldgradle/basic",
"6.8.3");
assertProjectLoadedWithNoProblems(p, "6.8.3");
-
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] 06/08: Use Project Dictated JVM for Gradle Discovery (#4985)
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch release160
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit c7b7d4a09f9e62c30fb8f84b17d4b59462319b44
Author: Laszlo Kishalmi
AuthorDate: Mon Dec 5 20:11:25 2022 -0800
Use Project Dictated JVM for Gradle Discovery (#4985)
---
.../gradle/GradleJavaCompatProblemsProvider.java | 90 ++
.../modules/gradle/GradleProjectConnection.java| 61 +--
.../api/execute/GradleDistributionManager.java | 29 ++-
.../gradle/execute/GradleDaemonExecutor.java | 1 -
.../modules/gradle/spi/execute/package-info.java | 35 +
5 files changed, 154 insertions(+), 62 deletions(-)
diff --git
a/extide/gradle/src/org/netbeans/modules/gradle/GradleJavaCompatProblemsProvider.java
b/extide/gradle/src/org/netbeans/modules/gradle/GradleJavaCompatProblemsProvider.java
index 52c7d2e382..66711bb0bd 100644
---
a/extide/gradle/src/org/netbeans/modules/gradle/GradleJavaCompatProblemsProvider.java
+++
b/extide/gradle/src/org/netbeans/modules/gradle/GradleJavaCompatProblemsProvider.java
@@ -21,17 +21,23 @@ package org.netbeans.modules.gradle;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.Collection;
import java.util.Collections;
+import java.util.Properties;
import org.netbeans.api.project.Project;
import org.netbeans.modules.gradle.api.NbGradleProject;
import org.netbeans.modules.gradle.api.execute.GradleDistributionManager;
import
org.netbeans.modules.gradle.api.execute.GradleDistributionManager.GradleDistribution;
import org.netbeans.modules.gradle.spi.execute.GradleDistributionProvider;
+import org.netbeans.modules.gradle.spi.execute.GradleJavaPlatformProvider;
import org.netbeans.spi.project.ProjectServiceProvider;
import org.netbeans.spi.project.ui.ProjectProblemsProvider;
import static
org.netbeans.spi.project.ui.ProjectProblemsProvider.PROP_PROBLEMS;
-import org.openide.util.NbBundle;
import org.openide.util.NbBundle.Messages;
/**
@@ -71,26 +77,82 @@ public final class GradleJavaCompatProblemsProvider
implements ProjectProblemsPr
"# {1} - Supported Java Version",
"# {2} - Required Gradle Version",
"# {3} - Forced Gradle Version",
-"TXT_JavaVersionMismatch=The IDE is running on Java {0} that is not
supported by Gradle {2}.\n"
-+ "The IDE will attempt to use Gradle {3} to gather the
project information.\n\n"
-+ "Either upgrade your Gradle version on your project or run
the IDE on "
-+ "Java {1} to avoid this problem!"
+"TXT_JavaVersionMismatch=The Java version: {0}, that is seletced
for the project "
++ "is not supported by Gradle {2}."
++ "The IDE will attempt to use Gradle {3} to gather the
project information."
++ "Possible solutions:"
++ "Upgrade your Gradle version on your project"
++ "Select Java Platform {1} (or below), on
Build>Compile settings, to avoid this problem!"
++ ""
})
@Override
public Collection getProblems() {
+GradleDistribution dist = getGradleDistribution();
+int javaVersion = getJavaVersion();
+if (!dist.isCompatibleWithJava(javaVersion)) {
+GradleDistribution compatDist =
GradleDistributionManager.get(dist.getGradleUserHome()).defaultDistribution();
+ProjectProblem problem = ProjectProblem.createWarning(
+Bundle.LBL_JavaVersionMismatch(),
+Bundle.TXT_JavaVersionMismatch(javaVersion,
dist.lastSupportedJava(),dist.getVersion(), compatDist.getVersion()));
+return Collections.singleton(problem);
+}
+return Collections.emptySet();
+}
+
+private GradleDistribution getGradleDistribution() {
+GradleDistribution dist = null;
GradleDistributionProvider pvd =
project.getLookup().lookup(GradleDistributionProvider.class);
if (pvd != null) {
-GradleDistribution dist = pvd.getGradleDistribution();
-if ((dist != null) && !dist.isCompatibleWithSystemJava()) {
-String javaVersion =
System.getProperty("java.specification.version",
System.getProperty("java.version")); //NOI18N
-GradleDistribution compatDist =
GradleDistributionManager.get(dist.getGradleUserHome()).defaultDistribution();
-ProjectProblem problem = ProjectProblem.createWarning(
-
[netbeans] 01/08: Fixed some Gradle introspection problems wit pre-6.1 Gradle Versions
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch release160
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit df9ce551fbe95ed4726f122e3d19e3d93c5ce6f2
Author: Laszlo Kishalmi
AuthorDate: Sun Nov 27 08:37:10 2022 -0800
Fixed some Gradle introspection problems wit pre-6.1 Gradle Versions
---
.../gradle/tooling/NbProjectInfoBuilder.java | 95 +-
.../gradle/api/GradleBaseProjectBuilder.java | 2 +-
2 files changed, 57 insertions(+), 40 deletions(-)
diff --git
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
index dae86ef964..fbd02232a9 100644
---
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
+++
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
@@ -91,7 +91,6 @@ import org.gradle.api.logging.Logging;
import org.gradle.api.plugins.ExtensionAware;
import org.gradle.api.plugins.ExtensionContainer;
import org.gradle.api.plugins.ExtensionsSchema.ExtensionSchema;
-import org.gradle.api.plugins.JavaPlatformPlugin;
import org.gradle.api.provider.Provider;
import org.gradle.api.reflect.HasPublicType;
import org.gradle.api.reflect.TypeOf;
@@ -105,7 +104,7 @@ import org.gradle.jvm.JvmLibrary;
import org.gradle.language.base.artifact.SourcesArtifact;
import org.gradle.language.java.artifact.JavadocArtifact;
import org.gradle.plugin.use.PluginId;
-import org.gradle.util.VersionNumber;
+import org.gradle.util.GradleVersion;
import org.netbeans.modules.gradle.tooling.internal.NbProjectInfo;
/**
@@ -176,8 +175,9 @@ class NbProjectInfoBuilder {
"war"
}));
+private static final GradleVersion GRADLE_VERSION =
GradleVersion.current().getBaseVersion();
+
final Project project;
-final VersionNumber gradleVersion;
final GradleInternalAdapter adapter;
public static final class ValueAndType {
@@ -197,9 +197,7 @@ class NbProjectInfoBuilder {
NbProjectInfoBuilder(Project project) {
this.project = project;
-this.gradleVersion =
VersionNumber.parse(project.getGradle().getGradleVersion());
-// checked that version 7.6.0 > 7.6.0-rc-1 in the VersionNumber order
-this.adapter = sinceGradleOrDefault("7.6.0-rc-1", () -> new
GradleInternalAdapter.Gradle76(project), () -> new
GradleInternalAdapter(project));
+this.adapter = sinceGradleOrDefault("7.6", () -> new
GradleInternalAdapter.Gradle76(project), () -> new
GradleInternalAdapter(project));
}
private NbProjectInfoModel model = new NbProjectInfoModel();
@@ -864,7 +862,7 @@ class NbProjectInfoBuilder {
model.getInfo().put("project_subProjects", sp);
Map ib = new HashMap<>();
-LOG.lifecycle("Gradle Version: {}", gradleVersion);
+LOG.lifecycle("Gradle Version: {}", GradleVersion.current());
sinceGradle("3.1", () -> {
for(IncludedBuild p: project.getGradle().getIncludedBuilds()) {
LOG.lifecycle("Include Build: {}", p.getName());
@@ -1016,36 +1014,44 @@ class NbProjectInfoBuilder {
}
if (Boolean.TRUE.equals(available.get(langId))) {
model.getInfo().put(propBase + lang,
storeSet(getProperty(sourceSet, langId, "srcDirs")));
-DirectoryProperty dirProp =
(DirectoryProperty)getProperty(sourceSet, langId, "classesDirectory");
-if (dirProp != null) {
-File outDir;
-
-if (dirProp.isPresent()) {
-outDir = dirProp.get().getAsFile();
-} else {
-// kotlin plugin uses some weird late
binding, so it has the output item, but it cannot be resolved to a
-// concrete file path at this time. Let's
make an approximation from
-Path candidate = null;
-if (base != null) {
-Path prefix = base.resolve(langId);
-// assume the language has just one
output dir in the source set:
-for (int i = 0; i < outPaths.size();
i++) {
-Path p = outPaths.get(i);
-if (p.startsWith(prefix)) {
-
[netbeans] 04/08: [#4865] Register JDPA and Java Compiler Output on Project level
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch release160
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 435e86ad7b2a83d4d3e2bedd106bba5341b539b5
Author: Laszlo Kishalmi
AuthorDate: Fri Nov 18 06:43:20 2022 -0800
[#4865] Register JDPA and Java Compiler Output on Project level
---
.../modules/gradle/java/output/LookupProviders.java| 14 +-
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git
a/java/gradle.java/src/org/netbeans/modules/gradle/java/output/LookupProviders.java
b/java/gradle.java/src/org/netbeans/modules/gradle/java/output/LookupProviders.java
index c652320244..5e05551a23 100644
---
a/java/gradle.java/src/org/netbeans/modules/gradle/java/output/LookupProviders.java
+++
b/java/gradle.java/src/org/netbeans/modules/gradle/java/output/LookupProviders.java
@@ -29,7 +29,7 @@ import org.openide.util.lookup.Lookups;
*/
public class LookupProviders {
-@LookupProvider.Registration(projectType =
NbGradleProject.GRADLE_PLUGIN_TYPE + "/java-base")
+@LookupProvider.Registration(projectType =
NbGradleProject.GRADLE_PROJECT_TYPE)
public static LookupProvider createJavaBaseProvider() {
return new LookupProvider() {
@Override
@@ -41,16 +41,4 @@ public class LookupProviders {
}
};
}
-
-@LookupProvider.Registration(projectTypes = {
-@LookupProvider.Registration.ProjectType(id =
NbGradleProject.GRADLE_PLUGIN_TYPE + "/com.github.lkishalmi.gatling"),
-@LookupProvider.Registration.ProjectType(id =
NbGradleProject.GRADLE_PLUGIN_TYPE + "/io.gatling.gradle")
-})
-public static LookupProvider createGatlingProvider() {
-return (baseContext) -> {
-return Lookups.fixed(
-new JDPAProcessorFactory()
-);
-};
-}
}
-
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] 07/08: Make Java Platform available on non-java Gradle Projects
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch release160
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 4a37b3625a1af8261b610bb535f74b09c3c37272
Author: Laszlo Kishalmi
AuthorDate: Mon Dec 5 22:45:43 2022 -0800
Make Java Platform available on non-java Gradle Projects
---
.../modules/gradle/java/execute/LookupProviders.java| 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git
a/java/gradle.java/src/org/netbeans/modules/gradle/java/execute/LookupProviders.java
b/java/gradle.java/src/org/netbeans/modules/gradle/java/execute/LookupProviders.java
index 1dc7f74878..41462bc76e 100644
---
a/java/gradle.java/src/org/netbeans/modules/gradle/java/execute/LookupProviders.java
+++
b/java/gradle.java/src/org/netbeans/modules/gradle/java/execute/LookupProviders.java
@@ -29,6 +29,18 @@ import org.openide.util.lookup.Lookups;
* @author lkishalmi
*/
public class LookupProviders {
+
+@LookupProvider.Registration(projectType =
NbGradleProject.GRADLE_PROJECT_TYPE)
+public static LookupProvider createProvider() {
+return new LookupProvider() {
+@Override
+public Lookup createAdditionalLookup(Lookup baseContext) {
+Project project = baseContext.lookup(Project.class);
+return Lookups.singleton(new
GradleJavaPlatformProviderImpl(project));
+}
+};
+}
+
@LookupProvider.Registration(projectType =
NbGradleProject.GRADLE_PLUGIN_TYPE + "/java-base")
public static LookupProvider createJavaBaseProvider() {
return new LookupProvider() {
@@ -37,7 +49,6 @@ public class LookupProviders {
Project project = baseContext.lookup(Project.class);
return Lookups.fixed(
new DebugFixHooks(project),
-new GradleJavaPlatformProviderImpl(project),
new ShowJavadocHook(project)
);
}
-
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 release160 updated (321935444b -> 6c11e077a6)
This is an automated email from the ASF dual-hosted git repository. lkishalmi pushed a change to branch release160 in repository https://gitbox.apache.org/repos/asf/netbeans.git from 321935444b Merge pull request #4937 from apache/delivery new df9ce551fb Fixed some Gradle introspection problems wit pre-6.1 Gradle Versions new 182ca8590f Fix #5015: Fix Gradle/broken task dependency and serialization (#5022) new 367ae9dea0 #4965: Fix issues with gradle pre-6.4 (#4995) new 435e86ad7b [#4865] Register JDPA and Java Compiler Output on Project level new c729a4f1b6 Made Gradle JavaCompilerProcessorFactory work in absence of a ClasspathProvider new c7b7d4a09f Use Project Dictated JVM for Gradle Discovery (#4985) new 4a37b3625a Make Java Platform available on non-java Gradle Projects new 6c11e077a6 Upgrade version numbers for the affected modules The 8 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: extide/gradle/manifest.mf | 2 +- .../gradle/tooling/GradleInternalAdapter.java | 4 +- .../gradle/tooling/NbProjectInfoBuilder.java | 118 - .../gradle/GradleJavaCompatProblemsProvider.java | 90 +--- .../modules/gradle/GradleProjectConnection.java| 61 ++- .../gradle/api/GradleBaseProjectBuilder.java | 2 +- .../api/execute/GradleDistributionManager.java | 29 ++--- .../gradle/execute/GradleDaemonExecutor.java | 1 - .../modules/gradle/spi/execute/package-info.java | 43 +++- .../modules/gradle/api/GradleBaseProjectTest.java | 5 + java/gradle.java/nbproject/project.properties | 2 +- .../gradle/java/execute/LookupProviders.java | 13 ++- .../java/output/JavaCompilerProcessorFactory.java | 16 +-- .../gradle/java/output/LookupProviders.java| 14 +-- 14 files changed, 234 insertions(+), 166 deletions(-) copy ide/languages.diff/src/org/netbeans/modules/languages/diff/DiffLanguageHierarchy.java => extide/gradle/src/org/netbeans/modules/gradle/spi/execute/package-info.java (58%) - 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] 02/08: Fix #5015: Fix Gradle/broken task dependency and serialization (#5022)
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch release160
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 182ca8590f462e9f62ce8c59fcc39c5cecdfb227
Author: Svatopluk Dedic
AuthorDate: Fri Dec 2 19:20:07 2022 +0100
Fix #5015: Fix Gradle/broken task dependency and serialization (#5022)
* Avoid failing on broken tasks during dependency inspection
* Corrected bad check for primitive class that passed also generated
proxies (fixes #5015)
---
.../modules/gradle/tooling/NbProjectInfoBuilder.java | 19 +--
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
index fbd02232a9..0c50fbfd40 100644
---
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
+++
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
@@ -330,11 +330,16 @@ class NbProjectInfoBuilder {
}
private String dependenciesAsString(Task t, TaskDependency td) {
-Set deps = td.getDependencies(t);
-if (deps.isEmpty()) {
+try {
+Set deps = td.getDependencies(t);
+if (deps.isEmpty()) {
+return "";
+}
+return
deps.stream().map(Task::getPath).collect(Collectors.joining(","));
+} catch (LinkageError | RuntimeException ex) {
+LOG.warn("Error getting dependencies for task {}: {}",
t.getName(), ex.getLocalizedMessage(), ex);
return "";
}
-return
deps.stream().map(Task::getPath).collect(Collectors.joining(","));
}
private void detectConfigurationArtifacts(NbProjectInfoModel model) {
@@ -503,13 +508,7 @@ class NbProjectInfoBuilder {
return false;
}
String n = c.getName();
-if (n.indexOf('.') == -1) {
-return true;
-} else if (n.startsWith("java.lang.")) {
-return true;
-}
-
-return false;
+return c.isPrimitive() || n.startsWith("java.lang.");
}
/**
-
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] 08/08: Upgrade version numbers for the affected modules
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch release160
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 6c11e077a65d7ba9e5317ae954955b9cbe5f37c5
Author: Laszlo Kishalmi
AuthorDate: Sun Nov 27 15:56:26 2022 -0800
Upgrade version numbers for the affected modules
---
extide/gradle/manifest.mf | 2 +-
java/gradle.java/nbproject/project.properties | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/extide/gradle/manifest.mf b/extide/gradle/manifest.mf
index 30e090e4c6..ada6ca95f7 100644
--- a/extide/gradle/manifest.mf
+++ b/extide/gradle/manifest.mf
@@ -3,4 +3,4 @@ AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.gradle/2
OpenIDE-Module-Layer: org/netbeans/modules/gradle/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/gradle/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.29
+OpenIDE-Module-Specification-Version: 2.29.1
diff --git a/java/gradle.java/nbproject/project.properties
b/java/gradle.java/nbproject/project.properties
index 859cdc0105..9ef6374316 100644
--- a/java/gradle.java/nbproject/project.properties
+++ b/java/gradle.java/nbproject/project.properties
@@ -25,5 +25,5 @@ javadoc.apichanges=${basedir}/apichanges.xml
test-unit-sys-prop.test.netbeans.dest.dir=${netbeans.dest.dir}
test-unit-sys-prop.java.awt.headless=true
test.use.jdk.javac=true
-spec.version.base=1.20.0
+spec.version.base=1.20.1
-
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] 05/08: Made Gradle JavaCompilerProcessorFactory work in absence of a ClasspathProvider
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch release160
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit c729a4f1b6007f2ac140a837cc000e4a80be2c1b
Author: Laszlo Kishalmi
AuthorDate: Fri Dec 2 08:45:36 2022 -0800
Made Gradle JavaCompilerProcessorFactory work in absence of a
ClasspathProvider
---
.../gradle/java/output/JavaCompilerProcessorFactory.java | 16 ++--
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git
a/java/gradle.java/src/org/netbeans/modules/gradle/java/output/JavaCompilerProcessorFactory.java
b/java/gradle.java/src/org/netbeans/modules/gradle/java/output/JavaCompilerProcessorFactory.java
index 294face367..3b099f6f29 100644
---
a/java/gradle.java/src/org/netbeans/modules/gradle/java/output/JavaCompilerProcessorFactory.java
+++
b/java/gradle.java/src/org/netbeans/modules/gradle/java/output/JavaCompilerProcessorFactory.java
@@ -68,12 +68,16 @@ public final class JavaCompilerProcessorFactory implements
OutputProcessorFactor
private StackTraceProcessor(RunConfig cfg) {
project = cfg.getProject();
ProjectSourcesClassPathProvider cpProvider =
project.getLookup().lookup(ProjectSourcesClassPathProvider.class);
-ClassPath[] projectClassPath =
cpProvider.getProjectClassPath(ClassPath.EXECUTE);
-ClassPath[] bootClassPath =
cpProvider.getProjectClassPath(ClassPath.BOOT);
-classPath = ClassPathSupport.createProxyClassPath(
-ClassPathSupport.createProxyClassPath(projectClassPath),
-ClassPathSupport.createProxyClassPath(bootClassPath)
-);
+if (cpProvider != null) {
+ClassPath[] projectClassPath =
cpProvider.getProjectClassPath(ClassPath.EXECUTE);
+ClassPath[] bootClassPath =
cpProvider.getProjectClassPath(ClassPath.BOOT);
+classPath = ClassPathSupport.createProxyClassPath(
+
ClassPathSupport.createProxyClassPath(projectClassPath),
+ClassPathSupport.createProxyClassPath(bootClassPath)
+);
+} else {
+classPath = ClassPath.EMPTY;
+}
}
@Override
-
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 (61c57e2cd3 -> 83d5a74de1)
This is an automated email from the ASF dual-hosted git repository. lkishalmi pushed a change to branch delivery in repository https://gitbox.apache.org/repos/asf/netbeans.git from 61c57e2cd3 Make Java Platform available on non-java Gradle Projects add 83d5a74de1 Upgrade version numbers for the affected modules No new revisions were added by this update. Summary of changes: extide/gradle/manifest.mf | 2 +- java/gradle.java/nbproject/project.properties | 2 +- 2 files changed, 2 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 delivery updated (edb745340d -> 61c57e2cd3)
This is an automated email from the ASF dual-hosted git repository. lkishalmi pushed a change to branch delivery in repository https://gitbox.apache.org/repos/asf/netbeans.git from edb745340d Use Project Dictated JVM for Gradle Discovery (#4985) add 61c57e2cd3 Make Java Platform available on non-java Gradle Projects No new revisions were added by this update. Summary of changes: .../modules/gradle/java/execute/LookupProviders.java| 13 - 1 file changed, 12 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated: Make Java Platform available on non-java Gradle Projects
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 ee7d2dda7e Make Java Platform available on non-java Gradle Projects
ee7d2dda7e is described below
commit ee7d2dda7e7fd6232754a331259323002f820d1e
Author: Laszlo Kishalmi
AuthorDate: Mon Dec 5 22:45:43 2022 -0800
Make Java Platform available on non-java Gradle Projects
---
.../modules/gradle/java/execute/LookupProviders.java| 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git
a/java/gradle.java/src/org/netbeans/modules/gradle/java/execute/LookupProviders.java
b/java/gradle.java/src/org/netbeans/modules/gradle/java/execute/LookupProviders.java
index 1dc7f74878..41462bc76e 100644
---
a/java/gradle.java/src/org/netbeans/modules/gradle/java/execute/LookupProviders.java
+++
b/java/gradle.java/src/org/netbeans/modules/gradle/java/execute/LookupProviders.java
@@ -29,6 +29,18 @@ import org.openide.util.lookup.Lookups;
* @author lkishalmi
*/
public class LookupProviders {
+
+@LookupProvider.Registration(projectType =
NbGradleProject.GRADLE_PROJECT_TYPE)
+public static LookupProvider createProvider() {
+return new LookupProvider() {
+@Override
+public Lookup createAdditionalLookup(Lookup baseContext) {
+Project project = baseContext.lookup(Project.class);
+return Lookups.singleton(new
GradleJavaPlatformProviderImpl(project));
+}
+};
+}
+
@LookupProvider.Registration(projectType =
NbGradleProject.GRADLE_PLUGIN_TYPE + "/java-base")
public static LookupProvider createJavaBaseProvider() {
return new LookupProvider() {
@@ -37,7 +49,6 @@ public class LookupProviders {
Project project = baseContext.lookup(Project.class);
return Lookups.fixed(
new DebugFixHooks(project),
-new GradleJavaPlatformProviderImpl(project),
new ShowJavadocHook(project)
);
}
-
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 (8fee76adf5 -> edb745340d)
This is an automated email from the ASF dual-hosted git repository. lkishalmi pushed a change to branch delivery in repository https://gitbox.apache.org/repos/asf/netbeans.git from 8fee76adf5 Made Gradle JavaCompilerProcessorFactory work in absence of a ClasspathProvider add edb745340d Use Project Dictated JVM for Gradle Discovery (#4985) No new revisions were added by this update. Summary of changes: .../gradle/GradleJavaCompatProblemsProvider.java | 90 ++ .../modules/gradle/GradleProjectConnection.java| 61 +-- .../api/execute/GradleDistributionManager.java | 29 ++- .../gradle/execute/GradleDaemonExecutor.java | 1 - .../modules/gradle/spi/execute/package-info.java | 43 --- 5 files changed, 133 insertions(+), 91 deletions(-) copy ide/languages.diff/src/org/netbeans/modules/languages/diff/DiffLanguageHierarchy.java => extide/gradle/src/org/netbeans/modules/gradle/spi/execute/package-info.java (58%) - 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 (44ab4540a4 -> 8fee76adf5)
This is an automated email from the ASF dual-hosted git repository. lkishalmi pushed a change to branch delivery in repository https://gitbox.apache.org/repos/asf/netbeans.git from 44ab4540a4 [#4865] Register JDPA and Java Compiler Output on Project level add 8fee76adf5 Made Gradle JavaCompilerProcessorFactory work in absence of a ClasspathProvider No new revisions were added by this update. Summary of changes: .../gradle/java/output/JavaCompilerProcessorFactory.java | 16 ++-- 1 file changed, 10 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch delivery updated (bc6c461930 -> 44ab4540a4)
This is an automated email from the ASF dual-hosted git repository. lkishalmi pushed a change to branch delivery in repository https://gitbox.apache.org/repos/asf/netbeans.git from bc6c461930 #4965: Fix issues with gradle pre-6.4 (#4995) add 44ab4540a4 [#4865] Register JDPA and Java Compiler Output on Project level No new revisions were added by this update. Summary of changes: .../modules/gradle/java/output/LookupProviders.java| 14 +- 1 file changed, 1 insertion(+), 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 delivery updated (5d3fe96b33 -> bc6c461930)
This is an automated email from the ASF dual-hosted git repository. lkishalmi pushed a change to branch delivery in repository https://gitbox.apache.org/repos/asf/netbeans.git from 5d3fe96b33 Fix #5015: Fix Gradle/broken task dependency and serialization (#5022) add bc6c461930 #4965: Fix issues with gradle pre-6.4 (#4995) No new revisions were added by this update. Summary of changes: .../org/netbeans/modules/gradle/tooling/GradleInternalAdapter.java | 4 ++-- .../org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java| 4 +++- .../src/org/netbeans/modules/gradle/api/GradleBaseProjectTest.java | 5 + 3 files changed, 10 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch delivery updated: Fix #5015: Fix Gradle/broken task dependency and serialization (#5022)
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new 5d3fe96b33 Fix #5015: Fix Gradle/broken task dependency and
serialization (#5022)
5d3fe96b33 is described below
commit 5d3fe96b339153d1bdcecb0aa38208520021c686
Author: Svatopluk Dedic
AuthorDate: Fri Dec 2 19:20:07 2022 +0100
Fix #5015: Fix Gradle/broken task dependency and serialization (#5022)
* Avoid failing on broken tasks during dependency inspection
* Corrected bad check for primitive class that passed also generated
proxies (fixes #5015)
---
.../modules/gradle/tooling/NbProjectInfoBuilder.java | 19 +--
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
index fbd02232a9..0c50fbfd40 100644
---
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
+++
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
@@ -330,11 +330,16 @@ class NbProjectInfoBuilder {
}
private String dependenciesAsString(Task t, TaskDependency td) {
-Set deps = td.getDependencies(t);
-if (deps.isEmpty()) {
+try {
+Set deps = td.getDependencies(t);
+if (deps.isEmpty()) {
+return "";
+}
+return
deps.stream().map(Task::getPath).collect(Collectors.joining(","));
+} catch (LinkageError | RuntimeException ex) {
+LOG.warn("Error getting dependencies for task {}: {}",
t.getName(), ex.getLocalizedMessage(), ex);
return "";
}
-return
deps.stream().map(Task::getPath).collect(Collectors.joining(","));
}
private void detectConfigurationArtifacts(NbProjectInfoModel model) {
@@ -503,13 +508,7 @@ class NbProjectInfoBuilder {
return false;
}
String n = c.getName();
-if (n.indexOf('.') == -1) {
-return true;
-} else if (n.startsWith("java.lang.")) {
-return true;
-}
-
-return false;
+return c.isPrimitive() || n.startsWith("java.lang.");
}
/**
-
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: Fixed some Gradle introspection problems wit pre-6.1 Gradle Versions
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new 648564ff47 Fixed some Gradle introspection problems wit pre-6.1 Gradle
Versions
648564ff47 is described below
commit 648564ff47d5a70c4e03ce781e407b5d6f547131
Author: Laszlo Kishalmi
AuthorDate: Sun Nov 27 08:37:10 2022 -0800
Fixed some Gradle introspection problems wit pre-6.1 Gradle Versions
---
.../gradle/tooling/NbProjectInfoBuilder.java | 95 +-
.../gradle/api/GradleBaseProjectBuilder.java | 2 +-
2 files changed, 57 insertions(+), 40 deletions(-)
diff --git
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
index dae86ef964..fbd02232a9 100644
---
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
+++
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
@@ -91,7 +91,6 @@ import org.gradle.api.logging.Logging;
import org.gradle.api.plugins.ExtensionAware;
import org.gradle.api.plugins.ExtensionContainer;
import org.gradle.api.plugins.ExtensionsSchema.ExtensionSchema;
-import org.gradle.api.plugins.JavaPlatformPlugin;
import org.gradle.api.provider.Provider;
import org.gradle.api.reflect.HasPublicType;
import org.gradle.api.reflect.TypeOf;
@@ -105,7 +104,7 @@ import org.gradle.jvm.JvmLibrary;
import org.gradle.language.base.artifact.SourcesArtifact;
import org.gradle.language.java.artifact.JavadocArtifact;
import org.gradle.plugin.use.PluginId;
-import org.gradle.util.VersionNumber;
+import org.gradle.util.GradleVersion;
import org.netbeans.modules.gradle.tooling.internal.NbProjectInfo;
/**
@@ -176,8 +175,9 @@ class NbProjectInfoBuilder {
"war"
}));
+private static final GradleVersion GRADLE_VERSION =
GradleVersion.current().getBaseVersion();
+
final Project project;
-final VersionNumber gradleVersion;
final GradleInternalAdapter adapter;
public static final class ValueAndType {
@@ -197,9 +197,7 @@ class NbProjectInfoBuilder {
NbProjectInfoBuilder(Project project) {
this.project = project;
-this.gradleVersion =
VersionNumber.parse(project.getGradle().getGradleVersion());
-// checked that version 7.6.0 > 7.6.0-rc-1 in the VersionNumber order
-this.adapter = sinceGradleOrDefault("7.6.0-rc-1", () -> new
GradleInternalAdapter.Gradle76(project), () -> new
GradleInternalAdapter(project));
+this.adapter = sinceGradleOrDefault("7.6", () -> new
GradleInternalAdapter.Gradle76(project), () -> new
GradleInternalAdapter(project));
}
private NbProjectInfoModel model = new NbProjectInfoModel();
@@ -864,7 +862,7 @@ class NbProjectInfoBuilder {
model.getInfo().put("project_subProjects", sp);
Map ib = new HashMap<>();
-LOG.lifecycle("Gradle Version: {}", gradleVersion);
+LOG.lifecycle("Gradle Version: {}", GradleVersion.current());
sinceGradle("3.1", () -> {
for(IncludedBuild p: project.getGradle().getIncludedBuilds()) {
LOG.lifecycle("Include Build: {}", p.getName());
@@ -1016,36 +1014,44 @@ class NbProjectInfoBuilder {
}
if (Boolean.TRUE.equals(available.get(langId))) {
model.getInfo().put(propBase + lang,
storeSet(getProperty(sourceSet, langId, "srcDirs")));
-DirectoryProperty dirProp =
(DirectoryProperty)getProperty(sourceSet, langId, "classesDirectory");
-if (dirProp != null) {
-File outDir;
-
-if (dirProp.isPresent()) {
-outDir = dirProp.get().getAsFile();
-} else {
-// kotlin plugin uses some weird late
binding, so it has the output item, but it cannot be resolved to a
-// concrete file path at this time. Let's
make an approximation from
-Path candidate = null;
-if (base != null) {
-Path prefix = base.resolve(langId);
-// assume the language has just one
output dir in the source set:
-
[netbeans] branch delivery created (now 321935444b)
This is an automated email from the ASF dual-hosted git repository. lkishalmi pushed a change to branch delivery in repository https://gitbox.apache.org/repos/asf/netbeans.git at 321935444b Merge pull request #4937 from apache/delivery No new revisions were added by this update. - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated: Use Project Dictated JVM for Gradle Discovery (#4985)
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 33c80743ea Use Project Dictated JVM for Gradle Discovery (#4985)
33c80743ea is described below
commit 33c80743eac96d9967a6d878288cf51119ab18bc
Author: Laszlo Kishalmi
AuthorDate: Mon Dec 5 20:11:25 2022 -0800
Use Project Dictated JVM for Gradle Discovery (#4985)
---
.../gradle/GradleJavaCompatProblemsProvider.java | 90 ++
.../modules/gradle/GradleProjectConnection.java| 61 +--
.../api/execute/GradleDistributionManager.java | 29 ++-
.../gradle/execute/GradleDaemonExecutor.java | 1 -
.../modules/gradle/spi/execute/package-info.java | 35 +
5 files changed, 154 insertions(+), 62 deletions(-)
diff --git
a/extide/gradle/src/org/netbeans/modules/gradle/GradleJavaCompatProblemsProvider.java
b/extide/gradle/src/org/netbeans/modules/gradle/GradleJavaCompatProblemsProvider.java
index 52c7d2e382..66711bb0bd 100644
---
a/extide/gradle/src/org/netbeans/modules/gradle/GradleJavaCompatProblemsProvider.java
+++
b/extide/gradle/src/org/netbeans/modules/gradle/GradleJavaCompatProblemsProvider.java
@@ -21,17 +21,23 @@ package org.netbeans.modules.gradle;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.Collection;
import java.util.Collections;
+import java.util.Properties;
import org.netbeans.api.project.Project;
import org.netbeans.modules.gradle.api.NbGradleProject;
import org.netbeans.modules.gradle.api.execute.GradleDistributionManager;
import
org.netbeans.modules.gradle.api.execute.GradleDistributionManager.GradleDistribution;
import org.netbeans.modules.gradle.spi.execute.GradleDistributionProvider;
+import org.netbeans.modules.gradle.spi.execute.GradleJavaPlatformProvider;
import org.netbeans.spi.project.ProjectServiceProvider;
import org.netbeans.spi.project.ui.ProjectProblemsProvider;
import static
org.netbeans.spi.project.ui.ProjectProblemsProvider.PROP_PROBLEMS;
-import org.openide.util.NbBundle;
import org.openide.util.NbBundle.Messages;
/**
@@ -71,26 +77,82 @@ public final class GradleJavaCompatProblemsProvider
implements ProjectProblemsPr
"# {1} - Supported Java Version",
"# {2} - Required Gradle Version",
"# {3} - Forced Gradle Version",
-"TXT_JavaVersionMismatch=The IDE is running on Java {0} that is not
supported by Gradle {2}.\n"
-+ "The IDE will attempt to use Gradle {3} to gather the
project information.\n\n"
-+ "Either upgrade your Gradle version on your project or run
the IDE on "
-+ "Java {1} to avoid this problem!"
+"TXT_JavaVersionMismatch=The Java version: {0}, that is seletced
for the project "
++ "is not supported by Gradle {2}."
++ "The IDE will attempt to use Gradle {3} to gather the
project information."
++ "Possible solutions:"
++ "Upgrade your Gradle version on your project"
++ "Select Java Platform {1} (or below), on
Build>Compile settings, to avoid this problem!"
++ ""
})
@Override
public Collection getProblems() {
+GradleDistribution dist = getGradleDistribution();
+int javaVersion = getJavaVersion();
+if (!dist.isCompatibleWithJava(javaVersion)) {
+GradleDistribution compatDist =
GradleDistributionManager.get(dist.getGradleUserHome()).defaultDistribution();
+ProjectProblem problem = ProjectProblem.createWarning(
+Bundle.LBL_JavaVersionMismatch(),
+Bundle.TXT_JavaVersionMismatch(javaVersion,
dist.lastSupportedJava(),dist.getVersion(), compatDist.getVersion()));
+return Collections.singleton(problem);
+}
+return Collections.emptySet();
+}
+
+private GradleDistribution getGradleDistribution() {
+GradleDistribution dist = null;
GradleDistributionProvider pvd =
project.getLookup().lookup(GradleDistributionProvider.class);
if (pvd != null) {
-GradleDistribution dist = pvd.getGradleDistribution();
-if ((dist != null) && !dist.isCompatibleWithSystemJava()) {
-String javaVersion =
System.getProperty("java.specification.version",
System.getProperty("java.version")); //NOI18N
-GradleDistr
[netbeans] branch master updated: Made Gradle JavaCompilerProcessorFactory work in absence of a ClasspathProvider
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 4914111583 Made Gradle JavaCompilerProcessorFactory work in absence of
a ClasspathProvider
4914111583 is described below
commit 4914111583e28563cbdca1fcb43ed797102ca786
Author: Laszlo Kishalmi
AuthorDate: Fri Dec 2 08:45:36 2022 -0800
Made Gradle JavaCompilerProcessorFactory work in absence of a
ClasspathProvider
---
.../gradle/java/output/JavaCompilerProcessorFactory.java | 16 ++--
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git
a/java/gradle.java/src/org/netbeans/modules/gradle/java/output/JavaCompilerProcessorFactory.java
b/java/gradle.java/src/org/netbeans/modules/gradle/java/output/JavaCompilerProcessorFactory.java
index 294face367..3b099f6f29 100644
---
a/java/gradle.java/src/org/netbeans/modules/gradle/java/output/JavaCompilerProcessorFactory.java
+++
b/java/gradle.java/src/org/netbeans/modules/gradle/java/output/JavaCompilerProcessorFactory.java
@@ -68,12 +68,16 @@ public final class JavaCompilerProcessorFactory implements
OutputProcessorFactor
private StackTraceProcessor(RunConfig cfg) {
project = cfg.getProject();
ProjectSourcesClassPathProvider cpProvider =
project.getLookup().lookup(ProjectSourcesClassPathProvider.class);
-ClassPath[] projectClassPath =
cpProvider.getProjectClassPath(ClassPath.EXECUTE);
-ClassPath[] bootClassPath =
cpProvider.getProjectClassPath(ClassPath.BOOT);
-classPath = ClassPathSupport.createProxyClassPath(
-ClassPathSupport.createProxyClassPath(projectClassPath),
-ClassPathSupport.createProxyClassPath(bootClassPath)
-);
+if (cpProvider != null) {
+ClassPath[] projectClassPath =
cpProvider.getProjectClassPath(ClassPath.EXECUTE);
+ClassPath[] bootClassPath =
cpProvider.getProjectClassPath(ClassPath.BOOT);
+classPath = ClassPathSupport.createProxyClassPath(
+
ClassPathSupport.createProxyClassPath(projectClassPath),
+ClassPathSupport.createProxyClassPath(bootClassPath)
+);
+} else {
+classPath = ClassPath.EMPTY;
+}
}
@Override
-
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 #5015: Fix Gradle/broken task dependency and serialization (#5022)
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 55bc01867b Fix #5015: Fix Gradle/broken task dependency and
serialization (#5022)
55bc01867b is described below
commit 55bc01867bb4602185d3fad2672479125b69fb77
Author: Svatopluk Dedic
AuthorDate: Fri Dec 2 19:20:07 2022 +0100
Fix #5015: Fix Gradle/broken task dependency and serialization (#5022)
* Avoid failing on broken tasks during dependency inspection
* Corrected bad check for primitive class that passed also generated
proxies (fixes #5015)
---
.../modules/gradle/tooling/NbProjectInfoBuilder.java | 19 +--
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
index a40b9d94f0..0fd561a2cd 100644
---
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
+++
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
@@ -330,11 +330,16 @@ class NbProjectInfoBuilder {
}
private String dependenciesAsString(Task t, TaskDependency td) {
-Set deps = td.getDependencies(t);
-if (deps.isEmpty()) {
+try {
+Set deps = td.getDependencies(t);
+if (deps.isEmpty()) {
+return "";
+}
+return
deps.stream().map(Task::getPath).collect(Collectors.joining(","));
+} catch (LinkageError | RuntimeException ex) {
+LOG.warn("Error getting dependencies for task {}: {}",
t.getName(), ex.getLocalizedMessage(), ex);
return "";
}
-return
deps.stream().map(Task::getPath).collect(Collectors.joining(","));
}
private void detectConfigurationArtifacts(NbProjectInfoModel model) {
@@ -503,13 +508,7 @@ class NbProjectInfoBuilder {
return false;
}
String n = c.getName();
-if (n.indexOf('.') == -1) {
-return true;
-} else if (n.startsWith("java.lang.")) {
-return true;
-}
-
-return false;
+return c.isPrimitive() || n.startsWith("java.lang.");
}
/**
-
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: #5023: Formatting preferences for Java contains bad sample code
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 54e8afb74b #5023: Formatting preferences for Java contains bad sample
code
54e8afb74b is described below
commit 54e8afb74b5247a878779bf318c704afacd38dd0
Author: Scott Palmer
AuthorDate: Mon Nov 28 17:53:59 2022 -0500
#5023: Formatting preferences for Java contains bad sample code
---
java/java.source/src/org/netbeans/modules/java/ui/Bundle.properties | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/java/java.source/src/org/netbeans/modules/java/ui/Bundle.properties
b/java/java.source/src/org/netbeans/modules/java/ui/Bundle.properties
index 98f2309528..7589b9380d 100644
--- a/java/java.source/src/org/netbeans/modules/java/ui/Bundle.properties
+++ b/java/java.source/src/org/netbeans/modules/java/ui/Bundle.properties
@@ -493,10 +493,11 @@ case 2\:\
default\:\
return number > 100 ? -1 : -2;\
}\
+}\
public int add(int a, int b) {\
return a + b;\
}\
-} }
+}
#do not translate
SAMPLE_Comments=public class ClassA {\n\
-
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch release161 created (now 321935444b)
This is an automated email from the ASF dual-hosted git repository. lkishalmi pushed a change to branch release161 in repository https://gitbox.apache.org/repos/asf/netbeans.git at 321935444b Merge pull request #4937 from apache/delivery No new revisions were added by this update. - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated: Fixed some Gradle introspection problems wit pre-6.1 Gradle Versions
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 1eff472c97 Fixed some Gradle introspection problems wit pre-6.1 Gradle
Versions
1eff472c97 is described below
commit 1eff472c976323bc350edbc99e99ead5d3f45a2b
Author: Laszlo Kishalmi
AuthorDate: Sun Nov 27 08:37:10 2022 -0800
Fixed some Gradle introspection problems wit pre-6.1 Gradle Versions
---
.../gradle/tooling/NbProjectInfoBuilder.java | 95 +-
.../gradle/api/GradleBaseProjectBuilder.java | 2 +-
2 files changed, 57 insertions(+), 40 deletions(-)
diff --git
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
index 5e8ecdc69f..a40b9d94f0 100644
---
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
+++
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
@@ -91,7 +91,6 @@ import org.gradle.api.logging.Logging;
import org.gradle.api.plugins.ExtensionAware;
import org.gradle.api.plugins.ExtensionContainer;
import org.gradle.api.plugins.ExtensionsSchema.ExtensionSchema;
-import org.gradle.api.plugins.JavaPlatformPlugin;
import org.gradle.api.provider.Provider;
import org.gradle.api.reflect.HasPublicType;
import org.gradle.api.reflect.TypeOf;
@@ -105,7 +104,7 @@ import org.gradle.jvm.JvmLibrary;
import org.gradle.language.base.artifact.SourcesArtifact;
import org.gradle.language.java.artifact.JavadocArtifact;
import org.gradle.plugin.use.PluginId;
-import org.gradle.util.VersionNumber;
+import org.gradle.util.GradleVersion;
import org.netbeans.modules.gradle.tooling.internal.NbProjectInfo;
/**
@@ -176,8 +175,9 @@ class NbProjectInfoBuilder {
"war"
}));
+private static final GradleVersion GRADLE_VERSION =
GradleVersion.current().getBaseVersion();
+
final Project project;
-final VersionNumber gradleVersion;
final GradleInternalAdapter adapter;
public static final class ValueAndType {
@@ -197,9 +197,7 @@ class NbProjectInfoBuilder {
NbProjectInfoBuilder(Project project) {
this.project = project;
-this.gradleVersion =
VersionNumber.parse(project.getGradle().getGradleVersion());
-// checked that version 7.6.0 > 7.6.0-rc-1 in the VersionNumber order
-this.adapter = sinceGradleOrDefault("7.6.0-rc-1", () -> new
GradleInternalAdapter.Gradle76(project), () -> new
GradleInternalAdapter(project));
+this.adapter = sinceGradleOrDefault("7.6", () -> new
GradleInternalAdapter.Gradle76(project), () -> new
GradleInternalAdapter(project));
}
private NbProjectInfoModel model = new NbProjectInfoModel();
@@ -864,7 +862,7 @@ class NbProjectInfoBuilder {
model.getInfo().put("project_subProjects", sp);
Map ib = new HashMap<>();
-LOG.lifecycle("Gradle Version: {}", gradleVersion);
+LOG.lifecycle("Gradle Version: {}", GradleVersion.current());
sinceGradle("3.1", () -> {
for(IncludedBuild p: project.getGradle().getIncludedBuilds()) {
LOG.lifecycle("Include Build: {}", p.getName());
@@ -1016,36 +1014,44 @@ class NbProjectInfoBuilder {
}
if (Boolean.TRUE.equals(available.get(langId))) {
model.getInfo().put(propBase + lang,
storeSet(getProperty(sourceSet, langId, "srcDirs")));
-DirectoryProperty dirProp =
(DirectoryProperty)getProperty(sourceSet, langId, "classesDirectory");
-if (dirProp != null) {
-File outDir;
-
-if (dirProp.isPresent()) {
-outDir = dirProp.get().getAsFile();
-} else {
-// kotlin plugin uses some weird late
binding, so it has the output item, but it cannot be resolved to a
-// concrete file path at this time. Let's
make an approximation from
-Path candidate = null;
-if (base != null) {
-Path prefix = base.resolve(langId);
-// assume the language has just one
output dir in the source set:
-
[netbeans] branch master updated: [#4865] Register JDPA and Java Compiler Output on Project level
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 794802e82e [#4865] Register JDPA and Java Compiler Output on Project
level
794802e82e is described below
commit 794802e82eedbd0d0c41938385d5c6ff5bd0fefa
Author: Laszlo Kishalmi
AuthorDate: Fri Nov 18 06:43:20 2022 -0800
[#4865] Register JDPA and Java Compiler Output on Project level
---
.../modules/gradle/java/output/LookupProviders.java| 14 +-
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git
a/java/gradle.java/src/org/netbeans/modules/gradle/java/output/LookupProviders.java
b/java/gradle.java/src/org/netbeans/modules/gradle/java/output/LookupProviders.java
index c652320244..5e05551a23 100644
---
a/java/gradle.java/src/org/netbeans/modules/gradle/java/output/LookupProviders.java
+++
b/java/gradle.java/src/org/netbeans/modules/gradle/java/output/LookupProviders.java
@@ -29,7 +29,7 @@ import org.openide.util.lookup.Lookups;
*/
public class LookupProviders {
-@LookupProvider.Registration(projectType =
NbGradleProject.GRADLE_PLUGIN_TYPE + "/java-base")
+@LookupProvider.Registration(projectType =
NbGradleProject.GRADLE_PROJECT_TYPE)
public static LookupProvider createJavaBaseProvider() {
return new LookupProvider() {
@Override
@@ -41,16 +41,4 @@ public class LookupProviders {
}
};
}
-
-@LookupProvider.Registration(projectTypes = {
-@LookupProvider.Registration.ProjectType(id =
NbGradleProject.GRADLE_PLUGIN_TYPE + "/com.github.lkishalmi.gatling"),
-@LookupProvider.Registration.ProjectType(id =
NbGradleProject.GRADLE_PLUGIN_TYPE + "/io.gatling.gradle")
-})
-public static LookupProvider createGatlingProvider() {
-return (baseContext) -> {
-return Lookups.fixed(
-new JDPAProcessorFactory()
-);
-};
-}
}
-
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: #4965: Fix issues with gradle pre-6.4 (#4995)
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 910c4eadb5 #4965: Fix issues with gradle pre-6.4 (#4995)
910c4eadb5 is described below
commit 910c4eadb585418b4edc44cedb84bc872be8d8d6
Author: Svatopluk Dedic
AuthorDate: Sun Nov 27 03:15:34 2022 +0100
#4965: Fix issues with gradle pre-6.4 (#4995)
* Fix #4965: Avoid NPE: return null for no supplier.
* Improve compatibility for Gradle < 6.4
---
.../org/netbeans/modules/gradle/tooling/GradleInternalAdapter.java | 4 ++--
.../org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java| 4 +++-
.../src/org/netbeans/modules/gradle/api/GradleBaseProjectTest.java | 5 +
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/GradleInternalAdapter.java
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/GradleInternalAdapter.java
index 515cfc7f1b..632321d772 100644
---
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/GradleInternalAdapter.java
+++
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/GradleInternalAdapter.java
@@ -111,7 +111,7 @@ public class GradleInternalAdapter {
}
public ValueAndType findPropertyValueInternal(String propName, Object val)
{
-return safeCall(() -> {
+return sinceGradleOrDefault("6.4",() -> safeCall(() -> {
if (val instanceof ProviderInternal) {
ProviderInternal provided = (ProviderInternal)val;
ValueSupplier.ExecutionTimeValue etv;
@@ -129,7 +129,7 @@ public class GradleInternalAdapter {
} else {
return new ValueAndType(val != null ? val.getClass() : null,
val);
}
-}, "property " + propName).orElse(null);
+}, "property " + propName).orElse(null), null);
}
@SuppressWarnings("unchecked")
diff --git
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
index dae86ef964..5e8ecdc69f 100644
---
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
+++
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
@@ -1615,8 +1615,10 @@ class NbProjectInfoBuilder {
sneakyThrow(t);
return null;
}
-} else {
+} else if (def != null) {
return def.get();
+} else {
+return null;
}
}
diff --git
a/extide/gradle/test/unit/src/org/netbeans/modules/gradle/api/GradleBaseProjectTest.java
b/extide/gradle/test/unit/src/org/netbeans/modules/gradle/api/GradleBaseProjectTest.java
index 2fe874a4b1..64778be87b 100644
---
a/extide/gradle/test/unit/src/org/netbeans/modules/gradle/api/GradleBaseProjectTest.java
+++
b/extide/gradle/test/unit/src/org/netbeans/modules/gradle/api/GradleBaseProjectTest.java
@@ -247,6 +247,11 @@ public class GradleBaseProjectTest extends
AbstractGradleProjectTestCase {
return p;
}
+public void testOldGradle611ProjectLoads() throws Exception {
+Project p = makeProjectWithWrapper("projects/oldgradle/basic",
"6.1.1");
+assertProjectLoadedWithNoProblems(p, "6.1.1");
+}
+
public void testOldGradle683ProjectLoads() throws Exception {
Project p = makeProjectWithWrapper("projects/oldgradle/basic",
"6.8.3");
assertProjectLoadedWithNoProblems(p, "6.8.3");
-
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated: Remove Abandoned Cache Dirs Automatically
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 ccfa084deb Remove Abandoned Cache Dirs Automatically
ccfa084deb is described below
commit ccfa084debd7bc056eb6f38d395ceb7ddb3775a0
Author: Laszlo Kishalmi
AuthorDate: Tue Nov 1 17:26:57 2022 -0700
Remove Abandoned Cache Dirs Automatically
---
.../org/netbeans/modules/janitor/Bundle.properties | 3 +-
.../src/org/netbeans/modules/janitor/Janitor.java | 63 +-
.../modules/janitor/JanitorOptionsPanel.form | 61 +
.../modules/janitor/JanitorOptionsPanel.java | 57
4 files changed, 114 insertions(+), 70 deletions(-)
diff --git
a/platform/janitor/src/org/netbeans/modules/janitor/Bundle.properties
b/platform/janitor/src/org/netbeans/modules/janitor/Bundle.properties
index efa8506a8d..86bec836d2 100644
--- a/platform/janitor/src/org/netbeans/modules/janitor/Bundle.properties
+++ b/platform/janitor/src/org/netbeans/modules/janitor/Bundle.properties
@@ -17,7 +17,8 @@
OpenIDE-Module-Name=Janitor
OpenIDE-Module-Short-Description=Removes unused cache/data
-JanitorOptionsPanel.jLabel1.text=Removal threshold (number of days):
JanitorOptionsPanel.btRunNow.text=Run Janitor Now
JanitorOptionsPanel.cbEnabled.text=Run Janitor on Startup
JanitorPanel.cbEnabled.text=Enable Janitor Scan on Startup
+JanitorOptionsPanel.lbUnusedDays.text=Removal threshold (number of days):
+JanitorOptionsPanel.cbAutoRemove.text=Auto Remove Abandoned Cache Directories
diff --git a/platform/janitor/src/org/netbeans/modules/janitor/Janitor.java
b/platform/janitor/src/org/netbeans/modules/janitor/Janitor.java
index 66882b4b28..0fa2e56456 100644
--- a/platform/janitor/src/org/netbeans/modules/janitor/Janitor.java
+++ b/platform/janitor/src/org/netbeans/modules/janitor/Janitor.java
@@ -92,6 +92,7 @@ public class Janitor {
public static final String PROP_JANITOR_ENABLED = "janitorEnabled";
//NOI18N
public static final String PROP_UNUSED_DAYS = "UnusedDays"; //NOI18N
+public static final String PROP_AUTO_REMOVE_ABANDONED_CACHE =
"autoRemoveAbandonedCache";
private static final String LOGFILE_NAME = "var/log/messages.log"; //NOI18N
private static final String ALL_CHECKSUM_NAME =
"lastModified/all-checksum.txt"; //NOI18N
@@ -100,7 +101,8 @@ public class Janitor {
static final RequestProcessor JANITOR_RP = new RequestProcessor("janitor",
1); //NOI18N
static final Map CLEANUP_TASKS = new
WeakHashMap<>();
-static final Runnable SCAN_FOR_JUNK = () -> {
+
+static void scanForJunk() {
// Remove previously opened notifications
CLEANUP_TASKS.values().forEach((nf) -> nf.clear());
CLEANUP_TASKS.clear();
@@ -113,28 +115,31 @@ public class Janitor {
Integer age = ver.second();
long toFree = size(getUserDir(name)) + size(getCacheDir(name));
toFree = toFree / (1_000_000) + 1;
-ActionListener cleanupListener;
-Notification nf;
if (getUserDir(name) != null) {
-cleanupListener = cleanupAction(name,
Bundle.TXT_CONFIRM_CLEANUP(name));
-nf = NotificationDisplayer.getDefault().notify(
+ActionListener cleanupListener = cleanupAction(name,
Bundle.TXT_CONFIRM_CLEANUP(name));
+Notification nf = NotificationDisplayer.getDefault().notify(
Bundle.TIT_ABANDONED_USERDIR(name, age, toFree),
clean,
Bundle.DESC_ABANDONED_USERDIR(name, age, toFree),
cleanupListener);
+CLEANUP_TASKS.put(cleanupListener, nf);
} else {
-cleanupListener = cleanupAction(name,
Bundle.TXT_CONFIRM_CACHE_CLEANUP(name));
-nf = NotificationDisplayer.getDefault().notify(
-Bundle.TIT_ABANDONED_CACHEDIR(name, toFree),
-clean,
-Bundle.DESC_ABANDONED_CACHEDIR(name, toFree),
-cleanupListener);
+if (isAutoRemoveAbanconedCache()) {
+JANITOR_RP.post(() -> cleanup(name));
+} else {
+ActionListener cleanupListener = cleanupAction(name,
Bundle.TXT_CONFIRM_CACHE_CLEANUP(name));
+Notification nf =
NotificationDisplayer.getDefault().notify(
+Bundle.TIT_ABANDONED_CACHEDIR(name, toFree),
+clean,
+Bundle.DESC_ABANDONED_CACHEDIR(name, toFree),
+cleanupListener);
+CLEANUP_TASKS.put(cleanupListener, nf);
+
[netbeans] branch master updated: ANTLRv4 indent and code snippet support. (#4800)
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 abb1a97c84 ANTLRv4 indent and code snippet support. (#4800)
abb1a97c84 is described below
commit abb1a97c84e22da99cd38640d52f57e029fa2dbb
Author: Laszlo Kishalmi
AuthorDate: Mon Oct 17 10:44:02 2022 -0700
ANTLRv4 indent and code snippet support. (#4800)
* Add indenting support for ANTLRv4 grammars
* Removed console error listeners, fixed a couple of potential NPE-s
* Added code snippets for ANTLR v4 Grammars
* ANTLR indent set to 4 be default
---
.../modules/languages/antlr/AntlrParserResult.java | 1 -
.../org/netbeans/modules/languages/antlr/layer.xml | 13 ++
.../languages/antlr/v3/Antlr3ParserResult.java | 5 +-
.../modules/languages/antlr/v3/preferences.xml | 28
.../antlr/v4/Antlr4CompletionProvider.java | 26 +---
.../languages/antlr/v4/Antlr4Formatter.java| 149 +
.../modules/languages/antlr/v4/Antlr4Language.java | 11 ++
.../languages/antlr/v4/Antlr4ParserResult.java | 25 +++-
.../modules/languages/antlr/v4/preferences.xml | 28
.../modules/languages/antlr/v4/snippets.xml| 56
10 files changed, 314 insertions(+), 28 deletions(-)
diff --git
a/java/languages.antlr/src/org/netbeans/modules/languages/antlr/AntlrParserResult.java
b/java/languages.antlr/src/org/netbeans/modules/languages/antlr/AntlrParserResult.java
index eaaae99e85..009e288dd6 100644
---
a/java/languages.antlr/src/org/netbeans/modules/languages/antlr/AntlrParserResult.java
+++
b/java/languages.antlr/src/org/netbeans/modules/languages/antlr/AntlrParserResult.java
@@ -64,7 +64,6 @@ public abstract class AntlrParserResult
extends ParserResult {
public AntlrParserResult get() {
if (! finished) {
-FileObject fo = getSnapshot().getSource().getFileObject();
T parser = createParser(getSnapshot());
parser.addErrorListener(createErrorListener());
parser.addParseListener(createFoldListener());
diff --git
a/java/languages.antlr/src/org/netbeans/modules/languages/antlr/layer.xml
b/java/languages.antlr/src/org/netbeans/modules/languages/antlr/layer.xml
index 0972a92bfa..d956ef1f30 100644
--- a/java/languages.antlr/src/org/netbeans/modules/languages/antlr/layer.xml
+++ b/java/languages.antlr/src/org/netbeans/modules/languages/antlr/layer.xml
@@ -41,6 +41,11 @@
+
+
+
+
+
@@ -60,6 +65,14 @@
+
+
+
+
+
+
+
+
diff --git
a/java/languages.antlr/src/org/netbeans/modules/languages/antlr/v3/Antlr3ParserResult.java
b/java/languages.antlr/src/org/netbeans/modules/languages/antlr/v3/Antlr3ParserResult.java
index 74b325bef8..81e01bbc28 100644
---
a/java/languages.antlr/src/org/netbeans/modules/languages/antlr/v3/Antlr3ParserResult.java
+++
b/java/languages.antlr/src/org/netbeans/modules/languages/antlr/v3/Antlr3ParserResult.java
@@ -26,6 +26,7 @@ import org.antlr.parser.antlr3.ANTLRv3ParserBaseListener;
import org.antlr.v4.runtime.CharStream;
import org.antlr.v4.runtime.CharStreams;
import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.ConsoleErrorListener;
import org.antlr.v4.runtime.Token;
import org.antlr.v4.runtime.tree.ParseTreeListener;
import org.netbeans.modules.csl.api.OffsetRange;
@@ -50,7 +51,9 @@ public final class Antlr3ParserResult extends
AntlrParserResult {
CharStream cs =
CharStreams.fromString(String.valueOf(snapshot.getText()));
ANTLRv3Lexer lexer = new ANTLRv3Lexer(cs);
CommonTokenStream tokens = new CommonTokenStream(lexer);
-return new ANTLRv3Parser(tokens);
+ANTLRv3Parser ret = new ANTLRv3Parser(tokens);
+ret.removeErrorListener(ConsoleErrorListener.INSTANCE);
+return ret;
}
@Override
diff --git
a/java/languages.antlr/src/org/netbeans/modules/languages/antlr/v3/preferences.xml
b/java/languages.antlr/src/org/netbeans/modules/languages/antlr/v3/preferences.xml
new file mode 100644
index 00..29d9676ecb
--- /dev/null
+++
b/java/languages.antlr/src/org/netbeans/modules/languages/antlr/v3/preferences.xml
@@ -0,0 +1,28 @@
+
+
+http://www.netbeans.org/dtds/EditorPreferences-1_0.dtd;>
+
+
+
+true
+4
+
diff --git
a/java/languages.antlr/src/org/netbeans/modules/langua
[netbeans] branch master updated: Improve support for ANTLRv4 Grammars (#4773)
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 463fb27299 Improve support for ANTLRv4 Grammars (#4773)
463fb27299 is described below
commit 463fb27299708621ee904e99eb247f33d2aca9a2
Author: Laszlo Kishalmi
AuthorDate: Wed Oct 12 11:00:57 2022 -0700
Improve support for ANTLRv4 Grammars (#4773)
* Split references and occurrences
* Support mode and channel references
* Better code completion on ANTLRv4 grammars
* Fixed fragment detection and some other stuff
---
.../modules/refactoring/spi/ui/AccessorImpl.java | 4 +-
java/languages.antlr/nbproject/project.xml | 32 +++
.../languages/antlr/AntlrDeclarationFinder.java| 8 +-
...ncesFinder.java => AntlrOccurrencesFinder.java} | 16 +-
.../modules/languages/antlr/AntlrParser.java | 6 +-
.../modules/languages/antlr/AntlrParserResult.java | 33 ++-
.../languages/antlr/AntlrStructureItem.java| 10 +-
.../languages/antlr/AntlrTokenSequence.java| 172 +
.../languages/antlr/refactoring/Refactoring.java | 2 +-
.../Antlr3CompletionProvider.java} | 70 ++
.../modules/languages/antlr/v3/Antlr3Language.java | 4 +-
.../languages/antlr/v3/Antlr3ParserResult.java | 24 +-
.../antlr/v4/Antlr4CompletionProvider.java | 273 +
.../modules/languages/antlr/v4/Antlr4Language.java | 2 +-
.../languages/antlr/v4/Antlr4ParserResult.java | 71 --
.../languages/antlr/AntlrTokenSequenceTest.java| 171 +
16 files changed, 788 insertions(+), 110 deletions(-)
diff --git
a/ide/refactoring.api/src/org/netbeans/modules/refactoring/spi/ui/AccessorImpl.java
b/ide/refactoring.api/src/org/netbeans/modules/refactoring/spi/ui/AccessorImpl.java
index e012b8ef0c..5c4ff90ca2 100644
---
a/ide/refactoring.api/src/org/netbeans/modules/refactoring/spi/ui/AccessorImpl.java
+++
b/ide/refactoring.api/src/org/netbeans/modules/refactoring/spi/ui/AccessorImpl.java
@@ -28,7 +28,9 @@ final class AccessorImpl extends SPIUIAccessor {
@Override
public void reset(FiltersDescription desc) {
-desc.reset();
+if (desc != null) {
+desc.reset();
+}
}
}
diff --git a/java/languages.antlr/nbproject/project.xml
b/java/languages.antlr/nbproject/project.xml
index 0088942f64..98efb939e6 100644
--- a/java/languages.antlr/nbproject/project.xml
+++ b/java/languages.antlr/nbproject/project.xml
@@ -25,6 +25,15 @@
http://www.netbeans.org/ns/nb-module-project/3;>
org.netbeans.modules.languages.antlr
+
+
org.netbeans.api.annotations.common
+
+
+
+1
+1.46
+
+
org.netbeans.core.multiview
@@ -86,6 +95,15 @@
1.26
+
+
org.netbeans.modules.editor.indent
+
+
+
+2
+1.61
+
+
org.netbeans.modules.editor.lib2
@@ -212,6 +230,20 @@
+
+
+unit
+
+
org.netbeans.libs.junit4
+
+
+
+
org.netbeans.modules.nbjunit
+
+
+
+
+
diff --git
a/java/languages.antlr/src/org/netbeans/modules/languages/antlr/AntlrDeclarationFinder.java
b/java/languages.antlr/src/org/netbeans/modules/languages/antlr/AntlrDeclarationFinder.java
index 1fa4169c42..f03c81fb9a 100644
---
a/java/languages.antlr/src/org/netbeans/modules/languages/antlr/AntlrDeclarationFinder.java
+++
b/java/languages.antlr/src/org/netbeans/modules/languages/antlr/AntlrDeclarationFinder.java
@@ -85,12 +85,12 @@ public class AntlrDeclarationFinder implements
DeclarationFinder {
}
scannedFiles.add(fo);
-AntlrParserResult result = AntlrParser.getParserResult(fo);
+AntlrParserResult result = AntlrParser.getParserResult(fo);
-Reference ref = ((Map) result.references).get(name);
+Reference ref = result.references.get(name);
-if(ref != null && ref.defOffset != null) {
-AntlrStructureItem asi = new
AntlrStructureItem.RuleStructur
[netbeans] branch master updated: Fix for Gradle project sources popup menu invocation error #4755
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 5b0d5261cd Fix for Gradle project sources popup menu invocation error
#4755
5b0d5261cd is described below
commit 5b0d5261cdde9f258b5118e9d09ec1b4cca8747a
Author: Maksim Khramov
AuthorDate: Sun Oct 9 17:56:25 2022 +0300
Fix for Gradle project sources popup menu invocation error #4755
---
.../modules/languages/antlr/refactoring/RefactoringActionsProvider.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/java/languages.antlr/src/org/netbeans/modules/languages/antlr/refactoring/RefactoringActionsProvider.java
b/java/languages.antlr/src/org/netbeans/modules/languages/antlr/refactoring/RefactoringActionsProvider.java
index 87bce7adea..b3bfc69bb5 100644
---
a/java/languages.antlr/src/org/netbeans/modules/languages/antlr/refactoring/RefactoringActionsProvider.java
+++
b/java/languages.antlr/src/org/netbeans/modules/languages/antlr/refactoring/RefactoringActionsProvider.java
@@ -97,6 +97,7 @@ public class RefactoringActionsProvider extends
ActionsImplementationProvider{
EditorCookie ec = lookup.lookup(EditorCookie.class);
if (ec != null) {
Document doc = ec.getDocument();
+if(doc == null) return ret;
FileObject file = NbEditorUtilities.getFileObject(doc);
ret = Antlr3Language.MIME_TYPE.equals(file.getMIMEType())
|| Antlr4Language.MIME_TYPE.equals(file.getMIMEType());
-
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 (09990b1614 -> ad57259dbc)
This is an automated email from the ASF dual-hosted git repository. lkishalmi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 09990b1614 NETBEANS-4720 Support custom gradle test sourcesets add ad57259dbc Override gradle's compiler version from compiler args. No new revisions were added by this update. Summary of changes: .../gradle/java/api/GradleJavaSourceSet.java | 32 -- 1 file changed, 30 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated (694f319b06 -> 09990b1614)
This is an automated email from the ASF dual-hosted git repository. lkishalmi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 694f319b06 Merge pull request #4694 from akronenw/fix_wildfly_app_server_start_log_line_parsing add 09990b1614 NETBEANS-4720 Support custom gradle test sourcesets No new revisions were added by this update. Summary of changes: .../gradle/java/GradleJavaTokenProvider.java | 26 +- .../modules/gradle/java/action-mapping.xml | 12 +- 2 files changed, 27 insertions(+), 11 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: Fix possible NPE while editing ANTLR Grammar
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 a1373cd4b0 Fix possible NPE while editing ANTLR Grammar
a1373cd4b0 is described below
commit a1373cd4b03cb6d5ce41b966b6c36f88a9ef5c5e
Author: Laszlo Kishalmi
AuthorDate: Mon Sep 19 23:30:20 2022 -0700
Fix possible NPE while editing ANTLR Grammar
---
.../netbeans/modules/languages/antlr/v3/Antlr3ParserResult.java | 7 +--
.../netbeans/modules/languages/antlr/v4/Antlr4ParserResult.java | 8 +---
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git
a/java/languages.antlr/src/org/netbeans/modules/languages/antlr/v3/Antlr3ParserResult.java
b/java/languages.antlr/src/org/netbeans/modules/languages/antlr/v3/Antlr3ParserResult.java
index cdd29cdd8e..84c7583fd3 100644
---
a/java/languages.antlr/src/org/netbeans/modules/languages/antlr/v3/Antlr3ParserResult.java
+++
b/java/languages.antlr/src/org/netbeans/modules/languages/antlr/v3/Antlr3ParserResult.java
@@ -137,8 +137,11 @@ public final class Antlr3ParserResult extends
AntlrParserResult {
@Override
public void exitRule_(ANTLRv3Parser.Rule_Context ctx) {
-AntlrStructureItem.RuleStructureItem rule = new
AntlrStructureItem.RuleStructureItem(ctx.id_().getText(), getFileObject(),
ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex() + 1);
-structure.add(rule);
+if (ctx.id_() != null) {
+AntlrStructureItem.RuleStructureItem rule = new
AntlrStructureItem.RuleStructureItem(
+ctx.id_().getText(), getFileObject(),
ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex() + 1);
+structure.add(rule);
+}
}
};
diff --git
a/java/languages.antlr/src/org/netbeans/modules/languages/antlr/v4/Antlr4ParserResult.java
b/java/languages.antlr/src/org/netbeans/modules/languages/antlr/v4/Antlr4ParserResult.java
index eba55a4126..b31cc2 100644
---
a/java/languages.antlr/src/org/netbeans/modules/languages/antlr/v4/Antlr4ParserResult.java
+++
b/java/languages.antlr/src/org/netbeans/modules/languages/antlr/v4/Antlr4ParserResult.java
@@ -211,7 +211,7 @@ public final class Antlr4ParserResult extends
AntlrParserResult {
@Override
public void exitLexerRuleSpec(ANTLRv4Parser.LexerRuleSpecContext
ctx) {
-if (ctx.FRAGMENT() == null) {
+if ((ctx.FRAGMENT() == null) && (ctx.TOKEN_REF() != null)) {
// Do not represent fragments in the structure
AntlrStructureItem.RuleStructureItem rule = new
AntlrStructureItem.RuleStructureItem(ctx.TOKEN_REF().getText(),
getFileObject(), ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex() +
1);
lexerStructure.add(rule);
@@ -220,8 +220,10 @@ public final class Antlr4ParserResult extends
AntlrParserResult {
@Override
public void exitParserRuleSpec(ANTLRv4Parser.ParserRuleSpecContext
ctx) {
-AntlrStructureItem.RuleStructureItem rule = new
AntlrStructureItem.RuleStructureItem(ctx.RULE_REF().getText(), getFileObject(),
ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex() + 1);
-structure.add(rule);
+if (ctx.RULE_REF() != null) {
+AntlrStructureItem.RuleStructureItem rule = new
AntlrStructureItem.RuleStructureItem(ctx.RULE_REF().getText(), getFileObject(),
ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex() + 1);
+structure.add(rule);
+}
}
@Override
-
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 (3940a9af52 -> f93f6b3c76)
This is an automated email from the ASF dual-hosted git repository. lkishalmi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 3940a9af52 Merge pull request #4630 from sdedic/maven/lifecycle-participants new 61c328115f Basic structure for languages.antlr module new 578eb1c64d Add ANTLR4 Tool to ANTLR4 Runtime (compile only) new c277ab3cd3 Initial implementation of ANTLR4 support new cd48633f54 Added languages.antlr to build and java.kit new a0a120b468 Include the ANTLR Generated code along with the source new a04ad6033b Add a working AntlrDeclarationFinder new e39ed9565c Add Code folding and Navigator support new 2811fe8a30 Added Occurance Finder for ANTLR new cf54b609be Better than nothing Completion Provider for ANTLR new 8883f2522b Removed unnecessary DataObject registration new ec1d069d29 Added Antlr icon, adjusted some coloring new 2d482cfd9d Fix verify-libs-and-licenses new 734a0ddea3 Only report major version in antlr4 runtime module new ca478e54d5 Ensure that only the relative grammar path is encoded in the generated java paths new 27ad94ca10 Move modification of grammar files to build script new 9bc0d5f3bb Merge remote-tracking branch 'mb/antlr4-support' into languages.antlr new 8f61cc8863 Fixed generated packages new fbb5970dec Added ANTLRv3 Grammar new 78eeaa8330 Fix package placement in the v4 Grammars new 92cd83a58c Clean up uneccessary Language registration new ee9837ed96 Added ANTLR v3 support new 935d94eefd Added more token mapping to ANTLR v3 Lexer new 107f437aef Adding keyhandler and some other adjustments new 6dc5a36dbb Try to split up ANTLR v3 and v4 Languages new c973bcaa4b Fix case insensitive completion to realy replace the selected text new 9fbaa8aa92 Fix a potential endless parsing loop processing imports new 3352396340 Stabilize Foldingmanager for antlr new 31defae369 Implementation of Goto Declaration and Completion using Indexer new fa856ecce1 Reimplementat of "Goto Declaration" and "Completion" with a local indexer new 7bf3865db3 Implement "Find Usages" new 553bc5d4eb Ensure navigation can be used to go to the corresponding element new a02bd7fae9 Move AntlrParserResult cache to AntlrParser and update that regularly. new 037e9b38e6 WeakReferences for AntlrParserResult can work now. new f3816f6537 ANTLRv4 Parser reports error on Unknown References new 570382ce5b Fixed ANTLRv4 usage finder new 10e8158927 Removed FileObject arguments from the ANTLR Parser listeners new d4d316c242 Fixed a possible NPE on ANTLR Find Usages action new f93f6b3c76 Merge pull request #4549 from lkishalmi/languages.antlr The 7488 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: .gitignore |6 + .../external/antlr4-runtime-4.7.2-license.txt |1 + ide/libs.antlr4.runtime/external/binaries-list |2 + .../netbeans/libs/antlr4/runtime/Bundle.properties |4 +- java/java.kit/nbproject/project.xml|6 + java/languages.antlr/build.xml | 143 + java/languages.antlr/licenseinfo.xml | 37 + java/languages.antlr/manifest.mf |6 + .../languages.antlr/nbproject/project.properties | 13 +- java/languages.antlr/nbproject/project.xml | 218 + .../src/org/antlr/parser/antlr3/ANTLRv3Lexer.g4| 636 +++ .../src/org/antlr/parser/antlr3/ANTLRv3Lexer.java | 625 +++ .../src/org/antlr/parser/antlr3/ANTLRv3Parser.g4 | 287 ++ .../src/org/antlr/parser/antlr3/ANTLRv3Parser.java | 3986 + .../parser/antlr3/ANTLRv3ParserBaseListener.java | 606 +++ .../antlr/parser/antlr3/ANTLRv3ParserListener.java | 487 ++ .../src/org/antlr/parser/antlr3/LexerAdaptor.java | 146 + .../src/org/antlr/parser/antlr4/ANTLRv4Lexer.g4| 406 ++ .../src/org/antlr/parser/antlr4/ANTLRv4Lexer.java | 484 ++ .../src/org/antlr/parser/antlr4/ANTLRv4Parser.g4 | 411 ++ .../src/org/antlr/parser/antlr4/ANTLRv4Parser.java | 4708 .../parser/antlr4/ANTLRv4ParserBaseListener.java | 834 .../antlr/parser/antlr4/ANTLRv4ParserListener.java | 677 +++ .../src/org/antlr/parser/antlr4/LexBasic.g4| 304 ++ .../src/org/antlr/parser/antlr4/LexerAdaptor.java | 151 + .../languages/antlr/AbstractAntlrLexer.java| 87 + .../languages/antlr/AntlrCompletionProvider.java | 150 + .../languages/antlr/AntlrDeclarationFinder.java| 145 + .../antlr/AntlrDeletedTextInterceptor.java | 75 + .../modules/languages/antlr/AntlrExamp
[netbeans] branch master updated: Minor cleanup in YAML Language Support
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 4efad12307 Minor cleanup in YAML Language Support
4efad12307 is described below
commit 4efad12307b79f8314edb81fe0fcac4aaffdd3ae
Author: Laszlo Kishalmi
AuthorDate: Sun Sep 11 20:27:20 2022 -0700
Minor cleanup in YAML Language Support
---
.../yaml/EmbeddedSectionsHighlighting.java | 4 +-
.../modules/languages/yaml/YamlCompletion.java | 2 +-
.../modules/languages/yaml/YamlLanguage.java | 78 +++-
.../modules/languages/yaml/YamlParser.java | 2 +-
.../modules/languages/yaml/YamlStructureItem.java | 2 +-
.../modules/languages/yaml/YamlTokenId.java| 86
.../languages/yaml/ruby/RubyEmbeddingProvider.java | 220 -
.../modules/languages/yaml/YamlLexerTest.java | 16 +-
.../modules/languages/yaml/YamlTestBase.java | 2 +-
9 files changed, 89 insertions(+), 323 deletions(-)
diff --git
a/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/EmbeddedSectionsHighlighting.java
b/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/EmbeddedSectionsHighlighting.java
index 6711aad43c..518201974a 100644
---
a/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/EmbeddedSectionsHighlighting.java
+++
b/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/EmbeddedSectionsHighlighting.java
@@ -37,7 +37,7 @@ import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.editor.BaseDocument;
import org.netbeans.editor.Utilities;
import org.netbeans.lib.editor.util.swing.DocumentUtilities;
-import static org.netbeans.modules.languages.yaml.YamlTokenId.YAML_MIME_TYPE;
+import static org.netbeans.modules.languages.yaml.YamlLanguage.MIME_TYPE;
import org.netbeans.spi.editor.highlighting.HighlightsLayer;
import org.netbeans.spi.editor.highlighting.HighlightsLayerFactory;
import org.netbeans.spi.editor.highlighting.HighlightsSequence;
@@ -257,7 +257,7 @@ public class EmbeddedSectionsHighlighting extends
AbstractHighlightsContainer im
}
} // End of Highlights class
-@MimeRegistration(mimeType = YAML_MIME_TYPE, service =
HighlightsLayerFactory.class)
+@MimeRegistration(mimeType = MIME_TYPE, service =
HighlightsLayerFactory.class)
public static final class Factory implements HighlightsLayerFactory {
@Override
diff --git
a/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/YamlCompletion.java
b/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/YamlCompletion.java
index 6ff30899b5..2e8e6655da 100644
---
a/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/YamlCompletion.java
+++
b/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/YamlCompletion.java
@@ -326,7 +326,7 @@ public class YamlCompletion implements
CodeCompletionHandler {
@Override
public String getMimeType() {
-return YamlTokenId.YAML_MIME_TYPE;
+return YamlLanguage.MIME_TYPE;
}
@Override
diff --git
a/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/YamlLanguage.java
b/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/YamlLanguage.java
index 218e7e2b63..c0f59aba54 100644
---
a/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/YamlLanguage.java
+++
b/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/YamlLanguage.java
@@ -18,7 +18,13 @@
*/
package org.netbeans.modules.languages.yaml;
+import java.util.Collection;
+import java.util.EnumSet;
+import org.netbeans.api.lexer.InputAttributes;
import org.netbeans.api.lexer.Language;
+import org.netbeans.api.lexer.LanguagePath;
+import org.netbeans.api.lexer.Token;
+import org.netbeans.api.lexer.TokenId;
import org.netbeans.core.spi.multiview.MultiViewElement;
import org.netbeans.core.spi.multiview.text.MultiViewEditorElement;
import org.netbeans.modules.csl.api.CodeCompletionHandler;
@@ -29,6 +35,11 @@ import org.netbeans.modules.csl.api.StructureScanner;
import org.netbeans.modules.csl.spi.DefaultLanguageConfig;
import org.netbeans.modules.csl.spi.LanguageRegistration;
import org.netbeans.modules.parsing.spi.Parser;
+import org.netbeans.spi.lexer.LanguageEmbedding;
+import org.netbeans.spi.lexer.LanguageHierarchy;
+import org.netbeans.spi.lexer.LanguageProvider;
+import org.netbeans.spi.lexer.Lexer;
+import org.netbeans.spi.lexer.LexerRestartInfo;
import org.openide.awt.*;
import org.openide.filesystems.MIMEResolver;
import org.openide.util.Lookup;
@@ -102,12 +113,12 @@ import org.openide.windows.TopComponent;
position = 1500
)
})
-@LanguageRegistration(mimeType = "text/x-yaml", useMultiview = true) //NOI18N
+@LanguageRegistration(mimeType = YamlLanguage.MIME_TYPE, useMultiview = true)
public class YamlLangua
[netbeans] branch master updated: FIX-3732: Prevent possible IAE in DocumentViewOp.
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 0b33041d2a FIX-3732: Prevent possible IAE in DocumentViewOp.
0b33041d2a is described below
commit 0b33041d2a20a4b5e6ae548711787ff76fc6ba22
Author: Laszlo Kishalmi
AuthorDate: Sun Sep 11 08:30:48 2022 -0700
FIX-3732: Prevent possible IAE in DocumentViewOp.
---
.../src/org/netbeans/modules/editor/lib2/view/DocumentViewOp.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/ide/editor.lib2/src/org/netbeans/modules/editor/lib2/view/DocumentViewOp.java
b/ide/editor.lib2/src/org/netbeans/modules/editor/lib2/view/DocumentViewOp.java
index 06cbd5a31f..7475b0937d 100644
---
a/ide/editor.lib2/src/org/netbeans/modules/editor/lib2/view/DocumentViewOp.java
+++
b/ide/editor.lib2/src/org/netbeans/modules/editor/lib2/view/DocumentViewOp.java
@@ -1391,7 +1391,7 @@ public final class DocumentViewOp
TextLayout createTextLayout(String text, Font font) {
checkSettingsInfo();
-if (fontRenderContext != null && font != null) {
+if (fontRenderContext != null && font != null && text.length() > 0) {
ViewStats.incrementTextLayoutCreated(text.length());
FontInfo fontInfo = getFontInfo(font);
TextLayout textLayout = new TextLayout(text, fontInfo.renderFont,
fontRenderContext);
-
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: Cleanup debug Exception after an old issue
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 c2b96e1c04 Cleanup debug Exception after an old issue
c2b96e1c04 is described below
commit c2b96e1c047946ff46ea993864721719e4a4541f
Author: Laszlo Kishalmi
AuthorDate: Tue Sep 6 19:30:44 2022 -0700
Cleanup debug Exception after an old issue
---
ide/editor/src/org/netbeans/modules/editor/NbEditorDocument.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/ide/editor/src/org/netbeans/modules/editor/NbEditorDocument.java
b/ide/editor/src/org/netbeans/modules/editor/NbEditorDocument.java
index 468d86cf92..2f570f074e 100644
--- a/ide/editor/src/org/netbeans/modules/editor/NbEditorDocument.java
+++ b/ide/editor/src/org/netbeans/modules/editor/NbEditorDocument.java
@@ -130,7 +130,6 @@ NbDocument.Printable, NbDocument.CustomEditor,
NbDocument.CustomToolbar, NbDocum
return null;
}
});
-putProperty("Issue-222763-debug", new Exception()); // Issue #222763
debugging - to be removed soon
}
public @Override int getShiftWidth() {
-
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: Gradle hide empty generated folders (#4525)
This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 dd6be41a3f Gradle hide empty generated folders (#4525)
dd6be41a3f is described below
commit dd6be41a3f8bd48ccdf812838407300409286d6b
Author: Laszlo Kishalmi
AuthorDate: Sat Sep 3 16:04:50 2022 -0700
Gradle hide empty generated folders (#4525)
* Fix Gradle resourche watchers not attached on project open
* Hide empty generated source dirs
* Move the SourceGroup filtering to the UI
---
.../modules/gradle/api/NbGradleProject.java| 52 +-
.../execute/GradleDistributionProviderImpl.java| 2 +-
.../java/classpath/ClassPathProviderImpl.java | 2 +-
.../gradle/java/classpath/GradleSourcesImpl.java | 1 -
.../gradle/java/nodes/SourcesNodeFactory.java | 28 +++-
5 files changed, 59 insertions(+), 26 deletions(-)
diff --git
a/extide/gradle/src/org/netbeans/modules/gradle/api/NbGradleProject.java
b/extide/gradle/src/org/netbeans/modules/gradle/api/NbGradleProject.java
index fc592b5e5d..08314942ae 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/api/NbGradleProject.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/api/NbGradleProject.java
@@ -31,6 +31,7 @@ import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
+import java.util.logging.Logger;
import java.util.prefs.Preferences;
import javax.swing.Icon;
import javax.swing.ImageIcon;
@@ -58,6 +59,8 @@ import org.openide.util.Utilities;
*/
public final class NbGradleProject {
+static final Logger LOG =
Logger.getLogger(NbGradleProject.class.getName());
+
/**
* As loading a Gradle project information into the memory could be a time
* consuming task each the Gradle Plugin uses heuristics and offline
@@ -170,7 +173,7 @@ public final class NbGradleProject {
@Override
public void activate(NbGradleProject watcher) {
-watcher.attachResourceWatchers();
+watcher.attachResourceWatchers(true);
}
@Override
@@ -268,34 +271,41 @@ public final class NbGradleProject {
private void doFireReload() {
detachResourceWatchers();
support.firePropertyChange(PROP_PROJECT_INFO, null, null);
-attachResourceWatchers();
+attachResourceWatchers(false);
}
private void detachResourceWatchers() {
-for (File resource : resources) {
-try {
-FileUtil.removeFileChangeListener(FCHSL, resource);
-} catch (IllegalArgumentException ex) {
-assert false : "Something is wrong with the resource handling";
+synchronized (resources) {
+for (File resource : resources) {
+try {
+FileUtil.removeFileChangeListener(FCHSL, resource);
+} catch (IllegalArgumentException ex) {
+assert false : "Something is wrong with the resource
handling";
+}
}
+resources.clear();
}
-resources.clear();
}
-private void attachResourceWatchers() {
+private void attachResourceWatchers(boolean elevateQuality) {
//Never listen on resource changes when only FALLBACK quality is needed
-if (project.getAimedQuality() == Quality.FALLBACK) return;
-
-Collection all
-= project.getLookup().lookupAll(WatchedResourceProvider.class);
-for (WatchedResourceProvider pvd : all) {
-resources.addAll(pvd.getWatchedResources());
-}
-for (File resource : resources) {
-try {
-FileUtil.addFileChangeListener(FCHSL, resource);
-} catch (IllegalArgumentException ex) {
-assert false : "Something is wrong with the resource handling";
+if ((project.getAimedQuality() == Quality.FALLBACK) &&
!elevateQuality) return;
+synchronized (resources) {
+if (!resources.isEmpty()) {
+LOG.warning("Gradle ResourceWatcher Leak: " + resources);
//NOI18N
+resources.clear();
+}
+Collection all
+=
project.getLookup().lookupAll(WatchedResourceProvider.class);
+for (WatchedResourceProvider pvd : all) {
+resources.addAll(pvd.getWatchedResources());
+}
+for (File resource : resources) {
+try {
+FileUtil.addFileChangeListener(FCHSL, resource);
+} catch (IllegalArgumentException ex) {
+assert false : "Something is wrong with the resource
handling";
+}
[netbeans] 03/03: A slightly better CharStream implementation
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 52409ead93742bbf36a51b00a2148002161b5b2d
Author: Laszlo Kishalmi
AuthorDate: Wed Aug 31 21:28:00 2022 -0700
A slightly better CharStream implementation
---
.../modules/languages/toml/LexerInputCharStream.java| 17 +++--
.../org/netbeans/modules/languages/toml/TomlLexer.java | 5 -
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git
a/ide/languages.toml/src/org/netbeans/modules/languages/toml/LexerInputCharStream.java
b/ide/languages.toml/src/org/netbeans/modules/languages/toml/LexerInputCharStream.java
index e830b63e3b..5f359d8485 100644
---
a/ide/languages.toml/src/org/netbeans/modules/languages/toml/LexerInputCharStream.java
+++
b/ide/languages.toml/src/org/netbeans/modules/languages/toml/LexerInputCharStream.java
@@ -28,8 +28,8 @@ import org.netbeans.spi.lexer.*;
*/
public class LexerInputCharStream implements CharStream {
private final LexerInput input;
-private final StringBuilder readBuffer = new StringBuilder();
+private int tokenMark = Integer.MAX_VALUE;
private int index = 0;
public LexerInputCharStream(LexerInput input) {
@@ -38,8 +38,12 @@ public class LexerInputCharStream implements CharStream {
@Override
public String getText(Interval intrvl) {
-int end = Math.min(intrvl.b + 1, readBuffer.length());
-return readBuffer.substring(intrvl.a, end);
+if (intrvl.a < tokenMark) {
+throw new UnsupportedOperationException("Read before the current
token start is not supported: " + intrvl.a + " < " + tokenMark);
+}
+int start = intrvl.a - tokenMark;
+int end = intrvl.b - tokenMark + 1;
+return String.valueOf(input.readText(start, end));
}
@Override
@@ -97,9 +101,6 @@ public class LexerInputCharStream implements CharStream {
private int read() {
int ret = input.read();
-if ((readBuffer.length() == index) && (ret != EOF)) {
-readBuffer.append((char)ret);
-}
index += 1;
return ret;
}
@@ -109,6 +110,10 @@ public class LexerInputCharStream implements CharStream {
input.backup(count);
}
+public final void markToken() {
+tokenMark = index;
+}
+
@Override
public int size() {
throw new UnsupportedOperationException("Stream size is unknown.");
diff --git
a/ide/languages.toml/src/org/netbeans/modules/languages/toml/TomlLexer.java
b/ide/languages.toml/src/org/netbeans/modules/languages/toml/TomlLexer.java
index a30199cf5f..dcbced435f 100644
--- a/ide/languages.toml/src/org/netbeans/modules/languages/toml/TomlLexer.java
+++ b/ide/languages.toml/src/org/netbeans/modules/languages/toml/TomlLexer.java
@@ -36,10 +36,12 @@ public final class TomlLexer implements Lexer {
private final TokenFactory tokenFactory;
private final org.tomlj.internal.TomlLexer lexer;
+private final LexerInputCharStream input;
public TomlLexer(LexerRestartInfo info) {
this.tokenFactory = info.tokenFactory();
-this.lexer = new org.tomlj.internal.TomlLexer(new
LexerInputCharStream(info.input()));
+this.input = new LexerInputCharStream(info.input());
+this.lexer = new org.tomlj.internal.TomlLexer(input);
if (info.state() != null) {
((LexerState) info.state()).restore(lexer);
}
@@ -130,6 +132,7 @@ public final class TomlLexer implements Lexer {
}
private Token token(TomlTokenId id) {
+input.markToken();
return tokenFactory.createToken(id);
}
-
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
