Changeset 30 in default

Timestamp:

11/02/10 17:25:47 (14 years ago)

Author:

zeiss

Message:

 

Location:

trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/formatter

Files:

• EbnfFormatterVisitor.java (modified) (8 diffs)
• FormatterConfig.java (modified) (2 diffs)

trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/formatter/EbnfFormatterVisitor.java

@@ -8 +8 @@
 import org.eclipse.xtext.parsetree.CompositeNode;
 import org.eclipse.xtext.parsetree.LeafNode;
+import org.eclipse.xtext.parsetree.NodeAdapter;
 import org.eclipse.xtext.parsetree.NodeUtil;
 
@@ -52 +53 @@
         private int rightHandSideRuleOffset = 0;
         private Stack<Integer> ruleSpacingStack = new Stack<Integer>();
+        private Double averageSingleDefinitionLength;
         
         public EbnfFormatterVisitor(EObject rootNode, FormatterConfig config) {
@@ -258 +260 @@
                 }
                 buf = result;
-                
         }
 
@@ -294 +295 @@
                 originalTextNoWhitespaces = originalText.replaceAll("[ \t\n\r]", "");
                 
-                //System.out.println(allComments.toString());
                 text("grammar " + node.getName());
                 if (node.getType() != null)
@@ -348 +348 @@
 
         protected void visitBefore(DefinitionList node) {
+                averageSingleDefinitionLength = null;
+                int totalLength = 0;
+                for (int i=0; i < node.eContents().size(); i++) {
+                        CompositeNode parseNode = NodeUtil.getNodeAdapter(node.eContents().get(i)).getParserNode();
+                        totalLength += parseNode.serialize().trim().length();
+                }
+                averageSingleDefinitionLength = (double) totalLength / (double) node.eContents().size();
         }
 
@@ -458 +465 @@
                 
                 lastWasSectionHeading=true;
-//              if (!lastWasSectionHeading || !buf.substring(buf.length()-2).equals("\n\n"))
-//              if (!buf.substring(buf.length()-2).equals("\n\n"))
-//                      buf.append("\n");
                 
                 text(node.getSectionHeader());
@@ -472 +476 @@
 
         protected void visitAfter(SingleDefinition node) {
+                boolean preventAlternativeBreakShortAlternatives = config.isPreventNewLineAfterAlternativeOnShortAlternatives() && (averageSingleDefinitionLength <= config.getShortAlternativeThreshold());
                 if (!isLastElement()) {
                         text(" | ");
@@ -477 +482 @@
                                 if (config.isPreventNewLineAfterAlternativeOnLessThanThreeElements()) {
                                         DefinitionList definitionList = (DefinitionList) node.eContainer();
-                                        if (definitionList.eContents().size() > 2) {
+                                        
+                                        if ((definitionList.eContents().size() > 2) && (!preventAlternativeBreakShortAlternatives)) {
                                                 newLine();
                                                 spaces(ruleSpacingStack.peek());
                                         }
                                 } else {
-                                        newLine();
-                                        spaces(ruleSpacingStack.peek());
+                                        if (!preventAlternativeBreakShortAlternatives) {
+                                                newLine();
+                                                spaces(ruleSpacingStack.peek());
+                                        }
                                 }
                         }

trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/formatter/FormatterConfig.java

@@ -5 +5 @@
         private boolean preventNewLineAfterAlternativeOnLessThanThreeElements = true;
         private boolean preventNewLineAfterAlternativeOnShortAlternatives = true;
+        private double shortAlternativeThreshold = 3.0;
 
         public boolean isNewLineAfterAlternative() {
@@ -32 +33 @@
         }
 
+        public double getShortAlternativeThreshold() {
+                return shortAlternativeThreshold;
+        }
+
+        public void setShortAlternativeThreshold(double shortAlternativeThreshold) {
+                this.shortAlternativeThreshold = shortAlternativeThreshold;
+        }
+
 }