Fix code run

klen · klen · commit dc3f4087627c · 2013-03-15T00:44:28.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
-*.pyc
+*.py[cod]
+*.sw?
+*~
 .DS_Store
 .ropeproject
 tags
diff --git a/autoload/pymode/run.vim b/autoload/pymode/run.vim
@@ -1,16 +1,39 @@
 " DESC: Save file if it modified and run python code
 fun! pymode#run#Run(line1, line2) "{{{
-    if &modifiable && &modified | write | endif	
+    if &modifiable && &modified
+        try
+            write
+        catch /E212/
+            echohl Error | echo "File modified and I can't save it. Cancel code checking." | echohl None
+            return 0
+        endtry
+    endif
     py import StringIO
-    py sys.stdout, _ = StringIO.StringIO(), sys.stdout
+    py sys.stdout, stdout_ = StringIO.StringIO(), sys.stdout
+    py sys.stderr, stderr_ = StringIO.StringIO(), sys.stderr
+    py enc = vim.eval('&enc')
     call pymode#WideMessage("Code running.")
     try
+        call setqflist([])
         py execfile(vim.eval('expand("%s:p")'))
-        py sys.stdout, out = _, sys.stdout.getvalue()
-        call pymode#TempBuffer()
-        py vim.current.buffer.append(out.split('\n'), 0)
-        wincmd p
-        call pymode#WideMessage("")
+        py out, err = sys.stdout.getvalue().strip(), sys.stderr.getvalue()
+        py sys.stdout, sys.stderr = stdout_, stderr_
+
+        cexpr ""
+        py for x in err.strip().split('\n'): vim.command('caddexpr "' + x.replace('"', r'\"') + '"')
+        let l:oldefm = &efm
+        set efm=%C\ %.%#,%A\ \ File\ \"%f\"\\,\ line\ %l%.%#,%Z%[%^\ ]%\\@=%m
+        call pymode#QuickfixOpen(0, g:pymode_lint_hold, g:pymode_lint_maxheight, g:pymode_lint_minheight, 0)
+        let &efm = l:oldefm
+
+python << EOF
+if out:
+    vim.command("call pymode#TempBuffer()")
+    vim.current.buffer.append([x.encode(enc) for x in out.split('\n')], 0)
+    vim.command("wincmd p")
+else:
+    vim.command('call pymode#WideMessage("No output.")')
+EOF
 
     catch /.*/
 
