-
Notifications
You must be signed in to change notification settings - Fork 31
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Word-diff feature #69
Conversation
Thank you for adding this! I'll check CI |
@MisanthropicBit I added workaround for CI failure. Could you rebase this branch onto master? https://github.com/rhysd/git-messenger.vim/actions/runs/530931012 |
63e4940
to
4491d97
Compare
@rhysd Thanks for fixing the CI workflow. All checks passed :) I still need to add some feature-specific tests to |
I'm sorry for the delay. I needed to fix action-setup-vim since |
@MisanthropicBit I'm playing with this feature. What do you think about hiding |
Co-authored-by: Linda_pp <rhysd@users.noreply.github.com>
Take the time you need 🙂 I'm glad my suspicion about I really like concealing the markers! Removes a lot of visual clutter and seems like a sensible default. Perhaps it should be configurable via an option but since the highlighting makes everything pretty clear, perhaps not? |
@MisanthropicBit Thank you for your thoughts. I think providing option for concealing is better. I'll add it after merging this PR. |
First draft of the word-diff feature, implementing #66. Word-diff mode is toggled via
r
andR
(as in wo[r]d-diff)Tests pass locally with
vim-themis
using both vim v8.2 and v0.4.4, although there are 2 pending tests (41 and 42) withvim
with the message: "# width of preview window cannot be changed" which makes sense since they are skipped if we don't have neovim 0.4.Docs and syntax files have been updated as well. Hopefully this is close to the desired implementation but please provide some feedback if not 🙂
EDIT: There is something fishy going on with the action-setup-vim and the command
sudo apt install -y vim-gnome
. Not sure what the problem is but I'll try to investigate. Perhaps it has something to do with the fact that GitHub Actions recently upgradedubuntu-latest
to 20.04.1 LTS from 18.04.5 LTS.