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
//! Utilities and modules related to rendering diff outputs.
//!
//! We have a modular system for displaying diff data to the terminal. Using this system makes it
//! much easier to extend with new formats that people may request.
//!
//! This library defines a fairly minimal interface for renderers: a single trait called
//! `Renderer`. From there implementers are free to do whatever they want with the diff data.
//!
//! This module also defines utilities that may be useful for `Renderer` implementations.
mod json;
mod unified;
use crate::diff::RichHunks;
use console::{Color, Style, Term};
use enum_dispatch::enum_dispatch;
use serde::{Deserialize, Serialize};
use std::collections::HashMap;
use std::io::Write;
use strum::{self, Display, EnumIter, EnumString};
use unified::Unified;
use self::json::Json;
/// The parameters required to display a diff for a particular document
#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
pub struct DocumentDiffData<'a> {
/// The filename of the document
pub filename: &'a str,
/// The full text of the document
pub text: &'a str,
}
/// The parameters a [Renderer] instance receives to render a diff.
#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
pub struct DisplayData<'a> {
/// The hunks constituting the diff.
pub hunks: RichHunks<'a>,
/// The parameters that correspond to the old document
pub old: DocumentDiffData<'a>,
/// The parameters that correspond to the new document
pub new: DocumentDiffData<'a>,
}
#[enum_dispatch]
#[derive(Clone, Eq, PartialEq, Debug, Serialize, Deserialize, Display, EnumIter, EnumString)]
#[strum(serialize_all = "snake_case")]
#[serde(tag = "type", rename_all = "snake_case")]
pub enum Renderers {
Unified,
Json,
}
impl Default for Renderers {
fn default() -> Self {
Renderers::Unified(Unified::default())
}
}
/// An interface that renders given diff data.
#[enum_dispatch(Renderers)]
pub trait Renderer {
/// Render a diff.
///
/// We use anyhow for errors so errors are free form for implementors, as they are not
/// recoverable.
///
/// `writer` can be any generic writer - it's not guaranteed that we're writing to a particular sink (could be a
/// pager, stdout, etc). `data` is the data that the renderer needs to display, this has information about the
/// document being written out. `term_info` is an optional reference to a term object that can be used by the
/// renderer to access information about the terminal if the current process is a TTY output.
fn render(
&self,
writer: &mut dyn Write,
data: &DisplayData,
term_info: Option<&Term>,
) -> anyhow::Result<()>;
}
/// A copy of the [Color](console::Color) enum so we can serialize using serde, and get around the
/// orphan rule.
#[derive(Debug, PartialEq, Eq, Copy, Clone, Serialize, Deserialize)]
#[serde(remote = "Color", rename_all = "snake_case")]
#[derive(Default)]
enum ColorDef {
Color256(u8),
#[default]
Black,
Red,
Green,
Yellow,
Blue,
Magenta,
Cyan,
White,
}
impl From<ColorDef> for Color {
fn from(c: ColorDef) -> Self {
match c {
ColorDef::Black => Color::Black,
ColorDef::White => Color::White,
ColorDef::Red => Color::Red,
ColorDef::Green => Color::Green,
ColorDef::Yellow => Color::Yellow,
ColorDef::Blue => Color::Blue,
ColorDef::Magenta => Color::Magenta,
ColorDef::Cyan => Color::Cyan,
ColorDef::Color256(c) => Color::Color256(c),
}
}
}
/// Workaround so we can use the `ColorDef` remote serialization mechanism with optional types
mod opt_color_def {
use super::{Color, ColorDef};
use serde::{Deserialize, Deserializer, Serialize, Serializer};
#[allow(clippy::trivially_copy_pass_by_ref)]
pub fn serialize<S>(value: &Option<Color>, serializer: S) -> Result<S::Ok, S::Error>
where
S: Serializer,
{
#[derive(Serialize)]
struct Helper<'a>(#[serde(with = "ColorDef")] &'a Color);
value.as_ref().map(Helper).serialize(serializer)
}
pub fn deserialize<'de, D>(deserializer: D) -> Result<Option<Color>, D::Error>
where
D: Deserializer<'de>,
{
#[derive(Deserialize)]
struct Helper(#[serde(with = "ColorDef")] Color);
let helper = Option::deserialize(deserializer)?;
Ok(helper.map(|Helper(external)| external))
}
}
/// A helper function for the serde serializer
///
/// Due to the shenanigans we're using to serialize the optional color, we need to supply this
/// method so serde can infer a default value for an option when its key is missing.
fn default_option<T>() -> Option<T> {
None
}
/// The style that applies to regular text in a diff
#[derive(Clone, Debug, PartialEq, Eq)]
struct RegularStyle(Style);
/// The style that applies to emphasized text in a diff
#[derive(Clone, Debug, PartialEq, Eq)]
struct EmphasizedStyle(Style);
/// The formatting directives to use with emphasized text in the line of a diff
///
/// `Bold` is used as the default emphasis strategy between two lines.
#[derive(Debug, PartialEq, EnumString, Serialize, Deserialize, Eq)]
#[strum(serialize_all = "snake_case")]
#[derive(Default)]
pub enum Emphasis {
/// Don't emphasize anything
///
/// This field exists because the absence of a value implies that the user wants to use the
/// default emphasis strategy.
None,
/// Bold the differences between the two lines for emphasis
#[default]
Bold,
/// Underline the differences between two lines for emphasis
Underline,
/// Use a colored highlight for emphasis
Highlight(HighlightColors),
}
/// The colors to use when highlighting additions and deletions
#[derive(Debug, Eq, PartialEq, Serialize, Deserialize)]
pub struct HighlightColors {
/// The background color to use with an addition
#[serde(with = "ColorDef")]
pub addition: Color,
/// The background color to use with a deletion
#[serde(with = "ColorDef")]
pub deletion: Color,
}
impl Default for HighlightColors {
fn default() -> Self {
HighlightColors {
addition: Color::Color256(0),
deletion: Color::Color256(0),
}
}
}
/// Configurations and templates for different configuration aliases
///
/// The user can define settings for each renderer as well as custom tags for different renderer
/// configurations.
#[derive(Serialize, Deserialize, Debug, Eq, PartialEq, Clone)]
#[serde(rename_all = "snake_case", default)]
pub struct RenderConfig {
/// The default diff renderer to use.
///
/// This is used if no renderer is specified at the command line.
default: String,
unified: unified::Unified,
json: json::Json,
/// A mapping of tags to custom rendering configurations.
///
/// These names *must* be distinct from the renderer names, otherwise the keys will conflict
/// with the configs set for each renderer in this config section.
custom: HashMap<String, Renderers>,
}
impl Default for RenderConfig {
fn default() -> Self {
let default_renderer = Renderers::default();
RenderConfig {
default: default_renderer.to_string(),
unified: Unified::default(),
json: Json::default(),
custom: HashMap::default(),
}
}
}
impl RenderConfig {
/// Verify that the custom user supplied keys don't conflict with built in types.
fn check_custom_render_keys(&self) -> anyhow::Result<()> {
let custom_map = &self.custom;
let render_iter = <Renderers as strum::IntoEnumIterator>::iter();
let conflicting_keys: Vec<String> = render_iter
.filter_map(|key| {
let key_str = key.to_string();
if custom_map.contains_key(&key_str) {
Some(key_str)
} else {
None
}
})
.collect();
let error_string = conflicting_keys.join(", ");
anyhow::ensure!(
conflicting_keys.is_empty(),
"Received invalid keys {}",
error_string
);
Ok(())
}
/// Get the renderer specified by the given tag.
///
/// If the tag is not specified this will fall back to the default renderer. This is a
/// relatively expensive operation so it should be used once and the result should be saved.
pub fn get_renderer(self, tag: Option<String>) -> anyhow::Result<Renderers> {
self.check_custom_render_keys()?;
let final_tag = if let Some(t) = tag { t } else { self.default };
let mut render_map = self.custom;
// TODO(afnan): automate this with a proc macro so we don't have to
// manually sync each renderer engine by hand.
render_map.insert("unified".into(), Renderers::from(self.unified));
render_map.insert("json".into(), Renderers::from(self.json));
if let Some(renderer) = render_map.remove(&final_tag) {
Ok(renderer)
} else {
Err(anyhow::anyhow!(
"Specified tag {} not found in renderers",
final_tag
))
}
}
}
#[cfg(test)]
mod tests {
use super::*;
use test_case::test_case;
#[test]
fn test_default_render_keys() {
let cfg = RenderConfig::default();
assert!(cfg.check_custom_render_keys().is_ok());
}
#[test_case("unified", true)]
#[test_case("json", true)]
#[test_case("gibberish", false)]
fn test_custom_renderer_tags_collision(tag: &str, expect_err: bool) {
let custom_map: HashMap<String, Renderers> =
HashMap::from([(tag.to_string(), Renderers::Unified(Unified::default()))]);
let cfg = RenderConfig {
custom: custom_map,
..Default::default()
};
let res = cfg.check_custom_render_keys();
if expect_err {
assert!(res.is_err());
} else {
assert!(res.is_ok());
}
}
#[test_case("unified")]
#[test_case("json")]
fn test_get_renderer_default_map(tag: &str) {
let cfg = RenderConfig::default();
let res = cfg.get_renderer(Some(tag.into()));
assert!(res.is_ok());
}
}