Changeset 211

Timestamp:

11/05/02 19:06:35 (21 years ago)

Author:

piso

Message:

wrapParagraph(): handle quoted text prefixes ("> ", "> > ", etc.) correctly.

File:

• trunk/j/src/org/armedbear/j/WrapText.java (modified) (7 diffs)

trunk/j/src/org/armedbear/j/WrapText.java

@@ -3 +3 @@
  *
  * Copyright (C) 1998-2002 Peter Graves
- * $Id: WrapText.java,v 1.3 2002-10-11 14:07:35 piso Exp $
+ * $Id: WrapText.java,v 1.4 2002-11-05 19:06:35 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -22 +22 @@
 package org.armedbear.j;
 
+import gnu.regexp.RE;
+import gnu.regexp.REMatch;
+import gnu.regexp.UncheckedRE;
 import javax.swing.undo.CompoundEdit;
 import org.armedbear.j.mail.SendMail;
@@ -70 +73 @@
     public void wrapParagraph()
     {
-        Position begin = findStartOfParagraph(dot);
-        Position end = findEndOfParagraph(dot);
+        String prefix = getPrefix(dot.getLine());
+        final Position begin, end;
+        if (prefix != null) {
+            int prefixLength = prefix.length();
+            begin = findStartOfQuotedText(dot, prefix, prefixLength);
+            end = findEndOfQuotedText(dot, prefix, prefixLength);
+        } else {
+            begin = findStartOfParagraph(dot);
+            end = findEndOfParagraph(dot);
+        }
         if (begin != null && end != null) {
             Region r = new Region(buffer, begin, end);
-            wrapRegion(r);
+            wrapRegion(r, prefix);
         }
     }
@@ -87 +98 @@
         }
     }
-
+    
     private void wrapCommentInternal()
     {
@@ -141 +152 @@
     private void wrapRegion(Region r)
     {
+        wrapRegion(r, null);
+    }
+
+    private void wrapRegion(Region r, String prefix)
+    {
         try {
             r.getBuffer().lockWrite();
@@ -149 +165 @@
         }
         try {
-            processRegion(r, null, true);
+            processRegion(r, prefix, true);
         }
         finally {
@@ -523 +539 @@
         return new Position(endLine, endLine.length());
     }
+    
+    private static final RE prefixRE = new UncheckedRE("^[> ]+");
+    
+    private static String getPrefix(Line line)
+    {
+        REMatch match = prefixRE.getMatch(line.getText());
+        return match != null ? match.toString() : null;
+    }
+
+    private static Position findStartOfQuotedText(Position pos, String prefix,
+        int prefixLength)
+    {
+        Line start = pos.getLine();
+        for (Line line = start.previous(); line != null; line = line.previous()) {
+            if (!prefix.equals(getPrefix(line)))
+                break;
+            if (line.substring(prefixLength).trim().length() == 0)
+                break; // Blank line (except for prefix string).
+            start = line;
+        }
+        return new Position(start, 0);
+    }
+
+    private static Position findEndOfQuotedText(Position pos, String prefix,
+        int prefixLength)
+    {
+        Line end = pos.getLine();
+        for (Line line = end.next(); line != null; line = line.next()) {
+            if (!prefix.equals(getPrefix(line)))
+                break;
+            if (line.substring(prefixLength).trim().length() == 0)
+                break; // Blank line (except for prefix string).
+            end = line;
+        }
+        if (end.next() != null)
+            return new Position(end.next(), 0);
+        return new Position(end, end.length());
+    }
 
     private void detab(Region r)