From: Jelte Fennema Date: Tue, 8 Jul 2014 14:16:11 +0000 (+0200) Subject: Fix indenting of strings between brackets X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/47ab0458c0c8f005777b92fccd4008d26bd0d0af?ds=inline;hp=-c Fix indenting of strings between brackets Add unit test Add myself to authors --- 47ab0458c0c8f005777b92fccd4008d26bd0d0af diff --git a/AUTHORS.rst b/AUTHORS.rst index 48a5cd8..1e2b53c 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -8,6 +8,7 @@ It is currently maintained by Hynek Schlawack with the generous help of the foll - 0player - Clay Gerrard - Hassan Kibirige +- Jelte Fennema - Johann Klähn - Joseph Irwin - Steve Losh diff --git a/indent/python.vim b/indent/python.vim index 0f58516..d146566 100644 --- a/indent/python.vim +++ b/indent/python.vim @@ -32,9 +32,12 @@ let s:control_statement = '^\s*\(if\|while\|with\|for\|except\)\>' let s:stop_statement = '^\s*\(break\|continue\|raise\|return\|pass\)\>' " Skip strings and comments -let s:skip = 'synIDattr(synID(line("."), col("."), 0), "name") ' . +let s:skip_special_chars = 'synIDattr(synID(line("."), col("."), 0), "name") ' . \ '=~? "string\\|comment"' +let s:skip_search = 'synIDattr(synID(line("."), col("."), 0), "name") ' . + \ '=~? "comment"' + " compatibility with vim patch 7.3.629: 'sw' can be set to -1 to follow 'ts' if exists('*shiftwidth') function! s:sw() @@ -68,12 +71,12 @@ function! s:find_opening_paren(...) let stopline = max([0, line('.') - s:maxoff]) " Return if cursor is in a comment or string - exe 'if' s:skip '| return [0, 0] | endif' + exe 'if' s:skip_search '| return [0, 0] | endif' let positions = [] for p in s:paren_pairs call add(positions, searchpairpos( - \ '\V'.p[0], '', '\V'.p[1], 'bnW', s:skip, stopline)) + \ '\V'.p[0], '', '\V'.p[1], 'bnW', s:skip_special_chars, stopline)) endfor " Remove empty matches and return the type with the closest match @@ -186,11 +189,11 @@ function! s:indent_like_previous_line(lnum) " Jump to last character in previous line. call cursor(lnum, len(text)) - let ignore_last_char = eval(s:skip) + let ignore_last_char = eval(s:skip_special_chars) " Search for final colon that is not inside a string or comment. while search(':\s*\%(#.*\)\?$', 'bcW', lnum) - if eval(s:skip) + if eval(s:skip_special_chars) normal! h else return base + s:sw() diff --git a/spec/indent/indent_spec.rb b/spec/indent/indent_spec.rb index 15e265a..1026bd1 100644 --- a/spec/indent/indent_spec.rb +++ b/spec/indent/indent_spec.rb @@ -76,6 +76,14 @@ shared_examples_for "vim" do end end + describe "when using gq to reindent a '(' that is" do + before { vim.feedkeys 'itest(' } + it "something and has a string without spaces at the end" do + vim.feedkeys 'something_very_long_blaaaaaaaaa, "some_very_long_string_blaaaaaaaaaaaaaaaaaaaa"\gqq' + indent.should == 5 + end + end + describe "when after multiple parens of different types" do it "indents by one level" do vim.feedkeys 'if({\'