Fix indenting of strings between brackets

[etc/vim.git] / indent / python.vim

diff --git a/indent/python.vim b/indent/python.vim
index 461e962adb88237248d845280e60aefa93f33611..d1465665f25ecd9b4a6704cb3fd0531f7eb2af7d 100644 (file)
--- a/indent/python.vim
+++ b/indent/python.vim
@@ -16,6 +16,9 @@ setlocal nolisp
 setlocal autoindent
 setlocal indentexpr=GetPythonPEPIndent(v:lnum)
 setlocal indentkeys=!^F,o,O,<:>,0),0],0},=elif,=except
 setlocal autoindent
 setlocal indentexpr=GetPythonPEPIndent(v:lnum)
 setlocal indentkeys=!^F,o,O,<:>,0),0],0},=elif,=except

+setlocal tabstop=4
+setlocal softtabstop=4
+setlocal shiftwidth=4

 
 let s:maxoff = 50
 let s:block_rules = {
 
 let s:maxoff = 50
 let s:block_rules = {


@@ -29,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: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"'
 
            \ '=~? "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()
 " compatibility with vim patch 7.3.629: 'sw' can be set to -1 to follow 'ts'
 if exists('*shiftwidth')
     function! s:sw()


@@ -65,12 +71,12 @@ function! s:find_opening_paren(...)
     let stopline = max([0, line('.') - s:maxoff])
 
     " Return if cursor is in a comment or string
     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(
 
     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
     endfor
 
     " Remove empty matches and return the type with the closest match


@@ -183,11 +189,11 @@ function! s:indent_like_previous_line(lnum)
 
     " Jump to last character in previous line.
     call cursor(lnum, len(text))
 
     " 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)
 
     " 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()
         normal! h
       else
         return base + s:sw()