workaround for broken formatting of action blocks (antlr#25)

matthiasbalke · Mar 10, 2020 · 6fca009 · 6fca009
1 parent bd1b7d8
commit 6fca009
Show file tree

Hide file tree

Showing 3 changed files with 166 additions and 165 deletions.
diff --git a/antlr4-formatter/src/main/java/com/khubla/antlr4formatter/Antlr4FormatterListenerImpl.java b/antlr4-formatter/src/main/java/com/khubla/antlr4formatter/Antlr4FormatterListenerImpl.java
@@ -23,6 +23,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import org.antlr.parser.antlr4.ANTLRv4Parser.ArgActionBlockContext;
 import org.antlr.parser.antlr4.ANTLRv4Parser.ActionBlockContext;
 import org.antlr.parser.antlr4.ANTLRv4Parser.GrammarDeclContext;
 import org.antlr.parser.antlr4.ANTLRv4Parser.LexerRuleSpecContext;
@@ -86,7 +87,7 @@ public static enum IndentType {
    /**
     * rules which are interpreted as literal
     */
-   private static final Set<Class<?>> interpretAsLiteralRules = new HashSet<Class<?>>(Arrays.asList(new Class<?>[] { ActionBlockContext.class }));
+   private static final Set<Class<?>> interpretAsLiteralRules = new HashSet<Class<?>>(Arrays.asList(new Class<?>[] { ArgActionBlockContext.class, ActionBlockContext.class }));
    /**
     * default indent size
     */

diff --git a/antlr4-formatter/src/test/resources/CSharpPreprocessorParser.formatted.g4 b/antlr4-formatter/src/test/resources/CSharpPreprocessorParser.formatted.g4
@@ -1,84 +1,84 @@
-// Eclipse Public License - v 1.0, http://www.eclipse.org/legal/epl-v10.html
-
-
-// Copyright (c) 2013, Christian Wulf (chwchw@gmx.de)
-
-
-// Copyright (c) 2016-2017, Ivan Kochurkin (kvanttt@gmail.com), Positive Technologies.
-
-parser grammar CSharpPreprocessorParser;
-
-
-options { tokenVocab = CSharpLexer; }
-@ parser :: header
-{import java.util.Stack;
-import java.util.HashSet;}
-@ parser :: members
-{Stack<Boolean> conditions = new Stack<Boolean>() {{ conditions.push(true); }};
-public HashSet<String> ConditionalSymbols = new HashSet<String>() {{ ConditionalSymbols.add("DEBUG"); }};
-
-private boolean allConditions() {
-	for(boolean condition: conditions) {
-		if (!condition)
-			return false;
-	}
-	return true;
-}
-}
-preprocessor_directive returns [boolean value]
-   : DEFINE CONDITIONAL_SYMBOL directive_new_line_or_sharp
-   { ConditionalSymbols.add($CONDITIONAL_SYMBOL.text);
-	   $value = allConditions(); } # preprocessorDeclaration
-   | UNDEF CONDITIONAL_SYMBOL directive_new_line_or_sharp
-   { ConditionalSymbols.remove($CONDITIONAL_SYMBOL.text);
-	   $value = allConditions(); } # preprocessorDeclaration
-   | IF expr = preprocessor_expression directive_new_line_or_sharp
-   { $value = $expr.value.equals("true") && allConditions(); conditions.push($expr.value.equals("true")); } # preprocessorConditional
-   | ELIF expr = preprocessor_expression directive_new_line_or_sharp
-   { if (!conditions.peek()) { conditions.pop(); $value = $expr.value.equals("true") && allConditions();
-	     conditions.push($expr.value.equals("true")); } else $value = false; } # preprocessorConditional
-   | ELSE directive_new_line_or_sharp
-   { if (!conditions.peek()) { conditions.pop(); $value = true && allConditions(); conditions.push(true); }
-	    else $value = false; } # preprocessorConditional
-   | ENDIF directive_new_line_or_sharp
-   { conditions.pop(); $value = conditions.peek(); } # preprocessorConditional
-   | LINE (DIGITS STRING? | DEFAULT | DIRECTIVE_HIDDEN) directive_new_line_or_sharp
-   { $value = allConditions(); } # preprocessorLine
-   | ERROR TEXT directive_new_line_or_sharp
-   { $value = allConditions(); } # preprocessorDiagnostic
-   | WARNING TEXT directive_new_line_or_sharp
-   { $value = allConditions(); } # preprocessorDiagnostic
-   | REGION TEXT? directive_new_line_or_sharp
-   { $value = allConditions(); } # preprocessorRegion
-   | ENDREGION TEXT? directive_new_line_or_sharp
-   { $value = allConditions(); } # preprocessorRegion
-   | PRAGMA TEXT directive_new_line_or_sharp
-   { $value = allConditions(); } # preprocessorPragma
-   ;
-
-directive_new_line_or_sharp
-   : DIRECTIVE_NEW_LINE
-   | EOF
-   ;
-
-preprocessor_expression returns [String value]
-   : TRUE
-   { $value = "true"; }
-   | FALSE
-   { $value = "false"; }
-   | CONDITIONAL_SYMBOL
-   { $value = ConditionalSymbols.contains($CONDITIONAL_SYMBOL.text) ? "true" : "false"; }
-   | OPEN_PARENS expr = preprocessor_expression CLOSE_PARENS
-   { $value = $expr.value; }
-   | BANG expr = preprocessor_expression
-   { $value = $expr.value.equals("true") ? "false" : "true"; }
-   | expr1 = preprocessor_expression OP_EQ expr2 = preprocessor_expression
-   { $value = ($expr1.value == $expr2.value ? "true" : "false"); }
-   | expr1 = preprocessor_expression OP_NE expr2 = preprocessor_expression
-   { $value = ($expr1.value != $expr2.value ? "true" : "false"); }
-   | expr1 = preprocessor_expression OP_AND expr2 = preprocessor_expression
-   { $value = ($expr1.value.equals("true") && $expr2.value.equals("true") ? "true" : "false"); }
-   | expr1 = preprocessor_expression OP_OR expr2 = preprocessor_expression
-   { $value = ($expr1.value.equals("true") || $expr2.value.equals("true") ? "true" : "false"); }
-   ;
-
+// Eclipse Public License - v 1.0, http://www.eclipse.org/legal/epl-v10.html
+
+
+// Copyright (c) 2013, Christian Wulf (chwchw@gmx.de)
+
+
+// Copyright (c) 2016-2017, Ivan Kochurkin (kvanttt@gmail.com), Positive Technologies.
+
+parser grammar CSharpPreprocessorParser;
+
+
+options { tokenVocab = CSharpLexer; }
+@ parser :: header
+{import java.util.Stack;
+import java.util.HashSet;}
+@ parser :: members
+{Stack<Boolean> conditions = new Stack<Boolean>() {{ conditions.push(true); }};
+public HashSet<String> ConditionalSymbols = new HashSet<String>() {{ ConditionalSymbols.add("DEBUG"); }};
+
+private boolean allConditions() {
+	for(boolean condition: conditions) {
+		if (!condition)
+			return false;
+	}
+	return true;
+}
+}
+preprocessor_directive returns[boolean value]
+   : DEFINE CONDITIONAL_SYMBOL directive_new_line_or_sharp
+   { ConditionalSymbols.add($CONDITIONAL_SYMBOL.text);
+	   $value = allConditions(); } # preprocessorDeclaration
+   | UNDEF CONDITIONAL_SYMBOL directive_new_line_or_sharp
+   { ConditionalSymbols.remove($CONDITIONAL_SYMBOL.text);
+	   $value = allConditions(); } # preprocessorDeclaration
+   | IF expr = preprocessor_expression directive_new_line_or_sharp
+   { $value = $expr.value.equals("true") && allConditions(); conditions.push($expr.value.equals("true")); } # preprocessorConditional
+   | ELIF expr = preprocessor_expression directive_new_line_or_sharp
+   { if (!conditions.peek()) { conditions.pop(); $value = $expr.value.equals("true") && allConditions();
+	     conditions.push($expr.value.equals("true")); } else $value = false; } # preprocessorConditional
+   | ELSE directive_new_line_or_sharp
+   { if (!conditions.peek()) { conditions.pop(); $value = true && allConditions(); conditions.push(true); }
+	    else $value = false; } # preprocessorConditional
+   | ENDIF directive_new_line_or_sharp
+   { conditions.pop(); $value = conditions.peek(); } # preprocessorConditional
+   | LINE (DIGITS STRING? | DEFAULT | DIRECTIVE_HIDDEN) directive_new_line_or_sharp
+   { $value = allConditions(); } # preprocessorLine
+   | ERROR TEXT directive_new_line_or_sharp
+   { $value = allConditions(); } # preprocessorDiagnostic
+   | WARNING TEXT directive_new_line_or_sharp
+   { $value = allConditions(); } # preprocessorDiagnostic
+   | REGION TEXT? directive_new_line_or_sharp
+   { $value = allConditions(); } # preprocessorRegion
+   | ENDREGION TEXT? directive_new_line_or_sharp
+   { $value = allConditions(); } # preprocessorRegion
+   | PRAGMA TEXT directive_new_line_or_sharp
+   { $value = allConditions(); } # preprocessorPragma
+   ;
+
+directive_new_line_or_sharp
+   : DIRECTIVE_NEW_LINE
+   | EOF
+   ;
+
+preprocessor_expression returns[String value]
+   : TRUE
+   { $value = "true"; }
+   | FALSE
+   { $value = "false"; }
+   | CONDITIONAL_SYMBOL
+   { $value = ConditionalSymbols.contains($CONDITIONAL_SYMBOL.text) ? "true" : "false"; }
+   | OPEN_PARENS expr = preprocessor_expression CLOSE_PARENS
+   { $value = $expr.value; }
+   | BANG expr = preprocessor_expression
+   { $value = $expr.value.equals("true") ? "false" : "true"; }
+   | expr1 = preprocessor_expression OP_EQ expr2 = preprocessor_expression
+   { $value = ($expr1.value == $expr2.value ? "true" : "false"); }
+   | expr1 = preprocessor_expression OP_NE expr2 = preprocessor_expression
+   { $value = ($expr1.value != $expr2.value ? "true" : "false"); }
+   | expr1 = preprocessor_expression OP_AND expr2 = preprocessor_expression
+   { $value = ($expr1.value.equals("true") && $expr2.value.equals("true") ? "true" : "false"); }
+   | expr1 = preprocessor_expression OP_OR expr2 = preprocessor_expression
+   { $value = ($expr1.value.equals("true") || $expr2.value.equals("true") ? "true" : "false"); }
+   ;
+
diff --git a/antlr4-formatter/src/test/resources/CSharpPreprocessorParser.unformatted.g4 b/antlr4-formatter/src/test/resources/CSharpPreprocessorParser.unformatted.g4
@@ -1,81 +1,81 @@
-// Eclipse Public License - v 1.0, http://www.eclipse.org/legal/epl-v10.html
-// Copyright (c) 2013, Christian Wulf (chwchw@gmx.de)
-// Copyright (c) 2016-2017, Ivan Kochurkin (kvanttt@gmail.com), Positive Technologies.
-
-parser grammar CSharpPreprocessorParser;
-
-options { tokenVocab=CSharpLexer; }
-
-@parser::header 
-{import java.util.Stack;
-import java.util.HashSet;}
-
-@parser::members
-{Stack<Boolean> conditions = new Stack<Boolean>() {{ conditions.push(true); }};
-public HashSet<String> ConditionalSymbols = new HashSet<String>() {{ ConditionalSymbols.add("DEBUG"); }};
-
-private boolean allConditions() {
-	for(boolean condition: conditions) {
-		if (!condition)
-			return false;
-	}
-	return true;
-}
-}
-
-preprocessor_directive returns [boolean value]
-	: DEFINE CONDITIONAL_SYMBOL directive_new_line_or_sharp{ ConditionalSymbols.add($CONDITIONAL_SYMBOL.text);
-	   $value = allConditions(); } #preprocessorDeclaration
-
-	| UNDEF CONDITIONAL_SYMBOL directive_new_line_or_sharp{ ConditionalSymbols.remove($CONDITIONAL_SYMBOL.text);
-	   $value = allConditions(); } #preprocessorDeclaration
-
-	| IF expr=preprocessor_expression directive_new_line_or_sharp
-	  { $value = $expr.value.equals("true") && allConditions(); conditions.push($expr.value.equals("true")); }
-	  #preprocessorConditional
-
-	| ELIF expr=preprocessor_expression directive_new_line_or_sharp
-	  { if (!conditions.peek()) { conditions.pop(); $value = $expr.value.equals("true") && allConditions();
-	     conditions.push($expr.value.equals("true")); } else $value = false; }
-	     #preprocessorConditional
-
-	| ELSE directive_new_line_or_sharp
-	  { if (!conditions.peek()) { conditions.pop(); $value = true && allConditions(); conditions.push(true); }
-	    else $value = false; }    #preprocessorConditional
-
-	| ENDIF directive_new_line_or_sharp             { conditions.pop(); $value = conditions.peek(); }
-	   #preprocessorConditional
-	| LINE (DIGITS STRING? | DEFAULT | DIRECTIVE_HIDDEN) directive_new_line_or_sharp { $value = allConditions(); }
-	   #preprocessorLine
-
-	| ERROR TEXT directive_new_line_or_sharp       { $value = allConditions(); }   #preprocessorDiagnostic
-
-	| WARNING TEXT directive_new_line_or_sharp     { $value = allConditions(); }   #preprocessorDiagnostic
-
-	| REGION TEXT? directive_new_line_or_sharp      { $value = allConditions(); }   #preprocessorRegion
-
-	| ENDREGION TEXT? directive_new_line_or_sharp  { $value = allConditions(); }   #preprocessorRegion
-
-	| PRAGMA TEXT directive_new_line_or_sharp      { $value = allConditions(); }   #preprocessorPragma
-	;
-
-directive_new_line_or_sharp
-    : DIRECTIVE_NEW_LINE
-    | EOF
-    ;
-
-preprocessor_expression returns [String value]
-	: TRUE                                 { $value = "true"; }
-	| FALSE                                { $value = "false"; }
-	| CONDITIONAL_SYMBOL                   { $value = ConditionalSymbols.contains($CONDITIONAL_SYMBOL.text) ? "true" : "false"; }
-	| OPEN_PARENS expr=preprocessor_expression CLOSE_PARENS { $value = $expr.value; }
-	| BANG expr=preprocessor_expression     { $value = $expr.value.equals("true") ? "false" : "true"; }
-	| expr1=preprocessor_expression OP_EQ expr2=preprocessor_expression
-	  { $value = ($expr1.value == $expr2.value ? "true" : "false"); }
-	| expr1=preprocessor_expression OP_NE expr2=preprocessor_expression
-	  { $value = ($expr1.value != $expr2.value ? "true" : "false"); }
-	| expr1=preprocessor_expression OP_AND expr2=preprocessor_expression
-	  { $value = ($expr1.value.equals("true") && $expr2.value.equals("true") ? "true" : "false"); }
-	| expr1=preprocessor_expression OP_OR expr2=preprocessor_expression
-	  { $value = ($expr1.value.equals("true") || $expr2.value.equals("true") ? "true" : "false"); }
+// Eclipse Public License - v 1.0, http://www.eclipse.org/legal/epl-v10.html
+// Copyright (c) 2013, Christian Wulf (chwchw@gmx.de)
+// Copyright (c) 2016-2017, Ivan Kochurkin (kvanttt@gmail.com), Positive Technologies.
+
+parser grammar CSharpPreprocessorParser;
+
+options { tokenVocab=CSharpLexer; }
+
+@parser::header 
+{import java.util.Stack;
+import java.util.HashSet;}
+
+@parser::members
+{Stack<Boolean> conditions = new Stack<Boolean>() {{ conditions.push(true); }};
+public HashSet<String> ConditionalSymbols = new HashSet<String>() {{ ConditionalSymbols.add("DEBUG"); }};
+
+private boolean allConditions() {
+	for(boolean condition: conditions) {
+		if (!condition)
+			return false;
+	}
+	return true;
+}
+}
+
+preprocessor_directive returns [boolean value]
+	: DEFINE CONDITIONAL_SYMBOL directive_new_line_or_sharp{ ConditionalSymbols.add($CONDITIONAL_SYMBOL.text);
+	   $value = allConditions(); } #preprocessorDeclaration
+
+	| UNDEF CONDITIONAL_SYMBOL directive_new_line_or_sharp{ ConditionalSymbols.remove($CONDITIONAL_SYMBOL.text);
+	   $value = allConditions(); } #preprocessorDeclaration
+
+	| IF expr=preprocessor_expression directive_new_line_or_sharp
+	  { $value = $expr.value.equals("true") && allConditions(); conditions.push($expr.value.equals("true")); }
+	  #preprocessorConditional
+
+	| ELIF expr=preprocessor_expression directive_new_line_or_sharp
+	  { if (!conditions.peek()) { conditions.pop(); $value = $expr.value.equals("true") && allConditions();
+	     conditions.push($expr.value.equals("true")); } else $value = false; }
+	     #preprocessorConditional
+
+	| ELSE directive_new_line_or_sharp
+	  { if (!conditions.peek()) { conditions.pop(); $value = true && allConditions(); conditions.push(true); }
+	    else $value = false; }    #preprocessorConditional
+
+	| ENDIF directive_new_line_or_sharp             { conditions.pop(); $value = conditions.peek(); }
+	   #preprocessorConditional
+	| LINE (DIGITS STRING? | DEFAULT | DIRECTIVE_HIDDEN) directive_new_line_or_sharp { $value = allConditions(); }
+	   #preprocessorLine
+
+	| ERROR TEXT directive_new_line_or_sharp       { $value = allConditions(); }   #preprocessorDiagnostic
+
+	| WARNING TEXT directive_new_line_or_sharp     { $value = allConditions(); }   #preprocessorDiagnostic
+
+	| REGION TEXT? directive_new_line_or_sharp      { $value = allConditions(); }   #preprocessorRegion
+
+	| ENDREGION TEXT? directive_new_line_or_sharp  { $value = allConditions(); }   #preprocessorRegion
+
+	| PRAGMA TEXT directive_new_line_or_sharp      { $value = allConditions(); }   #preprocessorPragma
+	;
+
+directive_new_line_or_sharp
+    : DIRECTIVE_NEW_LINE
+    | EOF
+    ;
+
+preprocessor_expression returns [String value]
+	: TRUE                                 { $value = "true"; }
+	| FALSE                                { $value = "false"; }
+	| CONDITIONAL_SYMBOL                   { $value = ConditionalSymbols.contains($CONDITIONAL_SYMBOL.text) ? "true" : "false"; }
+	| OPEN_PARENS expr=preprocessor_expression CLOSE_PARENS { $value = $expr.value; }
+	| BANG expr=preprocessor_expression     { $value = $expr.value.equals("true") ? "false" : "true"; }
+	| expr1=preprocessor_expression OP_EQ expr2=preprocessor_expression
+	  { $value = ($expr1.value == $expr2.value ? "true" : "false"); }
+	| expr1=preprocessor_expression OP_NE expr2=preprocessor_expression
+	  { $value = ($expr1.value != $expr2.value ? "true" : "false"); }
+	| expr1=preprocessor_expression OP_AND expr2=preprocessor_expression
+	  { $value = ($expr1.value.equals("true") && $expr2.value.equals("true") ? "true" : "false"); }
+	| expr1=preprocessor_expression OP_OR expr2=preprocessor_expression
+	  { $value = ($expr1.value.equals("true") || $expr2.value.equals("true") ? "true" : "false"); }
 	;