mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-05 03:47:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

wip only show coverage if it is newer than doc

Browse source
This commit is contained in:
Dustin Lagoy 2024-05-09 06:57:51 -07:00 • committed by Dustin Lagoy
parent 79b85030b2
commit a9f2ec3eea
3 changed files with 42 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

15
helix-view/src/coverage.rs
View file

@ -3,6 +3,7 @@ use serde::Deserialize;
use std::collections::HashMap;
use std::fs::File;
use std::io::BufReader;
use std::time::SystemTime;
pub struct Coverage {
pub files: HashMap<std::path::PathBuf, FileCoverage>,
@ -10,6 +11,7 @@ pub struct Coverage {
pub struct FileCoverage {
pub lines: HashMap<u32, bool>,
pub modified_time: Option<SystemTime>,
}
#[derive(Deserialize, Debug)]
@ -18,6 +20,7 @@ struct RawCoverage {
version: String,
sources: Sources,
packages: Packages,
modified_time: Option<SystemTime>,
}
#[derive(Deserialize, Debug)]
@ -72,8 +75,10 @@ struct Line {
pub fn parse(path: std::path::PathBuf) -> Option<Coverage> {
let file = File::open(path).ok()?;
let metadata = file.metadata().ok()?;
let reader = BufReader::new(file);
let tmp: RawCoverage = from_reader(reader).ok()?;
let mut tmp: RawCoverage = from_reader(reader).ok()?;
tmp.modified_time = metadata.modified().ok();
Some(tmp.into())
}
@ -89,7 +94,13 @@ impl From<RawCoverage> for Coverage {
for source in &coverage.sources.source {
let path: std::path::PathBuf = [&source.name, &class.filename].iter().collect();
if path.exists() {
files.insert(path, FileCoverage { lines });
files.insert(
path,
FileCoverage {
lines,
modified_time: coverage.modified_time,
},
);
break;
}
}

2
helix-view/src/document.rs
View file

@ -185,7 +185,7 @@ pub struct Document {
// Last time we wrote to the file. This will carry the time the file was last opened if there
// were no saves.
last_saved_time: SystemTime,
pub last_saved_time: SystemTime,
last_saved_revision: usize,
version: i32, // should be usize?

49
helix-view/src/gutter.rs
View file

@ -159,28 +159,35 @@ pub fn coverage<'doc>(
path = tmp.into();
}
}
if let Some(file) = cov.files.get(&path) {
let this_file = coverage::FileCoverage {
lines: file.lines.clone(),
};
return Box::new(
move |line: usize,
_selected: bool,
_first_visual_line: bool,
out: &mut String| {
if let Some(line_coverage) = this_file.lines.get(&(line as u32)) {
let (icon, style) = if *line_coverage {
("┃", covered)
if let Some(file_coverage) = cov.files.get(&path) {
if file_coverage
.modified_time
.is_some_and(|x| x > doc.last_saved_time)
{
// clone file coverage so it can be moved into the closure
let this_file = coverage::FileCoverage {
lines: file_coverage.lines.clone(),
modified_time: file_coverage.modified_time,
};
return Box::new(
move |line: usize,
_selected: bool,
_first_visual_line: bool,
out: &mut String| {
if let Some(line_coverage) = this_file.lines.get(&(line as u32)) {
let (icon, style) = if *line_coverage {
("┃", covered)
} else {
("┃", not_covered)
};
write!(out, "{}", icon).unwrap();
Some(style)
} else {
("┃", not_covered)
};
write!(out, "{}", icon).unwrap();
Some(style)
} else {
None
}
},
);
None
}
},
);
}
}
}
}