Cover/fix non-matching multiline closing

diff --git a/indent/python.vim b/indent/python.vim
index cc9d6c203fb01d77177e2e0c0bb42f3ba9993c98..b5ea8a994eb3661953473b1a7203e2e86e51a77b 100644 (file)
--- a/indent/python.vim
+++ b/indent/python.vim
@@ -381,11 +381,12 @@ function! GetPythonPEPIndent(lnum)
         if match_quotes != -1
             " closing multiline string
             let quotes = line[match_quotes:(match_quotes+2)]
         if match_quotes != -1
             " closing multiline string
             let quotes = line[match_quotes:(match_quotes+2)]

-            let pairpos = searchpairpos(quotes, '', quotes, 'b', 1, g:python_pep8_indent_searchpair_timeout)
+            call cursor(a:lnum, 1)
+            let pairpos = searchpairpos(quotes, '', quotes, 'bW', '', 0, g:python_pep8_indent_searchpair_timeout)

             if pairpos[0] != 0
                 return indent(pairpos[0])
             else
             if pairpos[0] != 0
                 return indent(pairpos[0])
             else

-                " TODO: test to cover this!
+                return -1

             endif
         endif
 
             endif
         endif
 

diff --git a/spec/indent/indent_spec.rb b/spec/indent/indent_spec.rb
index 400ec1154b15a09505604aee4843b8cd7d779693..68b545f68b22799d0f16514ed63f72eaba1e4a06 100644 (file)
--- a/spec/indent/indent_spec.rb
+++ b/spec/indent/indent_spec.rb
@@ -502,11 +502,26 @@ shared_examples_for "multiline strings" do
   end
 
   describe "when after a docstring" do
   end
 
   describe "when after a docstring" do

-    before { vim.feedkeys 'i    """' }

     it "it does indent the next line to the docstring" do
     it "it does indent the next line to the docstring" do

-      vim.feedkeys '\<CR>'
+      vim.feedkeys 'i    """\<CR>'
+      indent.should == 4
+      proposed_indent.should == 4
+    end
+
+    it "indents the closing docstring quotes" do
+      vim.feedkeys 'i    """\<CR>\<CR>"""'

       indent.should == 4
       proposed_indent.should == 4
       indent.should == 4
       proposed_indent.should == 4

+      vim.echo('getline(3)').should == '    """'
+    end
+
+    it "indents non-matching docstring quotes" do
+      vim.feedkeys 'i    """\<CR>\<Esc>'
+      vim.feedkeys "0C'''"
+      vim.echo('line(".")').should == "4"
+      vim.echo('getline(".")').should == "'''"
+      indent.should == 0
+      proposed_indent.should == -1

     end
   end
 
     end
   end