Struct DiffConflictMode 

pub struct DiffConflictMode;

diff-conflict-mode (smerge-style) minor — DX.8 shell (2026-06-24).

Separates conflict resolution from the 2-way diff-mode surface (design diff-extraction.md §4): it should activate only on buffers whose diff session carries conflict regions (crate::overlay::DiffSignKind::Conflict), and will contribute the conflict-resolution chords (keep-ours / keep-theirs / keep-both).

DX.8 landed this as a marker shell; CR.3 filled it in. The chords are REAL — d2o / d3o / d2p / d3p / dB, with handler bodies below calling the matching DiffSubsystem::diff_*_effect resolver. (This comment claimed otherwise long after they shipped, as did the user page, which is a worse bug than a missing feature: it tells the user not to try.)

Still outstanding: next-conflict / prev-conflict navigation and a dedicated conflict gutter. Guard = () — the mode allocates no per-buffer resources.

Implementations

impl DiffConflictMode

pub fn mode_id() -> ModeId

Trait Implementations

impl Mode for DiffConflictMode

fn keymap(&self) -> Keymap

CR.3 (2026-06-24): the conflict-resolution chords, contributed through the standard Mode::keymap() seam (the diff-mode do/dp pattern). Vim-fugitive 3-way family — d2o/d3o (keep-ours / keep-theirs), d2p/d3p (put-ours / put-theirs), dB (keep-both). The host’s K.2.4 translate pass resolves each cmd name and pushes the layer under MinorMode(diff-conflict-mode), gated by K.1.c to conflict-mode-active buffers.

fn action_handlers(&self) -> Vec<ActionHandlerContribution>

CR.3: the conflict-chord handler bodies, mode-owned. Bound globally at boot by register_mode_action_handlers (same rationale as DiffMode::action_handlers). Each reads the active buffer + cursor from the ActionContext and the DiffSubsystemHandle service and calls the matching DiffSubsystem::diff_*_effect resolver, which resolves “theirs” from the session and returns Effect::ApplyEdit — or, for the degenerate keep-ours / put-ours self-targets, an informative Echo (Dhruva 2026-06-24).

type Guard = ()

Owned cleanup token returned by Self::on_activate.

fn id(&self) -> ModeId

Canonical identity. Same value every call.

fn kind(&self) -> ModeKind

Major or minor. Read at registration and on every activation call (activate_major on a minor, or vice versa, is ModeActivationError::WrongKind).

fn on_activate( &self, _ctx: ModeContext, ) -> Pin<Box<dyn Future<Output = Result<(), ModeActivationError>> + Send + '_>>

Lifecycle. Called once per (buffer, activation) cycle after the registry has applied the declarative contributions. Returns an owned Guard carrying every resource the mode allocated. The dispatcher stashes the Guard until deactivation, at which point dropping it performs cleanup via the Guard’s Drop impl.

fn target_buffer_kind(&self) -> Option<BufferKind>

For major modes, the BufferKind this mode is the default major for (H.2, 2026-05-31). ModeRegistry::register indexes this so ModeRegistry::find_major_for_kind can dispatch buffer-creation events to the right major without host-side match BufferKind { ... } blocks.

fn target_language(&self) -> Option<&str>

For major modes, the language this mode is the default major for, by canonical name (Lang::name() — "rust", "org") (OM.1). The peer of target_buffer_kind for the dispatch path BufferKind::Document takes: language detection rather than kind dispatch.

fn options(&self) -> OptionOverrideSet

Option overrides this mode contributes. Pure declarative (same return value every call); the host merges these into the buffer’s option-resolution layer stack while the mode is active, at the mode’s layer (later-activated minors win ties), and drops them on deactivation. Build with lattice_config::overrides! { lattice_config::Wrap = true, … }.

fn decorations(&self) -> Vec<DecorationProvider>

Decoration providers (gutter / inline / overlay / statusline). Stub — reserved for the WIT plugin path (M.10).

fn gutter_decorations(&self, _ctx: &DecorationCtx<'_>) -> Vec<GutterDecoration>

Gutter sign decorations this mode contributes while active. Called once per pane per frame with a DecorationCtx carrying relevant render-state snapshots (diff sign map, LSP diagnostics arc). Returns per-line GutterDecoration values; the renderer partitions them by variant into the appropriate gutter column. Default: empty (no contribution).

fn completion_sources(&self) -> Vec<CompletionSourceContribution>

Insert-mode completion sources this mode contributes while active on a buffer. Empty by default; minors that own a completion source (lsp-completion-mode, snippet-completion-mode, buffer-words-mode, tree-sitter-completion-mode, path-completion-mode, plugin sources) override.

fn required_capabilities(&self) -> CapabilitySet

Capabilities the mode requires. Validated at activation; missing capability ⇒ ModeActivationError::MissingCapability, never silent skip.

fn conflicts_with(&self) -> &[ModeId]

Modes this one cannot be active alongside.

fn implies(&self) -> &[ModeId]

Minor modes activating this mode also activates. Used by relative-line-numbers-mode ⇒ line-numbers-mode, and by read-only majors ⇒ read-only-mode.

fn presents_extensions(&self) -> &[&'static str]

File extensions (lowercase, no dot) this major PRESENTS rather than edits — the file is never loaded as text.

fn mirrors_option(&self) -> Option<&'static str>

Declarative mirror hint for “this mode is the on/off switch for a typed option of the same observable state”. Some(canonical_name) ⇒ a host-driven cascade keeps the mode’s active state and the option’s value in sync.

fn invocation_runner(&self) -> Option<ModeId>

Invocation-runner discovery (2026-05-26). Modes that own command-invocation dispatch for their buffer kind (terminal-mode, oil-mode, file-tree-mode, help-mode, …) return their canonical ModeId; the host registers a runner function under that id at boot, and Editor::run_invocation looks it up by walking the active modes on the active pane’s buffer (minors first, then major) before falling back to the central grammar Action gate.

fn refresh_action(&self) -> Option<&'static str>

Which of this mode’s own actions refreshes its view, or None (the default) when the mode backs nothing refreshable (RV.1, 2026-08-10).

fn fold_toggle_action(&self) -> Option<&'static str>

Which of this mode’s actions <Tab> fires, and the declaration that pulls in foldable-view-mode — the shared minor owning the chord.

fn refresh_on_open(&self) -> bool

Should re-opening this view re-run its refresh?

fn activation_policy(&self) -> ActivationPolicy

A minor mode’s default auto-activation policy (MA.1; mode-architecture.md §7.4). The host’s minor-activation resolver reads this for every registered minor when a buffer enters a major mode, and activates those whose policy admits the entered major. The default is ActivationPolicy::Manual — auto-activate nowhere until the mode or the user opts in. Ignored for major modes (a buffer’s major is chosen by the major resolver, not this allowlist).

fn editable_tail(&self) -> Option<EditableTail>

The mode’s editable tail on an otherwise read-only buffer, or None (the default) for a fully read-only / fully writable buffer (AU‑3).