Inline s:skip_search

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

diff --git a/indent/python.vim b/indent/python.vim
index c56c2dc1f4e73aa14ec88295427677139aa8ecc1..52a2966209d3de7898e8cdd47201eb198c3ebfd4 100644 (file)
--- a/indent/python.vim
+++ b/indent/python.vim
@@ -61,7 +61,7 @@ let s:stop_statement = '^\s*\(break\|continue\|raise\|return\|pass\)\>'
 " jedi* refers to syntax definitions from jedi-vim for call signatures, which
 " are inserted temporarily into the buffer.
 let s:skip_special_chars = 'synIDattr(synID(line("."), col("."), 0), "name") ' .
 " jedi* refers to syntax definitions from jedi-vim for call signatures, which
 " are inserted temporarily into the buffer.
 let s:skip_special_chars = 'synIDattr(synID(line("."), col("."), 0), "name") ' .

-            \ '=~? "\\vstring|comment|jedi\\S"'
+            \ '=~? "\\vstring|comment|^pythonbytes%(contents)=$|jedi\\S"'

 
 let s:skip_after_opening_paren = 'synIDattr(synID(line("."), col("."), 0), "name") ' .
             \ '=~? "\\vcomment|jedi\\S"'
 
 let s:skip_after_opening_paren = 'synIDattr(synID(line("."), col("."), 0), "name") ' .
             \ '=~? "\\vcomment|jedi\\S"'


@@ -77,9 +77,6 @@ if has('conceal')
 endif
 
 
 endif
 
 

-let s:skip_search = 'synIDattr(synID(line("."), col("."), 0), "name") ' .
-            \ '=~? "comment"'
-

 " Use 'shiftwidth()' instead of '&sw'.
 " (Since Vim patch 7.3.629, 'shiftwidth' can be set to 0 to follow 'tabstop').
 if exists('*shiftwidth')
 " Use 'shiftwidth()' instead of '&sw'.
 " (Since Vim patch 7.3.629, 'shiftwidth' can be set to 0 to follow 'tabstop').
 if exists('*shiftwidth')


@@ -104,7 +101,9 @@ function! s:find_opening_paren(...)
     endif
 
     " Return if cursor is in a comment.
     endif
 
     " Return if cursor is in a comment.

-    exe 'if' s:skip_search '| return [0, 0] | endif'
+    if synIDattr(synID(line('.'), col('.'), 0), 'name') =~? 'comment'
+        return [0, 0]
+    endif

 
     let nearest = [0, 0]
     for [p, maxoff] in items(s:paren_pairs)
 
     let nearest = [0, 0]
     for [p, maxoff] in items(s:paren_pairs)


@@ -313,7 +312,7 @@ function! s:indent_like_previous_line(lnum)
         return -1
     endif
 
         return -1
     endif
 

-    if !empty && s:is_dedented_already(current, base)
+    if (current || !empty) && s:is_dedented_already(current, base)

         return -1
     endif
 
         return -1
     endif