Fixed issue with enabling and disabling vim mode dynamically
Also added indoc and marked text utility to vim tests to improve readability
This commit is contained in:
parent
0aaf270650
commit
1a29180185
11 changed files with 192 additions and 194 deletions
|
@ -1,4 +1,8 @@
|
|||
use std::path::{Path, PathBuf};
|
||||
use std::{
|
||||
collections::HashMap,
|
||||
ops::Range,
|
||||
path::{Path, PathBuf},
|
||||
};
|
||||
use tempdir::TempDir;
|
||||
|
||||
pub fn temp_tree(tree: serde_json::Value) -> TempDir {
|
||||
|
@ -48,3 +52,48 @@ pub fn sample_text(rows: usize, cols: usize, start_char: char) -> String {
|
|||
}
|
||||
text
|
||||
}
|
||||
|
||||
pub fn marked_text_by(
|
||||
marked_text: &str,
|
||||
markers: Vec<char>,
|
||||
) -> (String, HashMap<char, Vec<usize>>) {
|
||||
let mut extracted_markers: HashMap<char, Vec<usize>> = Default::default();
|
||||
let mut unmarked_text = String::new();
|
||||
|
||||
for char in marked_text.chars() {
|
||||
if markers.contains(&char) {
|
||||
let char_offsets = extracted_markers.entry(char).or_insert(Vec::new());
|
||||
char_offsets.push(unmarked_text.len());
|
||||
} else {
|
||||
unmarked_text.push(char);
|
||||
}
|
||||
}
|
||||
|
||||
(unmarked_text, extracted_markers)
|
||||
}
|
||||
|
||||
pub fn marked_text(marked_text: &str) -> (String, Vec<usize>) {
|
||||
let (unmarked_text, mut markers) = marked_text_by(marked_text, vec!['|']);
|
||||
(unmarked_text, markers.remove(&'|').unwrap_or_else(Vec::new))
|
||||
}
|
||||
|
||||
pub fn marked_text_ranges(
|
||||
marked_text: &str,
|
||||
range_markers: Vec<(char, char)>,
|
||||
) -> (String, Vec<Range<usize>>) {
|
||||
let mut marker_chars = Vec::new();
|
||||
for (start, end) in range_markers.iter() {
|
||||
marker_chars.push(*start);
|
||||
marker_chars.push(*end);
|
||||
}
|
||||
let (unmarked_text, markers) = marked_text_by(marked_text, marker_chars);
|
||||
let ranges = range_markers
|
||||
.iter()
|
||||
.map(|(start_marker, end_marker)| {
|
||||
let start = markers.get(start_marker).unwrap()[0];
|
||||
let end = markers.get(end_marker).unwrap()[0];
|
||||
start..end
|
||||
})
|
||||
.collect();
|
||||
(unmarked_text, ranges)
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue