[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: Recognize generatedDependencies tag (#4666)
This is an automated email from the ASF dual-hosted git repository.
jtulach 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 1c79f0f7aa Recognize generatedDependencies tag (#4666)
1c79f0f7aa is described below
commit 1c79f0f7aaaf220043f9273ffe620a0c6331c693
Author: Jaroslav Tulach <1842422+jtul...@users.noreply.github.com>
AuthorDate: Wed Sep 21 17:32:46 2022 +0200
Recognize generatedDependencies tag (#4666)
Co-authored-by: Jaroslav Tulach
---
.../src/org/netbeans/modules/java/mx/project/CoreSuite.java| 7 +++
.../src/org/netbeans/modules/java/mx/project/SuiteSources.java | 5 -
.../org/netbeans/modules/java/mx/project/suitepy/MxProject.java| 2 ++
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git
a/java/java.mx.project/src/org/netbeans/modules/java/mx/project/CoreSuite.java
b/java/java.mx.project/src/org/netbeans/modules/java/mx/project/CoreSuite.java
index d2270096c3..28e1b85043 100644
---
a/java/java.mx.project/src/org/netbeans/modules/java/mx/project/CoreSuite.java
+++
b/java/java.mx.project/src/org/netbeans/modules/java/mx/project/CoreSuite.java
@@ -160,6 +160,13 @@ final class CoreSuite {
return dependencies;
}
+@Override
+public List generatedDependencies() {
+return Collections.emptyList();
+}
+
+
+
@Override
public List annotationProcessors() {
return annotationProcessors;
diff --git
a/java/java.mx.project/src/org/netbeans/modules/java/mx/project/SuiteSources.java
b/java/java.mx.project/src/org/netbeans/modules/java/mx/project/SuiteSources.java
index 4f9347e27c..096d2bf2b1 100644
---
a/java/java.mx.project/src/org/netbeans/modules/java/mx/project/SuiteSources.java
+++
b/java/java.mx.project/src/org/netbeans/modules/java/mx/project/SuiteSources.java
@@ -771,7 +771,10 @@ final class SuiteSources implements Sources,
@Override
public Collection depNames() {
-return mxPrj.dependencies();
+List both = new ArrayList<>();
+both.addAll(mxPrj.dependencies());
+both.addAll(mxPrj.generatedDependencies());
+return both;
}
@Override
diff --git
a/java/java.mx.project/src/org/netbeans/modules/java/mx/project/suitepy/MxProject.java
b/java/java.mx.project/src/org/netbeans/modules/java/mx/project/suitepy/MxProject.java
index f9268dcd64..6da50ae4af 100644
---
a/java/java.mx.project/src/org/netbeans/modules/java/mx/project/suitepy/MxProject.java
+++
b/java/java.mx.project/src/org/netbeans/modules/java/mx/project/suitepy/MxProject.java
@@ -29,6 +29,8 @@ public interface MxProject {
List dependencies();
+List generatedDependencies();
+
List annotationProcessors();
String javaCompliance();
-
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 (cb4112b5ce -> 811419a925)
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 cb4112b5ce Merge pull request #4631 from sdedic/project/artiacts-tags new e7e9fc7a99 Fixed NPE in projects without build.gradle. new 771642c25b Sanitized displayName; cache/force logic fixed. new c1ef33864e Bugfix: use array locations. new 811419a925 Merge pull request #4665 from sdedic/gcn/nested-audit-errors The 7497 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: .../cloud/oracle/adm/ProjectVulnerability.java | 2 +- .../cloud/oracle/adm/VulnerabilityWorker.java | 12 - .../java/queries/GradleDependencyResult.java | 31 +- .../lsp/server/protocol/WorkspaceServiceImpl.java | 1 + 4 files changed, 25 insertions(+), 21 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
