sascha
/
difftastic
mirror of https://github.com/Wilfred/difftastic/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't store a position tuple in MatchedPos

a_star_module
Wilfred Hughes 2022-01-03 23:23:49 +07:00
parent c7c6f1a7b6
commit 1d1eedf7a5
3 changed files with 114 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/context.rs
Unescape Escape View File

@ -24,11 +24,7 @@ pub fn opposite_positions(mps: &[MatchedPos]) -> HashMap<LineNumber, HashSet<Lin
opposite_pos,
..
} => {
for (self_span, opposite_span) in zip_repeat_shorter(&self_pos.0, &opposite_pos.0) {
let opposite_lines = res.entry(self_span.line).or_insert_with(HashSet::new);
opposite_lines.insert(opposite_span.line);
}
for (self_span, opposite_span) in zip_repeat_shorter(&self_pos.1, &opposite_pos.1) {
for (self_span, opposite_span) in zip_repeat_shorter(&self_pos, &opposite_pos) {
let opposite_lines = res.entry(self_span.line).or_insert_with(HashSet::new);
opposite_lines.insert(opposite_span.line);
}

234
src/hunks.rs
Unescape Escape View File

@ -754,22 +754,16 @@ mod tests {
let matched_mp = MatchedPos {
kind: MatchKind::Unchanged {
highlight: TokenKind::Delimiter,
self_pos: (
vec![SingleLineSpan {
line: 1.into(),
start_col: 1,
end_col: 2,
}],
vec![],
),
opposite_pos: (
vec![SingleLineSpan {
line: 2.into(),
start_col: 1,
end_col: 2,
}],
vec![],
),
self_pos: vec![SingleLineSpan {
line: 1.into(),
start_col: 1,
end_col: 2,
}],
opposite_pos: vec![SingleLineSpan {
line: 2.into(),
start_col: 1,
end_col: 2,
}],
},
pos: SingleLineSpan {
line: 1.into(),
@ -806,22 +800,16 @@ mod tests {
MatchedPos {
kind: MatchKind::Unchanged {
highlight: TokenKind::Atom(AtomKind::Normal),
self_pos: (
vec![SingleLineSpan {
line: 0.into(),
start_col: 0,
end_col: 1,
}],
vec![],
),
opposite_pos: (
vec![SingleLineSpan {
line: 0.into(),
start_col: 0,
end_col: 1,
}],
vec![],
),
self_pos: vec![SingleLineSpan {
line: 0.into(),
start_col: 0,
end_col: 1,
}],
opposite_pos: vec![SingleLineSpan {
line: 0.into(),
start_col: 0,
end_col: 1,
}],
},
pos: SingleLineSpan {
line: 0.into(),
@ -832,22 +820,16 @@ mod tests {
MatchedPos {
kind: MatchKind::Unchanged {
highlight: TokenKind::Atom(AtomKind::Normal),
self_pos: (
vec![SingleLineSpan {
line: 1.into(),
start_col: 0,
end_col: 1,
}],
vec![],
),
opposite_pos: (
vec![SingleLineSpan {
line: 2.into(),
start_col: 0,
end_col: 1,
}],
vec![],
),
self_pos: vec![SingleLineSpan {
line: 1.into(),
start_col: 0,
end_col: 1,
}],
opposite_pos: vec![SingleLineSpan {
line: 2.into(),
start_col: 0,
end_col: 1,
}],
},
pos: SingleLineSpan {
line: 1.into(),
@ -861,22 +843,16 @@ mod tests {
MatchedPos {
kind: MatchKind::Unchanged {
highlight: TokenKind::Atom(AtomKind::Normal),
self_pos: (
vec![SingleLineSpan {
line: 0.into(),
start_col: 0,
end_col: 1,
}],
vec![],
),
opposite_pos: (
vec![SingleLineSpan {
line: 0.into(),
start_col: 0,
end_col: 1,
}],
vec![],
),
self_pos: vec![SingleLineSpan {
line: 0.into(),
start_col: 0,
end_col: 1,
}],
opposite_pos: vec![SingleLineSpan {
line: 0.into(),
start_col: 0,
end_col: 1,
}],
},
pos: SingleLineSpan {
line: 0.into(),
@ -897,22 +873,16 @@ mod tests {
MatchedPos {
kind: MatchKind::Unchanged {
highlight: TokenKind::Atom(AtomKind::Normal),
self_pos: (
vec![SingleLineSpan {
line: 2.into(),
start_col: 0,
end_col: 1,
}],
vec![],
),
opposite_pos: (
vec![SingleLineSpan {
line: 1.into(),
start_col: 0,
end_col: 1,
}],
vec![],
),
self_pos: vec![SingleLineSpan {
line: 2.into(),
start_col: 0,
end_col: 1,
}],
opposite_pos: vec![SingleLineSpan {
line: 1.into(),
start_col: 0,
end_col: 1,
}],
},
pos: SingleLineSpan {
line: 2.into(),
@ -956,22 +926,16 @@ mod tests {
MatchedPos {
kind: MatchKind::Unchanged {
highlight: TokenKind::Atom(AtomKind::Normal),
self_pos: (
vec![SingleLineSpan {
line: 0.into(),
start_col: 0,
end_col: 1,
}],
vec![],
),
opposite_pos: (
vec![SingleLineSpan {
line: 0.into(),
start_col: 0,
end_col: 1,
}],
vec![],
),
self_pos: vec![SingleLineSpan {
line: 0.into(),
start_col: 0,
end_col: 1,
}],
opposite_pos: vec![SingleLineSpan {
line: 0.into(),
start_col: 0,
end_col: 1,
}],
},
pos: SingleLineSpan {
line: 0.into(),
@ -982,22 +946,16 @@ mod tests {
MatchedPos {
kind: MatchKind::Unchanged {
highlight: TokenKind::Atom(AtomKind::Normal),
self_pos: (
vec![SingleLineSpan {
line: 1.into(),
start_col: 0,
end_col: 1,
}],
vec![],
),
opposite_pos: (
vec![SingleLineSpan {
line: 2.into(),
start_col: 0,
end_col: 1,
}],
vec![],
),
self_pos: vec![SingleLineSpan {
line: 1.into(),
start_col: 0,
end_col: 1,
}],
opposite_pos: vec![SingleLineSpan {
line: 2.into(),
start_col: 0,
end_col: 1,
}],
},
pos: SingleLineSpan {
line: 1.into(),
@ -1011,22 +969,16 @@ mod tests {
MatchedPos {
kind: MatchKind::Unchanged {
highlight: TokenKind::Atom(AtomKind::Normal),
self_pos: (
vec![SingleLineSpan {
line: 0.into(),
start_col: 0,
end_col: 1,
}],
vec![],
),
opposite_pos: (
vec![SingleLineSpan {
line: 0.into(),
start_col: 0,
end_col: 1,
}],
vec![],
),
self_pos: vec![SingleLineSpan {
line: 0.into(),
start_col: 0,
end_col: 1,
}],
opposite_pos: vec![SingleLineSpan {
line: 0.into(),
start_col: 0,
end_col: 1,
}],
},
pos: SingleLineSpan {
line: 0.into(),
@ -1047,22 +999,16 @@ mod tests {
MatchedPos {
kind: MatchKind::Unchanged {
highlight: TokenKind::Atom(AtomKind::Normal),
self_pos: (
vec![SingleLineSpan {
line: 2.into(),
start_col: 0,
end_col: 1,
}],
vec![],
),
opposite_pos: (
vec![SingleLineSpan {
line: 1.into(),
start_col: 0,
end_col: 1,
}],
vec![],
),
self_pos: vec![SingleLineSpan {
line: 2.into(),
start_col: 0,
end_col: 1,
}],
opposite_pos: vec![SingleLineSpan {
line: 1.into(),
start_col: 0,
end_col: 1,
}],
},
pos: SingleLineSpan {
line: 2.into(),

41
src/syntax.rs
Unescape Escape View File

@ -489,11 +489,8 @@ pub enum TokenKind {
pub enum MatchKind {
Unchanged {
highlight: TokenKind,
self_pos: (Vec<SingleLineSpan>, Vec<SingleLineSpan>),
// If it's a matched atom, only use the first vec. If it'a
// matched delimiter pair, use both vecs.
// TODO: better data type.
opposite_pos: (Vec<SingleLineSpan>, Vec<SingleLineSpan>),
self_pos: Vec<SingleLineSpan>,
opposite_pos: Vec<SingleLineSpan>,
},
Novel {
highlight: TokenKind,
@ -508,7 +505,7 @@ pub enum MatchKind {
impl MatchKind {
pub fn first_opposite_span(&self) -> Option<SingleLineSpan> {
match self {
MatchKind::Unchanged { opposite_pos, .. } => opposite_pos.0.first().copied(),
MatchKind::Unchanged { opposite_pos, .. } => opposite_pos.first().copied(),
MatchKind::UnchangedCommentPart { opposite_pos, .. } => opposite_pos.first().copied(),
MatchKind::Novel { .. } => None,
MatchKind::ChangedCommentPart {} => None,
@ -604,7 +601,8 @@ impl MatchedPos {
fn new(
ck: ChangeKind,
highlight: TokenKind,
pos: (&[SingleLineSpan], &[SingleLineSpan]),
pos: &[SingleLineSpan],
is_close: bool,
) -> Vec<Self> {
let kind = match ck {
ReplacedComment(this, opposite) => {
@ -621,8 +619,8 @@ impl MatchedPos {
return split_comment_words(
this_content,
// TODO: handle the whole pos.0 here.
pos.0[0],
// TODO: handle the whole pos here.
pos[0],
opposite_content,
opposite_pos[0],
);
@ -633,13 +631,19 @@ impl MatchedPos {
open_position,
close_position,
..
} => (open_position.clone(), close_position.clone()),
Atom { position, .. } => (position.clone(), position.clone()),
} => {
if is_close {
close_position.clone()
} else {
open_position.clone()
}
}
Atom { position, .. } => position.clone(),
};
MatchKind::Unchanged {
highlight,
self_pos: (pos.0.to_vec(), pos.1.to_vec()),
self_pos: pos.to_vec(),
opposite_pos,
}
}
@ -649,7 +653,7 @@ impl MatchedPos {
// Create a MatchedPos for every line that `pos` covers.
// TODO: what about opposite pos?
let mut res = vec![];
for line_pos in pos.0 {
for line_pos in pos {
// Don't create a MatchedPos for empty positions. This
// occurs when we have lists with empty open/close
// delimiter positions, such as the top-level list of syntax items.
@ -704,7 +708,8 @@ fn change_positions_<'a>(
positions.extend(MatchedPos::new(
change,
TokenKind::Delimiter,
(open_position, close_position),
open_position,
false,
));
change_positions_(nl_pos, opposite_nl_pos, children, positions);
@ -712,9 +717,8 @@ fn change_positions_<'a>(
positions.extend(MatchedPos::new(
change,
TokenKind::Delimiter,
// TODO: use open position here too (currently
// breaks display).
(close_position, close_position),
close_position,
true,
));
}
Atom {
@ -730,7 +734,8 @@ fn change_positions_<'a>(
positions.extend(MatchedPos::new(
change,
TokenKind::Atom(*kind),
(position, &[]),
position,
false,
));
}
}