Merge pull request #50 from barrettruth/fix/docs-warning
warn about conflicting plugins
This commit is contained in:
commit
26450d20a4
1 changed files with 22 additions and 11 deletions
33
README.md
33
README.md
|
|
@ -2,8 +2,8 @@
|
||||||
|
|
||||||
**Syntax highlighting for diffs in Neovim**
|
**Syntax highlighting for diffs in Neovim**
|
||||||
|
|
||||||
Enhance vim-fugitive and Neovim's built-in diff mode with language-aware syntax
|
Enhance `vim-fugitive` and Neovim's built-in diff mode with language-aware
|
||||||
highlighting.
|
syntax highlighting.
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
|
|
@ -19,7 +19,7 @@ highlighting.
|
||||||
## Requirements
|
## Requirements
|
||||||
|
|
||||||
- Neovim 0.9.0+
|
- Neovim 0.9.0+
|
||||||
- [vim-fugitive](https://github.com/tpope/vim-fugitive) (optional, for unified
|
- [`vim-fugitive`](https://github.com/tpope/vim-fugitive) (optional, for unified
|
||||||
diff syntax highlighting)
|
diff syntax highlighting)
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
@ -39,14 +39,25 @@ luarocks install diffs.nvim
|
||||||
|
|
||||||
## Known Limitations
|
## Known Limitations
|
||||||
|
|
||||||
- `vim-fugitive` syntax "flashing": diffs.nvim hooks into the
|
- **Syntax flashing**: `diffs.nvim` hooks into the `FileType fugitive` event
|
||||||
`FileType fugitive` event triggered by vim-fugitive, at which point the buffer
|
triggered by `vim-fugitive`, at which point the buffer is preliminarily
|
||||||
is preliminarily painted. The buffer is then re-painted after `debounce_ms`
|
painted. The buffer is then re-painted after `debounce_ms` milliseconds,
|
||||||
milliseconds, causing an unavoidable visual "flash" even when
|
causing an unavoidable visual "flash" even when `debounce_ms = 0`.
|
||||||
`debounce_ms = 0`.
|
|
||||||
|
- **Conflicting diff plugins**: `diffs.nvim` may not interact well with other
|
||||||
|
plugins that modify diff highlighting. Known plugins that may conflict:
|
||||||
|
- [`diffview.nvim`](https://github.com/sindrets/diffview.nvim) - provides its
|
||||||
|
own diff highlighting and conflict resolution UI
|
||||||
|
- [`mini.diff`](https://github.com/echasnovski/mini.diff) - visualizes buffer
|
||||||
|
differences with its own highlighting system
|
||||||
|
- [`gitsigns.nvim`](https://github.com/lewis6991/gitsigns.nvim) - generally
|
||||||
|
compatible, but both plugins modifying line highlights may produce
|
||||||
|
unexpected results
|
||||||
|
- [`git-conflict.nvim`](https://github.com/akinsho/git-conflict.nvim) -
|
||||||
|
conflict marker highlighting may overlap with `diffs.nvim`
|
||||||
|
|
||||||
# Acknowledgements
|
# Acknowledgements
|
||||||
|
|
||||||
- [vim-fugitive](https://github.com/tpope/vim-fugitive)
|
- [`vim-fugitive`](https://github.com/tpope/vim-fugitive)
|
||||||
- [codediff.nvim](https://github.com/esmuellert/codediff.nvim)
|
- [`codediff.nvim`](https://github.com/esmuellert/codediff.nvim)
|
||||||
- [diffview.nvim](https://github.com/sindrets/diffview.nvim)
|
- [`diffview.nvim`](https://github.com/sindrets/diffview.nvim)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue