As a reminder, we decided to do this based strictly content. Some support for style-based text properties is written, but not used

anywhere any more.

* Cleaned up split and join undo/redo.
* Added TypeInState, a data struct that remembers things about text properties for collapsed selections, so you can type
* Ctrl-B with an insertion point and the next character will be bold.
* Added all the logic to handle inline vs. block elements when setting text properties.
* Added some support for italic and underline as well.  Adding these things is pretty easy now.  Ctrl-B, Ctrl-I, Ctrl-U for testing bold, italic, underline.
* Added all the logic to make sure we only add style tags where they're needed, so you should never get the same style tag nested within itself, except as needed for block elements.
* Added methods for testing a node to see if a particular style is set.  This isn't 100% done yet, but with very little work we could have toolbar buttons that respond to selection changed notification that show the state of bold, italic, underline, etc. in real time.  Supports tri-state:  whole selection is bold, some of selection is bold, none of selection is bold, ...
* Fully undoable and redoable.
* Added some debug printfs to transactions and editors.  all controlled by a gNoisy static in each module.  helps me track down undo/redo problems.  if the output bugs people enough, I'll shut it off and re-enable it in my local tree.

Noticably missing:  make un-bold, make un-italic, etc.  This is coming soon.


git-svn-id: svn://10.0.0.236/trunk@25869 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/editor/libeditor/base/SplitElementTxn.cpp

@@ -19,8 +19,15 @@
 #include "SplitElementTxn.h"
 #include "nsIDOMNode.h"
 #include "nsIDOMSelection.h"
+#include "nsIDOMCharacterData.h"
 #include "nsIEditorSupport.h"
 
+#ifdef NS_DEBUG
+static PRBool gNoisy = PR_TRUE;
+#else
+static const PRBool gNoisy = PR_FALSE;
+#endif
+
 static NS_DEFINE_IID(kIEditorSupportIID,    NS_IEDITORSUPPORT_IID);
 
 // note that aEditor is not refcounted
@@ -45,6 +52,7 @@ SplitElementTxn::~SplitElementTxn()
 
 NS_IMETHODIMP SplitElementTxn::Do(void)
 {
+  if (gNoisy) { printf("%p Do Split of node %p offset %d\n", this, mExistingRightNode.get(), mOffset); }
   NS_ASSERTION(mExistingRightNode, "bad state");
   if (!mExistingRightNode) {
     return NS_ERROR_NOT_INITIALIZED;
@@ -55,6 +63,7 @@ NS_IMETHODIMP SplitElementTxn::Do(void)
 
   if ((NS_SUCCEEDED(result)) && (mNewLeftNode))
   {
+    if (gNoisy) { printf("  created left node = %p\n", this, mNewLeftNode.get()); }
     // get the parent node
     result = mExistingRightNode->GetParentNode(getter_AddRefs(mParent));
     // insert the new node
@@ -85,6 +94,10 @@ NS_IMETHODIMP SplitElementTxn::Do(void)
 
 NS_IMETHODIMP SplitElementTxn::Undo(void)
 {
+  if (gNoisy) { 
+    printf("%p Undo Split of existing node %p and new node %p offset %d\n", 
+           this, mExistingRightNode.get(), mNewLeftNode.get(), mOffset); 
+  }
   NS_ASSERTION(mExistingRightNode && mNewLeftNode && mParent, "bad state");
   if (!mExistingRightNode || !mNewLeftNode || !mParent) {
     return NS_ERROR_NOT_INITIALIZED;
@@ -112,8 +125,9 @@ NS_IMETHODIMP SplitElementTxn::Undo(void)
   if (NS_SUCCEEDED(result) && editor) 
   {
     result = editor->JoinNodesImpl(mExistingRightNode, mNewLeftNode, mParent, PR_FALSE);
-    if (NS_SUCCEEDED(result) && mNewLeftNode)
+    if (NS_SUCCEEDED(result))
     {
+      if (gNoisy) { printf("  left node = %p removed\n", this, mNewLeftNode.get()); }
       nsCOMPtr<nsIDOMSelection>selection;
       mEditor->GetSelection(getter_AddRefs(selection));
       if (selection)
@@ -128,25 +142,48 @@ NS_IMETHODIMP SplitElementTxn::Undo(void)
   return result;
 }
 
-/*
+/* redo cannot simply resplit the right node, because subsequent transactions
+ * on the redo stack may depend on the left node existing in its previous state.
+ */
 NS_IMETHODIMP SplitElementTxn::Redo(void)
 {
   NS_ASSERTION(mExistingRightNode && mNewLeftNode && mParent, "bad state");
   if (!mExistingRightNode || !mNewLeftNode || !mParent) {
     return NS_ERROR_NOT_INITIALIZED;
   }
+  if (gNoisy) { 
+    printf("%p Redo Split of existing node %p and new node %p offset %d\n", 
+           this, mExistingRightNode.get(), mNewLeftNode.get(), mOffset); 
+  }
   nsresult result;
-  nsCOMPtr<nsIEditorSupport> editor;
-  result = mEditor->QueryInterface(kIEditorSupportIID, getter_AddRefs(editor));
-  if (NS_SUCCEEDED(result) && editor) {
-    result = editor->SplitNodeImpl(mExistingRightNode, mOffset, mNewLeftNode, mParent);
+  nsCOMPtr<nsIDOMNode>resultNode;
+  // first, massage the existing node so it is in its post-split state
+  nsCOMPtr<nsIDOMCharacterData>rightNodeAsText;
+  rightNodeAsText = do_QueryInterface(mExistingRightNode);
+  if (rightNodeAsText)
+  {
+    result = rightNodeAsText->DeleteData(0, mOffset);
   }
-  else {
-    result = NS_ERROR_NOT_IMPLEMENTED;
+  else
+  {
+    nsCOMPtr<nsIDOMNode>child;
+    nsCOMPtr<nsIDOMNode>nextSibling;
+    result = mExistingRightNode->GetFirstChild(getter_AddRefs(child));
+    PRInt32 i;
+    for (i=0; i<mOffset; i++)
+    {
+      if (NS_FAILED(result)) {return result;}
+      if (!child) {return NS_ERROR_NULL_POINTER;}
+      child->GetNextSibling(getter_AddRefs(nextSibling));
+      result = mExistingRightNode->RemoveChild(child, getter_AddRefs(resultNode));
+      child = do_QueryInterface(nextSibling);
+    }
   }
+  // second, re-insert the left node into the tree 
+  result = mParent->InsertBefore(mNewLeftNode, mExistingRightNode, getter_AddRefs(resultNode));
   return result;
 }
-*/
+
 
 NS_IMETHODIMP SplitElementTxn::Merge(PRBool *aDidMerge, nsITransaction *aTransaction)
 {