]> 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:

Fix indenting of "else" with outer if
authorDaniel Hahler <git@thequod.de>
Thu, 26 Jul 2018 07:35:30 +0000 (09:35 +0200)
committerDaniel Hahler <git@thequod.de>
Thu, 26 Jul 2018 07:53:23 +0000 (09:53 +0200)
Fixes https://github.com/Vimjas/vim-python-pep8-indent/issues/97.

indent/python.vim
spec/indent/indent_spec.rb

index 8444a226a57d06d63a6e452ae5098e907a2fae56..f13ae9e698b32fa6670bffe3a91fab06fde2f8ba 100644 (file)
@@ -154,8 +154,6 @@ function! s:find_start_of_block(lnum, types, multiple)
                     if index(r, indent) == -1
                         let r += [indent]
                     endif
                     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)
                 endif
             endfor
             let last_indent = indent(lnum)
index e60da6215e45e5e89c1e7cc59dccb4aa93dcbe0b..400ec1154b15a09505604aee4843b8cd7d779693 100644 (file)
@@ -401,10 +401,22 @@ shared_examples_for "vim" do
   end
 
   describe "when an else is used inside of a nested if" 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:'
       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
 
     end
   end