Change error message to specify its origin. (#1240)

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

diff --git a/plugin/black.vim b/plugin/black.vim
index 8e05c2a9d7647d75be6a77ad35e1ec6452c20213..b174e5984526d883956757d5e2535a3bd17305f0 100644 (file)
--- a/plugin/black.vim
+++ b/plugin/black.vim
@@ -14,7 +14,7 @@
 "    - restore cursor/window position after formatting
 
 if v:version < 700 || !has('python3')
 "    - restore cursor/window position after formatting
 
 if v:version < 700 || !has('python3')

-    echo "This script requires vim7.0+ with Python 3.6 support."
+    echo "The black.vim plugin requires vim7.0+ with Python 3.6 support."

     finish
 endif
 
     finish
 endif
 


@@ -122,12 +122,20 @@ def Black():
   except Exception as exc:
     print(exc)
   else:
   except Exception as exc:
     print(exc)
   else:

-    cursor = vim.current.window.cursor
+    current_buffer = vim.current.window.buffer
+    cursors = []
+    for i, tabpage in enumerate(vim.tabpages):
+      if tabpage.valid:
+        for j, window in enumerate(tabpage.windows):
+          if window.valid and window.buffer == current_buffer:
+            cursors.append((i, j, 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)
+    for i, j, cursor in cursors:
+      window = vim.tabpages[i].windows[j]
+      try:
+        window.cursor = cursor
+      except vim.error:
+        window.cursor = (len(window.buffer), 0)

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