Struct DiffConflict 

pub struct DiffConflict { /* private fields */ }

A parsed merge conflict in a working file.

Source coordinates are one-based, half-open ranges, allowing empty parts. Returned by DiffFile::conflicts in source order; its slice index is the index accepted by super::DiffState::resolve_conflict. Fields are private and only the parser constructs these snapshots.

Implementations

impl DiffConflict

pub fn lines(&self) -> Range<usize>

One-based working-file lines, including markers, with an exclusive end.

pub fn current_lines(&self) -> Range<usize>

Current-side source lines, with an exclusive end; may be empty.

pub fn base_lines(&self) -> Option<Range<usize>>

Base source lines for diff3, with an exclusive end; may be empty.

pub fn incoming_lines(&self) -> Range<usize>

Incoming-side source lines, with an exclusive end; may be empty.

pub fn current_label(&self) -> &SharedString

The label from the opening marker.

pub fn base_label(&self) -> Option<&SharedString>

The base marker label, or None for a two-way conflict.

pub fn incoming_label(&self) -> &SharedString

The label from the closing marker.

Trait Implementations

impl Clone for DiffConflict

fn clone(&self) -> Self

Returns a duplicate of the value.

fn clone_from(&mut self, source: &Self)

Performs copy-assignment from source.

impl Debug for DiffConflict

fn fmt(&self, f: &mut Formatter<'_>) -> Result

Formats the value using the given formatter.