You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by jo...@apache.org on 2020/06/26 21:39:35 UTC
[royale-compiler] branch develop updated: MXMLTagData: added
protected setProblems() for FakeMXMLTagData to fix null exception in
findMatchingEndTag()
This is an automated email from the ASF dual-hosted git repository.
joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
The following commit(s) were added to refs/heads/develop by this push:
new 79311df MXMLTagData: added protected setProblems() for FakeMXMLTagData to fix null exception in findMatchingEndTag()
79311df is described below
commit 79311df9631fdf24f74bf3091df9970755da2321
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Fri Jun 26 14:39:26 2020 -0700
MXMLTagData: added protected setProblems() for FakeMXMLTagData to fix null exception in findMatchingEndTag()
---
.../org/apache/royale/compiler/internal/mxml/MXMLTagData.java | 5 +++++
.../royale/compiler/internal/parsing/mxml/MXMLTagDataDepth.java | 8 +++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/mxml/MXMLTagData.java b/compiler/src/main/java/org/apache/royale/compiler/internal/mxml/MXMLTagData.java
index f57bb08..171f58b 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/mxml/MXMLTagData.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/mxml/MXMLTagData.java
@@ -172,6 +172,11 @@ public class MXMLTagData extends MXMLUnitData implements IMXMLTagData
return contentEnd;
}
+ protected void setProblems(Collection<ICompilerProblem> problems)
+ {
+ this.problems = problems;
+ }
+
@SuppressWarnings("fallthrough")
MutablePrefixMap init(IMXMLData mxmlData, MXMLToken nameToken, ListIterator<MXMLToken> tokenIterator, MXMLDialect dialect, IFileSpecification spec, Collection<ICompilerProblem> problems)
{
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/parsing/mxml/MXMLTagDataDepth.java b/compiler/src/main/java/org/apache/royale/compiler/internal/parsing/mxml/MXMLTagDataDepth.java
index 0af74b1..3b84709 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/parsing/mxml/MXMLTagDataDepth.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/parsing/mxml/MXMLTagDataDepth.java
@@ -66,12 +66,18 @@ class MXMLTagDataDepth {
public FakeMXMLTagData(String tagName, boolean closeTag, boolean emptyTag) {
this.tagName = tagName;
nameType = closeTag ? MXMLTokenTypes.TOKEN_CLOSE_TAG_START : MXMLTokenTypes.TOKEN_OPEN_TAG_START;
- this.emptyTag = emptyTag;
+ this.emptyTag = emptyTag;
+
+ // a call to findMatchingEndTag() will fail without this
+ this.setProblems(new ArrayList<ICompilerProblem>());
}
public FakeMXMLTagData(MXMLTagData data, boolean emptyTag) {
super(data);
this.emptyTag = emptyTag;
+
+ // a call to findMatchingEndTag() will fail without this
+ this.setProblems(new ArrayList<ICompilerProblem>());
}
@Override