[mdv] getTeminatorAt recurses infinitely if template is its own terminator

pkg/mdv/lib/src/template_iterator.dart

Index: pkg/mdv/lib/src/template_iterator.dart
diff --git a/pkg/mdv/lib/src/template_iterator.dart b/pkg/mdv/lib/src/template_iterator.dart
index 67bc1235c647c3769f0af4c5da7891f67fbd6cb5..82c4a7f24cb05a2877b4a32e036229eaeb016299 100644
--- a/pkg/mdv/lib/src/template_iterator.dart
+++ b/pkg/mdv/lib/src/template_iterator.dart
@@ -235,7 +235,8 @@ class _TemplateIterator {
   Node getTerminatorAt(int index) {

[justinfagnani, 2013/07/23 19:59:40]

for my own education, what's a terminator?

[Jennifer Messerly, 2013/07/23 20:13:00]

you know almost as much as I do :)

from the code, each terminator is the last node in the expanded fragment. so if
I assign a 2-item model to: <template
repeat><div>foo</div><div>bar</div><template>, the two "bar" divs will be the
terminators.

     if (index == -1) return _templateElement;
     var terminator = terminators[index];
-    if (terminator is Element && (terminator as Element).isTemplate) {
+    if (terminator is Element && (terminator as Element).isTemplate &&
+        !identical(terminator, _templateElement)) {
       var subIterator = _mdv(terminator)._templateIterator;
       if (subIterator != null) {
         return subIterator.getTerminatorAt(subIterator.terminators.length - 1);
@@ -267,8 +268,8 @@ class _TemplateIterator {
 
     var parent = _templateElement.parentNode;
     while (terminator != previousTerminator) {
-      var node = terminator;
-      terminator = node.previousNode;
+      var node = previousTerminator.nextNode;
+      if (node == terminator) terminator = previousTerminator;
       node.remove();
       instanceNodes.add(node);
     }
@@ -314,6 +315,7 @@ class _TemplateIterator {
     for (var splice in splices) {
       for (int i = 0; i < splice.removedCount; i++) {
         var instanceNodes = extractInstanceAt(splice.index + removeDelta);
+        if (instanceNodes.length == 0) continue;
         var model = _mdv(instanceNodes.first)._templateInstance.model;
         instanceCache[model] = instanceNodes;
       }