MirroredRepos/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-02-21 20:38:44 +00:00
Code Issues Releases Wiki Activity

Use absolute path for lookup in database

Browse Source
This commit is contained in:
sharkdp 2020-03-22 10:19:35 +01:00 committed by David Peter
parent bd8a13dbc9
commit 57aed07814
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/assets.rs
View File

@ -196,8 +196,8 @@ impl HighlightingAssets {
.ok() .ok()
.and_then(|l| self.syntax_set.find_syntax_by_first_line(&l)); .and_then(|l| self.syntax_set.find_syntax_by_first_line(&l));
dbg!(path); let absolute_path = path.canonicalize().ok().unwrap_or(path.to_owned());
match dbg!(mapping.get_syntax_for(path)) { match mapping.get_syntax_for(absolute_path) {
Some(MappingTarget::MapTo(syntax_name)) => { Some(MappingTarget::MapTo(syntax_name)) => {
// TODO: we should probably return an error here if this syntax can not be // TODO: we should probably return an error here if this syntax can not be
// found. Currently, we just fall back to 'plain'. // found. Currently, we just fall back to 'plain'.
@ -275,6 +275,7 @@ mod tests {
assert_eq!(test.syntax_name("test.rs"), "Rust"); assert_eq!(test.syntax_name("test.rs"), "Rust");
assert_eq!(test.syntax_name("test.cpp"), "C++"); assert_eq!(test.syntax_name("test.cpp"), "C++");
assert_eq!(test.syntax_name("test.build"), "NAnt Build File");
assert_eq!(test.syntax_name("PKGBUILD"), "Bourne Again Shell (bash)"); assert_eq!(test.syntax_name("PKGBUILD"), "Bourne Again Shell (bash)");
assert_eq!(test.syntax_name(".bashrc"), "Bourne Again Shell (bash)"); assert_eq!(test.syntax_name(".bashrc"), "Bourne Again Shell (bash)");
assert_eq!(test.syntax_name("Makefile"), "Makefile"); assert_eq!(test.syntax_name("Makefile"), "Makefile");