]> git.madduck.net Git - etc/vim.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Unindent 'finally' after 'else' too
authorHynek Schlawack <hs@ox.cx>
Fri, 3 Jan 2014 20:00:18 +0000 (21:00 +0100)
committerHynek Schlawack <hs@ox.cx>
Fri, 3 Jan 2014 20:00:18 +0000 (21:00 +0100)
indent/python.vim
spec/indent/indent_spec.rb

index 4dcdf8b90df03f0abcd6c1504d9001772b47b42a..db12e241f1fb87f9b9089d25ef3c4af997f99182 100644 (file)
@@ -137,9 +137,8 @@ function! GetPythonPEPIndent(lnum)
         endif
     endif
 
         endif
     endif
 
-    " If the line starts with 'except', or 'finally', line up with 'try'
-    " or 'except'.
-    if thisline =~ '^\s*\(except\|finally\)\>'
+    " If the line starts with 'except' line up with 'try' or 'except'.
+    if thisline =~ '^\s*except\>'
         let bslnum = s:BlockStarter(a:lnum, '^\s*\(try\|except\)\>')
         if bslnum > 0
             return indent(bslnum)
         let bslnum = s:BlockStarter(a:lnum, '^\s*\(try\|except\)\>')
         if bslnum > 0
             return indent(bslnum)
@@ -148,6 +147,17 @@ function! GetPythonPEPIndent(lnum)
         endif
     endif
 
         endif
     endif
 
+    " If the line starts with 'finally', line up with 'try', 'else', or
+    " 'except'.
+    if thisline =~ '^\s*finally\>'
+        let bslnum = s:BlockStarter(a:lnum, '^\s*\(try\|except\|else\)\>')
+        if bslnum > 0
+            return indent(bslnum)
+        else
+            return -1
+        endif
+    endif
+
     " If the line starts with 'else', line it up with 'try', 'except', 'for',
     " 'if', or 'elif'.
     if thisline =~ '^\s*else\>'
     " If the line starts with 'else', line it up with 'try', 'except', 'for',
     " 'if', or 'elif'.
     if thisline =~ '^\s*else\>'
index 77b94ef4c36ad8055cf24bfe0483ee78f3db1077..a622cf8ef29139c225b7515f7b69328a8d9114bc 100644 (file)
@@ -144,6 +144,15 @@ shared_examples_for "vim" do
      end
   end
 
      end
   end
 
+  describe "when an 'else' is followed by" do
+     before { vim.feedkeys 'i\<TAB>\<TAB>else:\<CR>XXX\<CR>' }
+     it "a 'finally', it lines up with the 'else'" do
+        vim.feedkeys 'finally:'
+        indent.should == shiftwidth * 2
+     end
+  end
+
+
   describe "when a 'try' is followed by" do
      before { vim.feedkeys 'i\<TAB>\<TAB>try:\<CR>' }
      it "an 'except', it lines up with the 'try'" do
   describe "when a 'try' is followed by" do
      before { vim.feedkeys 'i\<TAB>\<TAB>try:\<CR>' }
      it "an 'except', it lines up with the 'try'" do