Fix docs, add g:pymode_lint_async option

klen · klen · commit 6d280c6f5891 · 2013-08-30T15:30:59.000+07:00
diff --git a/autoload/pymode/doc.vim b/autoload/pymode/doc.vim
@@ -8,7 +8,10 @@ fun! pymode#doc#Show(word) "{{{
         Python import StringIO
         Python sys.stdout, _ = StringIO.StringIO(), sys.stdout
         Python help(vim.eval('a:word'))
-        call pymode#TempBuffer()
+        Python sys.stdout, out = _, sys.stdout.getvalue()
+        if !g:pymode_test
+            call pymode#TempBuffer()
+        endif
         Python vim.current.buffer.append(str(out).splitlines(), 0)
         wincmd p
     endif
diff --git a/ftplugin/python/init-pymode.vim b/ftplugin/python/init-pymode.vim
@@ -2,6 +2,8 @@ if pymode#Default('g:pymode_init', 1)
     finish
 endif
 
+call pymode#Default('g:pymode_test', 0)
+
 let g:pymode_version = "0.6.18"
 
 com! PymodeVersion echomsg "Current python-mode version: " . g:pymode_version
@@ -62,6 +64,9 @@ if !pymode#Default("g:pymode_lint", 1) || g:pymode_lint
     " OPTION: g:pymode_lint_write -- bool. Check code every save.
     call pymode#Default("g:pymode_lint_write", 1)
 
+    " OPTION: g:pymode_lint_async -- bool. Run a checkers asynchronously 
+    call pymode#Default("g:pymode_lint_async", 1)
+
     " OPTION: g:pymode_lint_onfly -- bool. Check code every save.
     call pymode#Default("g:pymode_lint_onfly", 0)
 
diff --git a/pylibs/pymode/lint.py b/pylibs/pymode/lint.py
@@ -21,6 +21,7 @@ def check_file():
     """ Check current buffer. """
     buf = interface.get_current_buffer()
 
+    async = int(interface.get_option('lint_async'))
     linters = interface.get_option('lint_checker')
     ignore = interface.get_option('lint_ignore')
     select = interface.get_option('lint_select')
@@ -29,10 +30,15 @@ def check_file():
     options = parse_options(
         ignore=ignore, select=select, complexity=complexity, linters=linters)
 
-    add_task(
-        run_checkers, callback=parse_result, title='Code checking', buf=buf,
-        options=options,
-    )
+    if async:
+        add_task(
+            run_checkers, callback=parse_result, title='Code checking',
+            buf=buf, options=options,
+        )
+
+    else:
+        result = run_checkers(buf=buf, options=options)
+        parse_result(result, buf=buf)
 
 
 def run_checkers(callback=None, buf=None, options=None):
diff --git a/t/base.vim b/t/base.vim
@@ -1,4 +1,5 @@
 filetype plugin indent on
+set hidden
 
 describe 'pymode'
 
@@ -18,7 +19,6 @@ describe 'pymode'
         e test.py
         Python vim.current.buffer.append('Python is working.', 0)
         Expect getline(1) == 'Python is working.'
-        w
     end
 
 end
diff --git a/t/docs.vim b/t/docs.vim
@@ -0,0 +1,17 @@
+filetype plugin indent on
+set hidden
+
+describe 'docs'
+    before
+        e t/test.py
+        let g:pymode_test = 1
+    end
+
+    it 'pymode show docs'
+        Pydoc def
+        Expect getline(1) == 'Function definitions'
+        Expect 1 == 1
+    end
+
+end
+
diff --git a/t/lint.vim b/t/lint.vim
@@ -0,0 +1,30 @@
+filetype plugin indent on
+set hidden
+
+describe 'pymode check code'
+
+    before
+        e t/test.py
+    end
+
+    after
+        close
+    end
+
+    it 'async'
+        let g:pymode_lint_async = 1
+        PyLint
+        Expect getqflist() == []
+        sleep 1
+        call pymode#queue#Poll()
+        Expect getqflist() == [{'lnum': 2, 'bufnr': 1, 'col': 0, 'valid': 1, 'vcol': 0, 'nr': 0, 'type': 'E', 'pattern': '', 'text': 'W0612 local variable "test" is assigned to but never used [pyflakes]'}]
+    end
+
+    it 'disable async'
+        let g:pymode_lint_async = 0
+        PyLint
+        Expect getqflist() == [{'lnum': 2, 'bufnr': 1, 'col': 0, 'valid': 1, 'vcol': 0, 'nr': 0, 'type': 'E', 'pattern': '', 'text': 'W0612 local variable "test" is assigned to but never used [pyflakes]'}]
+    end
+
+end
+
