use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, JsonSchema)]
#[serde(tag = "result", rename_all = "snake_case")]
pub enum MergeOutcome {
Clean {
text: String,
},
Conflict {
regions: Vec<(usize, usize)>,
},
}
#[must_use]
pub fn three_way(base: &str, planned: &str, current: &str) -> MergeOutcome {
match diffy::merge(base, planned, current) {
Ok(text) => MergeOutcome::Clean { text },
Err(marked) => MergeOutcome::Conflict {
regions: conflict_regions(&marked, current),
},
}
}
fn conflict_regions(marked: &str, current: &str) -> Vec<(usize, usize)> {
let mut regions = Vec::new();
let mut search_from = 0usize;
let mut segment: Option<String> = None;
for text in marked.lines() {
if text.starts_with("=======") {
segment = Some(String::new());
} else if text.starts_with(">>>>>>>") {
close_segment(current, segment.take(), &mut search_from, &mut regions);
} else if text.starts_with("<<<<<<<") || text.starts_with("|||||||") {
segment = None;
} else if let Some(buffer) = &mut segment {
buffer.push_str(text);
buffer.push('\n');
}
}
regions
}
fn close_segment(
current: &str,
segment: Option<String>,
search_from: &mut usize,
regions: &mut Vec<(usize, usize)>,
) {
let Some(text) = segment.filter(|text| !text.is_empty()) else {
return;
};
if let Some(range) = locate(current, &text, search_from) {
regions.push(range);
}
}
fn locate(current: &str, needle: &str, search_from: &mut usize) -> Option<(usize, usize)> {
let relative = current.get(*search_from..)?.find(needle)?;
let start_byte = *search_from + relative;
let start_line = 1 + current[..start_byte].matches('\n').count();
let end_line = start_line + needle.matches('\n').count().saturating_sub(1);
*search_from = start_byte + needle.len();
Some((start_line, end_line))
}