From a7232a6ecc3daaad2d558f3a594baf652128f8e8 Mon Sep 17 00:00:00 2001 From: sharkdp Date: Tue, 24 Apr 2018 00:44:39 +0200 Subject: [PATCH] Support for custom syntaxes, add 'Markdown extended' theme, closes #10 --- README.md | 11 +++++++++-- src/main.rs | 9 +++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 0a5d2990..322e2834 100644 --- a/README.md +++ b/README.md @@ -19,10 +19,17 @@ ## Installation -``` +``` bash cargo install bat mkdir -p ~/.config/bat/themes cd ~/.config/bat/themes -wget https://raw.githubusercontent.com/cj/sublime/master/Color%20Scheme%20-%20Default/Monokai.tmTheme +git clone https://github.com/jonschlinkert/sublime-monokai-extended +ln -s "sublime-monokai-extended/Monokai Extended.tmTheme" Default.tmTheme + +mkdir -p ~/.config/bat/syntax +cd ~/.config/bat/syntax +git clone https://github.com/sublimehq/Packages/ +rm -rf Packages/Markdown +git clone https://github.com/jonschlinkert/sublime-markdown-extended ``` diff --git a/src/main.rs b/src/main.rs index 31c6037b..00a33bee 100644 --- a/src/main.rs +++ b/src/main.rs @@ -186,9 +186,14 @@ fn run(matches: &ArgMatches) -> Result<()> { let theme_dir = home_dir.join(".config").join("bat").join("themes"); let theme_set = ThemeSet::load_from_folder(theme_dir) .map_err(|_| io::Error::new(ErrorKind::Other, "Could not load themes"))?; - let theme = &theme_set.themes["Monokai"]; + let theme = &theme_set.themes["Default"]; - let syntax_set = SyntaxSet::load_defaults_nonewlines(); + // TODO: let mut syntax_set = SyntaxSet::load_defaults_nonewlines(); + let mut syntax_set = SyntaxSet::new(); + let syntax_dir = home_dir.join(".config").join("bat").join("syntax"); + let _ = syntax_set.load_syntaxes(syntax_dir, false); + syntax_set.load_plain_text_syntax(); + syntax_set.link_syntaxes(); if let Some(files) = matches.values_of("FILE") { for file in files {