diff --git a/cli/src/error.rs b/cli/src/error.rs index 3d5a4745..b57f0dd5 100644 --- a/cli/src/error.rs +++ b/cli/src/error.rs @@ -1,3 +1,4 @@ +use super::test_highlight; use std::fmt::Write; use std::io; use tree_sitter::QueryError; @@ -98,6 +99,12 @@ impl From for Error { } } +impl From for Error { + fn from(error: test_highlight::Failure) -> Self { + Error::new(error.message()) + } +} + impl From for Error { fn from(error: String) -> Self { Error::new(error) diff --git a/cli/src/highlight.rs b/cli/src/highlight.rs index 6a174e9d..2fa2e8b0 100644 --- a/cli/src/highlight.rs +++ b/cli/src/highlight.rs @@ -10,9 +10,7 @@ use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::Arc; use std::time::Instant; use std::{fs, io, path, str, thread, usize}; -use tree_sitter_highlight::{ - HighlightConfiguration, HighlightContext, HighlightEvent, Highlighter, HtmlRenderer, -}; +use tree_sitter_highlight::{HighlightConfiguration, HighlightEvent, Highlighter, HtmlRenderer}; pub const HTML_HEADER: &'static str = " @@ -53,8 +51,8 @@ pub struct Style { #[derive(Debug)] pub struct Theme { - pub highlighter: Highlighter, - styles: Vec