|
|
@ -10,8 +10,8 @@ pub struct DecorationText {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
pub trait Decoration {
|
|
|
|
pub trait Decoration {
|
|
|
|
fn for_line(&self, line_number: usize, printer: &Printer) -> DecorationText;
|
|
|
|
fn generate(&self, line_number: usize, continuation: bool, printer: &Printer)
|
|
|
|
fn for_wrap(&self, line_number: usize, printer: &Printer) -> DecorationText;
|
|
|
|
-> DecorationText;
|
|
|
|
fn width(&self) -> usize;
|
|
|
|
fn width(&self) -> usize;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -36,24 +36,29 @@ impl LineNumberDecoration {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
impl Decoration for LineNumberDecoration {
|
|
|
|
impl Decoration for LineNumberDecoration {
|
|
|
|
fn for_line(&self, line_number: usize, _printer: &Printer) -> DecorationText {
|
|
|
|
fn generate(
|
|
|
|
let plain: String = format!("{:4}", line_number);
|
|
|
|
&self,
|
|
|
|
DecorationText {
|
|
|
|
line_number: usize,
|
|
|
|
width: plain.len(),
|
|
|
|
continuation: bool,
|
|
|
|
text: self.color.paint(plain).to_string(),
|
|
|
|
_printer: &Printer,
|
|
|
|
}
|
|
|
|
) -> DecorationText {
|
|
|
|
}
|
|
|
|
if continuation {
|
|
|
|
|
|
|
|
if line_number > self.cached_wrap_invalid_at {
|
|
|
|
|
|
|
|
let new_width = self.cached_wrap.width + 1;
|
|
|
|
|
|
|
|
return DecorationText {
|
|
|
|
|
|
|
|
text: self.color.paint(" ".repeat(new_width)).to_string(),
|
|
|
|
|
|
|
|
width: new_width,
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
fn for_wrap(&self, line_number: usize, _printer: &Printer) -> DecorationText {
|
|
|
|
self.cached_wrap.clone()
|
|
|
|
if line_number > self.cached_wrap_invalid_at {
|
|
|
|
} else {
|
|
|
|
let new_width = self.cached_wrap.width + 1;
|
|
|
|
let plain: String = format!("{:4}", line_number);
|
|
|
|
return DecorationText {
|
|
|
|
DecorationText {
|
|
|
|
text: self.color.paint(" ".repeat(new_width)).to_string(),
|
|
|
|
width: plain.len(),
|
|
|
|
width: new_width,
|
|
|
|
text: self.color.paint(plain).to_string(),
|
|
|
|
};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
self.cached_wrap.clone()
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
fn width(&self) -> usize {
|
|
|
|
fn width(&self) -> usize {
|
|
|
@ -91,22 +96,24 @@ impl LineChangesDecoration {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
impl Decoration for LineChangesDecoration {
|
|
|
|
impl Decoration for LineChangesDecoration {
|
|
|
|
fn for_line(&self, line_number: usize, printer: &Printer) -> DecorationText {
|
|
|
|
fn generate(
|
|
|
|
if let Some(ref changes) = printer.line_changes {
|
|
|
|
&self,
|
|
|
|
match changes.get(&(line_number as u32)) {
|
|
|
|
line_number: usize,
|
|
|
|
Some(&LineChange::Added) => self.cached_added.clone(),
|
|
|
|
continuation: bool,
|
|
|
|
Some(&LineChange::RemovedAbove) => self.cached_removed_above.clone(),
|
|
|
|
printer: &Printer,
|
|
|
|
Some(&LineChange::RemovedBelow) => self.cached_removed_below.clone(),
|
|
|
|
) -> DecorationText {
|
|
|
|
Some(&LineChange::Modified) => self.cached_modified.clone(),
|
|
|
|
if !continuation {
|
|
|
|
_ => self.cached_none.clone(),
|
|
|
|
if let Some(ref changes) = printer.line_changes {
|
|
|
|
|
|
|
|
return match changes.get(&(line_number as u32)) {
|
|
|
|
|
|
|
|
Some(&LineChange::Added) => self.cached_added.clone(),
|
|
|
|
|
|
|
|
Some(&LineChange::RemovedAbove) => self.cached_removed_above.clone(),
|
|
|
|
|
|
|
|
Some(&LineChange::RemovedBelow) => self.cached_removed_below.clone(),
|
|
|
|
|
|
|
|
Some(&LineChange::Modified) => self.cached_modified.clone(),
|
|
|
|
|
|
|
|
_ => self.cached_none.clone(),
|
|
|
|
|
|
|
|
};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
|
|
|
|
self.cached_none.clone()
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// let status = printer.line_changes.and_then(|ref changes| changes.get(&(line_number as u32)));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fn for_wrap(&self, _line_number: usize, _printer: &Printer) -> DecorationText {
|
|
|
|
|
|
|
|
self.cached_none.clone()
|
|
|
|
self.cached_none.clone()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -132,11 +139,12 @@ impl GridBorderDecoration {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
impl Decoration for GridBorderDecoration {
|
|
|
|
impl Decoration for GridBorderDecoration {
|
|
|
|
fn for_line(&self, _line_number: usize, _printer: &Printer) -> DecorationText {
|
|
|
|
fn generate(
|
|
|
|
self.cached.clone()
|
|
|
|
&self,
|
|
|
|
}
|
|
|
|
_line_number: usize,
|
|
|
|
|
|
|
|
_continuation: bool,
|
|
|
|
fn for_wrap(&self, _line_number: usize, _printer: &Printer) -> DecorationText {
|
|
|
|
_printer: &Printer,
|
|
|
|
|
|
|
|
) -> DecorationText {
|
|
|
|
self.cached.clone()
|
|
|
|
self.cached.clone()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|