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 2021/10/14 21:32:49 UTC
[royale-compiler] branch develop updated (e609665 -> 8221cc2)
This is an automated email from the ASF dual-hosted git repository.
joshtynjala pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git.
from e609665 formatter: class should be public
new 5236461 formatter: format MXML script blocks
new 8221cc2 formatter: insert-space-meta-attributes
The 2 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:
.../org/apache/royale/formatter/FORMATTER.java | 105 ++++++++++++++++++---
.../royale/formatter/config/Configuration.java | 18 ++++
.../royale/formatter/TestArithmeticOperators.java | 20 ++--
.../apache/royale/formatter/TestArrayLiteral.java | 8 +-
.../apache/royale/formatter/TestAsDocComment.java | 14 +--
.../formatter/TestAutomaticSemicolonInsertion.java | 2 +-
.../royale/formatter/TestBitwiseOperators.java | 26 ++---
.../royale/formatter/TestBreakStatement.java | 10 +-
.../royale/formatter/TestClassDeclaration.java | 8 +-
.../royale/formatter/TestComparisonOperators.java | 16 ++--
.../royale/formatter/TestConstDeclaration.java | 6 +-
.../royale/formatter/TestContinueStatement.java | 10 +-
.../royale/formatter/TestDecrementOperator.java | 4 +-
.../TestDefaultXMLNamespaceDirective.java | 2 +-
.../royale/formatter/TestDeleteOperator.java | 2 +-
.../royale/formatter/TestDoWhileStatement.java | 26 ++---
.../royale/formatter/TestElseIfStatement.java | 30 +++---
.../apache/royale/formatter/TestElseStatement.java | 32 +++----
.../royale/formatter/TestFieldDeclaration.java | 14 +--
.../royale/formatter/TestForEachStatement.java | 24 ++---
.../royale/formatter/TestForInStatement.java | 24 ++---
.../apache/royale/formatter/TestForStatement.java | 26 ++---
.../royale/formatter/TestFunctionDeclaration.java | 24 ++---
.../apache/royale/formatter/TestIdentifier.java | 28 +++---
.../apache/royale/formatter/TestIfStatement.java | 30 +++---
.../royale/formatter/TestImportDirective.java | 2 +-
.../royale/formatter/TestIncludeDirective.java | 2 +-
.../royale/formatter/TestIncrementOperator.java | 4 +-
.../royale/formatter/TestInterfaceDeclaration.java | 12 +--
.../royale/formatter/TestLogicalOperators.java | 10 +-
.../org/apache/royale/formatter/TestMetadata.java | 16 ++--
.../royale/formatter/TestMethodDeclaration.java | 8 +-
.../formatter/TestMiscellaneousOperators.java | 4 +-
.../royale/formatter/TestMultiLineComment.java | 8 +-
.../apache/royale/formatter/TestNumberLiteral.java | 6 +-
.../apache/royale/formatter/TestObjectLiteral.java | 14 +--
.../royale/formatter/TestPackageDeclaration.java | 10 +-
.../royale/formatter/TestPreserveNewLines.java | 6 +-
.../org/apache/royale/formatter/TestRegExp.java | 2 +-
.../royale/formatter/TestReturnStatement.java | 10 +-
.../royale/formatter/TestSingleLineComment.java | 14 +--
.../apache/royale/formatter/TestStringLiteral.java | 12 +--
.../royale/formatter/TestSwitchStatement.java | 44 ++++-----
.../royale/formatter/TestTernaryStatement.java | 6 +-
.../royale/formatter/TestThrowStatement.java | 10 +-
.../royale/formatter/TestTryCatchStatement.java | 14 +--
.../formatter/TestUseNamespaceDirective.java | 2 +-
.../royale/formatter/TestVariableDeclaration.java | 10 +-
.../royale/formatter/TestWhileStatement.java | 24 ++---
.../java/org/apache/royale/formatter/TestXML.java | 6 +-
50 files changed, 433 insertions(+), 332 deletions(-)
[royale-compiler] 02/02: formatter: insert-space-meta-attributes
Posted by jo...@apache.org.
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
commit 8221cc24372d2d6f69410a4ed10527083986b6c2
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Thu Oct 14 14:28:17 2021 -0700
formatter: insert-space-meta-attributes
---
.../java/org/apache/royale/formatter/FORMATTER.java | 12 ++++++++++--
.../apache/royale/formatter/config/Configuration.java | 18 ++++++++++++++++++
2 files changed, 28 insertions(+), 2 deletions(-)
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 96ed5c8..04cff34 100644
--- a/formatter/src/main/java/org/apache/royale/formatter/FORMATTER.java
+++ b/formatter/src/main/java/org/apache/royale/formatter/FORMATTER.java
@@ -106,6 +106,7 @@ public class FORMATTER {
public boolean insertSpaceAfterFunctionKeywordForAnonymousFunctions = false;
public boolean insertSpaceBeforeAndAfterBinaryOperators = true;
public boolean insertSpaceAfterCommaDelimiter = true;
+ public boolean insertSpaceBetweenMetadataAttributes = true;
public boolean insertSpaceAtStartOfLineComment = true;
public int maxPreserveNewLines = 2;
public Semicolons semicolons = Semicolons.INSERT;
@@ -305,6 +306,7 @@ public class FORMATTER {
ignoreProblems = configuration.getIgnoreParsingProblems();
insertFinalNewLine = configuration.getInsertFinalNewLine();
insertSpaceAfterCommaDelimiter = configuration.getInsertSpaceAfterCommaDelimiter();
+ insertSpaceBetweenMetadataAttributes = configuration.getInsertSpaceBetweenMetadataAttributes();
insertSpaceAfterFunctionKeywordForAnonymousFunctions = configuration
.getInsertSpaceAfterFunctionKeywordForAnonymousFunctions();
insertSpaceAfterKeywordsInControlFlowStatements = configuration
@@ -1425,7 +1427,10 @@ public class FORMATTER {
case MetadataTokenTypes.TOKEN_ATTR_IMPLEMENTATION:
case MetadataTokenTypes.TOKEN_ATTR_OPERATOR_NS_QUALIFIER:
if (needsComma) {
- builder.append(", ");
+ builder.append(",");
+ if (insertSpaceBetweenMetadataAttributes) {
+ builder.append(" ");
+ }
}
needsComma = true;
builder.append(metaToken.getText());
@@ -1440,7 +1445,10 @@ public class FORMATTER {
break;
case MetadataTokenTypes.TOKEN_STRING:
if (needsComma) {
- builder.append(", ");
+ builder.append(",");
+ if (insertSpaceBetweenMetadataAttributes) {
+ builder.append(" ");
+ }
}
builder.append("\"");
builder.append(metaToken.getText());
diff --git a/formatter/src/main/java/org/apache/royale/formatter/config/Configuration.java b/formatter/src/main/java/org/apache/royale/formatter/config/Configuration.java
index 1b6699f..440be23 100644
--- a/formatter/src/main/java/org/apache/royale/formatter/config/Configuration.java
+++ b/formatter/src/main/java/org/apache/royale/formatter/config/Configuration.java
@@ -347,6 +347,24 @@ public class Configuration {
}
//
+ // 'insert-space-meta-attributes' option
+ //
+
+ private boolean insertSpaceBetweenMetadataAttributes = true;
+
+ public boolean getInsertSpaceBetweenMetadataAttributes()
+ {
+ return insertSpaceBetweenMetadataAttributes;
+ }
+
+ @Config
+ @Mapping("insert-space-meta-attributes")
+ public void setInsertSpaceBetweenMetadataAttributes(ConfigurationValue cv, boolean b)
+ {
+ this.insertSpaceBetweenMetadataAttributes = b;
+ }
+
+ //
// 'insert-space-line-comment' option
//
[royale-compiler] 01/02: formatter: format MXML script blocks
Posted by jo...@apache.org.
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
commit 5236461e83bc7d5c3437cc71ee357c4081a91146
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Thu Oct 14 14:17:49 2021 -0700
formatter: format MXML script blocks
---
.../org/apache/royale/formatter/FORMATTER.java | 93 +++++++++++++++++++---
.../royale/formatter/TestArithmeticOperators.java | 20 ++---
.../apache/royale/formatter/TestArrayLiteral.java | 8 +-
.../apache/royale/formatter/TestAsDocComment.java | 14 ++--
.../formatter/TestAutomaticSemicolonInsertion.java | 2 +-
.../royale/formatter/TestBitwiseOperators.java | 26 +++---
.../royale/formatter/TestBreakStatement.java | 10 +--
.../royale/formatter/TestClassDeclaration.java | 8 +-
.../royale/formatter/TestComparisonOperators.java | 16 ++--
.../royale/formatter/TestConstDeclaration.java | 6 +-
.../royale/formatter/TestContinueStatement.java | 10 +--
.../royale/formatter/TestDecrementOperator.java | 4 +-
.../TestDefaultXMLNamespaceDirective.java | 2 +-
.../royale/formatter/TestDeleteOperator.java | 2 +-
.../royale/formatter/TestDoWhileStatement.java | 26 +++---
.../royale/formatter/TestElseIfStatement.java | 30 +++----
.../apache/royale/formatter/TestElseStatement.java | 32 ++++----
.../royale/formatter/TestFieldDeclaration.java | 14 ++--
.../royale/formatter/TestForEachStatement.java | 24 +++---
.../royale/formatter/TestForInStatement.java | 24 +++---
.../apache/royale/formatter/TestForStatement.java | 26 +++---
.../royale/formatter/TestFunctionDeclaration.java | 24 +++---
.../apache/royale/formatter/TestIdentifier.java | 28 +++----
.../apache/royale/formatter/TestIfStatement.java | 30 +++----
.../royale/formatter/TestImportDirective.java | 2 +-
.../royale/formatter/TestIncludeDirective.java | 2 +-
.../royale/formatter/TestIncrementOperator.java | 4 +-
.../royale/formatter/TestInterfaceDeclaration.java | 12 +--
.../royale/formatter/TestLogicalOperators.java | 10 +--
.../org/apache/royale/formatter/TestMetadata.java | 16 ++--
.../royale/formatter/TestMethodDeclaration.java | 8 +-
.../formatter/TestMiscellaneousOperators.java | 4 +-
.../royale/formatter/TestMultiLineComment.java | 8 +-
.../apache/royale/formatter/TestNumberLiteral.java | 6 +-
.../apache/royale/formatter/TestObjectLiteral.java | 14 ++--
.../royale/formatter/TestPackageDeclaration.java | 10 +--
.../royale/formatter/TestPreserveNewLines.java | 6 +-
.../org/apache/royale/formatter/TestRegExp.java | 2 +-
.../royale/formatter/TestReturnStatement.java | 10 +--
.../royale/formatter/TestSingleLineComment.java | 14 ++--
.../apache/royale/formatter/TestStringLiteral.java | 12 +--
.../royale/formatter/TestSwitchStatement.java | 44 +++++-----
.../royale/formatter/TestTernaryStatement.java | 6 +-
.../royale/formatter/TestThrowStatement.java | 10 +--
.../royale/formatter/TestTryCatchStatement.java | 14 ++--
.../formatter/TestUseNamespaceDirective.java | 2 +-
.../royale/formatter/TestVariableDeclaration.java | 10 +--
.../royale/formatter/TestWhileStatement.java | 24 +++---
.../java/org/apache/royale/formatter/TestXML.java | 6 +-
49 files changed, 405 insertions(+), 330 deletions(-)
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 11ff4b4..96ed5c8 100644
--- a/formatter/src/main/java/org/apache/royale/formatter/FORMATTER.java
+++ b/formatter/src/main/java/org/apache/royale/formatter/FORMATTER.java
@@ -29,6 +29,8 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Scanner;
import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import org.apache.commons.io.FileUtils;
import org.apache.royale.compiler.clients.problems.ProblemFormatter;
@@ -182,7 +184,7 @@ public class FORMATTER {
public String formatFile(File file, Collection<ICompilerProblem> problems) throws IOException {
String fileText = FileUtils.readFileToString(file, "utf8");
- String filePath = FilenameNormalization.normalize(file.getAbsolutePath());
+ String filePath = file.getAbsolutePath();
return formatFileText(filePath, fileText, problems);
}
@@ -191,7 +193,13 @@ public class FORMATTER {
}
public String formatFileText(String filePath, String text, Collection<ICompilerProblem> problems) {
- String result = formatTextInternal(filePath, text, problems);
+ filePath = FilenameNormalization.normalize(filePath);
+ String result = null;
+ if (filePath.endsWith(".mxml")) {
+ result = formatMXMLTextInternal(filePath, text, problems);
+ } else {
+ result = formatAS3TextInternal(filePath, text, problems);
+ }
if (insertFinalNewLine && result.charAt(result.length() - 1) != '\n') {
return result + '\n';
}
@@ -202,13 +210,22 @@ public class FORMATTER {
return formatFileText(filePath, text, null);
}
- public String formatText(String text, Collection<ICompilerProblem> problems) {
- String filePath = FilenameNormalization.normalize("source.as");
- return formatTextInternal(filePath, text, problems);
+ public String formatActionScriptText(String text, Collection<ICompilerProblem> problems) {
+ String filePath = FilenameNormalization.normalize("stdin.as");
+ return formatAS3TextInternal(filePath, text, problems);
}
- public String formatText(String text) {
- return formatText(text, null);
+ public String formatActionScriptText(String text) {
+ return formatActionScriptText(text, null);
+ }
+
+ public String formatMXMLText(String text, Collection<ICompilerProblem> problems) {
+ String filePath = FilenameNormalization.normalize("stdin.mxml");
+ return formatMXMLTextInternal(filePath, text, problems);
+ }
+
+ public String formatMXMLText(String text) {
+ return formatMXMLText(text, null);
}
/**
@@ -346,13 +363,71 @@ public class FORMATTER {
}
if (file.isDirectory()) {
addDirectory(file);
- } else if (fileName.endsWith(".as")) {
+ } else if (fileName.endsWith(".as") || fileName.endsWith(".mxml")) {
inputFiles.add(file);
}
}
}
- private String formatTextInternal(String filePath, String text, Collection<ICompilerProblem> problems) {
+ private String formatMXMLTextInternal(String filePath, String text, Collection<ICompilerProblem> problems) {
+ String indent = "\t";
+ if (insertSpaces) {
+ indent = "";
+ for (int i = 0; i < tabSize; i++) {
+ indent += " ";
+ }
+ }
+ int lastIndex = 0;
+ StringBuilder builder = new StringBuilder();
+ Pattern scriptPattern = Pattern.compile(
+ "[\t ]*<((?:mx|fx):Script)>\\s*(?:<!\\[CDATA\\[)?((?:.|\\n)*?)(?:\\]\\]>)?\\s*<\\/(?:mx|fx):Script>");
+ Matcher scriptMatcher = scriptPattern.matcher(text);
+ if (problems == null) {
+ // we need to know if there were problems because it means that we
+ // need to return the original, unformatted text
+ problems = new ArrayList<ICompilerProblem>();
+ }
+ while (scriptMatcher.find()) {
+ int start = scriptMatcher.start();
+ int end = scriptMatcher.end();
+ String scriptTagText = scriptMatcher.group(1);
+ String scriptText = scriptMatcher.group(2);
+ String formattedScriptText = formatAS3TextInternal(filePath, scriptText, problems);
+ if (problems.size() > 0) {
+ return text;
+ }
+ String[] formattedLines = formattedScriptText.split("\n");
+ String lineIndent = indent + indent + indent;
+ for (int i = 0; i < formattedLines.length; i++) {
+ formattedLines[i] = lineIndent + formattedLines[i];
+ }
+ formattedScriptText = String.join("\n", formattedLines);
+ builder.append(text.substring(lastIndex, start));
+ builder.append(indent);
+ builder.append("<");
+ builder.append(scriptTagText);
+ builder.append(">\n");
+ builder.append(indent);
+ builder.append(indent);
+ builder.append("<![CDATA[\n");
+ builder.append(formattedScriptText);
+ builder.append("\n");
+ builder.append(indent);
+ builder.append(indent);
+ builder.append("]]>\n");
+ builder.append(indent);
+ builder.append("</");
+ builder.append(scriptTagText);
+ builder.append(">");
+ lastIndex = end;
+ }
+ if (lastIndex < text.length()) {
+ builder.append(text.substring(lastIndex));
+ }
+ return builder.toString();
+ }
+
+ private String formatAS3TextInternal(String filePath, String text, Collection<ICompilerProblem> problems) {
StringReader textReader = new StringReader(text);
StreamingASTokenizer tokenizer = null;
ASToken[] streamingTokens = null;
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestArithmeticOperators.java b/formatter/src/test/java/org/apache/royale/formatter/TestArithmeticOperators.java
index 778dc57..6a6e8fc 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestArithmeticOperators.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestArithmeticOperators.java
@@ -28,7 +28,7 @@ public class TestArithmeticOperators extends BaseFormatterTests {
public void testAdditionOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a+b;",
// @formatter:on
@@ -45,7 +45,7 @@ public class TestArithmeticOperators extends BaseFormatterTests {
public void testSubtractionOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a-b;",
// @formatter:on
@@ -62,7 +62,7 @@ public class TestArithmeticOperators extends BaseFormatterTests {
public void testMultiplicationOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a*b;",
// @formatter:on
@@ -79,7 +79,7 @@ public class TestArithmeticOperators extends BaseFormatterTests {
public void testDivisionOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a/b;",
// @formatter:on
@@ -96,7 +96,7 @@ public class TestArithmeticOperators extends BaseFormatterTests {
public void testModuloOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a%b;",
// @formatter:on
@@ -113,7 +113,7 @@ public class TestArithmeticOperators extends BaseFormatterTests {
public void testAdditionCompoundAssignmentOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a+=b;",
// @formatter:on
@@ -130,7 +130,7 @@ public class TestArithmeticOperators extends BaseFormatterTests {
public void testSubtractionCompoundAssignmentOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a-=b;",
// @formatter:on
@@ -147,7 +147,7 @@ public class TestArithmeticOperators extends BaseFormatterTests {
public void testMultiplicationCompoundAssignmentOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a*=b;",
// @formatter:on
@@ -164,7 +164,7 @@ public class TestArithmeticOperators extends BaseFormatterTests {
public void testDivisionCompoundAssignmentOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a/=b;",
// @formatter:on
@@ -181,7 +181,7 @@ public class TestArithmeticOperators extends BaseFormatterTests {
public void testModuloCompoundAssignmentOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a%=b;",
// @formatter:on
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestArrayLiteral.java b/formatter/src/test/java/org/apache/royale/formatter/TestArrayLiteral.java
index c714b79..2a28563 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestArrayLiteral.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestArrayLiteral.java
@@ -28,7 +28,7 @@ public class TestArrayLiteral extends BaseFormatterTests {
public void testEmpty() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"var array:Array = [];",
// @formatter:on
@@ -45,7 +45,7 @@ public class TestArrayLiteral extends BaseFormatterTests {
public void testSingleNumberOnOneLine() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"var array:Array = [123.4];",
// @formatter:on
@@ -62,7 +62,7 @@ public class TestArrayLiteral extends BaseFormatterTests {
public void testMultipleNumbersOnOneLine() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"var array:Array = [123.4, 567.8, 901.2];",
// @formatter:on
@@ -79,7 +79,7 @@ public class TestArrayLiteral extends BaseFormatterTests {
public void testMultipleStringsOnOneLine() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"var array:Array = [\"abc\", \"hello world\", \"\"];",
// @formatter:on
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestAsDocComment.java b/formatter/src/test/java/org/apache/royale/formatter/TestAsDocComment.java
index 5567861..cc905d4 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestAsDocComment.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestAsDocComment.java
@@ -30,7 +30,7 @@ public class TestAsDocComment extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"/** This is a comment */",
// @formatter:on
@@ -49,7 +49,7 @@ public class TestAsDocComment extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"/**\n" +
"* This is a comment\n" +
@@ -72,7 +72,7 @@ public class TestAsDocComment extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"/**\n" +
" * This is a comment\n" +
@@ -101,7 +101,7 @@ public class TestAsDocComment extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"package com.example\n" +
"{\n" +
@@ -136,7 +136,7 @@ public class TestAsDocComment extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"/**\n" +
" * This is a comment\n" +
@@ -165,7 +165,7 @@ public class TestAsDocComment extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"class MyClass\n" +
"{\n" +
@@ -196,7 +196,7 @@ public class TestAsDocComment extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"class MyClass\n" +
"{\n" +
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestAutomaticSemicolonInsertion.java b/formatter/src/test/java/org/apache/royale/formatter/TestAutomaticSemicolonInsertion.java
index 812db61..d82f1e8 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestAutomaticSemicolonInsertion.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestAutomaticSemicolonInsertion.java
@@ -29,7 +29,7 @@ public class TestAutomaticSemicolonInsertion extends BaseFormatterTests {
public void testInvalid() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"identifier1 identifier2;",
// @formatter:on
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestBitwiseOperators.java b/formatter/src/test/java/org/apache/royale/formatter/TestBitwiseOperators.java
index dceeb21..be72e58 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestBitwiseOperators.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestBitwiseOperators.java
@@ -28,7 +28,7 @@ public class TestBitwiseOperators extends BaseFormatterTests {
public void testBitwiseNotOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"~a;",
// @formatter:on
@@ -45,7 +45,7 @@ public class TestBitwiseOperators extends BaseFormatterTests {
public void testBitwiseAndOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a&b;",
// @formatter:on
@@ -62,7 +62,7 @@ public class TestBitwiseOperators extends BaseFormatterTests {
public void testBitwiseOrOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a|b;",
// @formatter:on
@@ -79,7 +79,7 @@ public class TestBitwiseOperators extends BaseFormatterTests {
public void testBitwiseXorOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a^b;",
// @formatter:on
@@ -96,7 +96,7 @@ public class TestBitwiseOperators extends BaseFormatterTests {
public void testBitwiseLeftShiftOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a<<b;",
// @formatter:on
@@ -113,7 +113,7 @@ public class TestBitwiseOperators extends BaseFormatterTests {
public void testBitwiseRightShiftOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a>>b;",
// @formatter:on
@@ -130,7 +130,7 @@ public class TestBitwiseOperators extends BaseFormatterTests {
public void testBitwiseRightUnsignedShiftOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a>>>b;",
// @formatter:on
@@ -147,7 +147,7 @@ public class TestBitwiseOperators extends BaseFormatterTests {
public void testBitwiseAndCompoundAssignmentOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a&=b;",
// @formatter:on
@@ -164,7 +164,7 @@ public class TestBitwiseOperators extends BaseFormatterTests {
public void testBitwiseOrCompoundAssignmentOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a|=b;",
// @formatter:on
@@ -181,7 +181,7 @@ public class TestBitwiseOperators extends BaseFormatterTests {
public void testBitwiseXorCompoundAssignmentOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a^=b;",
// @formatter:on
@@ -198,7 +198,7 @@ public class TestBitwiseOperators extends BaseFormatterTests {
public void testBitwiseLeftShiftCompoundAssignmentOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a<<=b;",
// @formatter:on
@@ -215,7 +215,7 @@ public class TestBitwiseOperators extends BaseFormatterTests {
public void testBitwiseRightShiftCompoundAssignmentOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a>>=b;",
// @formatter:on
@@ -232,7 +232,7 @@ public class TestBitwiseOperators extends BaseFormatterTests {
public void testBitwiseRightUnsignedShiftCompoundAssignmentOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a>>>=b;",
// @formatter:on
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestBreakStatement.java b/formatter/src/test/java/org/apache/royale/formatter/TestBreakStatement.java
index 08a58ed..b3e9487 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestBreakStatement.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestBreakStatement.java
@@ -30,7 +30,7 @@ public class TestBreakStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"break;",
// @formatter:on
@@ -49,7 +49,7 @@ public class TestBreakStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"break",
// @formatter:on
@@ -68,7 +68,7 @@ public class TestBreakStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"break label;",
// @formatter:on
@@ -87,7 +87,7 @@ public class TestBreakStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"break label",
// @formatter:on
@@ -106,7 +106,7 @@ public class TestBreakStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"break\n" +
"label;",
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestClassDeclaration.java b/formatter/src/test/java/org/apache/royale/formatter/TestClassDeclaration.java
index 61fd476..3109b92 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestClassDeclaration.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestClassDeclaration.java
@@ -29,7 +29,7 @@ public class TestClassDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"class MyClass {\n" +
"}",
@@ -51,7 +51,7 @@ public class TestClassDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"class MyClass\n" +
"{\n" +
@@ -73,7 +73,7 @@ public class TestClassDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"class MyClass {\n" +
"\tstatement;\n" +
@@ -97,7 +97,7 @@ public class TestClassDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"class MyClass\n" +
"{\n" +
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestComparisonOperators.java b/formatter/src/test/java/org/apache/royale/formatter/TestComparisonOperators.java
index f34cf1e..6d0e7ce 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestComparisonOperators.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestComparisonOperators.java
@@ -28,7 +28,7 @@ public class TestComparisonOperators extends BaseFormatterTests {
public void testEqualityOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a==b;",
// @formatter:on
@@ -44,7 +44,7 @@ public class TestComparisonOperators extends BaseFormatterTests {
public void testInqualityOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a!=b;",
// @formatter:on
@@ -61,7 +61,7 @@ public class TestComparisonOperators extends BaseFormatterTests {
public void testStrictEqualityOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a===b;",
// @formatter:on
@@ -77,7 +77,7 @@ public class TestComparisonOperators extends BaseFormatterTests {
public void testStrictInqualityOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a!==b;",
// @formatter:on
@@ -94,7 +94,7 @@ public class TestComparisonOperators extends BaseFormatterTests {
public void testGreaterThanOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a>b;",
// @formatter:on
@@ -111,7 +111,7 @@ public class TestComparisonOperators extends BaseFormatterTests {
public void testLessThanOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a<b;",
// @formatter:on
@@ -128,7 +128,7 @@ public class TestComparisonOperators extends BaseFormatterTests {
public void testGreaterThanOrEqualOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a>=b;",
// @formatter:on
@@ -145,7 +145,7 @@ public class TestComparisonOperators extends BaseFormatterTests {
public void testLessThanOrEqualOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a<=b;",
// @formatter:on
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestConstDeclaration.java b/formatter/src/test/java/org/apache/royale/formatter/TestConstDeclaration.java
index 6eff314..5286fc6 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestConstDeclaration.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestConstDeclaration.java
@@ -30,7 +30,7 @@ public class TestConstDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"const myConst",
// @formatter:on
@@ -49,7 +49,7 @@ public class TestConstDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"const myConst:String",
// @formatter:on
@@ -68,7 +68,7 @@ public class TestConstDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"const myConst:Number = 123.4;",
// @formatter:on
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestContinueStatement.java b/formatter/src/test/java/org/apache/royale/formatter/TestContinueStatement.java
index 3db11b7..3a9d1c7 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestContinueStatement.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestContinueStatement.java
@@ -31,7 +31,7 @@ public class TestContinueStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"continue;",
// @formatter:on
@@ -50,7 +50,7 @@ public class TestContinueStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"continue",
// @formatter:on
@@ -69,7 +69,7 @@ public class TestContinueStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"continue label;",
// @formatter:on
@@ -88,7 +88,7 @@ public class TestContinueStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"continue label",
// @formatter:on
@@ -107,7 +107,7 @@ public class TestContinueStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"continue\n" +
"label;",
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestDecrementOperator.java b/formatter/src/test/java/org/apache/royale/formatter/TestDecrementOperator.java
index 87c40aa..718607c 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestDecrementOperator.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestDecrementOperator.java
@@ -30,7 +30,7 @@ public class TestDecrementOperator extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"i--;",
// @formatter:on
@@ -49,7 +49,7 @@ public class TestDecrementOperator extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"--i;",
// @formatter:on
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestDefaultXMLNamespaceDirective.java b/formatter/src/test/java/org/apache/royale/formatter/TestDefaultXMLNamespaceDirective.java
index c83e520..bf3e95b 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestDefaultXMLNamespaceDirective.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestDefaultXMLNamespaceDirective.java
@@ -30,7 +30,7 @@ public class TestDefaultXMLNamespaceDirective extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"default xml namespace = ns;",
// @formatter:on
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestDeleteOperator.java b/formatter/src/test/java/org/apache/royale/formatter/TestDeleteOperator.java
index 8e57ee5..fcddbe5 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestDeleteOperator.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestDeleteOperator.java
@@ -30,7 +30,7 @@ public class TestDeleteOperator extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"delete myVar;",
// @formatter:on
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestDoWhileStatement.java b/formatter/src/test/java/org/apache/royale/formatter/TestDoWhileStatement.java
index c5b9f82..b96a2a3 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestDoWhileStatement.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestDoWhileStatement.java
@@ -30,7 +30,7 @@ public class TestDoWhileStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"do {\n" +
"}\n" +
@@ -53,7 +53,7 @@ public class TestDoWhileStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"do\n" +
"{\n" +
@@ -77,7 +77,7 @@ public class TestDoWhileStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"do\n" +
"{\n" +
@@ -104,7 +104,7 @@ public class TestDoWhileStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = false;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"do\n" +
"{\n" +
@@ -131,7 +131,7 @@ public class TestDoWhileStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"do {\n" +
"\tstatement;\n" +
@@ -157,7 +157,7 @@ public class TestDoWhileStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"do\n" +
"{\n" +
@@ -183,7 +183,7 @@ public class TestDoWhileStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"do statement;\n" +
"while (true);",
@@ -205,7 +205,7 @@ public class TestDoWhileStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"do;\n" +
"while (true);",
@@ -226,7 +226,7 @@ public class TestDoWhileStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tdo\n" +
@@ -257,7 +257,7 @@ public class TestDoWhileStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tdo\n" +
@@ -286,7 +286,7 @@ public class TestDoWhileStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tdo\n" +
@@ -319,7 +319,7 @@ public class TestDoWhileStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tdo;\n" +
@@ -346,7 +346,7 @@ public class TestDoWhileStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"do // comment\n" +
"{\n" +
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestElseIfStatement.java b/formatter/src/test/java/org/apache/royale/formatter/TestElseIfStatement.java
index 8808303..8b245db 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestElseIfStatement.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestElseIfStatement.java
@@ -30,7 +30,7 @@ public class TestElseIfStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (condition1) {\n" +
"\tstatement;\n" +
@@ -59,7 +59,7 @@ public class TestElseIfStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (condition1)\n" +
"{\n" +
@@ -88,7 +88,7 @@ public class TestElseIfStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (condition1) {\n" +
"}\n" +
@@ -115,7 +115,7 @@ public class TestElseIfStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (condition1)\n" +
"{\n" +
@@ -142,7 +142,7 @@ public class TestElseIfStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if(condition1)\n" +
"{\n" +
@@ -175,7 +175,7 @@ public class TestElseIfStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = false;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (condition1)\n" +
"{\n" +
@@ -208,7 +208,7 @@ public class TestElseIfStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (condition1) {\n" +
"\tstatement;\n" +
@@ -239,7 +239,7 @@ public class TestElseIfStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (condition1)\n" +
"{\n" +
@@ -270,7 +270,7 @@ public class TestElseIfStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (condition1) statement;\n" +
"else if (condition2) statement;",
@@ -293,7 +293,7 @@ public class TestElseIfStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (condition1);\n" +
"else if (condition2);",
@@ -314,7 +314,7 @@ public class TestElseIfStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tif (condition1)\n" +
@@ -349,7 +349,7 @@ public class TestElseIfStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tif (condition1)\n" +
@@ -380,7 +380,7 @@ public class TestElseIfStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tif (condition1)\n" +
@@ -419,7 +419,7 @@ public class TestElseIfStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tif (condition1);\n" +
@@ -446,7 +446,7 @@ public class TestElseIfStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (condition)\n" +
"{\n" +
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestElseStatement.java b/formatter/src/test/java/org/apache/royale/formatter/TestElseStatement.java
index e550d7b..5df628d 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestElseStatement.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestElseStatement.java
@@ -30,7 +30,7 @@ public class TestElseStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (condition) {\n" +
"\tstatement;\n" +
@@ -59,7 +59,7 @@ public class TestElseStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (condition)\n" +
"{\n" +
@@ -88,7 +88,7 @@ public class TestElseStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (condition) {\n" +
"}\n" +
@@ -115,7 +115,7 @@ public class TestElseStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (condition)\n" +
"{\n" +
@@ -142,7 +142,7 @@ public class TestElseStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (condition) {\n" +
"\tstatement;\n" +
@@ -173,7 +173,7 @@ public class TestElseStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (condition)\n" +
"{\n" +
@@ -204,7 +204,7 @@ public class TestElseStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (condition) statement;\n" +
"else statement;",
@@ -227,7 +227,7 @@ public class TestElseStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (true);\n" +
"else;",
@@ -249,7 +249,7 @@ public class TestElseStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"function myFunction():void\n" +
"{\n" +
@@ -288,7 +288,7 @@ public class TestElseStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tif (condition)\n" +
@@ -323,7 +323,7 @@ public class TestElseStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tif (true)\n" +
@@ -354,7 +354,7 @@ public class TestElseStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tif (true)\n" +
@@ -393,7 +393,7 @@ public class TestElseStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tif (true);\n" +
@@ -421,7 +421,7 @@ public class TestElseStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (true)\n" +
"{\n" +
@@ -454,7 +454,7 @@ public class TestElseStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (true)\n" +
"{\n" +
@@ -485,7 +485,7 @@ public class TestElseStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (condition)\n" +
"{\n" +
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestFieldDeclaration.java b/formatter/src/test/java/org/apache/royale/formatter/TestFieldDeclaration.java
index 1be874c..a5e9ed0 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestFieldDeclaration.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestFieldDeclaration.java
@@ -30,7 +30,7 @@ public class TestFieldDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"class ClassWithField\n" +
"{\n" +
@@ -55,7 +55,7 @@ public class TestFieldDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"class ClassWithField\n" +
"{\n" +
@@ -80,7 +80,7 @@ public class TestFieldDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"class ClassWithField\n" +
"{\n" +
@@ -105,7 +105,7 @@ public class TestFieldDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"class ClassWithField\n" +
"{\n" +
@@ -130,7 +130,7 @@ public class TestFieldDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"class ClassWithField\n" +
"{\n" +
@@ -155,7 +155,7 @@ public class TestFieldDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"class ClassWithField\n" +
"{\n" +
@@ -183,7 +183,7 @@ public class TestFieldDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"class ClassWithField\n" +
"{\n" +
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestForEachStatement.java b/formatter/src/test/java/org/apache/royale/formatter/TestForEachStatement.java
index 4d4757f..6325bc0 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestForEachStatement.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestForEachStatement.java
@@ -30,7 +30,7 @@ public class TestForEachStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"for each (var item:Object in array) {\n" +
"}",
@@ -52,7 +52,7 @@ public class TestForEachStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"for each (var item:Object in array)\n" +
"{\n" +
@@ -74,7 +74,7 @@ public class TestForEachStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"for each(var item:Object in array)\n" +
"{\n" +
@@ -99,7 +99,7 @@ public class TestForEachStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = false;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"for each (var item:Object in array)\n" +
"{\n" +
@@ -124,7 +124,7 @@ public class TestForEachStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"for each (var item:Object in array) {\n" +
"\tstatement;\n" +
@@ -148,7 +148,7 @@ public class TestForEachStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"for each (var item:Object in array)\n" +
"{\n" +
@@ -172,7 +172,7 @@ public class TestForEachStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"for each (var item:Object in array) statement;",
// @formatter:on
@@ -192,7 +192,7 @@ public class TestForEachStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"for each (var item:Object in array);",
// @formatter:on
@@ -211,7 +211,7 @@ public class TestForEachStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tfor each (var item:Object in array)\n" +
@@ -240,7 +240,7 @@ public class TestForEachStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tfor each (var item:Object in array)\n" +
@@ -267,7 +267,7 @@ public class TestForEachStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tfor each (var item:Object in array)\n" +
@@ -298,7 +298,7 @@ public class TestForEachStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tfor each (var item:Object in array);\n" +
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestForInStatement.java b/formatter/src/test/java/org/apache/royale/formatter/TestForInStatement.java
index d6255ed..bbb9a51 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestForInStatement.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestForInStatement.java
@@ -30,7 +30,7 @@ public class TestForInStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"for (var key:String in object) {\n" +
"}",
@@ -53,7 +53,7 @@ public class TestForInStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"for (var key:String in object)\n" +
"{\n" +
@@ -75,7 +75,7 @@ public class TestForInStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"for(var key:String in object)\n" +
"{\n" +
@@ -100,7 +100,7 @@ public class TestForInStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = false;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"for (var key:String in object)\n" +
"{\n" +
@@ -125,7 +125,7 @@ public class TestForInStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"for (var key:String in object) {\n" +
"\tstatement;\n" +
@@ -149,7 +149,7 @@ public class TestForInStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"for (var key:String in object)\n" +
"{\n" +
@@ -173,7 +173,7 @@ public class TestForInStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"for (var key:String in object) statement;",
// @formatter:on
@@ -193,7 +193,7 @@ public class TestForInStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"for (var key:String in object);",
// @formatter:on
@@ -212,7 +212,7 @@ public class TestForInStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tfor each (var key:String in object)\n" +
@@ -241,7 +241,7 @@ public class TestForInStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tfor (var key:String in object)\n" +
@@ -268,7 +268,7 @@ public class TestForInStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tfor (var key:String in object)\n" +
@@ -299,7 +299,7 @@ public class TestForInStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tfor (var key:String in object);\n" +
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestForStatement.java b/formatter/src/test/java/org/apache/royale/formatter/TestForStatement.java
index a044180..48032ce 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestForStatement.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestForStatement.java
@@ -30,7 +30,7 @@ public class TestForStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"for (var i:int = 0; i < 3; i++) {\n" +
"}",
@@ -52,7 +52,7 @@ public class TestForStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"for (var i:int = 0; i < 3; i++)\n" +
"{\n" +
@@ -74,7 +74,7 @@ public class TestForStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"for(var i:int = 0; i < 3; i++)\n" +
"{\n" +
@@ -99,7 +99,7 @@ public class TestForStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = false;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"for (var i:int = 0; i < 3; i++)\n" +
"{\n" +
@@ -124,7 +124,7 @@ public class TestForStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"for (var i:int = 0; i < 3; i++) {\n" +
"\tstatement;\n" +
@@ -148,7 +148,7 @@ public class TestForStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"for (var i:int = 0; i < 3; i++)\n" +
"{\n" +
@@ -172,7 +172,7 @@ public class TestForStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"for (var i:int = 0; i < 3; i++) statement;",
// @formatter:on
@@ -192,7 +192,7 @@ public class TestForStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"for (var i:int = 0; i < 3; i++);",
// @formatter:on
@@ -210,7 +210,7 @@ public class TestForStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (condition)\n" +
"{\n" +
@@ -241,7 +241,7 @@ public class TestForStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tfor (var i:int = 0; i < 3; i++)\n" +
@@ -270,7 +270,7 @@ public class TestForStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tfor (var i:int = 0; i < 3; i++)\n" +
@@ -297,7 +297,7 @@ public class TestForStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tfor (var i:int = 0; i < 3; i++)\n" +
@@ -328,7 +328,7 @@ public class TestForStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tfor (var i:int = 0; i < 3; i++);\n" +
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestFunctionDeclaration.java b/formatter/src/test/java/org/apache/royale/formatter/TestFunctionDeclaration.java
index a15fa8d..13de967 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestFunctionDeclaration.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestFunctionDeclaration.java
@@ -31,7 +31,7 @@ public class TestFunctionDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"function myFunction() {\n" +
"}",
@@ -53,7 +53,7 @@ public class TestFunctionDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"function myFunction()\n" +
"{\n" +
@@ -75,7 +75,7 @@ public class TestFunctionDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"function myFunction() {\n" +
"\tstatement;\n" +
@@ -99,7 +99,7 @@ public class TestFunctionDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"function myFunction()\n" +
"{\n" +
@@ -123,7 +123,7 @@ public class TestFunctionDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"function myFunction():void\n" +
"{\n" +
@@ -148,7 +148,7 @@ public class TestFunctionDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"function myFunction(p1:String)\n" +
"{\n" +
@@ -173,7 +173,7 @@ public class TestFunctionDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"function myFunction(p1:String, p2:Number)\n" +
"{\n" +
@@ -198,7 +198,7 @@ public class TestFunctionDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"function myFunction(p1:String,\n" +
"p2:Number):void\n" +
@@ -227,7 +227,7 @@ public class TestFunctionDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"function myFunction(p1:String, ...rest)\n" +
"{\n" +
@@ -252,7 +252,7 @@ public class TestFunctionDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"function myFunction(...rest)\n" +
"{\n" +
@@ -277,7 +277,7 @@ public class TestFunctionDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"(function myFunction(...rest)\n" +
"{\n" +
@@ -302,7 +302,7 @@ public class TestFunctionDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"identifier(function myFunction(...rest)\n" +
"{\n" +
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestIdentifier.java b/formatter/src/test/java/org/apache/royale/formatter/TestIdentifier.java
index af37e89..f56c396 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestIdentifier.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestIdentifier.java
@@ -27,7 +27,7 @@ public class TestIdentifier extends BaseFormatterTests {
public void testBasic() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"identifier;",
// @formatter:on
@@ -44,7 +44,7 @@ public class TestIdentifier extends BaseFormatterTests {
public void testUnaryPlus() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"+identifier;",
// @formatter:on
@@ -61,7 +61,7 @@ public class TestIdentifier extends BaseFormatterTests {
public void testUnaryPlusWithLeadingOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"var a = +identifier;",
// @formatter:on
@@ -78,7 +78,7 @@ public class TestIdentifier extends BaseFormatterTests {
public void testUnaryMinus() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"-identifier;",
// @formatter:on
@@ -95,7 +95,7 @@ public class TestIdentifier extends BaseFormatterTests {
public void testUnaryMinusWithLeadingOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"var a = -identifier;",
// @formatter:on
@@ -112,7 +112,7 @@ public class TestIdentifier extends BaseFormatterTests {
public void testUnaryMinusWithParentheses() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"(-identifier);",
// @formatter:on
@@ -129,7 +129,7 @@ public class TestIdentifier extends BaseFormatterTests {
public void testUnaryMinusWithBrackets() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a[-identifier];",
// @formatter:on
@@ -146,7 +146,7 @@ public class TestIdentifier extends BaseFormatterTests {
public void testUnaryMinusWithBlock() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\t-identifier;\n" +
@@ -167,7 +167,7 @@ public class TestIdentifier extends BaseFormatterTests {
public void testUnaryMinusWithSemicolon() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a;\n" +
"-identifier;",
@@ -186,7 +186,7 @@ public class TestIdentifier extends BaseFormatterTests {
public void testUnaryMinusWithReturn() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"return -identifier;",
// @formatter:on
@@ -203,7 +203,7 @@ public class TestIdentifier extends BaseFormatterTests {
public void testUnaryMinusWithComma() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"var array = [identifier, -identifier];",
// @formatter:on
@@ -220,7 +220,7 @@ public class TestIdentifier extends BaseFormatterTests {
public void testUnaryMinusWithColon() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"var obj = {field: -identifier};",
// @formatter:on
@@ -237,7 +237,7 @@ public class TestIdentifier extends BaseFormatterTests {
public void testNot() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"!identifier;",
// @formatter:on
@@ -254,7 +254,7 @@ public class TestIdentifier extends BaseFormatterTests {
public void testDoubleNot() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"!!identifier;",
// @formatter:on
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestIfStatement.java b/formatter/src/test/java/org/apache/royale/formatter/TestIfStatement.java
index 73e984e..cf931e3 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestIfStatement.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestIfStatement.java
@@ -30,7 +30,7 @@ public class TestIfStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (true) {\n" +
"}",
@@ -52,7 +52,7 @@ public class TestIfStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (true)\n" +
"{\n" +
@@ -74,7 +74,7 @@ public class TestIfStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if(true)\n" +
"{\n" +
@@ -99,7 +99,7 @@ public class TestIfStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = false;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (true)\n" +
"{\n" +
@@ -124,7 +124,7 @@ public class TestIfStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (true) {\n" +
"\tstatement;\n" +
@@ -148,7 +148,7 @@ public class TestIfStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (true)\n" +
"{\n" +
@@ -172,7 +172,7 @@ public class TestIfStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (true) statement;",
// @formatter:on
@@ -192,7 +192,7 @@ public class TestIfStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (true);",
// @formatter:on
@@ -211,7 +211,7 @@ public class TestIfStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (true) //comment\n" +
"{\n" +
@@ -236,7 +236,7 @@ public class TestIfStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (true)\n" +
"{\n" +
@@ -261,7 +261,7 @@ public class TestIfStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tif (condition)\n" +
@@ -290,7 +290,7 @@ public class TestIfStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tif (true)\n" +
@@ -317,7 +317,7 @@ public class TestIfStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tif (true)\n" +
@@ -348,7 +348,7 @@ public class TestIfStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tif (true);\n" +
@@ -373,7 +373,7 @@ public class TestIfStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (condition1)\n" +
"{\n" +
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestImportDirective.java b/formatter/src/test/java/org/apache/royale/formatter/TestImportDirective.java
index 76adea8..bc1039a 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestImportDirective.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestImportDirective.java
@@ -30,7 +30,7 @@ public class TestImportDirective extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"import com.example.MyClass;",
// @formatter:on
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestIncludeDirective.java b/formatter/src/test/java/org/apache/royale/formatter/TestIncludeDirective.java
index 9f2c2e4..1e6c28b 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestIncludeDirective.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestIncludeDirective.java
@@ -30,7 +30,7 @@ public class TestIncludeDirective extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"include \"file.as\";",
// @formatter:on
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestIncrementOperator.java b/formatter/src/test/java/org/apache/royale/formatter/TestIncrementOperator.java
index c8dd3ad..ab26ee1 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestIncrementOperator.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestIncrementOperator.java
@@ -30,7 +30,7 @@ public class TestIncrementOperator extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"i++;",
// @formatter:on
@@ -49,7 +49,7 @@ public class TestIncrementOperator extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"++i;",
// @formatter:on
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestInterfaceDeclaration.java b/formatter/src/test/java/org/apache/royale/formatter/TestInterfaceDeclaration.java
index 149ab72..c367401 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestInterfaceDeclaration.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestInterfaceDeclaration.java
@@ -30,7 +30,7 @@ public class TestInterfaceDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"interface MyInterface {\n" +
"}",
@@ -52,7 +52,7 @@ public class TestInterfaceDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"interface MyInterface\n" +
"{\n" +
@@ -74,7 +74,7 @@ public class TestInterfaceDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"interface MyInterface {\n" +
"\tstatement;\n" +
@@ -98,7 +98,7 @@ public class TestInterfaceDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"interface MyInterface\n" +
"{\n" +
@@ -122,7 +122,7 @@ public class TestInterfaceDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"interface MyInterface\n" +
"{\n" +
@@ -147,7 +147,7 @@ public class TestInterfaceDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"interface MyInterface\n" +
"{\n" +
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestLogicalOperators.java b/formatter/src/test/java/org/apache/royale/formatter/TestLogicalOperators.java
index a03f51c..b75d689 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestLogicalOperators.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestLogicalOperators.java
@@ -28,7 +28,7 @@ public class TestLogicalOperators extends BaseFormatterTests {
public void testLogicalNotOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"!a;",
// @formatter:on
@@ -45,7 +45,7 @@ public class TestLogicalOperators extends BaseFormatterTests {
public void testLogicalAndOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a&&b;",
// @formatter:on
@@ -62,7 +62,7 @@ public class TestLogicalOperators extends BaseFormatterTests {
public void testLogicalOrOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a||b;",
// @formatter:on
@@ -79,7 +79,7 @@ public class TestLogicalOperators extends BaseFormatterTests {
public void testLogicalAndCompoundAssignmentOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a&&=b;",
// @formatter:on
@@ -96,7 +96,7 @@ public class TestLogicalOperators extends BaseFormatterTests {
public void testLogicalOrCompoundAssignmentOperator() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a||=b;",
// @formatter:on
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestMetadata.java b/formatter/src/test/java/org/apache/royale/formatter/TestMetadata.java
index ae6a118..d678533 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestMetadata.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestMetadata.java
@@ -30,7 +30,7 @@ public class TestMetadata extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"[UnknownMetaTag]\n" +
"class MyClass\n" +
@@ -55,7 +55,7 @@ public class TestMetadata extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"[UnknownMetaTag(\"value\")]\n" +
"class MyClass\n" +
@@ -80,7 +80,7 @@ public class TestMetadata extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"[UnknownMetaTag(unknownAttr=\"value\")]\n" +
"class MyClass\n" +
@@ -105,7 +105,7 @@ public class TestMetadata extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"[UnknownMetaTag(unknownAttr1=\"value1\",unknownAttr2=\"value2\")]\n" +
"class MyClass\n" +
@@ -130,7 +130,7 @@ public class TestMetadata extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"[Event(name=\"change\", type=\"flash.events.Event\")]\n" +
"class MyClass\n" +
@@ -155,7 +155,7 @@ public class TestMetadata extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"class MyClass\n" +
"{\n" +
@@ -182,7 +182,7 @@ public class TestMetadata extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"class MyClass\n" +
"{\n" +
@@ -209,7 +209,7 @@ public class TestMetadata extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"class MyClass\n" +
"{\n" +
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestMethodDeclaration.java b/formatter/src/test/java/org/apache/royale/formatter/TestMethodDeclaration.java
index ed25ded..9d36fdb 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestMethodDeclaration.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestMethodDeclaration.java
@@ -30,7 +30,7 @@ public class TestMethodDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"class ClassWithMethod\n" +
"{\n" +
@@ -59,7 +59,7 @@ public class TestMethodDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"class ClassWithMethod\n" +
"{\n" +
@@ -86,7 +86,7 @@ public class TestMethodDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"class ClassWithMethod\n" +
"{\n" +
@@ -116,7 +116,7 @@ public class TestMethodDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"class ClassWithMethod\n" +
"{\n" +
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestMiscellaneousOperators.java b/formatter/src/test/java/org/apache/royale/formatter/TestMiscellaneousOperators.java
index 12ca619..2897ff5 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestMiscellaneousOperators.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestMiscellaneousOperators.java
@@ -27,7 +27,7 @@ public class TestMiscellaneousOperators extends BaseFormatterTests {
@Test
public void testAssignmentOperator() {
FORMATTER formatter = new FORMATTER();
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"a=b;",
// @formatter:on
@@ -43,7 +43,7 @@ public class TestMiscellaneousOperators extends BaseFormatterTests {
@Test
public void testNamespaceQualifierOperator() {
FORMATTER formatter = new FORMATTER();
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"ns::myVar;",
// @formatter:on
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestMultiLineComment.java b/formatter/src/test/java/org/apache/royale/formatter/TestMultiLineComment.java
index c3f8b24..c55a310 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestMultiLineComment.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestMultiLineComment.java
@@ -30,7 +30,7 @@ public class TestMultiLineComment extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"statement; /* this is a comment */",
// @formatter:on
@@ -49,7 +49,7 @@ public class TestMultiLineComment extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"/* this is a comment */\n" +
"statement;",
@@ -70,7 +70,7 @@ public class TestMultiLineComment extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"statement;\n" +
"/* this is a comment */",
@@ -91,7 +91,7 @@ public class TestMultiLineComment extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"/*\n" +
"\tthis is a comment\n" +
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestNumberLiteral.java b/formatter/src/test/java/org/apache/royale/formatter/TestNumberLiteral.java
index 1148e8f..9075f39 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestNumberLiteral.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestNumberLiteral.java
@@ -28,7 +28,7 @@ public class TestNumberLiteral extends BaseFormatterTests {
public void testFloat() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"123.4;",
// @formatter:on
@@ -45,7 +45,7 @@ public class TestNumberLiteral extends BaseFormatterTests {
public void testInt() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"123;",
// @formatter:on
@@ -62,7 +62,7 @@ public class TestNumberLiteral extends BaseFormatterTests {
public void testNegative() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"-123;",
// @formatter:on
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestObjectLiteral.java b/formatter/src/test/java/org/apache/royale/formatter/TestObjectLiteral.java
index 980cf15..91fc018 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestObjectLiteral.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestObjectLiteral.java
@@ -28,7 +28,7 @@ public class TestObjectLiteral extends BaseFormatterTests {
public void testEmpty() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"var obj:Object = {};",
// @formatter:on
@@ -45,7 +45,7 @@ public class TestObjectLiteral extends BaseFormatterTests {
public void testOneFieldOnSingleLine() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"var obj:Object = {one: 123.4};",
// @formatter:on
@@ -62,7 +62,7 @@ public class TestObjectLiteral extends BaseFormatterTests {
public void testOneFieldOnMultipleLines() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"var obj:Object = {\n" +
"\tone: 123.4\n" +
@@ -85,7 +85,7 @@ public class TestObjectLiteral extends BaseFormatterTests {
public void testMultipleFields() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"var obj:Object = {one: 123.4, two: \"hello world\"};",
// @formatter:on
@@ -102,7 +102,7 @@ public class TestObjectLiteral extends BaseFormatterTests {
public void testMultipleFieldsOnMultipleLines() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"var obj:Object = {\n" +
"\tone: 123.4,\n" +
@@ -128,7 +128,7 @@ public class TestObjectLiteral extends BaseFormatterTests {
public void testMultipleFieldsOnMultipleLines2() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"var obj:Object = {\n" +
"\tone: 123.4,\n" +
@@ -153,7 +153,7 @@ public class TestObjectLiteral extends BaseFormatterTests {
public void testStringField() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"var obj:Object = {\"string-field\": 123.4};",
// @formatter:on
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestPackageDeclaration.java b/formatter/src/test/java/org/apache/royale/formatter/TestPackageDeclaration.java
index 606833a..846d9e9 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestPackageDeclaration.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestPackageDeclaration.java
@@ -30,7 +30,7 @@ public class TestPackageDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"package {\n" +
"}",
@@ -53,7 +53,7 @@ public class TestPackageDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"package\n" +
"{\n" +
@@ -75,7 +75,7 @@ public class TestPackageDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"package {\n" +
"\tstatement;\n" +
@@ -99,7 +99,7 @@ public class TestPackageDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"package\n" +
"{\n" +
@@ -123,7 +123,7 @@ public class TestPackageDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"package com.example {\n" +
"\tstatement;\n" +
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestPreserveNewLines.java b/formatter/src/test/java/org/apache/royale/formatter/TestPreserveNewLines.java
index b4e2288..031cb70 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestPreserveNewLines.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestPreserveNewLines.java
@@ -29,7 +29,7 @@ public class TestPreserveNewLines extends BaseFormatterTests {
FORMATTER formatter = new FORMATTER();
formatter.maxPreserveNewLines = 0;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"/* this is a comment */\n" +
"\n" +
@@ -53,7 +53,7 @@ public class TestPreserveNewLines extends BaseFormatterTests {
FORMATTER formatter = new FORMATTER();
formatter.maxPreserveNewLines = 2;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"/* this is a comment */\n" +
"\n" +
@@ -76,7 +76,7 @@ public class TestPreserveNewLines extends BaseFormatterTests {
FORMATTER formatter = new FORMATTER();
formatter.maxPreserveNewLines = 0;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"1 + 2" +
"\n" +
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestRegExp.java b/formatter/src/test/java/org/apache/royale/formatter/TestRegExp.java
index c8ecabf..8e65983 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestRegExp.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestRegExp.java
@@ -28,7 +28,7 @@ public class TestRegExp extends BaseFormatterTests {
public void testRegExp() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"/\\d/g;",
// @formatter:on
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestReturnStatement.java b/formatter/src/test/java/org/apache/royale/formatter/TestReturnStatement.java
index 1b0b7c1..96ca600 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestReturnStatement.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestReturnStatement.java
@@ -31,7 +31,7 @@ public class TestReturnStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"return;",
// @formatter:on
@@ -50,7 +50,7 @@ public class TestReturnStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"return",
// @formatter:on
@@ -69,7 +69,7 @@ public class TestReturnStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"return 123;",
// @formatter:on
@@ -88,7 +88,7 @@ public class TestReturnStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"return 123",
// @formatter:on
@@ -107,7 +107,7 @@ public class TestReturnStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"return\n" +
"123;",
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestSingleLineComment.java b/formatter/src/test/java/org/apache/royale/formatter/TestSingleLineComment.java
index 98f8202..10e26f2 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestSingleLineComment.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestSingleLineComment.java
@@ -31,7 +31,7 @@ public class TestSingleLineComment extends BaseFormatterTests {
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
formatter.insertSpaceAtStartOfLineComment = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"//this is a comment",
// @formatter:on
@@ -50,7 +50,7 @@ public class TestSingleLineComment extends BaseFormatterTests {
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
formatter.insertSpaceAtStartOfLineComment = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"// this is a comment",
// @formatter:on
@@ -70,7 +70,7 @@ public class TestSingleLineComment extends BaseFormatterTests {
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
formatter.insertSpaceAtStartOfLineComment = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"statement; // this is a comment",
// @formatter:on
@@ -90,7 +90,7 @@ public class TestSingleLineComment extends BaseFormatterTests {
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
formatter.insertSpaceAtStartOfLineComment = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"// this is a comment\n" +
"statement;",
@@ -113,7 +113,7 @@ public class TestSingleLineComment extends BaseFormatterTests {
formatter.insertSpaces = false;
formatter.insertSpaceAtStartOfLineComment = true;
formatter.maxPreserveNewLines = 2;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"// this is a comment\n" +
"\n" +
@@ -137,7 +137,7 @@ public class TestSingleLineComment extends BaseFormatterTests {
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
formatter.insertSpaceAtStartOfLineComment = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"statement;\n" +
"// this is a comment",
@@ -159,7 +159,7 @@ public class TestSingleLineComment extends BaseFormatterTests {
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
formatter.insertSpaceAtStartOfLineComment = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"if (statement) // this is a comment\n" +
"{\n" +
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestStringLiteral.java b/formatter/src/test/java/org/apache/royale/formatter/TestStringLiteral.java
index 437338f..d8ae042 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestStringLiteral.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestStringLiteral.java
@@ -30,7 +30,7 @@ public class TestStringLiteral extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"\"\";",
// @formatter:on
@@ -49,7 +49,7 @@ public class TestStringLiteral extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"\"\\n\";",
// @formatter:on
@@ -68,7 +68,7 @@ public class TestStringLiteral extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"\"\\\"\";",
// @formatter:on
@@ -87,7 +87,7 @@ public class TestStringLiteral extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"\"'\";",
// @formatter:on
@@ -106,7 +106,7 @@ public class TestStringLiteral extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"'\\'';",
// @formatter:on
@@ -125,7 +125,7 @@ public class TestStringLiteral extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"'\"';",
// @formatter:on
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestSwitchStatement.java b/formatter/src/test/java/org/apache/royale/formatter/TestSwitchStatement.java
index 552edb3..d5a7677 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestSwitchStatement.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestSwitchStatement.java
@@ -30,7 +30,7 @@ public class TestSwitchStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"switch (condition) {\n" +
"}",
@@ -52,7 +52,7 @@ public class TestSwitchStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"switch (condition)\n" +
"{\n" +
@@ -74,7 +74,7 @@ public class TestSwitchStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"switch (condition)\n" +
"{\n" +
@@ -101,7 +101,7 @@ public class TestSwitchStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"switch (condition)\n" +
"{\n" +
@@ -130,7 +130,7 @@ public class TestSwitchStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"switch (condition)\n" +
"{\n" +
@@ -159,7 +159,7 @@ public class TestSwitchStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"switch (condition)\n" +
"{\n" +
@@ -190,7 +190,7 @@ public class TestSwitchStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"switch (condition)\n" +
"{\n" +
@@ -223,7 +223,7 @@ public class TestSwitchStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"switch (condition)\n" +
"{\n" +
@@ -250,7 +250,7 @@ public class TestSwitchStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"switch (condition)\n" +
"{\n" +
@@ -279,7 +279,7 @@ public class TestSwitchStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"switch (condition)\n" +
"{\n" +
@@ -308,7 +308,7 @@ public class TestSwitchStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"switch (condition)\n" +
"{\n" +
@@ -339,7 +339,7 @@ public class TestSwitchStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"switch (condition)\n" +
"{\n" +
@@ -372,7 +372,7 @@ public class TestSwitchStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"switch (condition)\n" +
"{\n" +
@@ -403,7 +403,7 @@ public class TestSwitchStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"switch (condition)\n" +
"{\n" +
@@ -434,7 +434,7 @@ public class TestSwitchStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"switch (condition)\n" +
"{\n" +
@@ -467,7 +467,7 @@ public class TestSwitchStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tswitch (condition)\n" +
@@ -496,7 +496,7 @@ public class TestSwitchStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tswitch (condition)\n" +
@@ -529,7 +529,7 @@ public class TestSwitchStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tswitch (condition)\n" +
@@ -564,7 +564,7 @@ public class TestSwitchStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tswitch (condition)\n" +
@@ -601,7 +601,7 @@ public class TestSwitchStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tswitch (condition)\n" +
@@ -634,7 +634,7 @@ public class TestSwitchStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tswitch (condition)\n" +
@@ -669,7 +669,7 @@ public class TestSwitchStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\tswitch (condition)\n" +
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestTernaryStatement.java b/formatter/src/test/java/org/apache/royale/formatter/TestTernaryStatement.java
index 3432198..f9648df 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestTernaryStatement.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestTernaryStatement.java
@@ -30,7 +30,7 @@ public class TestTernaryStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"condition ? statement : statement;",
// @formatter:on
@@ -49,7 +49,7 @@ public class TestTernaryStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"condition ? condition ? statement : statement : condition ? statement : statement;",
// @formatter:on
@@ -67,7 +67,7 @@ public class TestTernaryStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"condition ? {} : {};",
// @formatter:on
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestThrowStatement.java b/formatter/src/test/java/org/apache/royale/formatter/TestThrowStatement.java
index 3029b0e..7c380a9 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestThrowStatement.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestThrowStatement.java
@@ -32,7 +32,7 @@ public class TestThrowStatement extends BaseFormatterTests {
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
formatter.ignoreProblems = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"throw;",
// @formatter:on
@@ -53,7 +53,7 @@ public class TestThrowStatement extends BaseFormatterTests {
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
formatter.ignoreProblems = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"throw",
// @formatter:on
@@ -72,7 +72,7 @@ public class TestThrowStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"throw new Error();",
// @formatter:on
@@ -91,7 +91,7 @@ public class TestThrowStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"throw new Error()",
// @formatter:on
@@ -111,7 +111,7 @@ public class TestThrowStatement extends BaseFormatterTests {
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
formatter.ignoreProblems = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"throw\n" +
"new Error();",
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestTryCatchStatement.java b/formatter/src/test/java/org/apache/royale/formatter/TestTryCatchStatement.java
index a21a0aa..f487278 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestTryCatchStatement.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestTryCatchStatement.java
@@ -30,7 +30,7 @@ public class TestTryCatchStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"try {\n" +
"}\n" +
@@ -57,7 +57,7 @@ public class TestTryCatchStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"try\n" +
"{\n" +
@@ -84,7 +84,7 @@ public class TestTryCatchStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"try\n" +
"{\n" +
@@ -117,7 +117,7 @@ public class TestTryCatchStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = false;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"try\n" +
"{\n" +
@@ -151,7 +151,7 @@ public class TestTryCatchStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"try {\n" +
"\tstatement;\n" +
@@ -182,7 +182,7 @@ public class TestTryCatchStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"try\n" +
"{\n" +
@@ -213,7 +213,7 @@ public class TestTryCatchStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"try // comment\n" +
"{\n" +
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestUseNamespaceDirective.java b/formatter/src/test/java/org/apache/royale/formatter/TestUseNamespaceDirective.java
index c1c50f2..d537637 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestUseNamespaceDirective.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestUseNamespaceDirective.java
@@ -30,7 +30,7 @@ public class TestUseNamespaceDirective extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"use namespace ns;",
// @formatter:on
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestVariableDeclaration.java b/formatter/src/test/java/org/apache/royale/formatter/TestVariableDeclaration.java
index c769066..4959baa 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestVariableDeclaration.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestVariableDeclaration.java
@@ -31,7 +31,7 @@ public class TestVariableDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"var myVar",
// @formatter:on
@@ -50,7 +50,7 @@ public class TestVariableDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"var myVar:String",
// @formatter:on
@@ -69,7 +69,7 @@ public class TestVariableDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"var myVar:Number = 123.4;",
// @formatter:on
@@ -88,7 +88,7 @@ public class TestVariableDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"var myVar:*;",
// @formatter:on
@@ -107,7 +107,7 @@ public class TestVariableDeclaration extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"var myVar:Vector.<*>;",
// @formatter:on
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestWhileStatement.java b/formatter/src/test/java/org/apache/royale/formatter/TestWhileStatement.java
index 3363a7b..d712fb3 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestWhileStatement.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestWhileStatement.java
@@ -30,7 +30,7 @@ public class TestWhileStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"while (true)\n\n{\n" +
"}",
@@ -53,7 +53,7 @@ public class TestWhileStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"while (true)\n" +
"{\n" +
@@ -75,7 +75,7 @@ public class TestWhileStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"while(true)\n" +
"{\n" +
@@ -100,7 +100,7 @@ public class TestWhileStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = false;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"while (true)\n" +
"{\n" +
@@ -125,7 +125,7 @@ public class TestWhileStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"while (true) {\n" +
"\tstatement;\n" +
@@ -149,7 +149,7 @@ public class TestWhileStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = false;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"while (true)\n" +
"{\n" +
@@ -173,7 +173,7 @@ public class TestWhileStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"while (true) statement;",
// @formatter:on
@@ -193,7 +193,7 @@ public class TestWhileStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"while (true);",
// @formatter:on
@@ -212,7 +212,7 @@ public class TestWhileStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\twhile (condition)\n" +
@@ -241,7 +241,7 @@ public class TestWhileStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\twhile (true)\n" +
@@ -268,7 +268,7 @@ public class TestWhileStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\twhile (true)\n" +
@@ -299,7 +299,7 @@ public class TestWhileStatement extends BaseFormatterTests {
formatter.insertSpaceAfterKeywordsInControlFlowStatements = true;
formatter.placeOpenBraceOnNewLine = true;
formatter.insertSpaces = false;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"{\n" +
"\twhile (true);\n" +
diff --git a/formatter/src/test/java/org/apache/royale/formatter/TestXML.java b/formatter/src/test/java/org/apache/royale/formatter/TestXML.java
index b9f5c96..306cbf7 100644
--- a/formatter/src/test/java/org/apache/royale/formatter/TestXML.java
+++ b/formatter/src/test/java/org/apache/royale/formatter/TestXML.java
@@ -28,7 +28,7 @@ public class TestXML extends BaseFormatterTests {
public void testEmptyRootElementOnOneLine() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"<root></root>;",
// @formatter:on
@@ -45,7 +45,7 @@ public class TestXML extends BaseFormatterTests {
public void testEmptyRootElementOnMultipleLines() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"<root>\n" +
"</root>;",
@@ -64,7 +64,7 @@ public class TestXML extends BaseFormatterTests {
public void testSelfClosingRootElement() {
FORMATTER formatter = new FORMATTER();
formatter.insertSpaceBeforeAndAfterBinaryOperators = true;
- String result = formatter.formatText(
+ String result = formatter.formatActionScriptText(
// @formatter:off
"<root/>;",
// @formatter:on