From: Daniel Hahler <git@thequod.de>
Date: Thu, 26 Jul 2018 07:35:30 +0000 (+0200)
Subject: Fix indenting of "else" with outer if
X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/0c4a52f1f101f61376900fa655ffa256437bedc8

Fix indenting of "else" with outer if

Fixes https://github.com/Vimjas/vim-python-pep8-indent/issues/97.
---

diff --git a/indent/python.vim b/indent/python.vim
index 8444a22..f13ae9e 100644
--- a/indent/python.vim
+++ b/indent/python.vim
@@ -154,8 +154,6 @@ function! s:find_start_of_block(lnum, types, multiple)
                     if index(r, indent) == -1
                         let r += [indent]
                     endif
-                    " Remove any handled type, e.g. 'if'.
-                    call remove(types, index(types, type))
                 endif
             endfor
             let last_indent = indent(lnum)
diff --git a/spec/indent/indent_spec.rb b/spec/indent/indent_spec.rb
index e60da62..400ec11 100644
--- a/spec/indent/indent_spec.rb
+++ b/spec/indent/indent_spec.rb
@@ -401,10 +401,22 @@ shared_examples_for "vim" do
   end
 
   describe "when an else is used inside of a nested if" do
-    before { vim.feedkeys 'iif foo:\<CR>\<TAB>if bar:\<CR>\<TAB>\<TAB>pass\<CR>' }
-    it "indents an else to the inner if" do
+    before { vim.feedkeys 'iif foo:\<CR>if bar:\<CR>pass\<CR>' }
+    it "indents the else to the inner if" do
       vim.feedkeys 'else:'
-      indent.should == shiftwidth * 2
+      indent.should == shiftwidth
+    end
+  end
+
+  describe "when an else is used outside of a nested if" do
+    before { vim.feedkeys 'iif True:\<CR>if True:\<CR>pass\<CR>\<Esc>0' }
+    it "indents the else to the outer if" do
+      indent.should == 0
+      proposed_indent.should == shiftwidth
+
+      vim.feedkeys 'ielse:'
+      indent.should == 0
+      proposed_indent.should == 0
     end
   end