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/06 18:00:27 UTC
[royale-compiler] 04/07: formatter: increase indent when opening
square brackets
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 a9636818171e1c0e98287537fa7c67c15f9852ba
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Wed Oct 6 10:45:05 2021 -0700
formatter: increase indent when opening square brackets
---
.../java/org/apache/royale/formatter/FORMATTER.java | 17 +++++++++++++++--
1 file changed, 15 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 a93fc3f..50a076d 100644
--- a/formatter/src/main/java/org/apache/royale/formatter/FORMATTER.java
+++ b/formatter/src/main/java/org/apache/royale/formatter/FORMATTER.java
@@ -551,7 +551,7 @@ class FORMATTER {
}
if (!blockOpenPending) {
int newLinesInExtra = countNewLinesInExtra(token);
- if(prevToken != null && prevToken.getType() == ASTokenTypes.HIDDEN_TOKEN_SINGLE_LINE_COMMENT) {
+ if (prevToken != null && prevToken.getType() == ASTokenTypes.HIDDEN_TOKEN_SINGLE_LINE_COMMENT) {
newLinesInExtra++;
}
numRequiredNewLines = Math.max(numRequiredNewLines, newLinesInExtra);
@@ -656,6 +656,15 @@ class FORMATTER {
}
break;
}
+ case ASTokenTypes.TOKEN_SQUARE_CLOSE:
+ if (!blockStack.isEmpty()) {
+ BlockStackItem item = blockStack.get(blockStack.size() - 1);
+ if (item.token.getType() == ASTokenTypes.TOKEN_SQUARE_OPEN) {
+ indent = decreaseIndent(indent);
+ blockStack.remove(item);
+ }
+ }
+ break;
case ASTokenTypes.TOKEN_KEYWORD_AS:
case ASTokenTypes.TOKEN_KEYWORD_IS:
case ASTokenTypes.TOKEN_KEYWORD_IN:
@@ -885,6 +894,10 @@ class FORMATTER {
}
break;
}
+ case ASTokenTypes.TOKEN_SQUARE_OPEN:
+ indent = increaseIndent(indent);
+ blockStack.add(new BlockStackItem(token));
+ break;
case ASTokenTypes.TOKEN_OPERATOR_INCREMENT:
case ASTokenTypes.TOKEN_OPERATOR_DECREMENT: {
if (!inControlFlowStatement && prevToken != null
@@ -1195,7 +1208,7 @@ class FORMATTER {
comment = comment.substring(2).trim();
StringBuilder builder = new StringBuilder();
builder.append("//");
- if(insertSpaceAtStartOfLineComment) {
+ if (insertSpaceAtStartOfLineComment) {
builder.append(" ");
}
builder.append(comment);