Repository navigation
(DO NOT MERGE UNTIL 30/11/2026) refactor!: remove deprecated configuration - #492
Draft
barrettruth wants to merge 56 commits into
Draft
barrettruth wants to merge 56 commits into
barrettruth wants to merge 56 commits into
Conversation
- Warn users of the VS Code algorithm once per session before removal on 30 November 2026. - Explain how to select Neovim diff highlighting.
- Remove the shared-library loader, downloader, and FFI adapter. - Remove highlights.intra.algorithm and use Neovim diff highlighting.
- Warn before removal on 30 November 2026 and document a diagnostics recipe. - Emit conflict lifecycle events with the working buffer number.
- Remove automatic diagnostic suppression and conflict keymap settings. - Expose conflict and merge events with native configuration recipes.
- Preserve configured conflict mappings and their lifecycle behavior. - Warn that conflict.keymaps support ends on 30 November 2026.
- Remove conflict keymap configuration, installation, cleanup, and the deprecation warning. - Reduce conflict configuration to a boolean and remove unused config arguments.
…ntra-toggle # Conflicts: # doc/diffs.nvim.txt
…ntra-toggle # Conflicts: # doc/diffs.nvim.txt # lua/diffs/config.lua
…tra-toggle # Conflicts: # lua/diffs/commands.lua
…-toggle # Conflicts: # doc/diffs.nvim.txt # lua/diffs/difftastic.lua # lua/diffs/split.lua
# Conflicts: # doc/diffs.nvim.txt # spec/diff_spec.lua
# Conflicts: # spec/config_spec.lua
# Conflicts: # doc/diffs.nvim.txt
# Conflicts: # doc/diffs.nvim.txt # lua/diffs/commands.lua # lua/diffs/config.lua # lua/diffs/conflict.lua # lua/diffs/merge.lua # spec/config_spec.lua # spec/conflict_spec.lua # spec/jj_conflict_spec.lua # spec/merge_spec.lua # spec/plugin_spec.lua
# Conflicts: # lua/diffs/config.lua
# Conflicts: # lua/diffs/config.lua
# Conflicts: # lua/diffs/config.lua
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Hard-migrate off of the old config. Remove all backwards-compatibility/mentioning of previous settings.
Includes #454, #457, #460, #465, #472, #478, #480, #482, and #488.