[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
[netbeans-website] branch master updated: asserts from old part
This is an automated email from the ASF dual-hosted git repository.
skygo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-website.git
The following commit(s) were added to refs/heads/master by this push:
new 5e872959e asserts from old part
5e872959e is described below
commit 5e872959ebde034c90672a51003653b5fb3e1a73
Author: Eric Barboni
AuthorDate: Mon Oct 17 14:45:58 2022 +0200
asserts from old part
---
netbeans.apache.org/build.gradle | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/netbeans.apache.org/build.gradle b/netbeans.apache.org/build.gradle
index 42e8a910a..fa5905b30 100644
--- a/netbeans.apache.org/build.gradle
+++ b/netbeans.apache.org/build.gradle
@@ -87,7 +87,13 @@ task preprocessContentAssets(type: Copy,
"**/*.woff",
"**/doap_NetBeans.rdf"
}
-
+from(contentDir_old) {
+include "**/*.jpeg",
+"**/*.jpg",
+"**/*.js",
+"**/*.png",
+"**/*.svg"
+}
from("$contentDir/scss") {
into('css')
include "**/*.scss"
-
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 (58dd590826 -> ceac8ff3f0)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 58dd590826 Tomcat module cleanup (#4454) new 2924178523 Java JAR artifacts and Micronaut native-image implemented on top of Gradle Build Properties API. new 7226affdbd Representing external tasks: only name and path are reported. new 59badd1501 Delay so filesystem records newer file time. new f8561d5021 Logging added to maven infra. new e9eb7684d9 Add Micronaut to the enterprise suite new 233721ccd3 Open projects before querying its metadata. new ceac8ff3f0 Merge pull request #4730 from sdedic/gradle/java-micronaut-artifacts The 7603 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/main.yml | 3 + enterprise/micronaut/nbproject/project.properties | 3 +- enterprise/micronaut/nbproject/project.xml | 13 + .../micronaut/AbstractMicronautArtifacts.java | 171 .../gradle/MicronautGradleArtifactsImpl.java | 287 + .../maven/MicronautPackagingArtifactsImpl.java | 108 ++--- .../netbeans/modules/micronaut/resources/layer.xml | 16 +- .../resources/micronaut-actions-gradle.xml | 29 ++ ...aut-actions.xml => micronaut-actions-maven.xml} | 0 .../data/gradle/artifacts/multi/app/build.gradle | 44 ++ .../app/src/main/java/com/example/Application.java | 9 + .../app/src/main/java/com/example/Something.java | 1 + .../multi/app}/src/main/resources/logback.xml | 0 .../app/src/test/java/com/example/DemoTest.java| 21 + .../data/gradle/artifacts/multi/gradle.properties | 1 + .../data/gradle/artifacts/multi/oci/build.gradle | 50 +++ .../oci/src/main/java/com/example/Application.java | 9 + .../data/gradle/artifacts/multi/settings.gradle| 6 + .../unit/data/gradle/artifacts/simple/build.gradle | 45 +++ .../data/gradle/artifacts/simple/gradle.properties | 1 + .../data/gradle/artifacts/simple/micronaut-cli.yml | 6 + .../data/gradle/artifacts/simple/settings.gradle | 3 + .../src/main/java/com/example/Demo2Command.java| 28 ++ .../simple/src/main/resources/application.yml | 3 + .../simple}/src/main/resources/logback.xml | 0 .../test/java/com/example/Demo2CommandTest.java| 28 ++ .../MicronautGradleArtifactsImplTest.java} | 209 +- .../maven/MicronautPackagingArtifactImplTest.java | 94 - extide/gradle/apichanges.xml | 12 + extide/gradle/manifest.mf | 2 +- .../modules/gradle/api/GradleBaseProject.java | 36 +- .../netbeans/modules/gradle/api/GradleTask.java| 40 +- .../data/projects/externaldeps/p1/build.gradle | 27 ++ .../externaldeps/p1}/src/main/java/test/App.java | 0 .../data/projects/externaldeps/p2/build.gradle | 28 ++ .../externaldeps/p2/src/main/java/test/App2.java | 0 .../data/projects/externaldeps/settings.gradle | 23 ++ .../test/unit/data/projects/multi/p1/build.gradle | 27 ++ .../projects/multi/p1}/src/main/java/test/App.java | 0 .../test/unit/data/projects/multi/p2/build.gradle | 26 ++ .../projects/multi/p2/src/main/java/test/App2.java | 0 .../test/unit/data/projects/multi/settings.gradle | 23 ++ .../test/unit/data/projects/simple/build.gradle| 23 ++ .../test/unit/data/projects/simple/settings.gradle | 21 + .../projects/simple}/src/main/java/test/App.java | 0 .../modules/gradle/api/GradleBaseProjectTest.java | 208 ++ java/gradle.java/nbproject/project.properties | 2 +- java/gradle.java/nbproject/project.xml | 2 +- .../gradle/java/queries/GradleJarArtifacts.java| 444 + .../test/unit/data/artifacts/shadowed/build.gradle | 26 ++ .../shadowed}/src/main/java/test/App.java | 0 .../unit/data/artifacts/withTests/build.gradle | 21 + .../withTests}/src/main/java/test/App.java | 0 .../gradle/VerifyGradleProjectTemplatesTest.java | 11 +- .../gradle/java/queries/GradleJarArtifactTest.java | 356 + .../commands/ProjectMetadataCommand.java | 22 +- .../netbeans/modules/maven/ActionProviderImpl.java | 3 + .../netbeans/modules/maven/NbMavenProjectImpl.java | 10 + .../netbeans/modules/maven/api/NbMavenProject.java | 5 +- .../maven/modelcache/MavenProjectCache.java| 15 + .../maven/problems/MavenModelProblemsProvider.java | 7 + .../modules/maven/problems/SanityBuildAction.java | 10 +- 62 files changed, 2392 insertions(+), 226 deletions(-) create mode 100644 enterprise/micronaut/src/org/netbeans/modules/micronaut/AbstractMicronautArtifacts.java create mode
