62f2d0c · bat · git.iko.soy

git.iko.soy/bat

Do not export syntax_set and theme_set

commit62f2d0c1006937ad4204623e79190d37ba0bd48f authorsharkdp <davidpeter@web.de> dateSat 21 Mar 2020, 20:01 (7 years ago) parentfc1ca08

3 files changed+12−5

compare with master

unifiedsplit

src/assets.rs+10−2 src/bin/bat/main.rs+1−2 tests/no_duplicate_extensions.rs+1−1

src/assets.rs+10−2

@@ -15,8 +15,8 @@ pub const BAT_THEME_DEFAULT: &str = "Monokai Extended";

1515

1616#[derive(Debug)]

1717pub struct HighlightingAssets {

18− pub syntax_set: SyntaxSet,

19− pub theme_set: ThemeSet,

18+ pub(crate) syntax_set: SyntaxSet,

19+ pub(crate) theme_set: ThemeSet,

2020}

2121

2222impl HighlightingAssets {

@@ -138,6 +138,14 @@ impl HighlightingAssets {

138138 Ok(())

139139 }

140140

141+ pub fn syntaxes(&self) -> &[SyntaxReference] {

142+ self.syntax_set.syntaxes()

143+ }

144+

145+ pub fn themes(&self) -> &BTreeMap<String, Theme> {

146+ &self.theme_set.themes

147+ }

148+

141149 pub fn get_theme(&self, theme: &str) -> &Theme {

142150 match self.theme_set.themes.get(theme) {

143151 Some(theme) => theme,

src/bin/bat/main.rs+1−2

@@ -60,7 +60,6 @@ fn run_cache_subcommand(matches: &clap::ArgMatches) -> Result<()> {

6060pub fn list_languages(config: &Config) -> Result<()> {

6161 let assets = assets_from_cache_or_binary();

6262 let mut languages = assets

63− .syntax_set

6463 .syntaxes()

6564 .iter()

6665 .filter(|syntax| !syntax.hidden && !syntax.file_extensions.is_empty())

@@ -122,7 +121,7 @@ pub fn list_languages(config: &Config) -> Result<()> {

122121

123122pub fn list_themes(cfg: &Config) -> Result<()> {

124123 let assets = assets_from_cache_or_binary();

125− let themes = &assets.theme_set.themes;

124+ let themes = assets.themes();

126125 let mut config = cfg.clone();

127126 let mut style = HashSet::new();

128127 style.insert(OutputComponent::Plain);

tests/no_duplicate_extensions.rs+1−1

@@ -23,7 +23,7 @@ fn no_duplicate_extensions() {

2323

2424 let mut extensions = HashSet::new();

2525

26− for syntax in assets.syntax_set.syntaxes() {

26+ for syntax in assets.syntaxes() {

2727 for extension in &syntax.file_extensions {

2828 assert!(

2929 KNOWN_EXCEPTIONS.contains(&extension.as_str()) || extensions.insert(extension),