Reraise exception in `skip_if_exception` decorator

[etc/vim.git] / plugin / black.vim

diff --git a/plugin/black.vim b/plugin/black.vim
index 09261db7d392053b13ef7a16734fe7f0f114f60d..15a13d1b14f385ac49411eeae9bcf326e9b71c91 100644 (file)
--- a/plugin/black.vim
+++ b/plugin/black.vim
@@ -2,7 +2,7 @@
 " Author: Łukasz Langa
 " Created: Mon Mar 26 23:27:53 2018 -0700
 " Requires: Vim Ver7.0+
 " Author: Łukasz Langa
 " Created: Mon Mar 26 23:27:53 2018 -0700
 " Requires: Vim Ver7.0+

-" Version:  1.0
+" Version:  1.1

 "
 " Documentation:
 "   This plugin formats Python files.
 "
 " Documentation:
 "   This plugin formats Python files.


@@ -10,6 +10,8 @@
 " History:
 "  1.0:
 "    - initial version
 " History:
 "  1.0:
 "    - initial version

+"  1.1:
+"    - restore cursor/window position after formatting

 
 if v:version < 700 || !has('python3')
     echo "This script requires vim7.0+ with Python 3.6 support."
 
 if v:version < 700 || !has('python3')
     echo "This script requires vim7.0+ with Python 3.6 support."


@@ -35,10 +37,17 @@ if !exists("g:black_skip_string_normalization")
 endif
 
 python3 << endpython3
 endif
 
 python3 << endpython3

+import os

 import sys
 import vim
 
 def _get_python_binary(exec_prefix):
 import sys
 import vim
 
 def _get_python_binary(exec_prefix):

+  try:
+    default = vim.eval("g:pymode_python").strip()
+  except vim.error:
+    default = ""
+  if default and os.path.exists(default):
+    return default

   if sys.platform[:3] == "win":
     return exec_prefix / 'python.exe'
   return exec_prefix / 'bin' / 'python3'
   if sys.platform[:3] == "win":
     return exec_prefix / 'python.exe'
   return exec_prefix / 'bin' / 'python3'


@@ -96,18 +105,25 @@ if _initialize_black_env():
 def Black():
   start = time.time()
   fast = bool(int(vim.eval("g:black_fast")))
 def Black():
   start = time.time()
   fast = bool(int(vim.eval("g:black_fast")))

-  line_length = int(vim.eval("g:black_linelength"))
-  if bool(int(vim.eval("g:black_skip_string_normalization"))):
-    mode = black.FileMode.AUTO_DETECT & black.FileMode.NO_STRING_NORMALIZATION
+  mode = black.FileMode(
+    line_length=int(vim.eval("g:black_linelength")),
+    string_normalization=not bool(int(vim.eval("g:black_skip_string_normalization"))),
+    is_pyi=vim.current.buffer.name.endswith('.pyi'),
+  )

   buffer_str = '\n'.join(vim.current.buffer) + '\n'
   try:
   buffer_str = '\n'.join(vim.current.buffer) + '\n'
   try:

-    new_buffer_str = black.format_file_contents(buffer_str, line_length=line_length, fast=fast, mode=mode)
+    new_buffer_str = black.format_file_contents(buffer_str, fast=fast, mode=mode)

   except black.NothingChanged:
     print(f'Already well formatted, good job. (took {time.time() - start:.4f}s)')
   except Exception as exc:
     print(exc)
   else:
   except black.NothingChanged:
     print(f'Already well formatted, good job. (took {time.time() - start:.4f}s)')
   except Exception as exc:
     print(exc)
   else:

+    cursor = vim.current.window.cursor

     vim.current.buffer[:] = new_buffer_str.split('\n')[:-1]
     vim.current.buffer[:] = new_buffer_str.split('\n')[:-1]

+    try:
+      vim.current.window.cursor = cursor
+    except vim.error:
+      vim.current.window.cursor = (len(vim.current.buffer), 0)

     print(f'Reformatted in {time.time() - start:.4f}s.')
 
 def BlackUpgrade():
     print(f'Reformatted in {time.time() - start:.4f}s.')
 
 def BlackUpgrade():


@@ -121,6 +137,3 @@ endpython3
 command! Black :py3 Black()
 command! BlackUpgrade :py3 BlackUpgrade()
 command! BlackVersion :py3 BlackVersion()
 command! Black :py3 Black()
 command! BlackUpgrade :py3 BlackUpgrade()
 command! BlackVersion :py3 BlackVersion()

-
-nmap ,= :Black<CR>
-vmap ,= :Black<CR>