Can now insert custom strings before or after snippet

knatten · Oct 19, 2011 · 2fc4179 · 2fc4179
1 parent 89105b0
commit 2fc4179
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/python/SnippetySnip/snippetysnip.py b/python/SnippetySnip/snippetysnip.py
@@ -65,8 +65,13 @@ def insert_snippets(old_buffer, snippet_getter=get_snippet):
         new_buffer.append(line)
         match = re.search(snippet_begin, line)
         if match:
+            arguments = get_arguments(line)
             file_name, snippet_name = match.groups()
+            if arguments.get('before'):
+                new_buffer.append(arguments['before'])
             new_buffer.extend(snippet_getter(file_name, snippet_name).split("\n")[:-1])
+            if arguments.get('after'):
+                new_buffer.append(arguments['after'])
             new_buffer.append(remove_arguments(line).replace("snippetysnip", "snippetysnip_end"))
             end_line = find_end_line(old_buffer[line_no:], file_name, snippet_name)
             if end_line != -1:

diff --git a/python/SnippetySnip/test.py b/python/SnippetySnip/test.py
@@ -77,14 +77,33 @@ def test_inserts_before(self):
         expected = [
             "foo",
             "<!-- snippetysnip:snippy.cpp:snippet:(before=\"[sourcecode]\") -->",
-            #"[sourcecode]",
+            "[sourcecode]",
             "line1",
             "line2",
-            #"[/sourcecode]",
             "<!-- snippetysnip_end:snippy.cpp:snippet -->",
             "bar"
         ]
-        self.assertEqual(expected, insert_snippets(buffer, fake_get_snippet))
+        actual = insert_snippets(buffer, fake_get_snippet)
+        self.assertEqual(expected, actual)
+
+    def test_inserts_before_and_after(self):
+        buffer = [
+            "foo",
+            "<!-- snippetysnip:snippy.cpp:snippet:(before=\"[sourcecode]\", after=\"[/sourcecode]\") -->",
+            "bar"
+        ]
+        expected = [
+            "foo",
+            "<!-- snippetysnip:snippy.cpp:snippet:(before=\"[sourcecode]\", after=\"[/sourcecode]\") -->",
+            "[sourcecode]",
+            "line1",
+            "line2",
+            "[/sourcecode]",
+            "<!-- snippetysnip_end:snippy.cpp:snippet -->",
+            "bar"
+        ]
+        actual = insert_snippets(buffer, fake_get_snippet)
+        self.assertEqual(expected, actual)
 
 
 class Test_get_arguments(unittest.TestCase):