Version 0.5.6

klen · klen · commit 95ff68c3a7f2 · 2012-02-06T14:06:24.000+04:00
diff --git a/Changelog.rst b/Changelog.rst
@@ -1,6 +1,14 @@
 Changelog
 =========
 
+## 2012-02-06 0.5.6
+-------------------
+* Fix 'g:pymode_syntax' option
+* Show error message in bottom part of screen
+  see 'g:pymode_lint_message'
+* Fix pylint for windows users
+* Fix breakpoint command (Use pdb when idpb not installed)
+
 ## 2012-01-17 0.5.5
 -------------------
 * Add a sign for info messages from pylint.
diff --git a/README.rst b/README.rst
@@ -151,6 +151,9 @@ Default values: ::
     " Auto open cwindow if errors be finded
     let g:pymode_lint_cwindow = 1
 
+    " Show error message if cursor placed at the error line
+    let g:pymode_lint_message = 1
+
     " Auto jump on first error
     let g:pymode_lint_jump = 0
 
diff --git a/autoload/pymode.vim b/autoload/pymode.vim
@@ -73,3 +73,12 @@ fun! pymode#ShowCommand(cmd) "{{{
     normal gg
     wincmd p
 endfunction "}}}
+
+" DESC: Show wide message
+fun! pymode#WideMessage(msg) "{{{
+    let x=&ruler | let y=&showcmd
+    set noruler noshowcmd
+    redraw
+    echo strpart(a:msg, 0, &columns-1)
+    let &ruler=x | let &showcmd=y
+endfunction "}}}
diff --git a/autoload/pymode/lint.vim b/autoload/pymode/lint.vim
@@ -10,12 +10,23 @@ function! pymode#lint#Check()
     endif	
     exe "py ".g:pymode_lint_checker."()"
     call setqflist(b:qf_list, 'r')
+
     if g:pymode_lint_cwindow
         call pymode#QuickfixOpen(0, 0, g:pymode_lint_maxheight, g:pymode_lint_minheight, g:pymode_lint_jump)
     endif
+
     if g:pymode_lint_signs
         call pymode#PlaceSigns()
     endif
+
+    if g:pymode_lint_message
+        let b:errors = {}
+        for v in b:qf_list
+            let b:errors[v['lnum']] = v['text']
+        endfor
+        call pymode#lint#show_errormessage()
+    endif
+
 endfunction
 
 fun! pymode#lint#Toggle() "{{{
@@ -45,3 +56,17 @@ fun! pymode#lint#toggle_win(toggle, msg) "{{{
         cclose
     endif
 endfunction "}}}
+
+fun! pymode#lint#show_errormessage() "{{{
+    let cursor = getpos(".")
+    if !pymode#Default('b:errors', {}) || !len(b:errors)
+        return
+    endif
+    if has_key(b:errors, l:cursor[1])
+        call pymode#WideMessage(b:errors[l:cursor[1]])
+        let b:show_message = 1
+    else
+        let b:show_message = 0
+        echo
+    endif
+endfunction " }}}
diff --git a/doc/pymode.txt b/doc/pymode.txt
@@ -65,6 +65,8 @@ PythonMode. These options should be set in your vimrc.
 
 |'pymode_lint_cwindow'|             Show cwindow
 
+|'pymode_lint_message'|             Show current line errors in bottom
+
 |'pymode_lint_signs'|               Place signs
 
 |'pymode_lint_jump'|                Auto jump on first error
@@ -184,6 +186,13 @@ Default: 1.
 
 If this option is set to 0 then pylint not show cwindow.
 
+------------------------------------------------------------------------------
+                                                         *'pymode_lint_message'*
+Values: 0 or 1.
+Default: 1.
+
+If this option is set to 0 then pylint not show errors in bottom
+
 ------------------------------------------------------------------------------
                                                            *'pymode_lint_signs'*
 Values: 0 or 1.
diff --git a/ftplugin/python/pymode.vim b/ftplugin/python/pymode.vim
@@ -78,6 +78,9 @@ endif
 
 if g:pymode_lint
 
+    " DESC: Show message flag
+    let b:show_message = 0
+
     " DESC: Set commands
     command! -buffer -nargs=0 PyLintToggle :call pymode#lint#Toggle()
     command! -buffer -nargs=0 PyLintWindowToggle :call pymode#lint#ToggleWindow()
@@ -93,6 +96,11 @@ if g:pymode_lint
         au InsertLeave <buffer> PyLint
     endif
 
+    if g:pymode_lint_message
+        au CursorHold <buffer> call pymode#lint#show_errormessage()
+        au CursorMoved <buffer> call pymode#lint#show_errormessage()
+    endif
+
 endif
 
 " }}}
diff --git a/plugin/pymode.vim b/plugin/pymode.vim
@@ -1,4 +1,4 @@
-let g:pymode_version = "0.5.5"
+let g:pymode_version = "0.5.6"
 
 com! PymodeVersion echomsg "Current python-mode version: " . g:pymode_version
 
@@ -41,6 +41,9 @@ if !pymode#Default("g:pymode_lint", 1) || g:pymode_lint
     " OPTION: g:pymode_lint_onfly -- bool. Check code every save.
     call pymode#Default("g:pymode_lint_onfly", 0)
 
+    " OPTION: g:pymode_lint_message -- bool. Show current line error message
+    call pymode#Default("g:pymode_lint_message", 1)
+
     " OPTION: g:pymode_lint_checker -- str. Use pylint of pyflakes for check.
     call pymode#Default("g:pymode_lint_checker", "pylint")
 
@@ -89,7 +92,7 @@ from pyflakes import checker
 
 # Pylint setup
 linter = lint.PyLinter()
-pylint_re = re.compile('^[^:]+:(\d+): \[([EWRCI]+)[^\]]*\] (.*)$')
+pylint_re = re.compile('^(?:.:)?[^:]+:(\d+): \[([EWRCI]+)[^\]]*\] (.*)$')
 
 checkers.initialize(linter)
 linter.load_file_configuration(vim.eval("g:pymode_lint_config"))
@@ -161,11 +164,18 @@ endif
 
 if !pymode#Default("g:pymode_breakpoint", 1) || g:pymode_breakpoint
 
+    if !pymode#Default("g:pymode_breakpoint_cmd", "import ipdb; ipdb.set_trace() ### XXX BREAKPOINT")  && has("python")
+python << EOF
+try:
+    import ipdb
+except ImportError:
+    vim.command('let g:pymode_breakpoint_cmd = "import pdb; pdb.set_trace() ### XXX BREAKPOINT"')
+EOF
+    endif
+
     " OPTION: g:pymode_breakpoint_key -- string. Key for set/unset breakpoint.
     call pymode#Default("g:pymode_breakpoint_key", "<leader>b")
 
-    call pymode#Default("g:pymode_breakpoint_cmd", "import ipdb; ipdb.set_trace() ### XXX BREAKPOINT")
-
 endif
 
 " }}}
diff --git a/syntax/python.vim b/syntax/python.vim
@@ -1,5 +1,8 @@
 " vim: ft=vim:fdm=marker
 
+" OPTION: g:pymode_syntax -- bool.
+call pymode#Default('g:pymode_syntax', 1)
+
 " DESC: Disable script loading
 if pymode#Default('b:current_syntax', 'python') || !g:pymode_syntax
     finish
