unindent 'else' after 'for' and 'try/except'

diff --git a/indent/python.vim b/indent/python.vim
index 6fb188903dd98a175755cc8c079890fc84564857..9b8e9b187bf96182e10097fcad61e59176520c2e 100644 (file)
--- a/indent/python.vim
+++ b/indent/python.vim
@@ -19,7 +19,8 @@ setlocal indentkeys=!^F,o,O,<:>,0),0],0},=elif,=except
 
 let s:maxoff = 50
 let s:block_rules = {
-  \ '^\s*\(elif\|else\)\>': ['if', 'elif'],
+  \ '^\s*elif\>': ['if', 'elif'],
+  \ '^\s*else\>': ['if', 'elif', 'for', 'try', 'except'],
   \ '^\s*except\>': ['try', 'except'],
   \ '^\s*finally\>': ['try', 'except', 'else']
   \ }

diff --git a/spec/indent/indent_spec.rb b/spec/indent/indent_spec.rb
index 4652ef9762ecb4302957ab480a959d6de61db78b..db7a49cea2a57fd3e20aa5555c634cf03d49bc2f 100644 (file)
--- a/spec/indent/indent_spec.rb
+++ b/spec/indent/indent_spec.rb
@@ -100,6 +100,18 @@ shared_examples_for "vim" do
       end
   end
 
+  describe "when writing an 'else' block" do
+    it "aligns to the preceeding 'for' block" do
+      vim.feedkeys 'ifor x in "abc":\<CR>pass\<CR>else:'
+      indent.should == 0
+    end
+
+    it "aligns to the preceeding 'if' block" do
+      vim.feedkeys 'ifor x in "abc":\<CR>if True:\<CR>pass\<CR>else:'
+      indent.should == shiftwidth
+    end
+  end
+
   describe "when using parens and control statements" do
     it "avoids ambiguity by using extra indentation" do
       vim.feedkeys 'iif (111 and\<CR>'