Robot
/
bat
mirror of https://github.com/sharkdp/bat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hide some methods from HighlightingAssets

This commit is contained in:
sharkdp 2020-03-21 20:16:32 +01:00 committed by David Peter
parent 62f2d0c100
commit 094c526a0e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/assets.rs
View File

@ -142,11 +142,11 @@ impl HighlightingAssets {
self.syntax_set.syntaxes() self.syntax_set.syntaxes()
} }
pub fn themes(&self) -> &BTreeMap<String, Theme> { pub fn themes(&self) -> impl Iterator<Item = &String> {
&self.theme_set.themes self.theme_set.themes.keys()
} }
pub fn get_theme(&self, theme: &str) -> &Theme { pub(crate) fn get_theme(&self, theme: &str) -> &Theme {
match self.theme_set.themes.get(theme) { match self.theme_set.themes.get(theme) {
Some(theme) => theme, Some(theme) => theme,
None => { None => {
@ -161,6 +161,7 @@ impl HighlightingAssets {
} }
} }
#[doc(hidden)]
pub fn get_syntax( pub fn get_syntax(
&self, &self,
language: Option<&str>, language: Option<&str>,

5
src/bin/bat/main.rs
View File

@ -121,7 +121,6 @@ pub fn list_languages(config: &Config) -> Result<()> {
pub fn list_themes(cfg: &Config) -> Result<()> { pub fn list_themes(cfg: &Config) -> Result<()> {
let assets = assets_from_cache_or_binary(); let assets = assets_from_cache_or_binary();
let themes = assets.themes();
let mut config = cfg.clone(); let mut config = cfg.clone();
let mut style = HashSet::new(); let mut style = HashSet::new();
style.insert(OutputComponent::Plain); style.insert(OutputComponent::Plain);
@ -132,7 +131,7 @@ pub fn list_themes(cfg: &Config) -> Result<()> {
let mut stdout = stdout.lock(); let mut stdout = stdout.lock();
if config.colored_output { if config.colored_output {
for (theme, _) in themes.iter() { for theme in assets.themes() {
writeln!( writeln!(
stdout, stdout,
"Theme: {}\n", "Theme: {}\n",
@ -143,7 +142,7 @@ pub fn list_themes(cfg: &Config) -> Result<()> {
writeln!(stdout)?; writeln!(stdout)?;
} }
} else { } else {
for (theme, _) in themes.iter() { for theme in assets.themes() {
writeln!(stdout, "{}", theme)?; writeln!(stdout, "{}", theme)?;
} }
} }