161143: Add new method InsertTextWithQuotes, and call it from Rewrap. r=brade,jfrancis sr=sspitzer

editor/idl/nsIEditorMailSupport.idl

@@ -61,8 +61,20 @@ interface nsIEditorMailSupport : nsISupports
     */
   nsIDOMNode insertAsQuotation(in AString aQuotedText);
 
+  /**
+   * Inserts a plaintext string at the current location,
+   * with special processing for lines beginning with ">",
+   * which will be treated as mail quotes and inserted
+   * as plaintext quoted blocks.
+   * If the selection is not collapsed, the selection is deleted
+   * and the insertion takes place at the resulting collapsed selection.
+   *
+   * @param aString   the string to be inserted
+   */
+   void insertTextWithQuotations(in DOMString aStringToInsert);
+
   /** Paste a string as quoted text,
-    * as a quotation (whose representation is dependant on the editor type),
+    * whose representation is dependant on the editor type,
     * replacing the selected text (if any)
     * @param aCitation    The "mid" URL of the source message
     * @param aSelectionType Text or html?

editor/libeditor/html/nsHTMLDataTransfer.cpp

@@ -1589,7 +1589,7 @@ NS_IMETHODIMP nsHTMLEditor::PasteAsPlaintextQuotation(PRInt32 aSelectionType)
         NS_ASSERTION(text.Length() <= (len/2), "Invalid length!");
         stuffToPaste.Assign ( text.get(), len / 2 );
         nsAutoEditBatch beginBatching(this);
-        rv = InsertAsPlaintextQuotation(stuffToPaste, 0);
+        rv = InsertAsPlaintextQuotation(stuffToPaste, PR_TRUE, 0);
       }
     }
     nsCRT::free(flav);
@@ -1598,11 +1598,97 @@ NS_IMETHODIMP nsHTMLEditor::PasteAsPlaintextQuotation(PRInt32 aSelectionType)
   return rv;
 }
 
+NS_IMETHODIMP
+nsHTMLEditor::InsertTextWithQuotations(const nsAString &aStringToInsert)
+{
+  if (mWrapToWindow)
+    return InsertText(aStringToInsert);
+
+  // We're going to loop over the string, collecting up a "hunk"
+  // that's all the same type (quoted or not),
+  // Whenever the quotedness changes (or we reach the string's end)
+  // we will insert the hunk all at once, quoted or non.
+
+  static const PRUnichar cite('>');
+  PRBool curHunkIsQuoted = (aStringToInsert.First() == cite);
+
+  nsAString::const_iterator hunkStart, strEnd;
+  aStringToInsert.BeginReading(hunkStart);
+  aStringToInsert.EndReading(strEnd);
+
+  // In the loop below, we only look for DOM newlines (\n),
+  // because we don't have a FindChars method that can look
+  // for both \r and \n.  \r is illegal in the dom anyway,
+  // but in debug builds, let's take the time to verify that
+  // there aren't any there:
+#ifdef DEBUG
+  nsAString::const_iterator dbgStart (hunkStart);
+  if (FindCharInReadable('\r', dbgStart, strEnd))
+    NS_ASSERTION(PR_FALSE,
+            "Return characters in DOM! InsertTextWithQuotations may be wrong");
+#endif /* DEBUG */
+
+  // Loop over lines:
+  nsresult rv;
+  nsAString::const_iterator lineStart (hunkStart);
+  while (lineStart != strEnd)
+  {
+    // Search for the end of this line (dom newlines, see above):
+    PRBool found = FindCharInReadable('\n', lineStart, strEnd);
+    PRBool quoted = PR_FALSE;
+    if (found)
+    {
+      // if there's another newline, lineStart now points there.
+      // Loop over any consecutive newline chars:
+      nsAString::const_iterator firstNewline (lineStart);
+      while (*lineStart == '\n')
+        ++lineStart;
+      quoted = (*lineStart == cite);
+      if (quoted == curHunkIsQuoted)
+        continue;
+      // else we're changing state, so we need to insert
+      // from curHunk to lineStart then loop around.
+
+      // But if the current hunk is quoted, then we want to make sure
+      // that any extra newlines on the end do not get included in
+      // the quoted section: blank lines flaking a quoted section
+      // should be considered unquoted, so that if the user clicks
+      // there and starts typing, the new text will be outside of
+      // the quoted block.
+      if (curHunkIsQuoted)
+        lineStart = firstNewline;
+    }
+
+    // If no newline found, lineStart is now strEnd and we can finish up,
+    // inserting from curHunk to lineStart then returning.
+    const nsAString &curHunk (Substring(hunkStart, lineStart));
+    nsCOMPtr<nsIDOMNode> dummyNode;
+#ifdef DEBUG_akkana_verbose
+    printf("==== Inserting text as %squoted: ---\n%s---\n",
+           curHunkIsQuoted ? "" : "non-",
+           NS_LossyConvertUCS2toASCII(curHunk).get());
+#endif
+    if (curHunkIsQuoted)
+      rv = InsertAsPlaintextQuotation(curHunk, PR_FALSE,
+                                      getter_AddRefs(dummyNode));
+    else
+      rv = InsertText(curHunk);
+
+    if (!found)
+      break;
+
+    curHunkIsQuoted = quoted;
+    hunkStart = lineStart;
+  }
+
+  return rv;
+}
+
 NS_IMETHODIMP nsHTMLEditor::InsertAsQuotation(const nsAString & aQuotedText,
                                               nsIDOMNode **aNodeInserted)
 {
   if (mFlags & eEditorPlaintextMask)
-    return InsertAsPlaintextQuotation(aQuotedText, aNodeInserted);
+    return InsertAsPlaintextQuotation(aQuotedText, PR_TRUE, aNodeInserted);
 
   nsAutoString citation;
   nsAutoString charset;
@@ -1616,6 +1702,7 @@ NS_IMETHODIMP nsHTMLEditor::InsertAsQuotation(const nsAString & aQuotedText,
 // in order to preserve the original line wrapping.
 NS_IMETHODIMP
 nsHTMLEditor::InsertAsPlaintextQuotation(const nsAString & aQuotedText,
+                                         PRBool aAddCites,
                                          nsIDOMNode **aNodeInserted)
 {
   if (mWrapToWindow)
@@ -1689,8 +1776,13 @@ nsHTMLEditor::InsertAsPlaintextQuotation(const nsAString & aQuotedText,
         selection->Collapse(preNode, 0);
       }
 
-      //rv = InsertText(quotedStuff.get());
-      rv = nsPlaintextEditor::InsertAsQuotation(aQuotedText, aNodeInserted);
+      if (aAddCites)
+        rv = nsPlaintextEditor::InsertAsQuotation(aQuotedText, aNodeInserted);
+      else
+        rv = nsPlaintextEditor::InsertText(aQuotedText);
+      // Note that if !aAddCites, aNodeInserted isn't set.
+      // That's okay because the routines that use aAddCites
+      // don't need to know the inserted node.
 
       if (aNodeInserted && NS_SUCCEEDED(rv))
       {

editor/libeditor/html/nsHTMLEditor.h

@@ -223,7 +223,9 @@ public:
   /* ------------ nsIEditorMailSupport methods -------------- */
 
   NS_IMETHOD PasteAsQuotation(PRInt32 aSelectionType);
-  NS_IMETHOD InsertAsQuotation(const nsAString & aQuotedText, nsIDOMNode **aNodeInserted);
+  NS_IMETHOD InsertTextWithQuotations(const nsAString & aQuotedText);
+  NS_IMETHOD InsertAsQuotation(const nsAString & aQuotedText,
+                               nsIDOMNode **aNodeInserted);
   NS_IMETHOD PasteAsCitedQuotation(const nsAString & aCitation,
                                    PRInt32 aSelectionType);
   NS_IMETHOD InsertAsCitedQuotation(const nsAString & aQuotedText,
@@ -625,7 +627,18 @@ protected:
 
   // Methods for handling plaintext quotations
   NS_IMETHOD PasteAsPlaintextQuotation(PRInt32 aSelectionType);
+
+  /** Insert a string as quoted text,
+    * replacing the selected text (if any).
+    * @param aQuotedText     The string to insert.
+    * @param aAddCites       Whether to prepend extra ">" to each line
+    *                        (usually true, unless those characters
+    *                        have already been added.)
+    * @return aNodeInserted  The node spanning the insertion, if applicable.
+    *                        If aAddCites is false, this will be null.
+    */
   NS_IMETHOD InsertAsPlaintextQuotation(const nsAString & aQuotedText,
+                                        PRBool aAddCites,
                                         nsIDOMNode **aNodeInserted);
 
   // factored methods for handling insertion of data from transferables (drag&drop or clipboard)

editor/libeditor/text/nsPlaintextEditor.cpp

@@ -1595,6 +1595,12 @@ nsPlaintextEditor::OutputToStream(nsIOutputStream* aOutputStream,
 #pragma mark -
 #endif
 
+NS_IMETHODIMP
+nsPlaintextEditor::InsertTextWithQuotations(const nsAString &aStringToInsert)
+{
+  return InsertText(aStringToInsert);
+}
+
 NS_IMETHODIMP
 nsPlaintextEditor::PasteAsQuotation(PRInt32 aSelectionType)
 {
@@ -1702,7 +1708,6 @@ nsPlaintextEditor::InsertAsQuotation(const nsAString& aQuotedText,
   if (!aQuotedText.IsEmpty() && (aQuotedText.Last() != PRUnichar('\n')))
     quotedStuff.Append(PRUnichar('\n'));
 
-  nsCOMPtr<nsIDOMNode> preNode;
   // get selection
   nsCOMPtr<nsISelection> selection;
   rv = GetSelection(getter_AddRefs(selection));
@@ -1798,7 +1803,7 @@ nsPlaintextEditor::Rewrap(PRBool aRespectNewlines)
     rv = SelectAll();
     if (NS_FAILED(rv)) return rv;
 
-    return InsertText(wrapped);
+    return InsertTextWithQuotations(wrapped);
   }
   else                // rewrap only the selection
   {
@@ -1818,7 +1823,7 @@ nsPlaintextEditor::Rewrap(PRBool aRespectNewlines)
                        wrapped);
     if (NS_FAILED(rv)) return rv;
 
-    return InsertText(wrapped);
+    return InsertTextWithQuotations(wrapped);
   }
   return NS_OK;
 }

editor/libeditor/text/nsPlaintextEditor.h

@@ -86,6 +86,7 @@ public:
   NS_DECL_NSIPLAINTEXTEDITOR
 
   /* ------------ nsIEditorMailSupport overrides -------------- */
+  NS_IMETHOD InsertTextWithQuotations(const nsAString &aStringToInsert);
   NS_IMETHOD PasteAsQuotation(PRInt32 aSelectionType);
   NS_IMETHOD InsertAsQuotation(const nsAString& aQuotedText,
                                nsIDOMNode** aNodeInserted);