Revert "Improve s:find_start_of_multiline_statement: only look for round parens"...

This reverts commit 922268fbd89a49991b5b5b73e969f8daa8a10263.

Add a regression test.

Conflicts:
	indent/python.vim

diff --git a/indent/python.vim b/indent/python.vim
index e251ce286b944d36f792b22e14c661db01c50493..86155cf085210abc0f7420a9d7d8c9f1739fd4c9 100644 (file)
--- a/indent/python.vim
+++ b/indent/python.vim
@@ -46,9 +46,6 @@ let s:block_rules_multiple = {
 " The value is the maximum offset in lines.
 let s:paren_pairs = {'()': 50, '[]': 100, '{}': 1000}
 
 " The value is the maximum offset in lines.
 let s:paren_pairs = {'()': 50, '[]': 100, '{}': 1000}
 

-" Maximum offset when looking for multiline statements (in round parenthesis).
-let s:maxoff_multiline_statement = 50
-

 if &filetype ==# 'pyrex' || &filetype ==# 'cython'
     let b:control_statement = '\v^\s*(class|def|if|while|with|for|except|cdef|cpdef)>'
 else
 if &filetype ==# 'pyrex' || &filetype ==# 'cython'
     let b:control_statement = '\v^\s*(class|def|if|while|with|for|except|cdef|cpdef)>'
 else


@@ -125,21 +122,19 @@ function! s:find_opening_paren(...)
     return nearest
 endfunction
 
     return nearest
 endfunction
 

-" Find the start of a multi-line statement (based on surrounding parens).
+" Find the start of a multi-line statement

 function! s:find_start_of_multiline_statement(lnum)
     let lnum = a:lnum
     while lnum > 0
 function! s:find_start_of_multiline_statement(lnum)
     let lnum = a:lnum
     while lnum > 0

-        " XXX: not tested?!

         if getline(lnum - 1) =~# '\\$'
             let lnum = prevnonblank(lnum - 1)
         else
         if getline(lnum - 1) =~# '\\$'
             let lnum = prevnonblank(lnum - 1)
         else

-            call cursor(lnum, 1)
-            let stopline = max([1, lnum - s:maxoff_multiline_statement])
-            let pos = searchpairpos('\V(', '', '\V)', 'bnW', s:skip_special_chars, stopline)
-            if pos[0]
-                return pos[0]
+            let [paren_lnum, _] = s:find_opening_paren(lnum)
+            if paren_lnum < 1
+                return lnum
+            else
+                let lnum = paren_lnum

             endif
             endif

-            return lnum

         endif
     endwhile
 endfunction
         endif
     endwhile
 endfunction

diff --git a/spec/indent/indent_spec.rb b/spec/indent/indent_spec.rb
index b08203b8a0b05d89e71c0fdfab9a26b67a82b8dc..6e5a79ffabd33928097d206b375ff12592de3fd0 100644 (file)
--- a/spec/indent/indent_spec.rb
+++ b/spec/indent/indent_spec.rb
@@ -651,3 +651,18 @@ describe "Handles far away opening curly brackets" do
     indent.should == shiftwidth
   end
 end
     indent.should == shiftwidth
   end
 end

+
+describe "Compact multiline dict" do
+  before { vim.feedkeys '\<ESC>ggdGid = {"one": 1,' }
+
+  it "gets indented correctly" do
+    vim.feedkeys '\<CR>'
+    proposed_indent.should == 5
+
+    vim.feedkeys '"two": 2}'
+    proposed_indent.should == 5
+
+    vim.feedkeys '\<CR>'
+    proposed_indent.should == 0
+  end
+end