Neovim support: line buffers shouldn't contain newlines #30
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 tasks
|
👍 |
|
@evantravers. @sjl looks tired (he hasn't checked this PR over 45 days) so I forked this. vim-mundo supports nvim and it merged some reasonable pull requests which made to this repo. Please take a look! :D |
|
this is still an issue. @sjl are you still maintaining the plugin? |
|
👍 |
|
This strips more than just newlines. Does it break the diffs if lines contain trailing spaces? |
|
Adding diff --git a/autoload/gundo.py b/autoload/gundo.py
index 281b30c..a61ec20 100644
--- a/autoload/gundo.py
+++ b/autoload/gundo.py
@@ -336,7 +336,7 @@ def _fmt_time(t):
def _output_preview_text(lines):
_goto_window_for_buffer_name('__Gundo_Preview__')
vim.command('setlocal modifiable')
- vim.current.buffer[:] = lines
+ vim.current.buffer[:] = [line.rstrip('\n') for line in lines]
vim.command('setlocal nomodifiable')
def _generate_preview_diff(current, node_before, node_after): |
The result of `difflib.unified_diff()` may contains newlines at the end of its each line. It's suppressed in original Vim, but it's illegal in Neovim. Since there is no good way to prevent `difflib` from appending newlines to the results, `_output_preview_text()` function should sanitize it. Thanks @michamos Reference: https://github.com/neovim/neovim/blob/a5edc5f2572d6d63f7f7a32ae6ec7bcabe1472b6/src/nvim/api/buffer.c#L215 sjl/gundo.vim#30 (comment)
4e3b683 to
0d9806d
Compare
sjl
added a commit
that referenced
this pull request
Jan 19, 2016
Neovim support: line buffers shouldn't contain newlines
|
Merged, thanks. |
dsummersl
pushed a commit
to dsummersl/gundo.vim
that referenced
this pull request
Nov 27, 2016
dsummersl
added a commit
to dsummersl/gundo.vim
that referenced
this pull request
Nov 27, 2016
Fix sjl#30: error on help toggle
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The result of
difflib.unified_diff()may contains newlines at the end of itseach line. It's suppressed in original Vim, but it's illegal in Neovim.
Since there is no good way to prevent
difflibfrom appending newlines to theresults,
_output_preview_text()function should sanitize it.Reference