MirroredRepos/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-09-14 01:02:25 +01:00
Code Issues Releases Wiki Activity

Include theme_preview file in binary

Browse Source
This commit is contained in:
sharkdp
2018-08-28 20:12:45 +02:00
committed by David Peter
parent 6f67444c99
commit 8cacd9b432
5 changed files with 45 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/assets.rs
View File

@@ -11,6 +11,8 @@ use syntect::parsing::{SyntaxDefinition, SyntaxSet};
#[cfg(unix)]
use std::os::unix::fs::FileTypeExt;
use app::InputFile;
lazy_static! {
static ref PROJECT_DIRS: ProjectDirs =
ProjectDirs::from("", "", crate_name!()).expect("Could not get home directory");
@@ -164,10 +166,10 @@ impl HighlightingAssets {
}
}
pub fn get_syntax(&self, language: Option<&str>, filename: Option<&str>) -> &SyntaxDefinition {
pub fn get_syntax(&self, language: Option<&str>, filename: InputFile) -> &SyntaxDefinition {
let syntax = match (language, filename) {
(Some(language), _) => self.syntax_set.find_syntax_by_token(language),
(None, Some(filename)) => {
(None, InputFile::Ordinary(filename)) => {
#[cfg(not(unix))]
let may_read_from_file = true;
@@ -186,7 +188,8 @@ impl HighlightingAssets {
None
}
}
(None, None) => None,
(None, InputFile::StdIn) => None,
(_, InputFile::ThemePreviewFile) => self.syntax_set.find_syntax_by_name("Rust"),
};
syntax.unwrap_or_else(|| self.syntax_set.find_syntax_plain_text())