Fixes for extends and RemoveEmptySuperClass

diff --git a/vim/moose_snippets.vim b/vim/moose_snippets.vim
index d69c740..5b97d8d 100644 (file)
--- a/vim/moose_snippets.vim
+++ b/vim/moose_snippets.vim
@@ -6,7 +6,11 @@ if !exists('loaded_snippet') || &cp
 endif
 
 function! RemoveEmptySuperClass()
-    s/^extends '<{}>';\n//e
+    if @z == "SuperClass"
+        s/extends '<{}>';\n\n//e
+        return ""
+    endif
+
     return @z
 endfun
 
@@ -38,7 +42,7 @@ call Snippet('class', [
             \"package <{ClassName}>;",
             \"use Moose;",
             \"",
-            \"extends '<{SuperClass:RemoveEmptySuperClass()}>;",
+            \"extends '<{SuperClass:RemoveEmptySuperClass()}>';",
             \"",
             \"<{}>",
             \"",