traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

highlight: take callback parameters by value

Browse source
This commit is contained in:
Max Brunsfeld 2019-02-20 10:27:08 -08:00
parent c20a330fa5
commit 2ee5cbbc1d
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cli/src/highlight.rs
View file

@ -195,7 +195,7 @@ pub fn ansi(
let stdout = io::stdout();
let mut stdout = stdout.lock();
let mut scope_stack = Vec::new();
for event in highlight(source, language, property_sheet, &|s| {
for event in highlight(source, language, property_sheet, |s| {
language_for_injection_string(loader, s)
})? {
match event {
@ -258,8 +258,8 @@ pub fn html(
source,
language,
property_sheet,
&|s| language_for_injection_string(loader, s),
&|scope| {
|s| language_for_injection_string(loader, s),
|scope| {
if let Some(css_style) = theme.css_style(scope) {
css_style
} else {

12
highlight/src/lib.rs
View file

@ -84,7 +84,7 @@ struct Highlighter<'a, T>
where
T: Fn(&str) -> Option<(Language, &'a PropertySheet<Properties>)>,
{
injection_callback: &'a T,
injection_callback: T,
source: &'a [u8],
source_offset: usize,
parser: Parser,
@ -353,7 +353,7 @@ where
source: &'a [u8],
language: Language,
property_sheet: &'a PropertySheet<Properties>,
injection_callback: &'a F,
injection_callback: F,
) -> Result<Self, String> {
let mut parser = Parser::new();
parser.set_language(language)?;
@ -742,10 +742,10 @@ pub fn highlight<'a, F>(
source: &'a [u8],
language: Language,
property_sheet: &'a PropertySheet<Properties>,
injection_callback: &'a F,
injection_callback: F,
) -> Result<impl Iterator<Item = HighlightEvent<'a>> + 'a, String>
where
F: Fn(&str) -> Option<(Language, &'a PropertySheet<Properties>)>,
F: Fn(&str) -> Option<(Language, &'a PropertySheet<Properties>)> + 'a,
{
Highlighter::new(source, language, property_sheet, injection_callback)
}
@ -754,8 +754,8 @@ pub fn highlight_html<'a, F1, F2>(
source: &'a [u8],
language: Language,
property_sheet: &'a PropertySheet<Properties>,
injection_callback: &'a F1,
attribute_callback: &'a F2,
injection_callback: F1,
attribute_callback: F2,
) -> Result<Vec<String>, String>
where
F1: Fn(&str) -> Option<(Language, &'a PropertySheet<Properties>)>,