Unverified Commit 394edc38 authored by Łukasz Langa's avatar Łukasz Langa
Browse files

Revert "restore cursor to same line of code, not same line of buffer (#989)"

This reverts commit 65c5a0d9.

Edge cases were discovered on the pull request post merge.
parent 14b28c89
Loading
Loading
Loading
Loading
+4 −28
Changes for plugin/black.vim: 4 added lines, 28 removed lines.
Original line number Diff line number Diff line
@@ -114,29 +114,7 @@ def Black():
    string_normalization=not bool(int(vim.eval("g:black_skip_string_normalization"))),
    is_pyi=vim.current.buffer.name.endswith('.pyi'),
  )
  (cursor_line, cursor_column) = vim.current.window.cursor
  cb = vim.current.buffer[:]
  cb_bc = cb[0:cursor_line]
  # Format all code before the cursor.
  # Detect unclosed blocks, close them with pass.
  last_line = cb_bc[-1]
  if last_line.rstrip().endswith(":"):
      cb_bc[-1] = last_line + " pass"
  # Determine old:new cursor location mapping
  buffer_str_before = '\n'.join(cb_bc)+'\n'
  try:
    new_buffer_str_before = black.format_file_contents(buffer_str_before, fast=fast, mode=mode)
    new_cb = new_buffer_str_before.split('\n')[:-1]
    new_cursor_line = len(new_cb)
    new_cursor = (new_cursor_line, cursor_column)
  except black.NothingChanged:
    new_cursor_line = cursor_line
    new_cursor = (new_cursor_line, cursor_column)
  except Exception as exc:
    print(exc)
  # Now we know where the cursor should be
  # when we format the entire buffer. Do it:
  buffer_str = '\n'.join(cb) + '\n'
  buffer_str = '\n'.join(vim.current.buffer) + '\n'
  try:
    new_buffer_str = black.format_file_contents(buffer_str, fast=fast, mode=mode)
  except black.NothingChanged:
@@ -144,12 +122,10 @@ def Black():
  except Exception as exc:
    print(exc)
  else:
    # Replace the buffer
    new_cb = new_buffer_str.split('\n')[:-1]
    vim.current.buffer[:] = new_cb
    # Restore the cursor to its rightful place
    cursor = vim.current.window.cursor
    vim.current.buffer[:] = new_buffer_str.split('\n')[:-1]
    try:
      vim.current.window.cursor = new_cursor
      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.')