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
|
use std::io::Write;
use syntect::easy::HighlightLines;
use syntect::highlighting::{Style, StyleModifier};
use syntect::parsing::SyntaxReference;
use crate::config;
use crate::edits;
use crate::paint::superimpose_style_sections::superimpose_style_sections;
use crate::style;
pub struct Painter<'a> {
pub minus_lines: Vec<String>,
pub plus_lines: Vec<String>,
pub writer: &'a mut Write,
pub syntax: Option<&'a SyntaxReference>,
pub highlighter: HighlightLines<'a>,
pub config: &'a config::Config<'a>,
pub output_buffer: String,
}
impl<'a> Painter<'a> {
pub fn reset_highlighter(&mut self) {
self.highlighter = HighlightLines::new(self.syntax.unwrap(), self.config.theme);
}
pub fn paint_buffered_lines(&mut self) {
let (minus_line_syntax_style_sections, plus_line_syntax_style_sections) =
self.get_syntax_style_sections();
let (minus_line_diff_style_sections, plus_line_diff_style_sections) =
self.get_diff_style_sections();
// TODO: lines and style sections contain identical line text
if self.minus_lines.len() > 0 {
Painter::paint_lines(
&mut self.output_buffer,
&minus_line_syntax_style_sections,
&minus_line_diff_style_sections,
);
self.minus_lines.clear();
}
if self.plus_lines.len() > 0 {
Painter::paint_lines(
&mut self.output_buffer,
&plus_line_syntax_style_sections,
&plus_line_diff_style_sections,
);
self.plus_lines.clear();
}
}
/// Superimpose background styles and foreground syntax
/// highlighting styles, and write colored lines to output buffer.
pub fn paint_lines(
output_buffer: &mut String,
syntax_style_sections: &Vec<Vec<(Style, String)>>,
diff_style_sections: &Vec<Vec<(StyleModifier, String)>>,
) {
for (syntax_sections, diff_sections) in
syntax_style_sections.iter().zip(diff_style_sections)
{
for (style, text) in superimpose_style_sections(syntax_sections, diff_sections) {
paint_text(&text, style, output_buffer).unwrap();
}
}
}
/// Write output buffer to output stream, and clear the buffer.
pub fn emit(&mut self) -> std::io::Result<()> {
write!(self.writer, "{}", self.output_buffer)?;
self.output_buffer.truncate(0);
Ok(())
}
/// Perform syntax highlighting for minus and plus lines in buffer.
fn get_syntax_style_sections(
&mut self,
) -> (Vec<Vec<(Style, String)>>, Vec<Vec<(Style, String)>>) {
let mut minus_line_sections = Vec::new();
for line in self.minus_lines.iter() {
minus_line_sections.push(Painter::get_line_syntax_style_sections(
&line,
&mut self.highlighter,
&self.config,
self.config.opt.highlight_removed,
));
}
let mut plus_line_sections = Vec::new();
for line in self.plus_lines.iter() {
plus_line_sections.push(Painter::get_line_syntax_style_sections(
&line,
&mut self.highlighter,
&self.config,
true,
));
}
(minus_line_sections, plus_line_sections)
}
pub fn get_line_syntax_style_sections(
line: &str,
highlighter: &mut HighlightLines,
config: &config::Config,
should_syntax_highlight: bool,
) -> Vec<(Style, String)> {
if should_syntax_highlight {
highlighter
.highlight(line, &config.syntax_set)
.iter()
.map(|(style, s)| (*style, s.to_string()))
.collect::<Vec<(Style, String)>>()
} else {
vec![(config.no_style, line.to_string())]
}
}
/// Set background styles to represent diff for minus and plus lines in buffer.
fn get_diff_style_sections(
&mut self,
) -> (
Vec<Vec<(StyleModifier, String)>>,
Vec<Vec<(StyleModifier, String)>>,
) {
if self.minus_lines.len() == self.plus_lines.len() {
edits::infer_edit_sections(
&self.minus_lines,
&self.plus_lines,
self.config.minus_style_modifier,
self.config.minus_emph_style_modifier,
self.config.plus_style_modifier,
self.config.plus_emph_style_modifier,
0.66,
)
} else {
self.get_diff_style_sections_plain()
}
}
fn get_diff_style_sections_plain(
&mut self,
) -> (
Vec<Vec<(StyleModifier, String)>>,
Vec<Vec<(StyleModifier, String)>>,
) {
let mut minus_line_sections = Vec::new();
for line in self.minus_lines.iter() {
minus_line_sections.push(vec![(self.config.minus_style_modifier, line.to_string())]);
}
let mut plus_line_sections = Vec::new();
for line in self.plus_lines.iter() {
plus_line_sections.push(vec![(self.config.plus_style_modifier, line.to_string())]);
}
(minus_line_sections, plus_line_sections)
}
}
/// Write section text to buffer with color escape codes.
pub fn paint_text(text: &str, style: Style, output_buffer: &mut String) -> std::fmt::Result {
use std::fmt::Write;
if text.len() == 0 {
return Ok(());
}
match style.background {
style::NO_COLOR => (),
_ => write!(
output_buffer,
"\x1b[48;2;{};{};{}m",
style.background.r, style.background.g, style.background.b
)?,
}
match style.foreground {
style::NO_COLOR => write!(output_buffer, "{}", text)?,
_ => write!(
output_buffer,
"\x1b[38;2;{};{};{}m{}",
style.foreground.r, style.foreground.g, style.foreground.b, text
)?,
};
Ok(())
}
mod superimpose_style_sections {
use syntect::
|