BranchesTags

Repository files navigation

diffs.nvim

Treesitter-powered Diff Syntax highlighting for Neovim

Enhance Neovim's built-in diff mode (and much more!) with language-aware syntax highlighting driven by treesitter.

image

Features

  • Treesitter syntax highlighting in vim-fugitive, Neogit, builtin diff filetype, and more!
  • Word- and character-level diff highlighting, driven by 'diffopt'inline:
  • :Diff for pierre-style unified, stacked, or split diffs against any revision
  • :Diff review full-repo review diff with qflist/loclist navigation
  • :Diff files to diff two arbitrary files, or the buffer against its last save
  • Inline and 3-way merge conflict detection, highlighting, and resolution
  • Email quoting/patch syntax support (> diff ...)
  • Vim syntax fallback
  • Difftastic highlight support
  • Configurable highlighting

Requirements

  • Neovim 0.9.0+
  • Optional: the Treesitter diff parser for the best experience

Installation

With vim.pack (Neovim 0.12+):

vim.pack.add({
'https://github.com/barrettruth/diffs.nvim',
})

Or via luarocks:

luarocks install diffs.nvim

Documentation

:helpdiffs.nvim

FAQ

Q: Does diffs.nvim support vim-fugitive/Neogit/neojj/gitsigns/fzf-lua?

Yes. Enable integrations in your config:

vim.g.diffs= {
integrations= {
fugitive=true,
neogit=true,
neojj=true,
gitsigns=true,
}
}

fzf-lua is supported out-of-the-box.

See the documentation for more information.

Q: Can I use diffs.nvim as a Git mergetool?

Yes. Configure Git to open $MERGED with Neovim; diffs.nvim will detect conflict markers automatically. See :help diffs.nvim-git-mergetool.

Q: Can I exclude untracked files from :Diff review?

Yes. Run :Diff review ++nountracked. To make it the default, wrap it in your own command, e.g. :command! Review Diff review ++nountracked.

Known Limitations

  • Incomplete syntax context: Treesitter parses each diff hunk in isolation. Context lines within the hunk provide syntactic context for the parser. With or without context, hunks that start or end mid-expression may produce imperfect highlights due to treesitter error recovery.

  • Syntax "flashing": diffs.nvim hooks into the FileType fugitive event triggered by vim-fugitive, at which point the buffer is preliminarily painted. The decoration provider applies highlights on the next redraw cycle, so a brief first-paint flash may still occur.

  • Cold Start: Treesitter grammar loading (~10ms) and query compilation (~4ms) are one-time costs per language per Neovim session. Each language pays this cost on first encounter, which may cause a brief stutter when a diff containing a new language first enters the viewport.

  • Vim syntax fallback is deferred: The vim syntax fallback (for languages without a treesitter parser) cannot run inside the decoration provider's redraw cycle due to Neovim's restriction on buffer mutations. Vim syntax highlights for cold hunks may appear one frame later. Warm hunks can reuse cached vim syntax spans, and stale deferred renders are ignored after buffer changes.

  • Conflicting diff plugins: diffs.nvim may not interact well with other plugins that modify diff highlighting. Known plugins that may conflict:

    • diffview.nvim - provides its own diff highlighting and conflict resolution UI
    • mini.diff - visualizes buffer differences with its own highlighting system
    • gitsigns.nvim - generally compatible, but both plugins modifying line highlights may produce unexpected results
    • git-conflict.nvim - diffs.nvim now includes built-in conflict resolution; disable one or the other to avoid overlap

Acknowledgements

About

treesitter syntax highlighting for diffs

Topics

neovimneovim-plugintreesittervim

Resources

Readme
MIT license
Activity

Stars

196 stars

Watchers

2 watching

Forks

4 forks
Report repository

Releases

Packages

Contributors

Languages

, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
BranchesTags
Repository files navigation
diffs.nvim
Treesitter-powered Diff Syntax highlighting for Neovim
Enhance Neovim's built-in diff mode (and much more!) with language-aware syntax
highlighting driven by treesitter.
image
Features
  • Treesitter syntax highlighting in
vim-fugitive,
Neogit, builtin diff filetype, and
more!
  • Word- and character-level diff highlighting, driven by 'diffopt'inline:
  • :Diff for pierre-style unified, stacked, or split diffs against any revision
  • :Diff review full-repo review diff with qflist/loclist navigation
  • :Diff files to diff two arbitrary files, or the buffer against its last save
  • Inline and 3-way merge conflict detection, highlighting, and resolution
  • Email quoting/patch syntax support (> diff ...)
  • Vim syntax fallback
  • Difftastic highlight support
  • Configurable highlighting
Requirements
  • Neovim 0.9.0+
  • Optional: the Treesitter diff parser for the best experience
Installation
With vim.pack (Neovim 0.12+):
vim.pack.add({
'https://github.com/barrettruth/diffs.nvim',
})
Or via luarocks:
luarocks install diffs.nvim

Documentation
:helpdiffs.nvim
FAQ
Q: Does diffs.nvim support
vim-fugitive/Neogit/neojj/gitsigns/fzf-lua?
Yes. Enable integrations in your config:
vim.g.diffs= {
integrations= {
fugitive=true,
neogit=true,
neojj=true,
gitsigns=true,
}
}
fzf-lua is supported out-of-the-box.
See the documentation for more information.
Q: Can I use diffs.nvim as a Git mergetool?
Yes. Configure Git to open $MERGED with Neovim; diffs.nvim will detect
conflict markers automatically. See :help diffs.nvim-git-mergetool.
Q: Can I exclude untracked files from :Diff review?
Yes. Run :Diff review ++nountracked. To make it the default, wrap it in your
own command, e.g. :command! Review Diff review ++nountracked.
Known Limitations
  • Incomplete syntax context: Treesitter parses each diff hunk in isolation.
Context lines within the hunk provide syntactic context for the parser. With
or without context, hunks that start or end mid-expression may produce imperfect
highlights due to treesitter error recovery.
  • Syntax "flashing": diffs.nvim hooks into the FileType fugitive event
triggered by vim-fugitive, at which point the buffer is preliminarily
painted. The decoration provider applies highlights on the next redraw cycle,
so a brief first-paint flash may still occur.
  • Cold Start: Treesitter grammar loading (~10ms) and query compilation
(~4ms) are one-time costs per language per Neovim session. Each language pays
this cost on first encounter, which may cause a brief stutter when a diff
containing a new language first enters the viewport.
  • Vim syntax fallback is deferred: The vim syntax fallback (for languages
without a treesitter parser) cannot run inside the decoration provider's
redraw cycle due to Neovim's restriction on buffer mutations. Vim syntax
highlights for cold hunks may appear one frame later. Warm hunks can reuse
cached vim syntax spans, and stale deferred renders are ignored after buffer
changes.
  • Conflicting diff plugins: diffs.nvim may not interact well with other
plugins that modify diff highlighting. Known plugins that may conflict:
    • diffview.nvim - provides its
own diff highlighting and conflict resolution UI
    • mini.diff - visualizes buffer
differences with its own highlighting system
    • gitsigns.nvim - generally
compatible, but both plugins modifying line highlights may produce
unexpected results
    • git-conflict.nvim -
diffs.nvim now includes built-in conflict resolution; disable one or the
other to avoid overlap
Acknowledgements
About
treesitter syntax highlighting for diffs
Topics
neovimneovim-plugintreesittervim
Resources
Readme
MIT license
Activity
Stars
196 stars
Watchers
2 watching
Forks
4 forks
Report repository
Releases
Packages
Contributors
Languages

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
BranchesTags
Repository files navigation
diffs.nvim
Treesitter-powered Diff Syntax highlighting for Neovim
Enhance Neovim's built-in diff mode (and much more!) with language-aware syntax
highlighting driven by treesitter.
image
Features
  • Treesitter syntax highlighting in
vim-fugitive,
Neogit, builtin diff filetype, and
more!
  • Word- and character-level diff highlighting, driven by 'diffopt'inline:
  • :Diff for pierre-style unified, stacked, or split diffs against any revision
  • :Diff review full-repo review diff with qflist/loclist navigation
  • :Diff files to diff two arbitrary files, or the buffer against its last save
  • Inline and 3-way merge conflict detection, highlighting, and resolution
  • Email quoting/patch syntax support (> diff ...)
  • Vim syntax fallback
  • Difftastic highlight support
  • Configurable highlighting
Requirements
  • Neovim 0.9.0+
  • Optional: the Treesitter diff parser for the best experience
Installation
With vim.pack (Neovim 0.12+):
vim.pack.add({
'https://github.com/barrettruth/diffs.nvim',
})
Or via luarocks:
luarocks install diffs.nvim

Documentation
:helpdiffs.nvim
FAQ
Q: Does diffs.nvim support
vim-fugitive/Neogit/neojj/gitsigns/fzf-lua?
Yes. Enable integrations in your config:
vim.g.diffs= {
integrations= {
fugitive=true,
neogit=true,
neojj=true,
gitsigns=true,
}
}
fzf-lua is supported out-of-the-box.
See the documentation for more information.
Q: Can I use diffs.nvim as a Git mergetool?
Yes. Configure Git to open $MERGED with Neovim; diffs.nvim will detect
conflict markers automatically. See :help diffs.nvim-git-mergetool.
Q: Can I exclude untracked files from :Diff review?
Yes. Run :Diff review ++nountracked. To make it the default, wrap it in your
own command, e.g. :command! Review Diff review ++nountracked.
Known Limitations
  • Incomplete syntax context: Treesitter parses each diff hunk in isolation.
Context lines within the hunk provide syntactic context for the parser. With
or without context, hunks that start or end mid-expression may produce imperfect
highlights due to treesitter error recovery.
  • Syntax "flashing": diffs.nvim hooks into the FileType fugitive event
triggered by vim-fugitive, at which point the buffer is preliminarily
painted. The decoration provider applies highlights on the next redraw cycle,
so a brief first-paint flash may still occur.
  • Cold Start: Treesitter grammar loading (~10ms) and query compilation
(~4ms) are one-time costs per language per Neovim session. Each language pays
this cost on first encounter, which may cause a brief stutter when a diff
containing a new language first enters the viewport.
  • Vim syntax fallback is deferred: The vim syntax fallback (for languages
without a treesitter parser) cannot run inside the decoration provider's
redraw cycle due to Neovim's restriction on buffer mutations. Vim syntax
highlights for cold hunks may appear one frame later. Warm hunks can reuse
cached vim syntax spans, and stale deferred renders are ignored after buffer
changes.
  • Conflicting diff plugins: diffs.nvim may not interact well with other
plugins that modify diff highlighting. Known plugins that may conflict:
    • diffview.nvim - provides its
own diff highlighting and conflict resolution UI
    • mini.diff - visualizes buffer
differences with its own highlighting system
    • gitsigns.nvim - generally
compatible, but both plugins modifying line highlights may produce
unexpected results
    • git-conflict.nvim -
diffs.nvim now includes built-in conflict resolution; disable one or the
other to avoid overlap
Acknowledgements
About
treesitter syntax highlighting for diffs
Topics
neovimneovim-plugintreesittervim
Resources
Readme
MIT license
Activity
Stars
196 stars
Watchers
2 watching
Forks
4 forks
Report repository
Releases
Packages
Contributors
Languages

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
BranchesTags
Repository files navigation
diffs.nvim
Treesitter-powered Diff Syntax highlighting for Neovim
Enhance Neovim's built-in diff mode (and much more!) with language-aware syntax
highlighting driven by treesitter.
image
Features
  • Treesitter syntax highlighting in
vim-fugitive,
Neogit, builtin diff filetype, and
more!
  • Word- and character-level diff highlighting, driven by 'diffopt'inline:
  • :Diff for pierre-style unified, stacked, or split diffs against any revision
  • :Diff review full-repo review diff with qflist/loclist navigation
  • :Diff files to diff two arbitrary files, or the buffer against its last save
  • Inline and 3-way merge conflict detection, highlighting, and resolution
  • Email quoting/patch syntax support (> diff ...)
  • Vim syntax fallback
  • Difftastic highlight support
  • Configurable highlighting
Requirements
  • Neovim 0.9.0+
  • Optional: the Treesitter diff parser for the best experience
Installation
With vim.pack (Neovim 0.12+):
vim.pack.add({
'https://github.com/barrettruth/diffs.nvim',
})
Or via luarocks:
luarocks install diffs.nvim

Documentation
:helpdiffs.nvim
FAQ
Q: Does diffs.nvim support
vim-fugitive/Neogit/neojj/gitsigns/fzf-lua?
Yes. Enable integrations in your config:
vim.g.diffs= {
integrations= {
fugitive=true,
neogit=true,
neojj=true,
gitsigns=true,
}
}
fzf-lua is supported out-of-the-box.
See the documentation for more information.
Q: Can I use diffs.nvim as a Git mergetool?
Yes. Configure Git to open $MERGED with Neovim; diffs.nvim will detect
conflict markers automatically. See :help diffs.nvim-git-mergetool.
Q: Can I exclude untracked files from :Diff review?
Yes. Run :Diff review ++nountracked. To make it the default, wrap it in your
own command, e.g. :command! Review Diff review ++nountracked.
Known Limitations
  • Incomplete syntax context: Treesitter parses each diff hunk in isolation.
Context lines within the hunk provide syntactic context for the parser. With
or without context, hunks that start or end mid-expression may produce imperfect
highlights due to treesitter error recovery.
  • Syntax "flashing": diffs.nvim hooks into the FileType fugitive event
triggered by vim-fugitive, at which point the buffer is preliminarily
painted. The decoration provider applies highlights on the next redraw cycle,
so a brief first-paint flash may still occur.
  • Cold Start: Treesitter grammar loading (~10ms) and query compilation
(~4ms) are one-time costs per language per Neovim session. Each language pays
this cost on first encounter, which may cause a brief stutter when a diff
containing a new language first enters the viewport.
  • Vim syntax fallback is deferred: The vim syntax fallback (for languages
without a treesitter parser) cannot run inside the decoration provider's
redraw cycle due to Neovim's restriction on buffer mutations. Vim syntax
highlights for cold hunks may appear one frame later. Warm hunks can reuse
cached vim syntax spans, and stale deferred renders are ignored after buffer
changes.
  • Conflicting diff plugins: diffs.nvim may not interact well with other
plugins that modify diff highlighting. Known plugins that may conflict:
    • diffview.nvim - provides its
own diff highlighting and conflict resolution UI
    • mini.diff - visualizes buffer
differences with its own highlighting system
    • gitsigns.nvim - generally
compatible, but both plugins modifying line highlights may produce
unexpected results
    • git-conflict.nvim -
diffs.nvim now includes built-in conflict resolution; disable one or the
other to avoid overlap
Acknowledgements
About
treesitter syntax highlighting for diffs
Topics
neovimneovim-plugintreesittervim
Resources
Readme
MIT license
Activity
Stars
196 stars
Watchers
2 watching
Forks
4 forks
Report repository
Releases
Packages
Contributors
Languages

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
BranchesTags
Repository files navigation
diffs.nvim
Treesitter-powered Diff Syntax highlighting for Neovim
Enhance Neovim's built-in diff mode (and much more!) with language-aware syntax
highlighting driven by treesitter.
image
Features
  • Treesitter syntax highlighting in
vim-fugitive,
Neogit, builtin diff filetype, and
more!
  • Word- and character-level diff highlighting, driven by 'diffopt'inline:
  • :Diff for pierre-style unified, stacked, or split diffs against any revision
  • :Diff review full-repo review diff with qflist/loclist navigation
  • :Diff files to diff two arbitrary files, or the buffer against its last save
  • Inline and 3-way merge conflict detection, highlighting, and resolution
  • Email quoting/patch syntax support (> diff ...)
  • Vim syntax fallback
  • Difftastic highlight support
  • Configurable highlighting
Requirements
  • Neovim 0.9.0+
  • Optional: the Treesitter diff parser for the best experience
Installation
With vim.pack (Neovim 0.12+):
vim.pack.add({
'https://github.com/barrettruth/diffs.nvim',
})
Or via luarocks:
luarocks install diffs.nvim

Documentation
:helpdiffs.nvim
FAQ
Q: Does diffs.nvim support
vim-fugitive/Neogit/neojj/gitsigns/fzf-lua?
Yes. Enable integrations in your config:
vim.g.diffs= {
integrations= {
fugitive=true,
neogit=true,
neojj=true,
gitsigns=true,
}
}
fzf-lua is supported out-of-the-box.
See the documentation for more information.
Q: Can I use diffs.nvim as a Git mergetool?
Yes. Configure Git to open $MERGED with Neovim; diffs.nvim will detect
conflict markers automatically. See :help diffs.nvim-git-mergetool.
Q: Can I exclude untracked files from :Diff review?
Yes. Run :Diff review ++nountracked. To make it the default, wrap it in your
own command, e.g. :command! Review Diff review ++nountracked.
Known Limitations
  • Incomplete syntax context: Treesitter parses each diff hunk in isolation.
Context lines within the hunk provide syntactic context for the parser. With
or without context, hunks that start or end mid-expression may produce imperfect
highlights due to treesitter error recovery.
  • Syntax "flashing": diffs.nvim hooks into the FileType fugitive event
triggered by vim-fugitive, at which point the buffer is preliminarily
painted. The decoration provider applies highlights on the next redraw cycle,
so a brief first-paint flash may still occur.
  • Cold Start: Treesitter grammar loading (~10ms) and query compilation
(~4ms) are one-time costs per language per Neovim session. Each language pays
this cost on first encounter, which may cause a brief stutter when a diff
containing a new language first enters the viewport.
  • Vim syntax fallback is deferred: The vim syntax fallback (for languages
without a treesitter parser) cannot run inside the decoration provider's
redraw cycle due to Neovim's restriction on buffer mutations. Vim syntax
highlights for cold hunks may appear one frame later. Warm hunks can reuse
cached vim syntax spans, and stale deferred renders are ignored after buffer
changes.
  • Conflicting diff plugins: diffs.nvim may not interact well with other
plugins that modify diff highlighting. Known plugins that may conflict:
    • diffview.nvim - provides its
own diff highlighting and conflict resolution UI
    • mini.diff - visualizes buffer
differences with its own highlighting system
    • gitsigns.nvim - generally
compatible, but both plugins modifying line highlights may produce
unexpected results
    • git-conflict.nvim -
diffs.nvim now includes built-in conflict resolution; disable one or the
other to avoid overlap
Acknowledgements
About
treesitter syntax highlighting for diffs
Topics
neovimneovim-plugintreesittervim
Resources
Readme
MIT license
Activity
Stars
196 stars
Watchers
2 watching
Forks
4 forks
Report repository
Releases
Packages
Contributors
Languages

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
BranchesTags
Repository files navigation
diffs.nvim
Treesitter-powered Diff Syntax highlighting for Neovim
Enhance Neovim's built-in diff mode (and much more!) with language-aware syntax
highlighting driven by treesitter.
image
Features
  • Treesitter syntax highlighting in
vim-fugitive,
Neogit, builtin diff filetype, and
more!
  • Word- and character-level diff highlighting, driven by 'diffopt'inline:
  • :Diff for pierre-style unified, stacked, or split diffs against any revision
  • :Diff review full-repo review diff with qflist/loclist navigation
  • :Diff files to diff two arbitrary files, or the buffer against its last save
  • Inline and 3-way merge conflict detection, highlighting, and resolution
  • Email quoting/patch syntax support (> diff ...)
  • Vim syntax fallback
  • Difftastic highlight support
  • Configurable highlighting
Requirements
  • Neovim 0.9.0+
  • Optional: the Treesitter diff parser for the best experience
Installation
With vim.pack (Neovim 0.12+):
vim.pack.add({
'https://github.com/barrettruth/diffs.nvim',
})
Or via luarocks:
luarocks install diffs.nvim

Documentation
:helpdiffs.nvim
FAQ
Q: Does diffs.nvim support
vim-fugitive/Neogit/neojj/gitsigns/fzf-lua?
Yes. Enable integrations in your config:
vim.g.diffs= {
integrations= {
fugitive=true,
neogit=true,
neojj=true,
gitsigns=true,
}
}
fzf-lua is supported out-of-the-box.
See the documentation for more information.
Q: Can I use diffs.nvim as a Git mergetool?
Yes. Configure Git to open $MERGED with Neovim; diffs.nvim will detect
conflict markers automatically. See :help diffs.nvim-git-mergetool.
Q: Can I exclude untracked files from :Diff review?
Yes. Run :Diff review ++nountracked. To make it the default, wrap it in your
own command, e.g. :command! Review Diff review ++nountracked.
Known Limitations
  • Incomplete syntax context: Treesitter parses each diff hunk in isolation.
Context lines within the hunk provide syntactic context for the parser. With
or without context, hunks that start or end mid-expression may produce imperfect
highlights due to treesitter error recovery.
  • Syntax "flashing": diffs.nvim hooks into the FileType fugitive event
triggered by vim-fugitive, at which point the buffer is preliminarily
painted. The decoration provider applies highlights on the next redraw cycle,
so a brief first-paint flash may still occur.
  • Cold Start: Treesitter grammar loading (~10ms) and query compilation
(~4ms) are one-time costs per language per Neovim session. Each language pays
this cost on first encounter, which may cause a brief stutter when a diff
containing a new language first enters the viewport.
  • Vim syntax fallback is deferred: The vim syntax fallback (for languages
without a treesitter parser) cannot run inside the decoration provider's
redraw cycle due to Neovim's restriction on buffer mutations. Vim syntax
highlights for cold hunks may appear one frame later. Warm hunks can reuse
cached vim syntax spans, and stale deferred renders are ignored after buffer
changes.
  • Conflicting diff plugins: diffs.nvim may not interact well with other
plugins that modify diff highlighting. Known plugins that may conflict:
    • diffview.nvim - provides its
own diff highlighting and conflict resolution UI
    • mini.diff - visualizes buffer
differences with its own highlighting system
    • gitsigns.nvim - generally
compatible, but both plugins modifying line highlights may produce
unexpected results
    • git-conflict.nvim -
diffs.nvim now includes built-in conflict resolution; disable one or the
other to avoid overlap
Acknowledgements
About
treesitter syntax highlighting for diffs
Topics
neovimneovim-plugintreesittervim
Resources
Readme
MIT license
Activity
Stars
196 stars
Watchers
2 watching
Forks
4 forks
Report repository
Releases
Packages
Contributors
Languages

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
BranchesTags
Repository files navigation
diffs.nvim
Treesitter-powered Diff Syntax highlighting for Neovim
Enhance Neovim's built-in diff mode (and much more!) with language-aware syntax
highlighting driven by treesitter.
image
Features
  • Treesitter syntax highlighting in
vim-fugitive,
Neogit, builtin diff filetype, and
more!
  • Word- and character-level diff highlighting, driven by 'diffopt'inline:
  • :Diff for pierre-style unified, stacked, or split diffs against any revision
  • :Diff review full-repo review diff with qflist/loclist navigation
  • :Diff files to diff two arbitrary files, or the buffer against its last save
  • Inline and 3-way merge conflict detection, highlighting, and resolution
  • Email quoting/patch syntax support (> diff ...)
  • Vim syntax fallback
  • Difftastic highlight support
  • Configurable highlighting
Requirements
  • Neovim 0.9.0+
  • Optional: the Treesitter diff parser for the best experience
Installation
With vim.pack (Neovim 0.12+):
vim.pack.add({
'https://github.com/barrettruth/diffs.nvim',
})
Or via luarocks:
luarocks install diffs.nvim

Documentation
:helpdiffs.nvim
FAQ
Q: Does diffs.nvim support
vim-fugitive/Neogit/neojj/gitsigns/fzf-lua?
Yes. Enable integrations in your config:
vim.g.diffs= {
integrations= {
fugitive=true,
neogit=true,
neojj=true,
gitsigns=true,
}
}
fzf-lua is supported out-of-the-box.
See the documentation for more information.
Q: Can I use diffs.nvim as a Git mergetool?
Yes. Configure Git to open $MERGED with Neovim; diffs.nvim will detect
conflict markers automatically. See :help diffs.nvim-git-mergetool.
Q: Can I exclude untracked files from :Diff review?
Yes. Run :Diff review ++nountracked. To make it the default, wrap it in your
own command, e.g. :command! Review Diff review ++nountracked.
Known Limitations
  • Incomplete syntax context: Treesitter parses each diff hunk in isolation.
Context lines within the hunk provide syntactic context for the parser. With
or without context, hunks that start or end mid-expression may produce imperfect
highlights due to treesitter error recovery.
  • Syntax "flashing": diffs.nvim hooks into the FileType fugitive event
triggered by vim-fugitive, at which point the buffer is preliminarily
painted. The decoration provider applies highlights on the next redraw cycle,
so a brief first-paint flash may still occur.
  • Cold Start: Treesitter grammar loading (~10ms) and query compilation
(~4ms) are one-time costs per language per Neovim session. Each language pays
this cost on first encounter, which may cause a brief stutter when a diff
containing a new language first enters the viewport.
  • Vim syntax fallback is deferred: The vim syntax fallback (for languages
without a treesitter parser) cannot run inside the decoration provider's
redraw cycle due to Neovim's restriction on buffer mutations. Vim syntax
highlights for cold hunks may appear one frame later. Warm hunks can reuse
cached vim syntax spans, and stale deferred renders are ignored after buffer
changes.
  • Conflicting diff plugins: diffs.nvim may not interact well with other
plugins that modify diff highlighting. Known plugins that may conflict:
    • diffview.nvim - provides its
own diff highlighting and conflict resolution UI
    • mini.diff - visualizes buffer
differences with its own highlighting system
    • gitsigns.nvim - generally
compatible, but both plugins modifying line highlights may produce
unexpected results
    • git-conflict.nvim -
diffs.nvim now includes built-in conflict resolution; disable one or the
other to avoid overlap
Acknowledgements
About
treesitter syntax highlighting for diffs
Topics
neovimneovim-plugintreesittervim
Resources
Readme
MIT license
Activity
Stars
196 stars
Watchers
2 watching
Forks
4 forks
Report repository
Releases
Packages
Contributors
Languages

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
BranchesTags
Repository files navigation
diffs.nvim
Treesitter-powered Diff Syntax highlighting for Neovim
Enhance Neovim's built-in diff mode (and much more!) with language-aware syntax
highlighting driven by treesitter.
image
Features
  • Treesitter syntax highlighting in
vim-fugitive,
Neogit, builtin diff filetype, and
more!
  • Word- and character-level diff highlighting, driven by 'diffopt'inline:
  • :Diff for pierre-style unified, stacked, or split diffs against any revision
  • :Diff review full-repo review diff with qflist/loclist navigation
  • :Diff files to diff two arbitrary files, or the buffer against its last save
  • Inline and 3-way merge conflict detection, highlighting, and resolution
  • Email quoting/patch syntax support (> diff ...)
  • Vim syntax fallback
  • Difftastic highlight support
  • Configurable highlighting
Requirements
  • Neovim 0.9.0+
  • Optional: the Treesitter diff parser for the best experience
Installation
With vim.pack (Neovim 0.12+):
vim.pack.add({
'https://github.com/barrettruth/diffs.nvim',
})
Or via luarocks:
luarocks install diffs.nvim

Documentation
:helpdiffs.nvim
FAQ
Q: Does diffs.nvim support
vim-fugitive/Neogit/neojj/gitsigns/fzf-lua?
Yes. Enable integrations in your config:
vim.g.diffs= {
integrations= {
fugitive=true,
neogit=true,
neojj=true,
gitsigns=true,
}
}
fzf-lua is supported out-of-the-box.
See the documentation for more information.
Q: Can I use diffs.nvim as a Git mergetool?
Yes. Configure Git to open $MERGED with Neovim; diffs.nvim will detect
conflict markers automatically. See :help diffs.nvim-git-mergetool.
Q: Can I exclude untracked files from :Diff review?
Yes. Run :Diff review ++nountracked. To make it the default, wrap it in your
own command, e.g. :command! Review Diff review ++nountracked.
Known Limitations
  • Incomplete syntax context: Treesitter parses each diff hunk in isolation.
Context lines within the hunk provide syntactic context for the parser. With
or without context, hunks that start or end mid-expression may produce imperfect
highlights due to treesitter error recovery.
  • Syntax "flashing": diffs.nvim hooks into the FileType fugitive event
triggered by vim-fugitive, at which point the buffer is preliminarily
painted. The decoration provider applies highlights on the next redraw cycle,
so a brief first-paint flash may still occur.
  • Cold Start: Treesitter grammar loading (~10ms) and query compilation
(~4ms) are one-time costs per language per Neovim session. Each language pays
this cost on first encounter, which may cause a brief stutter when a diff
containing a new language first enters the viewport.
  • Vim syntax fallback is deferred: The vim syntax fallback (for languages
without a treesitter parser) cannot run inside the decoration provider's
redraw cycle due to Neovim's restriction on buffer mutations. Vim syntax
highlights for cold hunks may appear one frame later. Warm hunks can reuse
cached vim syntax spans, and stale deferred renders are ignored after buffer
changes.
  • Conflicting diff plugins: diffs.nvim may not interact well with other
plugins that modify diff highlighting. Known plugins that may conflict:
    • diffview.nvim - provides its
own diff highlighting and conflict resolution UI
    • mini.diff - visualizes buffer
differences with its own highlighting system
    • gitsigns.nvim - generally
compatible, but both plugins modifying line highlights may produce
unexpected results
    • git-conflict.nvim -
diffs.nvim now includes built-in conflict resolution; disable one or the
other to avoid overlap
Acknowledgements
About
treesitter syntax highlighting for diffs
Topics
neovimneovim-plugintreesittervim
Resources
Readme
MIT license
Activity
Stars
196 stars
Watchers
2 watching
Forks
4 forks
Report repository
Releases
Packages
Contributors
Languages