[royale-compiler] branch develop updated: fix handling of inline text in TLF MXML markup

[ah...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

aharui 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 616517c  fix handling of inline text in TLF MXML markup
616517c is described below

commit 616517cdb0e7fa0ee7ae2cb5cc0fbe5f712ff083
Author: Alex Harui <ah...@apache.org>
AuthorDate: Fri Aug 10 15:45:41 2018 -0700

    fix handling of inline text in TLF MXML markup
---
 .../org/apache/royale/compiler/internal/tree/mxml/MXMLTreeBuilder.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLTreeBuilder.java b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLTreeBuilder.java
index c910880..aedbbd3 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLTreeBuilder.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLTreeBuilder.java
@@ -381,6 +381,8 @@ public class MXMLTreeBuilder
         else if (typeName.equals(IASLanguageConstants.Array))
         {
             result = mxmlDialect.parseArray(project, text, flags);
+            if (result == null && flags.contains(TextParsingFlags.RICH_TEXT_CONTENT))
+                result = mxmlDialect.parseString(project, text, flags);            	
         }
         else if (typeName.equals(IASLanguageConstants.Object) ||
                  typeName.equals(IASLanguageConstants.ANY_TYPE))