From 13b9b12934aeabd6a33792fe9af99ce338e79e5f Mon Sep 17 00:00:00 2001
From: Holger Rapp <HolgerRapp@gmx.net>
Date: Thu, 2 Jul 2009 16:02:02 +0200
Subject: [PATCH] Got rid of tabstop in mirror

---
 PySnipEmu.py | 26 +++++++++++---------------
 test.py      | 12 +++++++-----
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/PySnipEmu.py b/PySnipEmu.py
index bfc40fc..ab13a54 100644
--- a/PySnipEmu.py
+++ b/PySnipEmu.py
@@ -103,7 +103,7 @@ class TextObject(object):
             self._parent = value
         return locals()
     parent = property(**parent())
-    
+
     @property
     def start(self):
         return self._start
@@ -121,36 +121,30 @@ class Mirror(TextObject):
         start = Position(idx,start_col)
         end = start + (ts.end - ts.start)
         TextObject.__init__(self, parent, start, end)
-        self._tabstop = ts
 
         ts.add_mirror(self)
 
-    @property
-    def tabstop(self):
-        return self._tabstop
-
-    def update(self,ts):
-        if ts != self._tabstop:
-            return 0
-
+    def update(self,text):
         new_end = _replace_text_in_buffer(
             self._parent.start + self._start,
             self._parent.start + self._end,
-            self._tabstop.current_text
+            text,
         )
         new_end -= self._parent.start
 
         oldcolspan = self.end.col - self.start.col
         oldlinespan = self.end.line - self.start.line
-        self._end = new_end
-        newcolspan = self.end.col - self.start.col
-        newlinespan = self.end.line - self.start.line
+
+        newcolspan =  new_end.col - self.start.col
+        newlinespan = new_end.line - self.start.line
 
         moved_lines = newlinespan - oldlinespan
         moved_cols = newcolspan - oldcolspan
 
         self._parent._move_textobjects_behind(moved_lines, moved_cols, self)
 
+        self._end = new_end
+
 
 class TabStop(TextObject):
     """
@@ -192,7 +186,7 @@ class TabStop(TextObject):
             self._end = new_end
 
             for m in self._mirrors:
-                m.update(self)
+                m.update(self._ct)
 
         return locals()
     current_text = property(**current_text())
@@ -293,6 +287,8 @@ class SnippetInstance(TextObject):
                     if lines:
                         m.start.line += lines
                         m.end.line += lines
+                        m.end.col -= m.start.col
+                        m.start.col = 0
                     else:
                         m.start.col += cols
                         m.end.col += cols
diff --git a/test.py b/test.py
index 2511344..8392025 100755
--- a/test.py
+++ b/test.py
@@ -256,8 +256,6 @@ class TextTabStopAllSurrounded_ExceptCorrectResult(_VimTest):
     def runTest(self): self.check_output()
 
 
-# TODO: mirror mit tabstop mit default variable
-# TODO: Mehrer tabs und mehrere mirrors
 class TextTabStopSimpleMirrorMultiline_ExceptCorrectResult(_VimTest):
     snippets = ("test", "$1\n$1")
     wanted = "hallo\nhallo"
@@ -305,14 +303,17 @@ class SimpleMirrorSameLine_ExceptCorrectResult(_VimTest):
     wanted = "hallo hallo"
     def cmd(self):
         self.type("test\thallo")
-
-
     def runTest(self): self.check_output()
 class SimpleMirrorSameLineMany_ExceptCorrectResult(_VimTest):
-    snippets = ("test", "$1 $1 $1 $1")
+    snippets = ("test", "$1 $1 $1hj)
     wanted = "hallo du hallo du hallo du hallo du"
     def cmd(self):
         self.type("test\thallo du")
+class SimpleMirrorSameLineManyMultiline_ExceptCorrectResult(_VimTest):
+    snippets = ("test", "$1 $1 $1 $1")
+    wanted = "hallo du\nwie gehts? hallo du\nwie gehts? hallo du\nwie gehts."
+    def cmd(self):
+        self.type("test\thallo du\nwie gehts?")
 
 
     def runTest(self): self.check_output()
@@ -350,6 +351,7 @@ class SimpleTabstopWithDefaultComplexKeep_ExceptCorrectResult(_VimTest):
         self.type("test\t")
     def runTest(self): self.check_output()
 
+# TODO: Mehrer tabs und mehrere mirrors
 
 
 # class MirrorMoreInvolved_ExceptCorrectResult(_VimTest):