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

Update to latest line-numbers

pull/593/head^2
Wilfred Hughes 2023-11-19 13:11:07 +07:00
parent 1dbcd08a90
commit 1ec868e1df
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
Unescape Escape View File

@ -494,9 +494,9 @@ dependencies = [
[[package]]
name = "line-numbers"
version = "0.2.2"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "793a75315eb63b8699158825bdea85d63eeb850e7543cb834abef3c7b5b53780"
checksum = "7b25f5068853805faa3c19f44d0c401446e4eb3f47cc808fa331eec30f0ba35c"
[[package]]
name = "linux-raw-sys"

2
Cargo.toml
Unescape Escape View File

@ -72,7 +72,7 @@ hashbrown = "0.12.3"
humansize = "2.1.3"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
line-numbers = "0.2.2"
line-numbers = "0.3.0"
[dev-dependencies]
# assert_cmd 2.0.6 requires rust 1.60

10
src/line_parser.rs
Unescape Escape View File

@ -121,9 +121,9 @@ pub(crate) fn change_positions(lhs_src: &str, rhs_src: &str) -> Vec<MatchedPos>
TextChangeKind::Unchanged => {
for (lhs_line, rhs_line) in lhs_lines.iter().zip(rhs_lines) {
let lhs_pos =
lhs_lp.from_offsets(lhs_offset, lhs_offset + line_len_in_bytes(lhs_line));
lhs_lp.from_region(lhs_offset, lhs_offset + line_len_in_bytes(lhs_line));
let rhs_pos =
rhs_lp.from_offsets(rhs_offset, rhs_offset + line_len_in_bytes(rhs_line));
rhs_lp.from_region(rhs_offset, rhs_offset + line_len_in_bytes(rhs_line));
res.push(MatchedPos {
kind: MatchKind::UnchangedToken {
@ -149,7 +149,7 @@ pub(crate) fn change_positions(lhs_src: &str, rhs_src: &str) -> Vec<MatchedPos>
match diff_res {
myers_diff::DiffResult::Left(lhs_word) => {
let lhs_pos =
lhs_lp.from_offsets(lhs_offset, lhs_offset + lhs_word.len());
lhs_lp.from_region(lhs_offset, lhs_offset + lhs_word.len());
res.push(MatchedPos {
kind: MatchKind::NovelWord {
highlight: TokenKind::Atom(AtomKind::Normal),
@ -162,9 +162,9 @@ pub(crate) fn change_positions(lhs_src: &str, rhs_src: &str) -> Vec<MatchedPos>
myers_diff::DiffResult::Both(lhs_word, rhs_word) => {
if *lhs_word != "\n" {
let lhs_pos =
lhs_lp.from_offsets(lhs_offset, lhs_offset + lhs_word.len());
lhs_lp.from_region(lhs_offset, lhs_offset + lhs_word.len());
let rhs_pos =
rhs_lp.from_offsets(rhs_offset, rhs_offset + rhs_word.len());
rhs_lp.from_region(rhs_offset, rhs_offset + rhs_word.len());
res.push(MatchedPos {
kind: MatchKind::NovelLinePart {

6
src/parse/syntax.rs
Unescape Escape View File

@ -677,7 +677,7 @@ fn split_atom_words(
kind: MatchKind::NovelWord {
highlight: TokenKind::Atom(kind),
},
pos: content_newlines.from_offsets_relative_to(
pos: content_newlines.from_region_relative_to(
// TODO: don't assume a single line atom.
pos[0],
offset,
@ -691,9 +691,9 @@ fn split_atom_words(
// This word is present on both sides.
// TODO: don't assume this atom is on a single line.
let word_pos =
content_newlines.from_offsets_relative_to(pos[0], offset, offset + word.len())
content_newlines.from_region_relative_to(pos[0], offset, offset + word.len())
[0];
let opposite_word_pos = opposite_content_newlines.from_offsets_relative_to(
let opposite_word_pos = opposite_content_newlines.from_region_relative_to(
opposite_pos[0],
opposite_offset,
opposite_offset + opposite_word.len(),

10
src/parse/tree_sitter_parser.rs
Unescape Escape View File

@ -1554,9 +1554,9 @@ fn list_from_cursor<'a>(
// the delimiter text and the start/end of this node as the
// delimiter positions.
let outer_open_content = "";
let outer_open_position = nl_pos.from_offsets(root_node.start_byte(), root_node.start_byte());
let outer_open_position = nl_pos.from_region(root_node.start_byte(), root_node.start_byte());
let outer_close_content = "";
let outer_close_position = nl_pos.from_offsets(root_node.end_byte(), root_node.end_byte());
let outer_close_position = nl_pos.from_region(root_node.end_byte(), root_node.end_byte());
// TODO: this should probably only allow the delimiters to be the
// first and last child in the list.
@ -1604,7 +1604,7 @@ fn list_from_cursor<'a>(
));
} else if node_i == i {
inner_open_content = &src[node.start_byte()..node.end_byte()];
inner_open_position = nl_pos.from_offsets(node.start_byte(), node.end_byte());
inner_open_position = nl_pos.from_region(node.start_byte(), node.end_byte());
} else if node_i < j {
between_delim.extend(syntax_from_cursor(
arena,
@ -1619,7 +1619,7 @@ fn list_from_cursor<'a>(
));
} else if node_i == j {
inner_close_content = &src[node.start_byte()..node.end_byte()];
inner_close_position = nl_pos.from_offsets(node.start_byte(), node.end_byte());
inner_close_position = nl_pos.from_region(node.start_byte(), node.end_byte());
} else if node_i > j {
after_delim.extend(syntax_from_cursor(
arena,
@ -1685,7 +1685,7 @@ fn atom_from_cursor<'a>(
ignore_comments: bool,
) -> Option<&'a Syntax<'a>> {
let node = cursor.node();
let position = nl_pos.from_offsets(node.start_byte(), node.end_byte());
let position = nl_pos.from_region(node.start_byte(), node.end_byte());
let mut content = &src[node.start_byte()..node.end_byte()];
// The C and C++ grammars have a '\n' node with the