From: Daniel Hahler Date: Thu, 26 Jul 2018 07:26:18 +0000 (+0200) Subject: Fix multiline handling with blank lines (#111) X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/b0d020f899c720469eaea8bfe50e71285ad053e6?ds=sidebyside;hp=-c Fix multiline handling with blank lines (#111) --- b0d020f899c720469eaea8bfe50e71285ad053e6 diff --git a/indent/python.vim b/indent/python.vim index cd44fba..8444a22 100644 --- a/indent/python.vim +++ b/indent/python.vim @@ -337,11 +337,11 @@ endfunction " Is the syntax at lnum (and optionally cnum) a python string? function! s:is_python_string(lnum, ...) let line = getline(a:lnum) - let linelen = len(line) - if linelen < 1 - let linelen = 1 + if a:0 + let cols = type(a:1) != type([]) ? [a:1] : a:1 + else + let cols = range(1, max([1, len(line)])) endif - let cols = a:0 ? type(a:1) != type([]) ? [a:1] : a:1 : range(1, linelen) for cnum in cols if match(map(synstack(a:lnum, cnum), \ "synIDattr(v:val, 'name')"), 'python\S*String') == -1 @@ -361,7 +361,7 @@ function! GetPythonPEPIndent(lnum) let prevline = getline(a:lnum-1) " Multilinestrings: continous, docstring or starting. - if s:is_python_string(a:lnum-1, len(prevline)) + if s:is_python_string(a:lnum-1, max([1, len(prevline)])) \ && (s:is_python_string(a:lnum, 1) \ || match(line, '^\%("""\|''''''\)') != -1) @@ -379,8 +379,8 @@ function! GetPythonPEPIndent(lnum) endif if s:is_python_string(a:lnum-1) - " Previous line is (completely) a string. - return indent(a:lnum-1) + " Previous line is (completely) a string: keep current indent. + return -1 endif if match(prevline, '^\s*\%("""\|''''''\)') != -1 diff --git a/spec/indent/indent_spec.rb b/spec/indent/indent_spec.rb index a85edcc..e60da62 100644 --- a/spec/indent/indent_spec.rb +++ b/spec/indent/indent_spec.rb @@ -130,7 +130,7 @@ shared_examples_for "vim" do vim.echo('synIDattr(synID(line("."), col("."), 0), "name")' ).downcase.should include 'string' vim.feedkeys 'a\' - proposed_indent.should == 0 + proposed_indent.should == -1 indent.should == 0 end @@ -464,7 +464,7 @@ shared_examples_for "multiline strings" do end end - describe "when after assigning an unfinished string" do + describe "when after assigning an indented unfinished string" do before { vim.feedkeys 'i test = """' } it "it indents the next line" do @@ -475,7 +475,7 @@ shared_examples_for "multiline strings" do end end - describe "when after assigning a finished string" do + describe "when after assigning an indented finished string" do before { vim.feedkeys 'i test = ""' } it "it does indent the next line" do @@ -508,12 +508,30 @@ shared_examples_for "multiline strings" do end describe "when breaking a string after opening parenthesis" do - before { vim.feedkeys 'i foo("""bar' } + before { vim.feedkeys 'i foo("""bar\\\' } it "it does indent the next line as after an opening multistring" do vim.feedkeys '\' - expected_proposed, expected_indent = multiline_indent(4, 4 + shiftwidth) + _, expected_indent = multiline_indent(4, 4 + shiftwidth) indent.should == expected_indent - proposed_indent.should == expected_proposed + proposed_indent.should == -1 + + # it keeps the indent after an empty line + vim.feedkeys '\' + proposed_indent, expected_indent = multiline_indent(4, 4 + shiftwidth) + indent.should == expected_indent + proposed_indent.should == proposed_indent + + # it keeps the indent of nonblank above + vim.feedkeys '\\' + proposed_indent, expected_indent = multiline_indent(4, 4 + shiftwidth) + indent.should == expected_indent + proposed_indent.should == proposed_indent + + # it keeps the indent of nonblank above before an empty line + vim.feedkeys '\' + proposed_indent, expected_indent = multiline_indent(4, 4 + shiftwidth) + indent.should == expected_indent + proposed_indent.should == proposed_indent end end end