mirror of
https://github.com/sharkdp/bat.git
synced 2025-04-19 09:10:36 +01:00
Case insensitive --map-syntax
(#2650)
Co-authored-by: Nicolas AMBRY <nicolas.ambry@atos.net>
This commit is contained in:
parent
e2bf85e749
commit
5a240f36b9
@ -8,6 +8,7 @@
|
|||||||
## Bugfixes
|
## Bugfixes
|
||||||
|
|
||||||
- Fix `more` not being found on Windows when provided via `BAT_PAGER`, see #2570, #2580, and #2651 (@mataha)
|
- Fix `more` not being found on Windows when provided via `BAT_PAGER`, see #2570, #2580, and #2651 (@mataha)
|
||||||
|
- Switched default behavior of `--map-syntax` to be case insensitive #2520
|
||||||
|
|
||||||
## Other
|
## Other
|
||||||
|
|
||||||
|
@ -211,7 +211,7 @@ impl<'a> SyntaxMapping<'a> {
|
|||||||
|
|
||||||
pub fn insert(&mut self, from: &str, to: MappingTarget<'a>) -> Result<()> {
|
pub fn insert(&mut self, from: &str, to: MappingTarget<'a>) -> Result<()> {
|
||||||
let glob = GlobBuilder::new(from)
|
let glob = GlobBuilder::new(from)
|
||||||
.case_insensitive(false)
|
.case_insensitive(true)
|
||||||
.literal_separator(true)
|
.literal_separator(true)
|
||||||
.build()?;
|
.build()?;
|
||||||
self.mappings.push((glob.compile_matcher(), to));
|
self.mappings.push((glob.compile_matcher(), to));
|
||||||
|
1
tests/examples/map-syntax_case.Config
vendored
Normal file
1
tests/examples/map-syntax_case.Config
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
{"test": "value"}
|
@ -2385,3 +2385,27 @@ fn lessopen_validity() {
|
|||||||
"\u{1b}[33m[bat warning]\u{1b}[0m: LESSOPEN ignored: must contain exactly one %s\n",
|
"\u{1b}[33m[bat warning]\u{1b}[0m: LESSOPEN ignored: must contain exactly one %s\n",
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Regression test for issue #2520 and PR #2650
|
||||||
|
// Syntax highlighting should be the same regardless of
|
||||||
|
// --map-syntax' case or file extension's case
|
||||||
|
#[test]
|
||||||
|
fn highlighting_independant_from_map_syntax_case() {
|
||||||
|
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("");
|
||||||
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user