mirror of
https://github.com/tree-sitter/tree-sitter.git
synced 2026-09-10 07:36:22 -04:00
refactor: remove difference dependency
This commit is contained in:
parent
c440f2a7c6
commit
fc146ad510
BIN
Cargo.lock
generated
BIN
Cargo.lock
generated
Binary file not shown.
|
|
@ -51,7 +51,6 @@ clap = { version = "4.5.4", features = [
|
|||
] }
|
||||
ctor = "0.2.8"
|
||||
ctrlc = { version = "3.4.4", features = ["termination"] }
|
||||
difference = "2.0.0"
|
||||
dirs = "5.0.1"
|
||||
filetime = "0.2.23"
|
||||
fs4 = "0.8.3"
|
||||
|
|
@ -75,6 +74,7 @@ semver = "1.0.23"
|
|||
serde = { version = "1.0.202", features = ["derive"] }
|
||||
serde_derive = "1.0.197"
|
||||
serde_json = { version = "1.0.117", features = ["preserve_order"] }
|
||||
similar = "2.5.0"
|
||||
smallbitvec = "2.5.3"
|
||||
tempfile = "3.10.1"
|
||||
thiserror = "1.0.61"
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@ anstyle.workspace = true
|
|||
anyhow.workspace = true
|
||||
clap.workspace = true
|
||||
ctrlc.workspace = true
|
||||
difference.workspace = true
|
||||
dirs.workspace = true
|
||||
filetime.workspace = true
|
||||
glob.workspace = true
|
||||
|
|
@ -47,6 +46,7 @@ semver.workspace = true
|
|||
serde.workspace = true
|
||||
serde_derive.workspace = true
|
||||
serde_json.workspace = true
|
||||
similar.workspace = true
|
||||
smallbitvec.workspace = true
|
||||
tiny_http.workspace = true
|
||||
walkdir.workspace = true
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@ use std::{
|
|||
|
||||
use anstyle::{AnsiColor, Color, Style};
|
||||
use anyhow::{anyhow, Context, Result};
|
||||
use difference::{Changeset, Difference};
|
||||
use indoc::indoc;
|
||||
use lazy_static::lazy_static;
|
||||
use regex::{
|
||||
bytes::{Regex as ByteRegex, RegexBuilder as ByteRegexBuilder},
|
||||
Regex,
|
||||
};
|
||||
use similar::{ChangeTag, TextDiff};
|
||||
use tree_sitter::{format_sexp, Language, LogType, Parser, Query};
|
||||
use walkdir::WalkDir;
|
||||
|
||||
|
|
@ -276,32 +276,39 @@ pub fn print_diff_key() {
|
|||
}
|
||||
|
||||
pub fn print_diff(actual: &str, expected: &str, use_color: bool) {
|
||||
let changeset = Changeset::new(actual, expected, "\n");
|
||||
for diff in &changeset.diffs {
|
||||
match diff {
|
||||
Difference::Same(part) => {
|
||||
let diff = TextDiff::from_lines(actual, expected);
|
||||
for diff in diff.iter_all_changes() {
|
||||
match diff.tag() {
|
||||
ChangeTag::Equal => {
|
||||
if use_color {
|
||||
print!("{part}{}", changeset.split);
|
||||
print!("{diff}");
|
||||
} else {
|
||||
print!("correct:\n{part}{}", changeset.split);
|
||||
print!(" {diff}");
|
||||
}
|
||||
}
|
||||
Difference::Add(part) => {
|
||||
ChangeTag::Insert => {
|
||||
if use_color {
|
||||
println!("{}{}", paint(Some(AnsiColor::Green), part), changeset.split);
|
||||
print!("{}", paint(Some(AnsiColor::Green), diff.as_str().unwrap()));
|
||||
} else {
|
||||
print!("expected:\n{part}{}", changeset.split);
|
||||
print!("+{diff}");
|
||||
}
|
||||
if diff.missing_newline() {
|
||||
println!();
|
||||
}
|
||||
}
|
||||
Difference::Rem(part) => {
|
||||
ChangeTag::Delete => {
|
||||
if use_color {
|
||||
println!("{}{}", paint(Some(AnsiColor::Red), part), changeset.split);
|
||||
print!("{}", paint(Some(AnsiColor::Red), diff.as_str().unwrap()));
|
||||
} else {
|
||||
print!("unexpected:\n{part}{}", changeset.split);
|
||||
print!("-{diff}");
|
||||
}
|
||||
if diff.missing_newline() {
|
||||
println!();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
println!();
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue