Merge branch 'develop' of https://github.com/klen/python-mode into develop

vim-IDE · vim-IDE · commit d854dc2d9a81 · 2015-08-27T06:00:17.000Z
diff --git a/AUTHORS b/AUTHORS
@@ -38,6 +38,7 @@ Contributors:
 * Piet Delport (http://github.com/pjdelport);
 * Robert David Grant (http://github.com/bgrant);
 * Ronald Andreu Kaiser (http://github.com/cathoderay);
+* Samir Benmendil (https://github.com/Ram-Z)
 * Sorin Ionescu (sorin-ionescu);
 * Steve Losh (http://github.com/sjl);
 * Tommy Allen (https://github.com/tweekmonster)
diff --git a/README.rst b/README.rst
@@ -40,7 +40,7 @@ See (very old) screencast here: http://www.youtube.com/watch?v=67OZNp9Z0CQ
 (sorry for quality, this is my first screencast) Another old presentation here:
 http://www.youtube.com/watch?v=YhqsjUUHj6g
 
-**To read python-mode documentation in Vim, see** ``:help pymode.txt``
+**To read python-mode documentation in Vim, see** ``:help pymode``
 
 
 .. contents::
@@ -62,7 +62,7 @@ Using pathogen (recommended)
 
     % cd ~/.vim
     % mkdir -p bundle && cd bundle
-    % git clone git://github.com/klen/python-mode.git
+    % git clone https://github.com/klen/python-mode.git
 
 - Enable `pathogen <https://github.com/tpope/vim-pathogen>`_
   in your ``~/.vimrc``: ::
@@ -81,7 +81,7 @@ Manually
 --------
 ::
 
-    % git clone git://github.com/klen/python-mode.git
+    % git clone https://github.com/klen/python-mode.git
     % cd python-mode
     % cp -R * ~/.vim
 
diff --git a/autoload/pymode.vim b/autoload/pymode.vim
@@ -76,9 +76,11 @@ endfunction "}}}
 
 " DESC: Remove unused whitespaces
 fun! pymode#trim_whitespaces() "{{{
-    let cursor_pos = getpos('.')
-    silent! %s/\s\+$//
-    call setpos('.', cursor_pos)
+    if g:pymode_trim_whitespaces
+        let cursor_pos = getpos('.')
+        silent! %s/\s\+$//
+        call setpos('.', cursor_pos)
+    endif
 endfunction "}}}
 
 
diff --git a/autoload/pymode/breakpoint.vim b/autoload/pymode/breakpoint.vim
@@ -17,7 +17,7 @@ fun! pymode#breakpoint#init() "{{{
 
 from imp import find_module
 
-for module in ('pudb', 'ipdb'):
+for module in ('wdb', 'pudb', 'ipdb'):
     try:
         find_module(module)
         vim.command('let g:pymode_breakpoint_cmd = "import %s; %s.set_trace()  # XXX BREAKPOINT"' % (module, module))
diff --git a/autoload/pymode/doc.vim b/autoload/pymode/doc.vim
@@ -29,6 +29,9 @@ fun! pymode#doc#show(word) "{{{
     setlocal nomodifiable
     setlocal nomodified
     setlocal filetype=rst
+    if g:pymode_doc_vertical
+        wincmd L
+    endif
     wincmd p
 
 endfunction "}}}
diff --git a/autoload/pymode/folding.vim b/autoload/pymode/folding.vim
@@ -18,7 +18,7 @@ fun! pymode#folding#text() " {{{
     while getline(fs) !~ s:def_regex && getline(fs) !~ s:doc_begin_regex
         let fs = nextnonblank(fs + 1)
     endwhile
-    if getline(fs) =~ s:doc_begin_regex
+    if getline(fs) =~ s:doc_end_regex && getline(fs) =~ s:doc_begin_regex
         let fs = nextnonblank(fs + 1)
     endif
     let line = getline(fs)
@@ -50,6 +50,10 @@ fun! pymode#folding#expr(lnum) "{{{
     endif
 
     if line =~ s:def_regex
+        " single line def
+        if indent(a:lnum) >= indent(a:lnum+1)
+            return '='
+        endif
         " Check if last decorator is before the last def
         let decorated = 0
         let lnum = a:lnum - 1
diff --git a/doc/pymode.txt b/doc/pymode.txt
@@ -98,10 +98,6 @@ Setup default python options                                *'g:pymode_options'*
 >
     let g:pymode_options = 1
 
-Setup max line length                       *'g:pymode_options_max_line_length'*
->
-    let g:pymode_options_max_line_length = 79
-
 If this option is set to 1, pymode will enable the following options for
 python buffers: >
 
@@ -115,6 +111,10 @@ python buffers: >
     setlocal commentstring=#%s
     setlocal define=^\s*\\(def\\\\|class\\)
 
+Setup max line length                       *'g:pymode_options_max_line_length'*
+>
+    let g:pymode_options_max_line_length = 79
+
 Enable colorcolumn display at max_line_length   *'g:pymode_options_colorcolumn'*
 >
     let g:pymode_options_colorcolumn = 1
diff --git a/plugin/pymode.vim b/plugin/pymode.vim
@@ -52,6 +52,9 @@ call pymode#default("g:pymode_options", 1)
 call pymode#default("g:pymode_options_max_line_length", 80)
 call pymode#default("g:pymode_options_colorcolumn", 1)
 
+" Enable/disable vertical display of python documentation
+call pymode#default("g:pymode_doc_vertical", 0)
+
 " Minimal height of pymode quickfix window
 call pymode#default('g:pymode_quickfix_maxheight', 6)
 
diff --git a/syntax/python.vim b/syntax/python.vim
@@ -80,13 +80,13 @@ endif
     syn match pythonFunction "\%(\%(def\s\|@\)\s*\)\@<=\h\%(\w\|\.\)*" contained nextgroup=pythonVars
     syn region pythonVars start="(" skip=+\(".*"\|'.*'\)+ end=")" contained contains=pythonParameters transparent keepend
     syn match pythonParameters "[^,]*" contained contains=pythonParam skipwhite
-    syn match pythonParam "[^,]*" contained contains=pythonExtraOperator,pythonLambdaExpr,pythonBuiltinObj,pythonBuiltinType,pythonConstant,pythonString,pythonNumber,pythonBrackets,pythonSelf skipwhite
+    syn match pythonParam "[^,]*" contained contains=pythonExtraOperator,pythonLambdaExpr,pythonBuiltinObj,pythonBuiltinType,pythonConstant,pythonString,pythonNumber,pythonBrackets,pythonSelf,pythonComment skipwhite
     syn match pythonBrackets "{[(|)]}" contained skipwhite
 
     syn keyword pythonStatement class nextgroup=pythonClass skipwhite
     syn match pythonClass "\%(\%(class\s\)\s*\)\@<=\h\%(\w\|\.\)*" contained nextgroup=pythonClassVars
     syn region pythonClassVars start="(" end=")" contained contains=pythonClassParameters transparent keepend
-    syn match pythonClassParameters "[^,\*]*" contained contains=pythonBuiltin,pythonBuiltinObj,pythonBuiltinType,pythonExtraOperatorpythonStatement,pythonBrackets,pythonString skipwhite
+    syn match pythonClassParameters "[^,\*]*" contained contains=pythonBuiltin,pythonBuiltinObj,pythonBuiltinType,pythonExtraOperatorpythonStatement,pythonBrackets,pythonString,pythonComment skipwhite
 
     syn keyword pythonRepeat        for while
     syn keyword pythonConditional   if elif else
