[gedit] Make sure to remove all non-tabbed placeholders on snippet deactivation

[Jesse van den Kieboom <jessevdk src gnome org>]

commit 2211e9f74983e3025dfee0a6e078f42912032d32
Author: Jesse van den Kieboom <jesse icecrew nl>
Date:   Sun Oct 11 02:20:18 2009 +0200

    Make sure to remove all non-tabbed placeholders on snippet deactivation

 plugins/snippets/snippets/Document.py |   32 ++++++++++++++++++--------------
 1 files changed, 18 insertions(+), 14 deletions(-)
---
diff --git a/plugins/snippets/snippets/Document.py b/plugins/snippets/snippets/Document.py
index c866f82..64247d2 100644
--- a/plugins/snippets/snippets/Document.py
+++ b/plugins/snippets/snippets/Document.py
@@ -603,7 +603,8 @@ class Document:
         def deactivate_snippet(self, snippet, force = False):
                 buf = self.view.get_buffer()
                 remove = []
-                
+                ordered_remove = []
+
                 for tabstop in snippet.placeholders:
                         if tabstop == -1:
                                 placeholders = snippet.placeholders[-1]
@@ -618,8 +619,10 @@ class Document:
                                                 self.update_placeholders.remove(placeholder)
                                         elif placeholder in self.jump_placeholders:
                                                 placeholder[0].leave()
-                                                
+
                                         remove.append(placeholder)
+                                elif placeholder in self.ordered_placeholders:
+                                        ordered_remove.append(placeholder)
 
                 for placeholder in remove:
                         if placeholder == self.active_placeholder:
@@ -630,9 +633,13 @@ class Document:
 
                         placeholder.remove(force)
 
+                for placeholder in ordered_remove:
+                        self.ordered_placeholders.remove(placeholder)
+                        placeholder.remove(force)
+
                 snippet.deactivate()
                 self.active_snippets.remove(snippet)
-                
+
                 if len(self.active_snippets) == 0:
                         self.last_snippet_removed()
 
@@ -671,22 +678,19 @@ class Document:
                                 if piter.compare(begin) < 0 or piter.compare(end) > 0:
                                         # Oh no! Remove the snippet this instant!!
                                         self.deactivate_snippet(snippet)
-                
+
                 current = self.current_placeholder()
-                
+
                 if current != self.active_placeholder:
-                        if self.active_placeholder:
-                                self.jump_placeholders.append((self.active_placeholder, current))
-                                
-                                if self.timeout_update_id == 0:
-                                        self.timeout_update_id = gobject.timeout_add(0, 
-                                                        self.update_snippet_contents)
+                        self.jump_placeholders.append((self.active_placeholder, current))
+
+                        if self.timeout_update_id == 0:
+                                self.timeout_update_id = gobject.timeout_add(0, 
+                                                self.update_snippet_contents)
 
-                        self.set_active_placeholder(current)
-        
         def on_buffer_changed(self, buf):
                 current = self.current_placeholder()
-                
+
                 if current:
                         if not current in self.update_placeholders:
                                 self.update_placeholders.append(current)