-
Notifications
You must be signed in to change notification settings - Fork 393
/
delta.rs
519 lines (481 loc) · 19.7 KB
/
delta.rs
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
use std::borrow::Cow;
use std::io::BufRead;
use std::io::Write;
use bytelines::ByteLines;
use unicode_segmentation::UnicodeSegmentation;
use crate::ansi;
use crate::cli;
use crate::config::Config;
use crate::draw;
use crate::features;
use crate::format;
use crate::hunk_header;
use crate::paint::Painter;
use crate::parse;
use crate::style::{self, DecorationStyle};
#[derive(Clone, Debug, PartialEq)]
pub enum State {
CommitMeta, // In commit metadata section
FileMeta, // In diff metadata section, between (possible) commit metadata and first hunk
HunkHeader, // In hunk metadata line
HunkZero, // In hunk; unchanged line
HunkMinus(Option<String>), // In hunk; removed line (raw_line)
HunkPlus(Option<String>), // In hunk; added line (raw_line)
Unknown,
}
#[derive(Debug, PartialEq)]
pub enum Source {
GitDiff, // Coming from a `git diff` command
DiffUnified, // Coming from a `diff -u` command
Unknown,
}
impl State {
fn is_in_hunk(&self) -> bool {
matches!(
*self,
State::HunkHeader | State::HunkZero | State::HunkMinus(_) | State::HunkPlus(_)
)
}
}
// Possible transitions, with actions on entry:
//
//
// | from \ to | CommitMeta | FileMeta | HunkHeader | HunkZero | HunkMinus | HunkPlus |
// |-------------+-------------+-------------+-------------+-------------+-------------+----------|
// | CommitMeta | emit | emit | | | | |
// | FileMeta | | emit | emit | | | |
// | HunkHeader | | | | emit | push | push |
// | HunkZero | emit | emit | emit | emit | push | push |
// | HunkMinus | flush, emit | flush, emit | flush, emit | flush, emit | push | push |
// | HunkPlus | flush, emit | flush, emit | flush, emit | flush, emit | flush, push | push |
struct StateMachine<'a> {
line: String,
raw_line: String,
state: State,
source: Source,
minus_file: String,
plus_file: String,
file_event: parse::FileEvent,
painter: Painter<'a>,
config: &'a Config,
// When a file is modified, we use lines starting with '---' or '+++' to obtain the file name.
// When a file is renamed without changes, we use lines starting with 'rename' to obtain the
// file name (there is no diff hunk and hence no lines starting with '---' or '+++'). But when
// a file is renamed with changes, both are present, and we rely on the following variables to
// avoid emitting the file meta header line twice (#245).
current_file_pair: Option<(String, String)>,
handled_file_meta_header_line_file_pair: Option<(String, String)>,
}
pub fn delta<I>(lines: ByteLines<I>, writer: &mut dyn Write, config: &Config) -> std::io::Result<()>
where
I: BufRead,
{
StateMachine::new(writer, config).consume(lines)
}
impl<'a> StateMachine<'a> {
pub fn new(writer: &'a mut dyn Write, config: &'a Config) -> Self {
Self {
line: "".to_string(),
raw_line: "".to_string(),
state: State::Unknown,
source: Source::Unknown,
minus_file: "".to_string(),
plus_file: "".to_string(),
file_event: parse::FileEvent::NoEvent,
current_file_pair: None,
handled_file_meta_header_line_file_pair: None,
painter: Painter::new(writer, config),
config,
}
}
fn consume<I>(&mut self, mut lines: ByteLines<I>) -> std::io::Result<()>
where
I: BufRead,
{
while let Some(Ok(raw_line_bytes)) = lines.next() {
self.ingest_line(raw_line_bytes);
let line = &self.line;
if self.source == Source::Unknown {
self.source = detect_source(&line);
}
let mut handled_line = if line.starts_with("commit ") {
self.handle_commit_meta_header_line()?
} else if line.starts_with("diff ") {
self.handle_file_meta_diff_line()?
} else if (self.state == State::FileMeta || self.source == Source::DiffUnified)
&& (line.starts_with("--- ")
|| line.starts_with("rename from ")
|| line.starts_with("copy from "))
{
self.handle_file_meta_minus_line()?
} else if (self.state == State::FileMeta || self.source == Source::DiffUnified)
&& (line.starts_with("+++ ")
|| line.starts_with("rename to ")
|| line.starts_with("copy to "))
{
self.handle_file_meta_plus_line()?
} else if line.starts_with("@@") {
self.handle_hunk_header_line()?
} else if self.source == Source::DiffUnified && line.starts_with("Only in ")
|| line.starts_with("Submodule ")
|| line.starts_with("Binary files ")
{
self.handle_additional_file_meta_cases()?
} else if self.state.is_in_hunk() {
// A true hunk line should start with one of: '+', '-', ' '. However, handle_hunk_line
// handles all lines until the state self transitions away from the hunk states.
self.handle_hunk_line()?
} else {
false
};
if self.state == State::FileMeta && self.should_handle() && !self.config.color_only {
// The file metadata section is 4 lines. Skip them under non-plain file-styles.
// However in the case of color_only mode,
// we won't skip because we can't change raw_line structure.
handled_line = true
}
if !handled_line {
self.painter.emit()?;
writeln!(
self.painter.writer,
"{}",
format::format_raw_line(&self.raw_line, self.config)
)?;
}
}
self.painter.paint_buffered_minus_and_plus_lines();
self.painter.emit()?;
Ok(())
}
fn ingest_line(&mut self, raw_line_bytes: &[u8]) {
// TODO: retain raw_line as Cow
self.raw_line = String::from_utf8_lossy(&raw_line_bytes).to_string();
if self.config.max_line_length > 0 && self.raw_line.len() > self.config.max_line_length {
self.raw_line = ansi::truncate_str(
&self.raw_line,
self.config.max_line_length,
&self.config.truncation_symbol,
)
.to_string()
};
self.line = ansi::strip_ansi_codes(&self.raw_line);
}
/// Should a handle_* function be called on this element?
fn should_handle(&self) -> bool {
let style = self.config.get_style(&self.state);
!(style.is_raw && style.decoration_style == DecorationStyle::NoDecoration)
}
fn handle_commit_meta_header_line(&mut self) -> std::io::Result<bool> {
let mut handled_line = false;
self.painter.paint_buffered_minus_and_plus_lines();
self.state = State::CommitMeta;
if self.should_handle() {
self.painter.emit()?;
self._handle_commit_meta_header_line()?;
handled_line = true
}
Ok(handled_line)
}
fn _handle_commit_meta_header_line(&mut self) -> std::io::Result<()> {
if self.config.commit_style.is_omitted {
return Ok(());
}
let (mut draw_fn, pad, decoration_ansi_term_style) =
draw::get_draw_function(self.config.commit_style.decoration_style);
let (formatted_line, formatted_raw_line) = if self.config.hyperlinks {
(
features::hyperlinks::format_commit_line_with_osc8_commit_hyperlink(
&self.line,
self.config,
),
features::hyperlinks::format_commit_line_with_osc8_commit_hyperlink(
&self.raw_line,
self.config,
),
)
} else {
(Cow::from(&self.line), Cow::from(&self.raw_line))
};
draw_fn(
self.painter.writer,
&format!("{}{}", formatted_line, if pad { " " } else { "" }),
&format!("{}{}", formatted_raw_line, if pad { " " } else { "" }),
&self.config.decorations_width,
self.config.commit_style,
decoration_ansi_term_style,
)?;
Ok(())
}
#[allow(clippy::unnecessary_wraps)]
fn handle_file_meta_diff_line(&mut self) -> std::io::Result<bool> {
self.painter.paint_buffered_minus_and_plus_lines();
self.state = State::FileMeta;
self.handled_file_meta_header_line_file_pair = None;
Ok(false)
}
fn handle_file_meta_minus_line(&mut self) -> std::io::Result<bool> {
let mut handled_line = false;
let parsed_file_meta_line =
parse::parse_file_meta_line(&self.line, self.source == Source::GitDiff);
self.minus_file = parsed_file_meta_line.0;
self.file_event = parsed_file_meta_line.1;
if self.source == Source::DiffUnified {
self.state = State::FileMeta;
self.painter
.set_syntax(parse::get_file_extension_from_marker_line(&self.line));
} else {
self.painter
.set_syntax(parse::get_file_extension_from_file_meta_line_file_path(
&self.minus_file,
));
}
// In color_only mode, raw_line's structure shouldn't be changed.
// So it needs to avoid fn _handle_file_meta_header_line
// (it connects the plus_file and minus_file),
// and to call fn handle_generic_file_meta_header_line directly.
if self.config.color_only {
_write_generic_file_meta_header_line(
&self.line,
&self.raw_line,
&mut self.painter,
self.config,
)?;
handled_line = true;
}
Ok(handled_line)
}
fn handle_file_meta_plus_line(&mut self) -> std::io::Result<bool> {
let mut handled_line = false;
let parsed_file_meta_line =
parse::parse_file_meta_line(&self.line, self.source == Source::GitDiff);
self.plus_file = parsed_file_meta_line.0;
self.painter
.set_syntax(parse::get_file_extension_from_file_meta_line_file_path(
&self.plus_file,
));
self.current_file_pair = Some((self.minus_file.clone(), self.plus_file.clone()));
// In color_only mode, raw_line's structure shouldn't be changed.
// So it needs to avoid fn _handle_file_meta_header_line
// (it connects the plus_file and minus_file),
// and to call fn handle_generic_file_meta_header_line directly.
if self.config.color_only {
_write_generic_file_meta_header_line(
&self.line,
&self.raw_line,
&mut self.painter,
self.config,
)?;
handled_line = true
} else if self.should_handle()
&& self.handled_file_meta_header_line_file_pair != self.current_file_pair
{
self.painter.emit()?;
self._handle_file_meta_header_line(self.source == Source::DiffUnified)?;
self.handled_file_meta_header_line_file_pair = self.current_file_pair.clone()
}
Ok(handled_line)
}
/// Construct file change line from minus and plus file and write with FileMeta styling.
fn _handle_file_meta_header_line(&mut self, comparing: bool) -> std::io::Result<()> {
let line = parse::get_file_change_description_from_file_paths(
&self.minus_file,
&self.plus_file,
comparing,
&self.file_event,
self.config,
);
// FIXME: no support for 'raw'
_write_generic_file_meta_header_line(&line, &line, &mut self.painter, self.config)
}
fn handle_additional_file_meta_cases(&mut self) -> std::io::Result<bool> {
let mut handled_line = false;
// Additional FileMeta cases:
//
// 1. When comparing directories with diff -u, if filenames match between the
// directories, the files themselves will be compared. However, if an equivalent
// filename is not present, diff outputs a single line (Only in...) starting
// indicating that the file is present in only one of the directories.
//
// 2. Git diff emits lines describing submodule state such as "Submodule x/y/z contains
// untracked content"
//
// See https://github.com/dandavison/delta/issues/60#issuecomment-557485242 for a
// proposal for more robust parsing logic.
self.painter.paint_buffered_minus_and_plus_lines();
self.state = State::FileMeta;
if self.should_handle() {
self.painter.emit()?;
_write_generic_file_meta_header_line(
&self.line,
&self.raw_line,
&mut self.painter,
self.config,
)?;
handled_line = true;
}
Ok(handled_line)
}
/// Emit the hunk header, with any requested decoration.
fn handle_hunk_header_line(&mut self) -> std::io::Result<bool> {
self.painter.paint_buffered_minus_and_plus_lines();
self.state = State::HunkHeader;
self.painter.set_highlighter();
self.painter.emit()?;
let (code_fragment, line_numbers) = parse::parse_hunk_header(&self.line);
if self.config.line_numbers {
self.painter
.line_numbers_data
.initialize_hunk(&line_numbers, self.plus_file.to_string());
}
if self.config.hunk_header_style.is_raw {
hunk_header::write_hunk_header_raw(
&mut self.painter,
&self.line,
&self.raw_line,
self.config,
)?;
} else if self.config.hunk_header_style.is_omitted {
writeln!(self.painter.writer)?;
} else {
// Add a blank line below the hunk-header-line for readability, unless
// color_only mode is active.
if !self.config.color_only {
writeln!(self.painter.writer)?;
}
hunk_header::write_hunk_header(
&code_fragment,
&line_numbers,
&mut self.painter,
&self.line,
&self.plus_file,
self.config,
)?;
};
self.painter.set_highlighter();
Ok(true)
}
/// Handle a hunk line, i.e. a minus line, a plus line, or an unchanged line.
// In the case of a minus or plus line, we store the line in a
// buffer. When we exit the changed region we process the collected
// minus and plus lines jointly, in order to paint detailed
// highlighting according to inferred edit operations. In the case of
// an unchanged line, we paint it immediately.
fn handle_hunk_line(&mut self) -> std::io::Result<bool> {
// Don't let the line buffers become arbitrarily large -- if we
// were to allow that, then for a large deleted/added file we
// would process the entire file before painting anything.
if self.painter.minus_lines.len() > self.config.line_buffer_size
|| self.painter.plus_lines.len() > self.config.line_buffer_size
{
self.painter.paint_buffered_minus_and_plus_lines();
}
self.state = match self.line.chars().next() {
Some('-') => {
if let State::HunkPlus(_) = self.state {
self.painter.paint_buffered_minus_and_plus_lines();
}
let state = match self.config.inspect_raw_lines {
cli::InspectRawLines::True
if style::line_has_style_other_than(
&self.raw_line,
[*style::GIT_DEFAULT_MINUS_STYLE, self.config.git_minus_style].iter(),
) =>
{
State::HunkMinus(Some(self.painter.prepare_raw_line(&self.raw_line)))
}
_ => State::HunkMinus(None),
};
self.painter
.minus_lines
.push((self.painter.prepare(&self.line), state.clone()));
state
}
Some('+') => {
let state = match self.config.inspect_raw_lines {
cli::InspectRawLines::True
if style::line_has_style_other_than(
&self.raw_line,
[*style::GIT_DEFAULT_PLUS_STYLE, self.config.git_plus_style].iter(),
) =>
{
State::HunkPlus(Some(self.painter.prepare_raw_line(&self.raw_line)))
}
_ => State::HunkPlus(None),
};
self.painter
.plus_lines
.push((self.painter.prepare(&self.line), state.clone()));
state
}
Some(' ') => {
self.painter.paint_buffered_minus_and_plus_lines();
self.painter.paint_zero_line(&self.line);
State::HunkZero
}
_ => {
// The first character here could be e.g. '\' from '\ No newline at end of file'. This
// is not a hunk line, but the parser does not have a more accurate state corresponding
// to this.
self.painter.paint_buffered_minus_and_plus_lines();
self.painter
.output_buffer
.push_str(&self.painter.expand_tabs(self.raw_line.graphemes(true)));
self.painter.output_buffer.push('\n');
State::HunkZero
}
};
self.painter.emit()?;
Ok(true)
}
}
/// Write `line` with FileMeta styling.
fn _write_generic_file_meta_header_line(
line: &str,
raw_line: &str,
painter: &mut Painter,
config: &Config,
) -> std::io::Result<()> {
// If file_style is "omit", we'll skip the process and print nothing.
// However in the case of color_only mode,
// we won't skip because we can't change raw_line structure.
if config.file_style.is_omitted && !config.color_only {
return Ok(());
}
let (mut draw_fn, pad, decoration_ansi_term_style) =
draw::get_draw_function(config.file_style.decoration_style);
// Prints the new line below file-meta-line.
// However in the case of color_only mode,
// we won't print it because we can't change raw_line structure.
if !config.color_only {
writeln!(painter.writer)?;
}
draw_fn(
painter.writer,
&format!("{}{}", line, if pad { " " } else { "" }),
&format!("{}{}", raw_line, if pad { " " } else { "" }),
&config.decorations_width,
config.file_style,
decoration_ansi_term_style,
)?;
Ok(())
}
/// Try to detect what is producing the input for delta.
///
/// Currently can detect:
/// * git diff
/// * diff -u
fn detect_source(line: &str) -> Source {
if line.starts_with("commit ") || line.starts_with("diff --git ") {
Source::GitDiff
} else if line.starts_with("diff -u")
|| line.starts_with("diff -ru")
|| line.starts_with("diff -r -u")
|| line.starts_with("diff -U")
|| line.starts_with("--- ")
|| line.starts_with("Only in ")
{
Source::DiffUnified
} else {
Source::Unknown
}
}