Revert 824f2ce

Pushing softmatchable nodes to the end broke correctness when `beforeNodeRemoved => false` is in the mix.

Author: botandrose-machine

PR.md

@@ -51,7 +51,6 @@ Speaking of lasagna, here is the tasty meat. By removing the two-pass mode, and
   - if match found
     - remove any nodes up to the match:
       - pantry persistent nodes
-      - shuffle soft matches to the end for later reuse
       - delete the rest
     - morph the match
   - elsif no match found, and node is persistent

src/idiomorph.js

@@ -256,7 +256,6 @@ var Idiomorph = (function () {
      *   - if match found
      *     - remove any nodes up to the match:
      *       - pantry persistent nodes
-     *       - shuffle soft matches to the end for later reuse
      *       - delete the rest
      *     - morph the match
      *   - elsif no match found, and node is persistent
@@ -304,14 +303,7 @@ var Idiomorph = (function () {
           if (bestMatch) {
             // if the node to morph is not at the insertion point then remove/move up to it
             if (bestMatch !== insertionPoint) {
-              removeNodesBetween(
-                ctx,
-                insertionPoint,
-                bestMatch,
-                // additional args so that we can retain future soft matches
-                newChild.nextSibling,
-                endPoint,
-              );
+              removeNodesBetween(ctx, insertionPoint, bestMatch);
             }
             morphNode(bestMatch, newChild, ctx);
             insertionPoint = bestMatch.nextSibling;
@@ -471,26 +463,16 @@ var Idiomorph = (function () {
 
     /**
      * Gets rid of an unwanted DOM node; strategy depends on nature of its reuse:
-     * - Persistent nodes will be moved to the pantry for later reuse by removeNode
-     * - Future soft-matchable nodes will be moved to the end of the parent for later reuse
-     * - Finally, unreusable nodes will have the hooks called, and then are removed
+     * - Persistent nodes will be moved to the pantry for later reuse
+     * - Other nodes will have their hooks called, and then are removed
      * @param {MorphContext} ctx
      * @param {Node} node
-     * @param {Node|null} nextNewChild
-     * @param {Node|null} endPoint
      */
-    function removeNode(ctx, node, nextNewChild = null, endPoint = null) {
+    function removeNode(ctx, node) {
       // are we going to id set match this later?
       if (ctx.idMap.has(node) && node instanceof Element) {
         // skip callbacks and move to pantry
         moveBefore(ctx.pantry, node, null);
-
-        // will be soft-matched to an upcoming new sibling?
-      } else if (findBestMatch(ctx, node, nextNewChild, null)) {
-        // skip callbacks and move to the end of the parent for later soft matching
-        moveBefore(/** @type {Element} */ (node.parentNode), node, endPoint);
-
-        // unreusable
       } else {
         // remove for realsies
         if (ctx.callbacks.beforeNodeRemoved(node) === false) return;
@@ -504,24 +486,16 @@ var Idiomorph = (function () {
      * @param {MorphContext} ctx
      * @param {Node} startInclusive
      * @param {Node} endExclusive
-     * @param {Node|null} nextNewChild
-     * @param {Node|null} endPoint
      * @returns {Node|null}
      */
-    function removeNodesBetween(
-      ctx,
-      startInclusive,
-      endExclusive,
-      nextNewChild,
-      endPoint,
-    ) {
+    function removeNodesBetween(ctx, startInclusive, endExclusive) {
       /** @type {Node | null} */
       let cursor = startInclusive;
       // remove nodes until the endExclusive node
       while (cursor && cursor !== endExclusive) {
         let tempNode = /** @type {Node} */ (cursor);
         cursor = cursor.nextSibling;
-        removeNode(ctx, tempNode, nextNewChild, endPoint);
+        removeNode(ctx, tempNode);
       }
       return cursor;
     }

test/ops.js

@@ -61,7 +61,7 @@ describe("morphing operations", function () {
     );
   });
 
-  it.skip("prepending a new softmatchable node onto the beginning", function () {
+  it("prepending a new softmatchable node onto the beginning", function () {
     assertOps(
       "<section><a>A</a><a>B</a></section>",
       "<section><a>New</a><a>A</a><a>B</a></section>",
@@ -78,7 +78,7 @@ describe("morphing operations", function () {
     );
   });
 
-  it.skip("inserting a new softmatchable node into the middle", function () {
+  it("inserting a new softmatchable node into the middle", function () {
     assertOps(
       "<section><a>A</a><a>B</a><a>C</a><a>D</a></section>",
       "<section><a>A</a><a>B</a><a>New</a><a>C</a><a>D</a></section>",
@@ -114,7 +114,7 @@ describe("morphing operations", function () {
     );
   });
 
-  it.skip("removing a softmatchable node from the front", function () {
+  it("removing a softmatchable node from the front", function () {
     assertOps(
       "<section><a>A</a><a>B</a><a>C</a></section>",
       "<section><a>B</a><a>C</a></section>",
@@ -131,7 +131,7 @@ describe("morphing operations", function () {
     );
   });
 
-  it.skip("removing a softmatchable node from the middle", function () {
+  it("removing a softmatchable node from the middle", function () {
     assertOps(
       "<section><a>A</a><a>B</a><a>C</a></section>",
       "<section><a>A</a><a>C</a></section>",