gitgutter compatibility

klen · klen · commit 90fb3415313b · 2013-03-26T10:06:10.000+08:00
diff --git a/autoload/pymode.vim b/autoload/pymode.vim
@@ -50,18 +50,19 @@ fun! pymode#QuickfixOpen(onlyRecognized, holdCursor, maxHeight, minHeight, jumpE
 endfunction "}}}
 
 
-fun! pymode#PlaceSigns() "{{{
+fun! pymode#PlaceSigns(bnum) "{{{
     " DESC: Place error signs
     "
     if has('signs')
-        sign unplace *
+        " TODO: Create pymode sign namespace
+        execute "sign unplace buffer=".a:bnum
 
         if !pymode#Default("g:pymode_lint_signs_always_visible", 0) || g:pymode_lint_signs_always_visible
             call RopeShowSignsRulerIfNeeded()
         endif
 
         for item in filter(getqflist(), 'v:val.bufnr != ""')
-            execute printf('silent! sign place 1 line=%d name=%s buffer=%d', item.lnum, item.type, item.bufnr)
+            execute printf('sign place %d line=%d name=%s buffer=%d', item.lnum, item.lnum, "Pymode".item.type, item.bufnr)
         endfor
 
     endif
diff --git a/autoload/pymode/lint.vim b/autoload/pymode/lint.vim
@@ -20,13 +20,13 @@ fun! pymode#lint#Check() "{{{
 endfunction " }}}
 
 
-fun! pymode#lint#Parse()
+fun! pymode#lint#Parse(bnum)
     " DESC: Parse result of code checking.
     "
     call setqflist(g:qf_list, 'r')
 
     if g:pymode_lint_signs
-        call pymode#PlaceSigns()
+        call pymode#PlaceSigns(a:bnum)
     endif
 
     if g:pymode_lint_cwindow
diff --git a/ftplugin/python/init-pymode.vim b/ftplugin/python/init-pymode.vim
@@ -111,11 +111,12 @@ if !pymode#Default("g:pymode_lint", 1) || g:pymode_lint
     if (!pymode#Default("g:pymode_lint_signs", 1) || g:pymode_lint_signs) && has('signs')
 
         " DESC: Signs definition
-        sign define W text=WW texthl=Todo
-        sign define C text=CC texthl=Comment
-        sign define R text=RR texthl=Visual
-        sign define E text=EE texthl=Error
-        sign define I text=II texthl=Info
+        sign define PymodeW text=WW texthl=Todo
+        sign define PymodeC text=CC texthl=Comment
+        sign define PymodeR text=RR texthl=Visual
+        sign define PymodeE text=EE texthl=Error
+        sign define PymodeI text=II texthl=Info
+        sign define PymodeF text=FF texthl=Info
 
         if !pymode#Default("g:pymode_lint_signs_always_visible", 0) || g:pymode_lint_signs_always_visible
             " Show the sign's ruller if asked for, even it there's no error to show
diff --git a/pylibs/pylama/main.py b/pylibs/pylama/main.py
@@ -45,7 +45,7 @@ def run(path, ignore=None, select=None, linters=default_linters, **meta):  # nol
                 for e in linter(path, code=code, **meta):
                     e['col'] = e.get('col') or 0
                     e['lnum'] = e.get('lnum') or 0
-                    e['type'] = e.get('type') or 'E'
+                    e['type'] = e.get('type') or 'W'
                     e['text'] = "{0} [{1}]".format((e.get(
                         'text') or '').strip()
                         .replace("'", "\"").split('\n')[0], lint)
diff --git a/pylibs/pymode/lint.py b/pylibs/pymode/lint.py
@@ -57,8 +57,8 @@ def run_checkers(task=None, checkers=None, ignore=None,
         task.done = 100
 
 
-def parse_result(result):
-    command(('let g:qf_list = %s' % repr(result)).replace('\': u', '\': '))
-    command('call pymode#lint#Parse()')
+def parse_result(result, bnum):
+    command(('let g:qf_list = {0}'.format(repr(result)).replace('\': u', '\': ')))
+    command('call pymode#lint#Parse({0})'.format(bnum))
 
 # pymode:lint_ignore=W0622
diff --git a/pylibs/pymode/queue.py b/pylibs/pymode/queue.py
@@ -55,6 +55,6 @@ def check_task():
         if isinstance(thread, Task):
             if thread.finished:
                 thread.stop()
-                thread.callback(thread.result)
+                thread.callback(thread.result, thread.buffer.number)
             else:
                 show_message('%s %s%%' % (thread.title, thread.done))
