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
|
use crate::features::diff_highlight;
use crate::features::OptionValueFunction;
pub fn make_feature() -> Vec<(String, OptionValueFunction)> {
let mut feature = diff_highlight::_make_feature(true);
feature.extend(builtin_feature!([
(
"minus-emph-style",
String,
Some("color.diff-highlight.oldHighlight"),
_opt => "bold red 52"
),
(
"plus-emph-style",
String,
Some("color.diff-highlight.newHighlight"),
_opt => "bold green 22"
),
(
"commit-style",
String,
None,
_opt => "bold yellow"
),
(
"commit-decoration-style",
String,
None,
_opt => "none"
),
(
"file-style",
String,
Some("color.diff.meta"),
_opt => "11"
),
(
"file-decoration-style",
String,
None,
_opt => "bold yellow ul ol"
),
(
"hunk-header-style",
String,
Some("color.diff.frag"),
_opt => "bold syntax"
),
(
"hunk-header-decoration-style",
String,
None,
_opt => "magenta box"
)
]));
feature
}
#[cfg(test)]
pub mod tests {
use std::fs::remove_file;
use crate::features;
#[test]
fn test_diff_so_fancy_defaults() {
let config = features::tests::make_config(&["--features", "diff-so-fancy"], None, None);
assert_eq!(
config.commit_style.ansi_term_style,
features::tests::make_style("bold yellow").ansi_term_style
);
assert_eq!(
config.commit_style.decoration_style,
features::tests::make_decoration_style("none")
);
assert_eq!(
config.file_style.ansi_term_style,
features::tests::make_style("11").ansi_term_style
);
assert_eq!(
config.file_style.decoration_style,
features::tests::make_decoration_style("bold yellow ul ol")
);
assert_eq!(
config.hunk_header_style.ansi_term_style,
features::tests::make_style("bold syntax").ansi_term_style
);
assert_eq!(
config.hunk_header_style.decoration_style,
features::tests::make_decoration_style("magenta box")
);
}
#[test]
fn test_diff_so_fancy_respects_git_config() {
let git_config_contents = b"
[color \"diff\"]
meta = 11
frag = magenta bold
commit = yellow bold
old = red bold
new = green bold
whitespace = red reverse
";
let git_config_path = "delta__test_diff_so_fancy.gitconfig";
let config = features::tests::make_config(
&["--features", "diff-so-fancy some-other-feature"],
Some(git_config_contents),
Some(git_config_path),
);
assert_eq!(
config.commit_style.ansi_term_style,
features::tests::make_style("yellow bold").ansi_term_style
);
assert_eq!(
config.file_style.ansi_term_style,
features::tests::make_style("11").ansi_term_style
);
assert_eq!(
config.hunk_header_style.ansi_term_style,
features::tests::make_style("magenta bold").ansi_term_style
);
assert_eq!(
config.commit_style.decoration_style,
features::tests::make_decoration_style("none")
);
assert_eq!(
config.file_style.decoration_style,
features::tests::make_decoration_style("yellow bold ul ol")
);
assert_eq!(
config.hunk_header_style.decoration_style,
features::tests::make_decoration_style("magenta box")
);
remove_file(git_config_path).unwrap();
}
#[test]
fn test_diff_so_fancy_obeys_feature_precedence_rules() {
let git_config_contents = b"
[color \"diff\"]
meta = 11
frag = magenta bold
commit = yellow bold
old = red bold
new = green bold
whitespace = red reverse
[delta \"decorations\"]
commit-decoration-style = bold box ul
file-style = bold 19 ul
file-decoration-style = none
";
let git_config_path = "delta__test_diff_so_fancy_obeys_feature_precedence_rules.gitconfig";
let config = features::tests::make_config(
&["--features", "decorations diff-so-fancy"],
Some(git_config_contents),
Some(git_config_path),
);
assert_eq!(
config.file_style.ansi_term_style,
features::tests::make_style("11").ansi_term_style
);
assert_eq!(
config.file_style.decoration_style,
features::tests::make_decoration_style("yellow bold ul ol")
);
let config = features::tests::make_config(
&["--features", "diff-so-fancy decorations"],
Some(git_config_contents),
Some(git_config_path),
);
assert_eq!(
config.file_style.ansi_term_style,
features::tests::make_style("ul bold 19").ansi_term_style
);
assert_eq!(
config.file_style.decoration_style,
features::tests::make_decoration_style("none")
);
remove_file(git_config_path).unwrap();
}
}
|
