Compare commits
No commits in common. "aa4a877d1e17f829768a262a0e7367248dabc2a5" and "e1d3b81607e5059c14e54ab788114011cc89a402" have entirely different histories.
aa4a877d1e
...
e1d3b81607
3 changed files with 10 additions and 12 deletions
|
|
@ -15,11 +15,11 @@ with language-aware syntax highlighting.
|
||||||
[vscode-diff](https://github.com/esmuellert/codediff.nvim) FFI backend for
|
[vscode-diff](https://github.com/esmuellert/codediff.nvim) FFI backend for
|
||||||
word-level accuracy)
|
word-level accuracy)
|
||||||
- `:Gdiff` unified diff against any revision
|
- `:Gdiff` unified diff against any revision
|
||||||
|
- Background-only diff colors for `&diff` buffers
|
||||||
- Inline merge conflict detection, highlighting, and resolution
|
- Inline merge conflict detection, highlighting, and resolution
|
||||||
- Email quoting/patch syntax support (`> diff ...`)
|
- Email-quoted diff highlighting (`> diff ...` prefixes, arbitrary nesting
|
||||||
- Vim syntax fallback
|
depth)
|
||||||
- Configurable highlighiting blend & priorities
|
- Vim syntax fallback, configurable blend/priorities
|
||||||
- Context-inclusive, high-accuracy highlights
|
|
||||||
|
|
||||||
## Requirements
|
## Requirements
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -89,7 +89,7 @@ Configuration is done via `vim.g.diffs`. Set this before the plugin loads:
|
||||||
max_lines = 500,
|
max_lines = 500,
|
||||||
},
|
},
|
||||||
vim = {
|
vim = {
|
||||||
enabled = true,
|
enabled = false,
|
||||||
max_lines = 200,
|
max_lines = 200,
|
||||||
},
|
},
|
||||||
intra = {
|
intra = {
|
||||||
|
|
@ -204,7 +204,7 @@ Configuration is done via `vim.g.diffs`. Set this before the plugin loads:
|
||||||
See |diffs.TreesitterConfig| for fields.
|
See |diffs.TreesitterConfig| for fields.
|
||||||
|
|
||||||
{vim} (table, default: see below)
|
{vim} (table, default: see below)
|
||||||
Vim syntax fallback highlighting options.
|
Vim syntax highlighting options (experimental).
|
||||||
See |diffs.VimConfig| for fields.
|
See |diffs.VimConfig| for fields.
|
||||||
|
|
||||||
{intra} (table, default: see below)
|
{intra} (table, default: see below)
|
||||||
|
|
@ -269,15 +269,13 @@ Configuration is done via `vim.g.diffs`. Set this before the plugin loads:
|
||||||
|
|
||||||
*diffs.VimConfig*
|
*diffs.VimConfig*
|
||||||
Vim config fields: ~
|
Vim config fields: ~
|
||||||
{enabled} (boolean, default: true)
|
{enabled} (boolean, default: false)
|
||||||
Use vim syntax highlighting as fallback when no
|
Use vim syntax highlighting as fallback when no
|
||||||
treesitter parser is available for a language.
|
treesitter parser is available for a language.
|
||||||
Creates a scratch buffer, sets the filetype, and
|
Creates a scratch buffer, sets the filetype, and
|
||||||
queries |synID()| per character to extract
|
queries |synID()| per character to extract
|
||||||
highlight groups. Deferred via |vim.schedule()|
|
highlight groups. Slower than treesitter but
|
||||||
so it never blocks the first paint. Slower than
|
covers languages without a TS parser installed.
|
||||||
treesitter but covers languages without a TS
|
|
||||||
parser installed (e.g., COBOL, Fortran).
|
|
||||||
|
|
||||||
{max_lines} (integer, default: 200)
|
{max_lines} (integer, default: 200)
|
||||||
Skip vim syntax highlighting for hunks larger than
|
Skip vim syntax highlighting for hunks larger than
|
||||||
|
|
|
||||||
|
|
@ -124,7 +124,7 @@ local default_config = {
|
||||||
max_lines = 500,
|
max_lines = 500,
|
||||||
},
|
},
|
||||||
vim = {
|
vim = {
|
||||||
enabled = true,
|
enabled = false,
|
||||||
max_lines = 200,
|
max_lines = 200,
|
||||||
},
|
},
|
||||||
intra = {
|
intra = {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue