MirroredRepos/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-10-31 15:12:12 +00:00
Code Issues Releases Wiki Activity

Change assets.rs tests to use InputKind::CustomReader

Browse Source 
This should avoid errors in filesystems that don't
support UTF-8 or invalid UTF-8.
This commit is contained in:
Ethan P
2020-05-11 19:23:56 -07:00
parent f39487fca9
commit 7d07aa395a
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/assets.rs
View File

@@ -233,14 +233,12 @@ impl HighlightingAssets {
path.canonicalize().ok().unwrap_or_else(|| path.to_owned()); path.canonicalize().ok().unwrap_or_else(|| path.to_owned());
let line_syntax = self.get_first_line_syntax(&mut input.reader); let line_syntax = self.get_first_line_syntax(&mut input.reader);
match mapping.get_syntax_for(path_str) { match mapping.get_syntax_for(absolute_path) {
Some(MappingTarget::MapTo(syntax_name)) => { Some(MappingTarget::MapTo(syntax_name)) => {
println!("Mapped {:?} as {:?}", path_str, syntax_name);
self.syntax_set.find_syntax_by_name(syntax_name) self.syntax_set.find_syntax_by_name(syntax_name)
} }
Some(MappingTarget::MapToUnknown) => line_syntax, Some(MappingTarget::MapToUnknown) => line_syntax,
None => { None => {
println!("Test {:?}", path_str);
let file_name = path.file_name().unwrap_or_default(); let file_name = path.file_name().unwrap_or_default();
self.get_extension_syntax(file_name).or(line_syntax) self.get_extension_syntax(file_name).or(line_syntax)
} }
@@ -281,8 +279,6 @@ mod tests {
use super::*; use super::*;
use std::ffi::OsStr; use std::ffi::OsStr;
use std::fs::File;
use std::io::Write;
use tempdir::TempDir; use tempdir::TempDir;
@@ -306,12 +302,8 @@ mod tests {
fn syntax_for_file_with_content_os(&self, file_name: &OsStr, first_line: &str) -> String { fn syntax_for_file_with_content_os(&self, file_name: &OsStr, first_line: &str) -> String {
let file_path = self.temp_dir.path().join(file_name); let file_path = self.temp_dir.path().join(file_name);
{ let input = Input::from_reader(Box::new(BufReader::new(first_line.as_bytes())))
let mut temp_file = File::create(&file_path).unwrap(); .with_name(Some(file_path.as_os_str()));
writeln!(temp_file, "{}", first_line).unwrap();
}
let input = Input::ordinary_file(file_path.as_os_str());
let dummy_stdin: &[u8] = &[]; let dummy_stdin: &[u8] = &[];
let mut opened_input = input.open(dummy_stdin).unwrap(); let mut opened_input = input.open(dummy_stdin).unwrap();
let syntax = self let syntax = self