Changeset 22 in default for trunk

Timestamp:

11/02/10 10:19:44 (14 years ago)

Author:

zeiss

Message:

 

File:

• trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/src/de/ugoe/cs/swe/bnftools/ui/formatter/EbnfFormatterVisitor.java (modified) (2 diffs)

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

@@ -148 +148 @@
         }
         
+        private String scanBackWhitespaces(String str, int position) {
+                StringBuffer whiteSpaces = new StringBuffer();
+                int currentPosition = position;
+                while (isWhitespace(str.charAt(currentPosition))) {
+                        whiteSpaces.append(str.charAt(currentPosition));
+                        currentPosition--;
+                }
+                return whiteSpaces.toString();
+        }
+        
+        private String stripEndingNewline(String str) {
+                int position = str.length() - 1;
+                while ((str.charAt(position) == '\n') || (str.charAt(position) == '\r')) {
+                        position--;
+                }
+                return str.substring(0, position + 1);
+        }
+        
         private void weaveComments() {
                 bufferPosition = 0;
@@ -165 +183 @@
                                         LeafNode currentComment = allComments.get(allCommentsPosition); 
                                         if (currentComment.getTotalOffset() == bufferPositionOriginalText) {
-                                                result.append(currentComment.getText());
+                                                
                                                 
                                                 if (isMultiLineComment(currentComment.getText())) {
+                                                        result.append(currentComment.getText());
                                                         result.append("\n");
-                                                } 
+                                                } else {
+                                                        String lastWhiteSpaces = scanBackWhitespaces(result.toString(), result.toString().length()-1);
+                                                        result.delete(result.toString().length() - lastWhiteSpaces.length(), result.toString().length());
+                                                        result.append(" " + stripEndingNewline(currentComment.getText()));
+                                                        result.append(lastWhiteSpaces);
+                                                }
                                                 bufferPositionOriginalText+=currentComment.getLength();
                                                 allCommentsPosition++;
                                         }
                                 }
-                                
                         } else {
                                 result.append(formattedText.substring(bufferPositionFormattedText, bufferPositionFormattedText+1));