Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expose syntect theme and syntax sets #2030

Merged
merged 9 commits into from
Feb 8, 2022
Merged

Expose syntect theme and syntax sets #2030

Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0b22913
Expose syntect SyntaxSet and LazyThemeSet
dandavison Jan 15, 2022
9c2b737
Do not expose LazyThemeSet publicly
dandavison Jan 22, 2022
3d01991
Use new type pattern instead of enum with one variant
dandavison Jan 22, 2022
fccdada
Revert "Use new type pattern instead of enum with one variant"
dandavison Feb 7, 2022
8e8f111
Revert "Do not expose LazyThemeSet publicly"
dandavison Feb 7, 2022
9b8089c
Revert "Expose syntect SyntaxSet and LazyThemeSet"
dandavison Feb 7, 2022
ae6773e
Expose get_syntax_set and get_theme
dandavison Feb 7, 2022
85d8cc8
Document public functions
dandavison Feb 7, 2022
ddc15a6
Add changelog entry
dandavison Feb 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/assets.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ impl HighlightingAssets {
self.fallback_theme = Some(theme);
}

fn get_syntax_set(&self) -> Result<&SyntaxSet> {
/// Return the collection of syntect syntax definitions.
pub fn get_syntax_set(&self) -> Result<&SyntaxSet> {
self.syntax_set_cell
.get_or_try_init(|| self.serialized_syntax_set.deserialize())
}
Expand Down Expand Up @@ -186,7 +187,8 @@ impl HighlightingAssets {
}
}

pub(crate) fn get_theme(&self, theme: &str) -> &Theme {
/// Look up a syntect theme by name.
pub fn get_theme(&self, theme: &str) -> &Theme {
match self.get_theme_set().get(theme) {
Some(theme) => theme,
None => {
Expand Down