Robot
/
bat
mirror of https://github.com/sharkdp/bat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

assets::tests: Add get_syntax_name() helper 

And instead of taking a get_syntax_set() detour to return a
name that represents "no syntax", return such a string directly.
This commit is contained in:
Martin Nordholts 2021-08-02 16:20:21 +02:00
parent a7fd9f4b1b
commit a610987ef7
1 changed files with 16 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/assets.rs
View File

@ -443,6 +443,18 @@ mod tests {
}
}
fn get_syntax_name(
&self,
language: Option<&str>,
input: &mut OpenedInput,
mapping: &SyntaxMapping,
) -> String {
self.assets
.get_syntax(language, input, mapping)
.map(|syntax| syntax.name.clone())
.unwrap_or_else(|_| "!no syntax!".to_owned())
}
fn syntax_for_real_file_with_content_os(
&self,
file_name: &OsStr,
@ -458,16 +470,7 @@ mod tests {
let dummy_stdin: &[u8] = &[];
let mut opened_input = input.open(dummy_stdin, None).unwrap();
self.assets
.get_syntax(None, &mut opened_input, &self.syntax_mapping)
.unwrap_or_else(|_| {
self.assets
.get_syntax_set()
.expect("this is mod tests")
.find_syntax_plain_text()
})
.name
.clone()
self.get_syntax_name(None, &mut opened_input, &self.syntax_mapping)
}
fn syntax_for_file_with_content_os(&self, file_name: &OsStr, first_line: &str) -> String {
@ -477,16 +480,7 @@ mod tests {
let dummy_stdin: &[u8] = &[];
let mut opened_input = input.open(dummy_stdin, None).unwrap();
self.assets
.get_syntax(None, &mut opened_input, &self.syntax_mapping)
.unwrap_or_else(|_| {
self.assets
.get_syntax_set()
.expect("this is mod tests")
.find_syntax_plain_text()
})
.name
.clone()
self.get_syntax_name(None, &mut opened_input, &self.syntax_mapping)
}
#[cfg(unix)]
@ -506,16 +500,7 @@ mod tests {
let input = Input::stdin().with_name(Some(file_name));
let mut opened_input = input.open(content, None).unwrap();
self.assets
.get_syntax(None, &mut opened_input, &self.syntax_mapping)
.unwrap_or_else(|_| {
self.assets
.get_syntax_set()
.expect("this is mod tests")
.find_syntax_plain_text()
})
.name
.clone()
self.get_syntax_name(None, &mut opened_input, &self.syntax_mapping)
}
fn syntax_is_same_for_inputkinds(&self, file_name: &str, content: &str) -> bool {
@ -669,14 +654,7 @@ mod tests {
let mut opened_input = input.open(dummy_stdin, None).unwrap();
assert_eq!(
test.assets
.get_syntax(None, &mut opened_input, &test.syntax_mapping)
.unwrap_or_else(|_| test
.assets
.get_syntax_set()
.expect("this is mod tests")
.find_syntax_plain_text())
.name,
test.get_syntax_name(None, &mut opened_input, &test.syntax_mapping),
"SSH Config"
);
}