You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2016/11/05 08:50:48 UTC
[06/23] git commit: [flex-falcon]
[refs/heads/feature-autobuild/example-maven-dirs] - better end line and end
column on MXML DOM
better end line and end column on MXML DOM
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/39b119a4
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/39b119a4
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/39b119a4
Branch: refs/heads/feature-autobuild/example-maven-dirs
Commit: 39b119a4773e12d6069f3d0b7643b590373b13c8
Parents: f7dc953
Author: Josh Tynjala <jo...@gmail.com>
Authored: Sun Oct 30 16:53:51 2016 -0700
Committer: Josh Tynjala <jo...@gmail.com>
Committed: Sun Oct 30 16:53:51 2016 -0700
----------------------------------------------------------------------
.../apache/flex/compiler/internal/mxml/MXMLTagAttributeData.java | 2 ++
.../java/org/apache/flex/compiler/internal/mxml/MXMLTagData.java | 4 ++++
.../org/apache/flex/compiler/internal/mxml/MXMLTextData.java | 2 ++
3 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/39b119a4/compiler/src/main/java/org/apache/flex/compiler/internal/mxml/MXMLTagAttributeData.java
----------------------------------------------------------------------
diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/mxml/MXMLTagAttributeData.java b/compiler/src/main/java/org/apache/flex/compiler/internal/mxml/MXMLTagAttributeData.java
index 5e04336..bb82967 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/internal/mxml/MXMLTagAttributeData.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/internal/mxml/MXMLTagAttributeData.java
@@ -55,6 +55,8 @@ public class MXMLTagAttributeData extends SourceLocation implements IMXMLTagAttr
setStart(nameToken.getStart());
setLine(nameToken.getLine());
setColumn(nameToken.getColumn());
+ setEndLine(nameToken.getEndLine());
+ setEndColumn(nameToken.getEndColumn());
setEnd(nameToken.getEnd());
// Deal with name if it is of the form name.state
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/39b119a4/compiler/src/main/java/org/apache/flex/compiler/internal/mxml/MXMLTagData.java
----------------------------------------------------------------------
diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/mxml/MXMLTagData.java b/compiler/src/main/java/org/apache/flex/compiler/internal/mxml/MXMLTagData.java
index 5ddd780..1a1a3f0 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/internal/mxml/MXMLTagData.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/internal/mxml/MXMLTagData.java
@@ -90,6 +90,8 @@ public class MXMLTagData extends MXMLUnitData implements IMXMLTagData
this.setOffsets(other.getStart(), other.getEnd());
this.setLine(other.getLine());
this.setColumn(other.getColumn());
+ this.setEndLine(other.getEndLine());
+ this.setEndColumn(other.getEndColumn());
}
protected String tagName;
@@ -201,6 +203,8 @@ public class MXMLTagData extends MXMLUnitData implements IMXMLTagData
setTagOffsets(startOffset, nameEnd, nameStart, contentEnd);
setColumn(nameToken.getColumn());
setLine(nameToken.getLine());
+ setEndColumn(nameToken.getEndColumn());
+ setEndLine(nameToken.getEndLine());
attributesStart = getNameEnd();
ArrayList<IMXMLTagAttributeData> attrs = new ArrayList<IMXMLTagAttributeData>();
attributeMap = new LinkedHashMap<String, IMXMLTagAttributeData>(); //preserve order of attrs
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/39b119a4/compiler/src/main/java/org/apache/flex/compiler/internal/mxml/MXMLTextData.java
----------------------------------------------------------------------
diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/mxml/MXMLTextData.java b/compiler/src/main/java/org/apache/flex/compiler/internal/mxml/MXMLTextData.java
index 5411912..e6e9acf 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/internal/mxml/MXMLTextData.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/internal/mxml/MXMLTextData.java
@@ -46,6 +46,8 @@ public class MXMLTextData extends MXMLUnitData implements IMXMLTextData
setOffsets(textToken.getStart(), textToken.getEnd());
setLine(textToken.getLine());
setColumn(textToken.getColumn());
+ setEndLine(textToken.getEndLine());
+ setEndColumn(textToken.getEndColumn());
switch (textToken.getType())
{