@@ -443,6 +443,18 @@ mod tests {
443443 }
444444 }
445445
446+ fn get_syntax_name(
447+ &self,
448+ language: Option<&str>,
449+ input: &mut OpenedInput,
450+ mapping: &SyntaxMapping,
451+ ) -> String {
452+ self.assets
453+ .get_syntax(language, input, mapping)
454+ .map(|syntax| syntax.name.clone())
455+ .unwrap_or_else(|_| "!no syntax!".to_owned())
456+ }
457+
446458 fn syntax_for_real_file_with_content_os(
447459 &self,
448460 file_name: &OsStr,
@@ -458,16 +470,7 @@ mod tests {
458470 let dummy_stdin: &[u8] = &[];
459471 let mut opened_input = input.open(dummy_stdin, None).unwrap();
460472
461− self.assets
462− .get_syntax(None, &mut opened_input, &self.syntax_mapping)
463− .unwrap_or_else(|_| {
464− self.assets
465− .get_syntax_set()
466− .expect("this is mod tests")
467− .find_syntax_plain_text()
468− })
469− .name
470− .clone()
473+ self.get_syntax_name(None, &mut opened_input, &self.syntax_mapping)
471474 }
472475
473476 fn syntax_for_file_with_content_os(&self, file_name: &OsStr, first_line: &str) -> String {
@@ -477,16 +480,7 @@ mod tests {
477480 let dummy_stdin: &[u8] = &[];
478481 let mut opened_input = input.open(dummy_stdin, None).unwrap();
479482
480− self.assets
481− .get_syntax(None, &mut opened_input, &self.syntax_mapping)
482− .unwrap_or_else(|_| {
483− self.assets
484− .get_syntax_set()
485− .expect("this is mod tests")
486− .find_syntax_plain_text()
487− })
488− .name
489− .clone()
483+ self.get_syntax_name(None, &mut opened_input, &self.syntax_mapping)
490484 }
491485
492486 #[cfg(unix)]
@@ -506,16 +500,7 @@ mod tests {
506500 let input = Input::stdin().with_name(Some(file_name));
507501 let mut opened_input = input.open(content, None).unwrap();
508502
509− self.assets
510− .get_syntax(None, &mut opened_input, &self.syntax_mapping)
511− .unwrap_or_else(|_| {
512− self.assets
513− .get_syntax_set()
514− .expect("this is mod tests")
515− .find_syntax_plain_text()
516− })
517− .name
518− .clone()
503+ self.get_syntax_name(None, &mut opened_input, &self.syntax_mapping)
519504 }
520505
521506 fn syntax_is_same_for_inputkinds(&self, file_name: &str, content: &str) -> bool {
@@ -669,14 +654,7 @@ mod tests {
669654 let mut opened_input = input.open(dummy_stdin, None).unwrap();
670655
671656 assert_eq!(
672− test.assets
673− .get_syntax(None, &mut opened_input, &test.syntax_mapping)
674− .unwrap_or_else(|_| test
675− .assets
676− .get_syntax_set()
677− .expect("this is mod tests")
678− .find_syntax_plain_text())
679− .name,
657+ test.get_syntax_name(None, &mut opened_input, &test.syntax_mapping),
680658 "SSH Config"
681659 );
682660 }