commit d76804aae02115dbb76c09eb3b39ab183281da5f
author Josh Tynjala <joshtynjala@apache.org> Thu Jul 28 13:17:29 2022 -0700
committer Josh Tynjala <joshtynjala@apache.org> Thu Jul 28 13:17:32 2022 -0700
tree 4fb1f4f89ab22547adc7b4eed3a40f2d9d77516f
parent 6085daac2f73781f70c75ea57eebc8b31f8a6533

formatter: fix detection of opening mx|fx:Script element when document contains CRLF newlines

formatter/src/main/java/org/apache/royale/formatter/FORMATTER.java

diff --git a/formatter/src/main/java/org/apache/royale/formatter/FORMATTER.java b/formatter/src/main/java/org/apache/royale/formatter/FORMATTER.java
index a512c09..f73dc03 100644
--- a/formatter/src/main/java/org/apache/royale/formatter/FORMATTER.java
+++ b/formatter/src/main/java/org/apache/royale/formatter/FORMATTER.java
@@ -408,7 +408,7 @@
 		}
 		StringBuilder builder = new StringBuilder();
 		Pattern scriptPattern = Pattern.compile(
-				"^<((?:mx|fx):(\\w+))>\\s*(<!\\[CDATA\\[)?((?:.|\\n)*?)(?:\\]\\]>)?\\s*<\\/(?:mx|fx):(?:\\w+)>$");
+				"^<((?:mx|fx):(\\w+))>\\s*(<!\\[CDATA\\[)?((?:.|(?:\\r?\\n))*?)(?:\\]\\]>)?\\s*<\\/(?:mx|fx):(?:\\w+)>$");
 		Matcher scriptMatcher = scriptPattern.matcher(text);
 		if (!scriptMatcher.matches()) {
 			return text;