mirror of
https://github.com/sharkdp/bat.git
synced 2025-04-14 06:40:39 +01:00
Make map-syntax target case insensitive
This commit is contained in:
parent
ac40f7cfd8
commit
c3e4cf6f45
@ -163,7 +163,7 @@ impl HighlightingAssets {
|
|||||||
|
|
||||||
if let Some(MappingTarget::MapTo(syntax_name)) = syntax_match {
|
if let Some(MappingTarget::MapTo(syntax_name)) = syntax_match {
|
||||||
return self
|
return self
|
||||||
.find_syntax_by_name(syntax_name)?
|
.find_syntax_by_token(syntax_name)?
|
||||||
.ok_or_else(|| Error::UnknownSyntax(syntax_name.to_owned()));
|
.ok_or_else(|| Error::UnknownSyntax(syntax_name.to_owned()));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -259,6 +259,13 @@ impl HighlightingAssets {
|
|||||||
.map(|syntax| SyntaxReferenceInSet { syntax, syntax_set }))
|
.map(|syntax| SyntaxReferenceInSet { syntax, syntax_set }))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn find_syntax_by_token(&self, token: &str) -> Result<Option<SyntaxReferenceInSet>> {
|
||||||
|
let syntax_set = self.get_syntax_set()?;
|
||||||
|
Ok(syntax_set
|
||||||
|
.find_syntax_by_token(token)
|
||||||
|
.map(|syntax| SyntaxReferenceInSet { syntax, syntax_set }))
|
||||||
|
}
|
||||||
|
|
||||||
fn get_syntax_for_file_name(
|
fn get_syntax_for_file_name(
|
||||||
&self,
|
&self,
|
||||||
file_name: &OsStr,
|
file_name: &OsStr,
|
||||||
|
@ -2751,6 +2751,27 @@ fn highlighting_independant_from_map_syntax_case() {
|
|||||||
.stderr("");
|
.stderr("");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn map_syntax_target_syntax_case_insensitive() {
|
||||||
|
let expected = bat()
|
||||||
|
.arg("-f")
|
||||||
|
.arg("--map-syntax=*.config:json")
|
||||||
|
.arg("map-syntax_case.Config")
|
||||||
|
.assert()
|
||||||
|
.get_output()
|
||||||
|
.stdout
|
||||||
|
.clone();
|
||||||
|
|
||||||
|
bat()
|
||||||
|
.arg("-f")
|
||||||
|
.arg("--map-syntax=*.config:json")
|
||||||
|
.arg("map-syntax_case.Config")
|
||||||
|
.assert()
|
||||||
|
.success()
|
||||||
|
.stdout(expected)
|
||||||
|
.stderr("");
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn strip_ansi_always_strips_ansi() {
|
fn strip_ansi_always_strips_ansi() {
|
||||||
bat()
|
bat()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user