2020-05-23 09:22:08 -04:00
|
|
|
// Copyright 2018-2020 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};
|
|
|
|
|
|
|
|
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
|
|
|
}
|
|
|
|
|
|
|
|
fn write_line_diff(
|
|
|
|
diff: &mut String,
|
|
|
|
orig_line: &mut usize,
|
|
|
|
edit_line: &mut usize,
|
|
|
|
line_number_width: usize,
|
|
|
|
orig: &mut String,
|
|
|
|
edit: &mut String,
|
2020-11-12 17:17:31 -05:00
|
|
|
) {
|
2020-05-23 09:22:08 -04:00
|
|
|
let split = orig.split('\n').enumerate();
|
|
|
|
for (i, s) in split {
|
2020-11-12 17:17:31 -05:00
|
|
|
diff.push_str(&format!(
|
2020-09-17 21:48:08 -04:00
|
|
|
"{:width$}{} ",
|
2020-05-23 09:22:08 -04:00
|
|
|
*orig_line + i,
|
2020-09-17 21:48:08 -04:00
|
|
|
colors::gray(" |"),
|
2020-05-23 09:22:08 -04:00
|
|
|
width = line_number_width
|
2020-11-12 17:17:31 -05:00
|
|
|
));
|
|
|
|
diff.push_str(&fmt_rem());
|
|
|
|
diff.push_str(s);
|
|
|
|
diff.push('\n');
|
2020-05-23 09:22:08 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
let split = edit.split('\n').enumerate();
|
|
|
|
for (i, s) in split {
|
2020-11-12 17:17:31 -05:00
|
|
|
diff.push_str(&format!(
|
2020-09-17 21:48:08 -04:00
|
|
|
"{:width$}{} ",
|
2020-05-23 09:22:08 -04:00
|
|
|
*edit_line + i,
|
2020-09-17 21:48:08 -04:00
|
|
|
colors::gray(" |"),
|
2020-05-23 09:22:08 -04:00
|
|
|
width = line_number_width
|
2020-11-12 17:17:31 -05:00
|
|
|
));
|
|
|
|
diff.push_str(&fmt_add());
|
|
|
|
diff.push_str(s);
|
|
|
|
diff.push('\n');
|
2020-05-23 09:22:08 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
*orig_line += orig.split('\n').count();
|
|
|
|
*edit_line += edit.split('\n').count();
|
|
|
|
|
|
|
|
orig.clear();
|
|
|
|
edit.clear();
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Print diff of the same file_path, before and after formatting.
|
|
|
|
///
|
|
|
|
/// Diff format is loosely based on Github diff formatting.
|
2020-11-12 17:17:31 -05:00
|
|
|
pub fn diff(orig_text: &str, edit_text: &str) -> String {
|
2020-05-23 09:22:08 -04:00
|
|
|
let lines = edit_text.split('\n').count();
|
|
|
|
let line_number_width = lines.to_string().chars().count();
|
|
|
|
|
|
|
|
let mut diff = String::new();
|
|
|
|
|
|
|
|
let mut text1 = orig_text.to_string();
|
|
|
|
let mut text2 = edit_text.to_string();
|
|
|
|
|
|
|
|
if !text1.ends_with('\n') {
|
2020-11-12 17:17:31 -05:00
|
|
|
text1.push('\n');
|
2020-05-23 09:22:08 -04:00
|
|
|
}
|
|
|
|
if !text2.ends_with('\n') {
|
2020-11-12 17:17:31 -05:00
|
|
|
text2.push('\n');
|
2020-05-23 09:22:08 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
let mut orig_line: usize = 1;
|
|
|
|
let mut edit_line: usize = 1;
|
|
|
|
let mut orig: String = String::new();
|
|
|
|
let mut edit: String = String::new();
|
|
|
|
let mut changes = false;
|
|
|
|
|
|
|
|
let chunks = difference(&text1, &text2);
|
|
|
|
for chunk in chunks {
|
|
|
|
match chunk {
|
|
|
|
Chunk::Delete(s) => {
|
|
|
|
let split = s.split('\n').enumerate();
|
|
|
|
for (i, s) in split {
|
|
|
|
if i > 0 {
|
2020-09-14 18:05:17 -04:00
|
|
|
orig.push('\n');
|
2020-05-23 09:22:08 -04:00
|
|
|
}
|
2020-06-29 08:17:37 -04:00
|
|
|
orig.push_str(&fmt_rem_text_highlight(s));
|
2020-05-23 09:22:08 -04:00
|
|
|
}
|
|
|
|
changes = true
|
|
|
|
}
|
|
|
|
Chunk::Insert(s) => {
|
|
|
|
let split = s.split('\n').enumerate();
|
|
|
|
for (i, s) in split {
|
|
|
|
if i > 0 {
|
2020-09-14 18:05:17 -04:00
|
|
|
edit.push('\n');
|
2020-05-23 09:22:08 -04:00
|
|
|
}
|
2020-06-29 08:17:37 -04:00
|
|
|
edit.push_str(&fmt_add_text_highlight(s));
|
2020-05-23 09:22:08 -04:00
|
|
|
}
|
|
|
|
changes = true
|
|
|
|
}
|
|
|
|
Chunk::Equal(s) => {
|
|
|
|
let split = s.split('\n').enumerate();
|
|
|
|
for (i, s) in split {
|
|
|
|
if i > 0 {
|
|
|
|
if changes {
|
|
|
|
write_line_diff(
|
|
|
|
&mut diff,
|
|
|
|
&mut orig_line,
|
|
|
|
&mut edit_line,
|
|
|
|
line_number_width,
|
|
|
|
&mut orig,
|
|
|
|
&mut edit,
|
2020-11-12 17:17:31 -05:00
|
|
|
);
|
2020-05-23 09:22:08 -04:00
|
|
|
changes = false
|
|
|
|
} else {
|
|
|
|
orig.clear();
|
|
|
|
edit.clear();
|
|
|
|
orig_line += 1;
|
|
|
|
edit_line += 1;
|
|
|
|
}
|
|
|
|
}
|
2020-06-29 08:17:37 -04:00
|
|
|
orig.push_str(&fmt_rem_text(s));
|
|
|
|
edit.push_str(&fmt_add_text(s));
|
2020-05-23 09:22:08 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2020-11-12 17:17:31 -05:00
|
|
|
diff
|
2020-05-23 09:22:08 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_diff() {
|
|
|
|
let simple_console_log_unfmt = "console.log('Hello World')";
|
|
|
|
let simple_console_log_fmt = "console.log(\"Hello World\");";
|
|
|
|
assert_eq!(
|
2020-11-12 17:17:31 -05:00
|
|
|
colors::strip_ansi_codes(&diff(
|
|
|
|
simple_console_log_unfmt,
|
|
|
|
simple_console_log_fmt
|
|
|
|
)),
|
2020-09-17 21:48:08 -04:00
|
|
|
"1 | -console.log('Hello World')\n1 | +console.log(\"Hello World\");\n"
|
2020-05-23 09:22:08 -04:00
|
|
|
);
|
|
|
|
|
|
|
|
let line_number_unfmt = "\n\n\n\nconsole.log(\n'Hello World'\n)";
|
|
|
|
let line_number_fmt = "console.log(\n\"Hello World\"\n);";
|
|
|
|
assert_eq!(
|
2020-11-12 17:17:31 -05:00
|
|
|
colors::strip_ansi_codes(&diff(line_number_unfmt, line_number_fmt)),
|
2020-09-17 21:48:08 -04:00
|
|
|
"1 | -\n2 | -\n3 | -\n4 | -\n5 | -console.log(\n1 | +console.log(\n6 | -'Hello World'\n2 | +\"Hello World\"\n7 | -)\n3 | +);\n"
|
2020-05-23 09:22:08 -04:00
|
|
|
)
|
|
|
|
}
|