Changeset 31 in default

Timestamp:

11/02/10 18:29:57 (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) (10 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;
 
@@ -181 +180 @@
         
         private void weaveComments() {
-//              if (true) {
-//                      StringBuffer result = new StringBuffer();
-//                      result.append(buf.toString());
-//                      buf = result;
-//                      return;
-//              }
-                
                 bufferPositionOriginalText = 0;
                 bufferPositionFormattedTextNoWhitespaces = 0;
@@ -248 +240 @@
                                         }
                                 } else { // disaster handling: return original unformatted text!
+                                        System.err.println("Disaster Recovery: returning original text!!");
                                         buf = new StringBuffer();
                                         buf.append(originalText);
@@ -287 +280 @@
         }
 
+        private boolean lastIsClosingParentheses() {
+                char ch = buf.toString().charAt(buf.toString().length()-1);
+                if ((ch == ')') || (ch == ']') || (ch == '}'))
+                        return true;
+                return false;
+        }
+
+        private void wrap() {
+                if ((config.isWrapAfterThreshold()) && (newLineOffsetCounter > config.getWrapThreshold())) {
+                        newLine();
+                        if (ruleSpacingStack.size() > 1)
+                                spaces(ruleSpacingStack.peek() + 1);
+                        else
+                                spaces(ruleSpacingStack.peek());
+                }
+        }
+
         // -----------------------------------------------------------------------------
 
@@ -372 +382 @@
         }
 
-        protected void visitBefore(GroupedSequence node) {
-                text("(");
-                ruleSpacingStack.push(newLineOffsetCounter);
-        }
-
-        protected void visitAfter(GroupedSequence node) {
-                text(")");
-                ruleSpacingStack.pop();
-        }
-
         protected void visitBefore(HookCombinator node) {
         }
@@ -402 +402 @@
         }
 
+        protected void visitBefore(GroupedSequence node) {
+                wrap();
+                text("(");
+                ruleSpacingStack.push(newLineOffsetCounter-1);
+        }
+
+        protected void visitAfter(GroupedSequence node) {
+//              if ((config.isAlignParentheses() && (node.eContents().get(0).eContents().size() >= config.getAlignParenthesesElementCountThreshold())) || (lastIsClosingParentheses())) {
+                if (config.isAlignParentheses() && (node.eContents().get(0).eContents().size() >= config.getAlignParenthesesElementCountThreshold())) {
+                        newLine();
+                        spaces(ruleSpacingStack.peek());
+                }
+                
+                text(")");
+                ruleSpacingStack.pop();
+        }
+
         protected void visitBefore(OptionalSequence node) {
+                wrap();
                 text("[");
-                ruleSpacingStack.push(newLineOffsetCounter);
+                ruleSpacingStack.push(newLineOffsetCounter-1);
         }
 
         protected void visitAfter(OptionalSequence node) {
+//              if ((config.isAlignParentheses() && (node.eContents().get(0).eContents().size() >= config.getAlignParenthesesElementCountThreshold())) || (lastIsClosingParentheses())) {
+                if (config.isAlignParentheses() && (node.eContents().get(0).eContents().size() >= config.getAlignParenthesesElementCountThreshold())) {
+                        newLine();
+                        spaces(ruleSpacingStack.peek());
+                }
+
                 text("]");
                 ruleSpacingStack.pop();
@@ -413 +437 @@
 
         protected void visitBefore(RepeatedSequence node) {
+                wrap();
                 text("{");
-                ruleSpacingStack.push(newLineOffsetCounter);
+                ruleSpacingStack.push(newLineOffsetCounter-1);
         }
 
         protected void visitAfter(RepeatedSequence node) {
+//              if ((config.isAlignParentheses() && (node.eContents().get(0).eContents().size() >= config.getAlignParenthesesElementCountThreshold())) || (lastIsClosingParentheses())) {
+                if (config.isAlignParentheses() && (node.eContents().get(0).eContents().size() >= config.getAlignParenthesesElementCountThreshold())) {
+                        newLine();
+                        spaces(ruleSpacingStack.peek());
+                }
+
                 text("}");
                 if (node.isMorethanonce())
@@ -454 +485 @@
 
         protected void visitBefore(RuleReference node) {
+                wrap();
                 text(node.getRuleref().getName());
         }
@@ -482 +514 @@
                                 if (config.isPreventNewLineAfterAlternativeOnLessThanThreeElements()) {
                                         DefinitionList definitionList = (DefinitionList) node.eContainer();
-                                        
                                         if ((definitionList.eContents().size() > 2) && (!preventAlternativeBreakShortAlternatives)) {
                                                 newLine();
-                                                spaces(ruleSpacingStack.peek());
+                                                if (ruleSpacingStack.size() > 1)
+                                                        spaces(ruleSpacingStack.peek() + 1);
+                                                else
+                                                        spaces(ruleSpacingStack.peek());
                                         }
                                 } else {
                                         if (!preventAlternativeBreakShortAlternatives) {
                                                 newLine();
-                                                spaces(ruleSpacingStack.peek());
+                                                if (ruleSpacingStack.size() > 1)
+                                                        spaces(ruleSpacingStack.peek() + 1);
+                                                else
+                                                        spaces(ruleSpacingStack.peek());
                                         }
                                 }
@@ -498 +535 @@
 
         protected void visitBefore(StringRule node) {
+                wrap();
                 if (node.getLiteral() != null)
                         text("\"" + node.getLiteral() + "\"");

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

@@ -6 +6 @@
         private boolean preventNewLineAfterAlternativeOnShortAlternatives = true;
         private double shortAlternativeThreshold = 3.0;
+        private boolean alignParentheses = true;
+        private int alignParenthesesElementCountThreshold = 3;
+        private boolean wrapAfterThreshold = true;
+        private int wrapThreshold = 80;
 
         public boolean isNewLineAfterAlternative() {
@@ -41 +45 @@
         }
 
+        public boolean isAlignParentheses() {
+                return alignParentheses;
+        }
+
+        public void setAlignParentheses(boolean alignParentheses) {
+                this.alignParentheses = alignParentheses;
+        }
+
+        public int getAlignParenthesesElementCountThreshold() {
+                return alignParenthesesElementCountThreshold;
+        }
+
+        public void setAlignParenthesesElementCountThreshold(
+                        int alignParenthesesElementCountThreshold) {
+                this.alignParenthesesElementCountThreshold = alignParenthesesElementCountThreshold;
+        }
+
+        public boolean isWrapAfterThreshold() {
+                return wrapAfterThreshold;
+        }
+
+        public void setWrapAfterThreshold(boolean wrapAfterThreshold) {
+                this.wrapAfterThreshold = wrapAfterThreshold;
+        }
+
+        public int getWrapThreshold() {
+                return wrapThreshold;
+        }
+
+        public void setWrapThreshold(int wrapThreshold) {
+                this.wrapThreshold = wrapThreshold;
+        }
+
 }