Update show documentation functioonality (c) blueyed

klen · klen · commit d7cf768f0f35 · 2013-12-06T21:19:25.000+07:00
diff --git a/autoload/pymode/doc.vim b/autoload/pymode/doc.vim
@@ -2,16 +2,37 @@
 "
 PymodePython import pymode
 
+
+fun! pymode#doc#find() "{{{
+    " Extract the 'word' at the cursor, expanding leftwards across identifiers
+    " and the . operator, and rightwards across the identifier only.
+    "
+    " For example:
+    "   import xml.dom.minidom
+    "           ^   !
+    "
+    " With the cursor at ^ this returns 'xml'; at ! it returns 'xml.dom'.
+    let l:line = getline(".")
+    let l:pre = l:line[:col(".") - 1]
+    let l:suf = l:line[col("."):]
+    let word = matchstr(pre, "[A-Za-z0-9_.]*$") . matchstr(suf, "^[A-Za-z0-9_]*")
+    call pymode#doc#show(word)
+endfunction "}}}
+
+
+
 fun! pymode#doc#show(word) "{{{
     if a:word == ''
         call pymode#error("No name/symbol under cursor!")
-    else
-        call pymode#tempbuffer_open('__doc__')
-        PymodePython pymode.get_documentation()
-        setlocal nomodifiable
-        setlocal nomodified
-        setlocal filetype=rst
-        wincmd p
+        return 0
     endif
+
+    call pymode#tempbuffer_open('__doc__')
+    PymodePython pymode.get_documentation()
+    setlocal nomodifiable
+    setlocal nomodified
+    setlocal filetype=rst
+    wincmd p
+
 endfunction "}}}
 
diff --git a/ftplugin/python/pymode.vim b/ftplugin/python/pymode.vim
@@ -100,7 +100,7 @@ if g:pymode_doc
     command! -buffer -nargs=1 PymodeDoc call pymode#doc#show("<args>")
 
     " Set keys
-    exe "nnoremap <silent> <buffer> " g:pymode_doc_bind ":call pymode#doc#show(expand('<cword>'))<CR>"
+    exe "nnoremap <silent> <buffer> " g:pymode_doc_bind ":call pymode#doc#find()<CR>"
     exe "vnoremap <silent> <buffer> " g:pymode_doc_bind ":<C-U>call pymode#doc#show(@*)<CR>"
 
 end
diff --git a/pymode/__init__.py b/pymode/__init__.py
@@ -35,3 +35,4 @@ def get_documentation():
     help(vim.eval('a:word'))
     sys.stdout, out = _, sys.stdout.getvalue()
     vim.current.buffer.append(str(out).splitlines(), 0)
+
