2022-01-07 22:09:52 -05:00
|
|
|
// Copyright 2018-2022 the Deno authors. All rights reserved. MIT license.
|
2020-09-05 20:34:02 -04:00
|
|
|
|
2020-05-23 09:22:08 -04:00
|
|
|
use crate::colors;
|
|
|
|
use dissimilar::{diff as difference, Chunk};
|
2022-07-01 09:28:06 -04:00
|
|
|
use std::fmt::Write as _;
|
2020-05-23 09:22:08 -04:00
|
|
|
|
2021-07-02 10:16:09 -04:00
|
|
|
/// Print diff of the same file_path, before and after formatting.
|
|
|
|
///
|
2022-07-10 22:49:18 -04:00
|
|
|
/// Diff format is loosely based on GitHub diff formatting.
|
2021-07-02 10:16:09 -04:00
|
|
|
pub fn diff(orig_text: &str, edit_text: &str) -> String {
|
|
|
|
if orig_text == edit_text {
|
|
|
|
return String::new();
|
|
|
|
}
|
|
|
|
|
|
|
|
// normalize newlines as it adds too much noise if they differ
|
|
|
|
let orig_text = orig_text.replace("\r\n", "\n");
|
|
|
|
let edit_text = edit_text.replace("\r\n", "\n");
|
|
|
|
|
|
|
|
if orig_text == edit_text {
|
|
|
|
return " | Text differed by line endings.\n".to_string();
|
|
|
|
}
|
|
|
|
|
|
|
|
DiffBuilder::build(&orig_text, &edit_text)
|
|
|
|
}
|
|
|
|
|
|
|
|
struct DiffBuilder {
|
|
|
|
output: String,
|
|
|
|
line_number_width: usize,
|
|
|
|
orig_line: usize,
|
|
|
|
edit_line: usize,
|
|
|
|
orig: String,
|
|
|
|
edit: String,
|
|
|
|
has_changes: bool,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl DiffBuilder {
|
|
|
|
pub fn build(orig_text: &str, edit_text: &str) -> String {
|
|
|
|
let mut diff_builder = DiffBuilder {
|
|
|
|
output: String::new(),
|
|
|
|
orig_line: 1,
|
|
|
|
edit_line: 1,
|
|
|
|
orig: String::new(),
|
|
|
|
edit: String::new(),
|
|
|
|
has_changes: false,
|
|
|
|
line_number_width: {
|
|
|
|
let line_count = std::cmp::max(
|
|
|
|
orig_text.split('\n').count(),
|
|
|
|
edit_text.split('\n').count(),
|
|
|
|
);
|
|
|
|
line_count.to_string().chars().count()
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
let chunks = difference(orig_text, edit_text);
|
|
|
|
diff_builder.handle_chunks(chunks);
|
|
|
|
diff_builder.output
|
|
|
|
}
|
|
|
|
|
|
|
|
fn handle_chunks<'a>(&'a mut self, chunks: Vec<Chunk<'a>>) {
|
|
|
|
for chunk in chunks {
|
|
|
|
match chunk {
|
|
|
|
Chunk::Delete(s) => {
|
|
|
|
let split = s.split('\n').enumerate();
|
|
|
|
for (i, s) in split {
|
|
|
|
if i > 0 {
|
|
|
|
self.orig.push('\n');
|
|
|
|
}
|
|
|
|
self.orig.push_str(&fmt_rem_text_highlight(s));
|
|
|
|
}
|
|
|
|
self.has_changes = true
|
|
|
|
}
|
|
|
|
Chunk::Insert(s) => {
|
|
|
|
let split = s.split('\n').enumerate();
|
|
|
|
for (i, s) in split {
|
|
|
|
if i > 0 {
|
|
|
|
self.edit.push('\n');
|
|
|
|
}
|
|
|
|
self.edit.push_str(&fmt_add_text_highlight(s));
|
|
|
|
}
|
|
|
|
self.has_changes = true
|
|
|
|
}
|
|
|
|
Chunk::Equal(s) => {
|
|
|
|
let split = s.split('\n').enumerate();
|
|
|
|
for (i, s) in split {
|
|
|
|
if i > 0 {
|
|
|
|
self.flush_changes();
|
|
|
|
}
|
|
|
|
self.orig.push_str(&fmt_rem_text(s));
|
|
|
|
self.edit.push_str(&fmt_add_text(s));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
self.flush_changes();
|
|
|
|
}
|
|
|
|
|
|
|
|
fn flush_changes(&mut self) {
|
|
|
|
if self.has_changes {
|
|
|
|
self.write_line_diff();
|
|
|
|
|
|
|
|
self.orig_line += self.orig.split('\n').count();
|
|
|
|
self.edit_line += self.edit.split('\n').count();
|
|
|
|
self.has_changes = false;
|
|
|
|
} else {
|
|
|
|
self.orig_line += 1;
|
|
|
|
self.edit_line += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
self.orig.clear();
|
|
|
|
self.edit.clear();
|
|
|
|
}
|
|
|
|
|
|
|
|
fn write_line_diff(&mut self) {
|
|
|
|
let split = self.orig.split('\n').enumerate();
|
|
|
|
for (i, s) in split {
|
2022-07-01 09:28:06 -04:00
|
|
|
write!(
|
|
|
|
self.output,
|
2021-07-02 10:16:09 -04:00
|
|
|
"{:width$}{} ",
|
|
|
|
self.orig_line + i,
|
|
|
|
colors::gray(" |"),
|
|
|
|
width = self.line_number_width
|
2022-07-01 09:28:06 -04:00
|
|
|
)
|
|
|
|
.unwrap();
|
2021-07-02 10:16:09 -04:00
|
|
|
self.output.push_str(&fmt_rem());
|
|
|
|
self.output.push_str(s);
|
|
|
|
self.output.push('\n');
|
|
|
|
}
|
|
|
|
|
|
|
|
let split = self.edit.split('\n').enumerate();
|
|
|
|
for (i, s) in split {
|
2022-07-01 09:28:06 -04:00
|
|
|
write!(
|
|
|
|
self.output,
|
2021-07-02 10:16:09 -04:00
|
|
|
"{:width$}{} ",
|
|
|
|
self.edit_line + i,
|
|
|
|
colors::gray(" |"),
|
|
|
|
width = self.line_number_width
|
2022-07-01 09:28:06 -04:00
|
|
|
)
|
|
|
|
.unwrap();
|
2021-07-02 10:16:09 -04:00
|
|
|
self.output.push_str(&fmt_add());
|
|
|
|
self.output.push_str(s);
|
|
|
|
self.output.push('\n');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-23 09:22:08 -04:00
|
|
|
fn fmt_add() -> String {
|
2020-11-09 09:38:29 -05:00
|
|
|
colors::green_bold("+").to_string()
|
2020-05-23 09:22:08 -04:00
|
|
|
}
|
|
|
|
|
2020-06-29 08:17:37 -04:00
|
|
|
fn fmt_add_text(x: &str) -> String {
|
2020-11-09 09:38:29 -05:00
|
|
|
colors::green(x).to_string()
|
2020-05-23 09:22:08 -04:00
|
|
|
}
|
|
|
|
|
2020-06-29 08:17:37 -04:00
|
|
|
fn fmt_add_text_highlight(x: &str) -> String {
|
2020-11-09 09:38:29 -05:00
|
|
|
colors::black_on_green(x).to_string()
|
2020-05-23 09:22:08 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
fn fmt_rem() -> String {
|
2020-11-09 09:38:29 -05:00
|
|
|
colors::red_bold("-").to_string()
|
2020-05-23 09:22:08 -04:00
|
|
|
}
|
|
|
|
|
2020-06-29 08:17:37 -04:00
|
|
|
fn fmt_rem_text(x: &str) -> String {
|
2020-11-09 09:38:29 -05:00
|
|
|
colors::red(x).to_string()
|
2020-05-23 09:22:08 -04:00
|
|
|
}
|
|
|
|
|
2020-06-29 08:17:37 -04:00
|
|
|
fn fmt_rem_text_highlight(x: &str) -> String {
|
2020-11-09 09:38:29 -05:00
|
|
|
colors::white_on_red(x).to_string()
|
2020-05-23 09:22:08 -04:00
|
|
|
}
|
|
|
|
|
2021-02-01 10:55:23 -05:00
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
|
|
|
use super::*;
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_diff() {
|
2021-07-02 10:16:09 -04:00
|
|
|
run_test(
|
|
|
|
"console.log('Hello World')",
|
|
|
|
"console.log(\"Hello World\");",
|
|
|
|
concat!(
|
|
|
|
"1 | -console.log('Hello World')\n",
|
|
|
|
"1 | +console.log(\"Hello World\");\n",
|
|
|
|
),
|
2021-02-01 10:55:23 -05:00
|
|
|
);
|
|
|
|
|
2021-07-02 10:16:09 -04:00
|
|
|
run_test(
|
|
|
|
"\n\n\n\nconsole.log(\n'Hello World'\n)",
|
|
|
|
"console.log(\n\"Hello World\"\n);",
|
|
|
|
concat!(
|
|
|
|
"1 | -\n",
|
|
|
|
"2 | -\n",
|
|
|
|
"3 | -\n",
|
|
|
|
"4 | -\n",
|
|
|
|
"5 | -console.log(\n",
|
|
|
|
"1 | +console.log(\n",
|
|
|
|
"6 | -'Hello World'\n",
|
|
|
|
"2 | +\"Hello World\"\n",
|
|
|
|
"7 | -)\n3 | +);\n",
|
|
|
|
),
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_eof_newline_missing() {
|
|
|
|
run_test(
|
|
|
|
"test\nsome line text test",
|
|
|
|
"test\nsome line text test\n",
|
|
|
|
concat!(
|
|
|
|
"2 | -some line text test\n",
|
|
|
|
"2 | +some line text test\n",
|
|
|
|
"3 | +\n",
|
|
|
|
),
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_newlines_differing() {
|
|
|
|
run_test("test\n", "test\r\n", " | Text differed by line endings.\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
fn run_test(diff_text1: &str, diff_text2: &str, expected_output: &str) {
|
2021-02-01 10:55:23 -05:00
|
|
|
assert_eq!(
|
2021-09-12 12:04:17 -04:00
|
|
|
test_util::strip_ansi_codes(&diff(diff_text1, diff_text2,)),
|
2021-07-02 10:16:09 -04:00
|
|
|
expected_output,
|
2021-02-01 10:55:23 -05:00
|
|
|
);
|
|
|
|
}
|
2020-05-23 09:22:08 -04:00
|
|
|
}
|