Improve/fix indent with closing parenthesis (#129)

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

diff --git a/indent/python.vim b/indent/python.vim
index 3c86195606f68dfed29429151c8af5ceed6de8dc..aca216e79d69e63da8411a269c9522ae03c6b627 100644 (file)
--- a/indent/python.vim
+++ b/indent/python.vim
@@ -222,7 +222,12 @@ function! s:indent_like_opening_paren(lnum)
         if starts_with_closing_paren && !hang_closing
             let res = base
         else
         if starts_with_closing_paren && !hang_closing
             let res = base
         else

-            return base + s:sw()
+            let res = base + s:sw()
+
+            " Special case for parenthesis.
+            if text[paren_col-1] ==# '(' && getline(a:lnum) !~# '\v\)\s*:?\s*$'
+                return res
+            endif

         endif
     else
         " Indent to match position of opening paren.
         endif
     else
         " Indent to match position of opening paren.

diff --git a/spec/indent/indent_spec.rb b/spec/indent/indent_spec.rb
index 2ff0cafc72a418a8006f3ad56447fe7b15ab839c..55e2fba42debd58c112b670391dcf43cba755f5c 100644 (file)
--- a/spec/indent/indent_spec.rb
+++ b/spec/indent/indent_spec.rb
@@ -203,9 +203,24 @@ shared_examples_for "vim" do
   end
 
   describe "when using a function definition" do
   end
 
   describe "when using a function definition" do

-      it "indents shiftwidth spaces" do
+      it "handles indent with closing parenthesis on same line" do

           vim.feedkeys 'idef long_function_name(\<CR>arg'
           indent.should == shiftwidth
           vim.feedkeys 'idef long_function_name(\<CR>arg'
           indent.should == shiftwidth

+          vim.feedkeys '):'
+          indent.should == shiftwidth * 2
+      end
+
+      it "handles indent with closing parenthesis on new line" do
+          vim.feedkeys 'idef long_function_name(\<CR>arg'
+          indent.should == shiftwidth
+          vim.feedkeys '\<CR>'
+          indent.should == shiftwidth
+          vim.feedkeys ')'
+          indent.should == (hang_closing ? shiftwidth * 2 : 0)
+          vim.feedkeys ':'
+          indent.should == (hang_closing ? shiftwidth * 2 : 0)
+          vim.feedkeys '\<Esc>k'
+          indent.should == shiftwidth

       end
   end
 
       end
   end