Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'helix-core/src/syntax.rs')
-rw-r--r--helix-core/src/syntax.rs2826
1 files changed, 1895 insertions, 931 deletions
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 4bc177ef..73ea7ea8 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -1,526 +1,563 @@
-pub mod config;
+use crate::{
+ auto_pairs::AutoPairs,
+ chars::char_is_line_ending,
+ diagnostic::Severity,
+ regex::Regex,
+ transaction::{ChangeSet, Operation},
+ RopeSlice, Tendril,
+};
+
+use ahash::RandomState;
+use arc_swap::{ArcSwap, Guard};
+use bitflags::bitflags;
+use hashbrown::raw::RawTable;
+use slotmap::{DefaultKey as LayerId, HopSlotMap};
use std::{
borrow::Cow,
- collections::HashMap,
- fmt, iter,
- ops::{self, RangeBounds},
- path::Path,
+ cell::RefCell,
+ collections::{HashMap, HashSet, VecDeque},
+ fmt::{self, Display},
+ hash::{Hash, Hasher},
+ mem::{replace, transmute},
+ path::{Path, PathBuf},
+ str::FromStr,
sync::Arc,
- time::Duration,
};
-use anyhow::{Context, Result};
-use arc_swap::{ArcSwap, Guard};
-use config::{Configuration, FileType, LanguageConfiguration, LanguageServerConfiguration};
-use foldhash::HashSet;
-use helix_loader::grammar::get_language;
-use helix_stdx::rope::RopeSliceExt as _;
-use once_cell::sync::OnceCell;
-use ropey::RopeSlice;
-use tree_house::{
- highlighter,
- query_iter::QueryIter,
- tree_sitter::{
- query::{InvalidPredicateError, UserPredicate},
- Capture, Grammar, InactiveQueryCursor, InputEdit, Node, Pattern, Query, RopeInput, Tree,
- },
- Error, InjectionLanguageMarker, LanguageConfig as SyntaxConfig, Layer,
-};
+use once_cell::sync::{Lazy, OnceCell};
+use serde::{ser::SerializeSeq, Deserialize, Serialize};
-use crate::{indent::IndentQuery, tree_sitter, ChangeSet, Language};
+use helix_loader::grammar::{get_language, load_runtime_file};
-pub use tree_house::{
- highlighter::{Highlight, HighlightEvent},
- query_iter::QueryIterEvent,
- Error as HighlighterError, LanguageLoader, TreeCursor, TREE_SITTER_MATCH_LIMIT,
-};
+fn deserialize_regex<'de, D>(deserializer: D) -> Result<Option<Regex>, D::Error>
+where
+ D: serde::Deserializer<'de>,
+{
+ Option::<String>::deserialize(deserializer)?
+ .map(|buf| Regex::new(&buf).map_err(serde::de::Error::custom))
+ .transpose()
+}
-#[derive(Debug)]
-pub struct LanguageData {
- config: Arc<LanguageConfiguration>,
- syntax: OnceCell<Option<SyntaxConfig>>,
- indent_query: OnceCell<Option<IndentQuery>>,
- textobject_query: OnceCell<Option<TextObjectQuery>>,
- tag_query: OnceCell<Option<TagQuery>>,
- rainbow_query: OnceCell<Option<RainbowQuery>>,
+fn deserialize_lsp_config<'de, D>(deserializer: D) -> Result<Option<serde_json::Value>, D::Error>
+where
+ D: serde::Deserializer<'de>,
+{
+ Option::<toml::Value>::deserialize(deserializer)?
+ .map(|toml| toml.try_into().map_err(serde::de::Error::custom))
+ .transpose()
}
-impl LanguageData {
- fn new(config: LanguageConfiguration) -> Self {
- Self {
- config: Arc::new(config),
- syntax: OnceCell::new(),
- indent_query: OnceCell::new(),
- textobject_query: OnceCell::new(),
- tag_query: OnceCell::new(),
- rainbow_query: OnceCell::new(),
+fn deserialize_tab_width<'de, D>(deserializer: D) -> Result<usize, D::Error>
+where
+ D: serde::Deserializer<'de>,
+{
+ usize::deserialize(deserializer).and_then(|n| {
+ if n > 0 && n <= 16 {
+ Ok(n)
+ } else {
+ Err(serde::de::Error::custom(
+ "tab width must be a value from 1 to 16 inclusive",
+ ))
}
- }
+ })
+}
- pub fn config(&self) -> &Arc<LanguageConfiguration> {
- &self.config
- }
+pub fn deserialize_auto_pairs<'de, D>(deserializer: D) -> Result<Option<AutoPairs>, D::Error>
+where
+ D: serde::Deserializer<'de>,
+{
+ Ok(Option::<AutoPairConfig>::deserialize(deserializer)?.and_then(AutoPairConfig::into))
+}
- /// Loads the grammar and compiles the highlights, injections and locals for the language.
- /// This function should only be used by this module or the xtask crate.
- pub fn compile_syntax_config(
- config: &LanguageConfiguration,
- loader: &Loader,
- ) -> Result<Option<SyntaxConfig>> {
- let name = &config.language_id;
- let parser_name = config.grammar.as_deref().unwrap_or(name);
- let Some(grammar) = get_language(parser_name)? else {
- log::info!("Skipping syntax config for '{name}' because the parser's shared library does not exist");
- return Ok(None);
- };
- let highlight_query_text = read_query(name, "highlights.scm");
- let injection_query_text = read_query(name, "injections.scm");
- let local_query_text = read_query(name, "locals.scm");
- let config = SyntaxConfig::new(
- grammar,
- &highlight_query_text,
- &injection_query_text,
- &local_query_text,
- )
- .with_context(|| format!("Failed to compile highlights for '{name}'"))?;
+fn default_timeout() -> u64 {
+ 20
+}
- reconfigure_highlights(&config, &loader.scopes());
+#[derive(Debug, Serialize, Deserialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct Configuration {
+ pub language: Vec<LanguageConfiguration>,
+ #[serde(default)]
+ pub language_server: HashMap<String, LanguageServerConfiguration>,
+}
- Ok(Some(config))
+impl Default for Configuration {
+ fn default() -> Self {
+ todo!()
+ // crate::config::default_syntax_loader()
}
+}
- pub fn syntax_config(&self, loader: &Loader) -> Option<&SyntaxConfig> {
- self.syntax
- .get_or_init(|| {
- Self::compile_syntax_config(&self.config, loader)
- .map_err(|err| {
- log::error!("{err:#}");
- })
- .ok()
- .flatten()
- })
- .as_ref()
+#[derive(Debug)]
+pub struct TextObjectQuery {
+ pub query: Query,
+}
+
+#[derive(Debug)]
+pub enum CapturedNode<'a> {
+ Single(Node<'a>),
+ /// Guaranteed to be not empty
+ Grouped(Vec<Node<'a>>),
+}
+
+impl<'a> CapturedNode<'a> {
+ pub fn start_byte(&self) -> usize {
+ match self {
+ Self::Single(n) => n.start_byte(),
+ Self::Grouped(ns) => ns[0].start_byte(),
+ }
}
- /// Compiles the indents.scm query for a language.
- /// This function should only be used by this module or the xtask crate.
- pub fn compile_indent_query(
- grammar: Grammar,
- config: &LanguageConfiguration,
- ) -> Result<Option<IndentQuery>> {
- let name = &config.language_id;
- let text = read_query(name, "indents.scm");
- if text.is_empty() {
- return Ok(None);
+ pub fn end_byte(&self) -> usize {
+ match self {
+ Self::Single(n) => n.end_byte(),
+ Self::Grouped(ns) => ns.last().unwrap().end_byte(),
}
- let indent_query = IndentQuery::new(grammar, &text)
- .with_context(|| format!("Failed to compile indents.scm query for '{name}'"))?;
- Ok(Some(indent_query))
}
- fn indent_query(&self, loader: &Loader) -> Option<&IndentQuery> {
- self.indent_query
- .get_or_init(|| {
- let grammar = self.syntax_config(loader)?.grammar;
- Self::compile_indent_query(grammar, &self.config)
- .map_err(|err| {
- log::error!("{err}");
- })
- .ok()
- .flatten()
- })
- .as_ref()
+ pub fn byte_range(&self) -> std::ops::Range<usize> {
+ self.start_byte()..self.end_byte()
}
+}
- /// Compiles the textobjects.scm query for a language.
- /// This function should only be used by this module or the xtask crate.
- pub fn compile_textobject_query(
- grammar: Grammar,
- config: &LanguageConfiguration,
- ) -> Result<Option<TextObjectQuery>> {
- let name = &config.language_id;
- let text = read_query(name, "textobjects.scm");
- if text.is_empty() {
- return Ok(None);
- }
- let query = Query::new(grammar, &text, |_, _| Ok(()))
- .with_context(|| format!("Failed to compile textobjects.scm queries for '{name}'"))?;
- Ok(Some(TextObjectQuery::new(query)))
+/// The maximum number of in-progress matches a TS cursor can consider at once.
+/// This is set to a constant in order to avoid performance problems for medium to large files. Set with `set_match_limit`.
+/// Using such a limit means that we lose valid captures, so there is fundamentally a tradeoff here.
+///
+///
+/// Old tree sitter versions used a limit of 32 by default until this limit was removed in version `0.19.5` (must now be set manually).
+/// However, this causes performance issues for medium to large files.
+/// In helix, this problem caused treesitter motions to take multiple seconds to complete in medium-sized rust files (3k loc).
+///
+///
+/// Neovim also encountered this problem and reintroduced this limit after it was removed upstream
+/// (see <https://github.com/neovim/neovim/issues/14897> and <https://github.com/neovim/neovim/pull/14915>).
+/// The number used here is fundamentally a tradeoff between breaking some obscure edge cases and performance.
+///
+///
+/// Neovim chose 64 for this value somewhat arbitrarily (<https://github.com/neovim/neovim/pull/18397>).
+/// 64 is too low for some languages though. In particular, it breaks some highlighting for record fields in Erlang record definitions.
+/// This number can be increased if new syntax highlight breakages are found, as long as the performance penalty is not too high.
+const TREE_SITTER_MATCH_LIMIT: u32 = 256;
+
+impl TextObjectQuery {
+ /// Run the query on the given node and return sub nodes which match given
+ /// capture ("function.inside", "class.around", etc).
+ ///
+ /// Captures may contain multiple nodes by using quantifiers (+, *, etc),
+ /// and support for this is partial and could use improvement.
+ ///
+ /// ```query
+ /// (comment)+ @capture
+ ///
+ /// ; OR
+ /// (
+ /// (comment)*
+ /// .
+ /// (function)
+ /// ) @capture
+ /// ```
+ pub fn capture_nodes<'a>(
+ &'a self,
+ capture_name: &str,
+ node: Node<'a>,
+ slice: RopeSlice<'a>,
+ cursor: &'a mut QueryCursor,
+ ) -> Option<impl Iterator<Item = CapturedNode<'a>>> {
+ self.capture_nodes_any(&[capture_name], node, slice, cursor)
}
- fn textobject_query(&self, loader: &Loader) -> Option<&TextObjectQuery> {
- self.textobject_query
- .get_or_init(|| {
- let grammar = self.syntax_config(loader)?.grammar;
- Self::compile_textobject_query(grammar, &self.config)
- .map_err(|err| {
- log::error!("{err}");
- })
- .ok()
- .flatten()
- })
- .as_ref()
+ /// Find the first capture that exists out of all given `capture_names`
+ /// and return sub nodes that match this capture.
+ pub fn capture_nodes_any<'a>(
+ &'a self,
+ capture_names: &[&str],
+ node: Node<'a>,
+ slice: RopeSlice<'a>,
+ cursor: &'a mut QueryCursor,
+ ) -> Option<impl Iterator<Item = CapturedNode<'a>>> {
+ let capture_idx = capture_names
+ .iter()
+ .find_map(|cap| self.query.capture_index_for_name(cap))?;
+
+ cursor.set_match_limit(TREE_SITTER_MATCH_LIMIT);
+
+ let nodes = cursor
+ .captures(&self.query, node, RopeProvider(slice))
+ .filter_map(move |(mat, _)| {
+ let nodes: Vec<_> = mat
+ .captures
+ .iter()
+ .filter_map(|cap| (cap.index == capture_idx).then_some(cap.node))
+ .collect();
+
+ if nodes.len() > 1 {
+ Some(CapturedNode::Grouped(nodes))
+ } else {
+ nodes.into_iter().map(CapturedNode::Single).next()
+ }
+ });
+
+ Some(nodes)
}
+}
- /// Compiles the tags.scm query for a language.
- /// This function should only be used by this module or the xtask crate.
- pub fn compile_tag_query(
- grammar: Grammar,
- config: &LanguageConfiguration,
- ) -> Result<Option<TagQuery>> {
- let name = &config.language_id;
- let text = read_query(name, "tags.scm");
- if text.is_empty() {
- return Ok(None);
- }
- let query = Query::new(grammar, &text, |_pattern, predicate| match predicate {
- // TODO: these predicates are allowed in tags.scm queries but not yet used.
- UserPredicate::IsPropertySet { key: "local", .. } => Ok(()),
- UserPredicate::Other(pred) => match pred.name() {
- "strip!" | "select-adjacent!" => Ok(()),
- _ => Err(InvalidPredicateError::unknown(predicate)),
- },
- _ => Err(InvalidPredicateError::unknown(predicate)),
+pub fn read_query(language: &str, filename: &str) -> String {
+ static INHERITS_REGEX: Lazy<Regex> =
+ Lazy::new(|| Regex::new(r";+\s*inherits\s*:?\s*([a-z_,()-]+)\s*").unwrap());
+
+ let query = load_runtime_file(language, filename).unwrap_or_default();
+
+ // replaces all "; inherits <language>(,<language>)*" with the queries of the given language(s)
+ INHERITS_REGEX
+ .replace_all(&query, |captures: &regex::Captures| {
+ captures[1]
+ .split(',')
+ .map(|language| format!("\n{}\n", read_query(language, filename)))
+ .collect::<String>()
})
- .with_context(|| format!("Failed to compile tags.scm query for '{name}'"))?;
- Ok(Some(TagQuery { query }))
- }
+ .to_string()
+}
- fn tag_query(&self, loader: &Loader) -> Option<&TagQuery> {
- self.tag_query
- .get_or_init(|| {
- let grammar = self.syntax_config(loader)?.grammar;
- Self::compile_tag_query(grammar, &self.config)
- .map_err(|err| {
- log::error!("{err}");
- })
- .ok()
- .flatten()
- })
- .as_ref()
+impl LanguageConfiguration {
+ fn initialize_highlight(&self, scopes: &[String]) -> Option<Arc<HighlightConfiguration>> {
+ let highlights_query = read_query(&self.language_id, "highlights.scm");
+ // always highlight syntax errors
+ // highlights_query += "\n(ERROR) @error";
+
+ let injections_query = read_query(&self.language_id, "injections.scm");
+ let locals_query = read_query(&self.language_id, "locals.scm");
+
+ if highlights_query.is_empty() {
+ None
+ } else {
+ let language = get_language(self.grammar.as_deref().unwrap_or(&self.language_id))
+ .map_err(|err| {
+ log::error!(
+ "Failed to load tree-sitter parser for language {:?}: {}",
+ self.language_id,
+ err
+ )
+ })
+ .ok()?;
+ let config = HighlightConfiguration::new(
+ language,
+ &highlights_query,
+ &injections_query,
+ &locals_query,
+ )
+ .map_err(|err| log::error!("Could not parse queries for language {:?}. Are your grammars out of sync? Try running 'hx --grammar fetch' and 'hx --grammar build'. This query could not be parsed: {:?}", self.language_id, err))
+ .ok()?;
+
+ config.configure(scopes);
+ Some(Arc::new(config))
+ }
}
- /// Compiles the rainbows.scm query for a language.
- /// This function should only be used by this module or the xtask crate.
- pub fn compile_rainbow_query(
- grammar: Grammar,
- config: &LanguageConfiguration,
- ) -> Result<Option<RainbowQuery>> {
- let name = &config.language_id;
- let text = read_query(name, "rainbows.scm");
- if text.is_empty() {
- return Ok(None);
+ pub fn reconfigure(&self, scopes: &[String]) {
+ if let Some(Some(config)) = self.highlight_config.get() {
+ config.configure(scopes);
}
- let rainbow_query = RainbowQuery::new(grammar, &text)
- .with_context(|| format!("Failed to compile rainbows.scm query for '{name}'"))?;
- Ok(Some(rainbow_query))
}
- fn rainbow_query(&self, loader: &Loader) -> Option<&RainbowQuery> {
- self.rainbow_query
+ pub fn highlight_config(&self, scopes: &[String]) -> Option<Arc<HighlightConfiguration>> {
+ self.highlight_config
+ .get_or_init(|| self.initialize_highlight(scopes))
+ .clone()
+ }
+
+ pub fn is_highlight_initialized(&self) -> bool {
+ self.highlight_config.get().is_some()
+ }
+
+ pub fn indent_query(&self) -> Option<&Query> {
+ self.indent_query
+ .get_or_init(|| self.load_query("indents.scm"))
+ .as_ref()
+ }
+
+ pub fn textobject_query(&self) -> Option<&TextObjectQuery> {
+ self.textobject_query
.get_or_init(|| {
- let grammar = self.syntax_config(loader)?.grammar;
- Self::compile_rainbow_query(grammar, &self.config)
- .map_err(|err| {
- log::error!("{err}");
- })
- .ok()
- .flatten()
+ self.load_query("textobjects.scm")
+ .map(|query| TextObjectQuery { query })
})
.as_ref()
}
- fn reconfigure(&self, scopes: &[String]) {
- if let Some(Some(config)) = self.syntax.get() {
- reconfigure_highlights(config, scopes);
+ fn load_query(&self, kind: &str) -> Option<Query> {
+ let query_text = read_query(&self.language_id, kind);
+ if query_text.is_empty() {
+ return None;
}
+ let lang = self.highlight_config.get()?.as_ref()?.language;
+ Query::new(lang, &query_text)
+ .map_err(|e| {
+ log::error!(
+ "Failed to parse {} queries for {}: {}",
+ kind,
+ self.language_id,
+ e
+ )
+ })
+ .ok()
}
}
-pub fn reconfigure_highlights(config: &SyntaxConfig, recognized_names: &[String]) {
- config.configure(move |capture_name| {
- let capture_parts: Vec<_> = capture_name.split('.').collect();
-
- let mut best_index = None;
- let mut best_match_len = 0;
- for (i, recognized_name) in recognized_names.iter().enumerate() {
- let mut len = 0;
- let mut matches = true;
- for (i, part) in recognized_name.split('.').enumerate() {
- match capture_parts.get(i) {
- Some(capture_part) if *capture_part == part => len += 1,
- _ => {
- matches = false;
- break;
- }
- }
- }
- if matches && len > best_match_len {
- best_index = Some(i);
- best_match_len = len;
- }
- }
- best_index.map(|idx| Highlight::new(idx as u32))
- });
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(default, rename_all = "kebab-case", deny_unknown_fields)]
+pub struct SoftWrap {
+ /// Soft wrap lines that exceed viewport width. Default to off
+ // NOTE: Option on purpose because the struct is shared between language config and global config.
+ // By default the option is None so that the language config falls back to the global config unless explicitly set.
+ pub enable: Option<bool>,
+ /// Maximum space left free at the end of the line.
+ /// This space is used to wrap text at word boundaries. If that is not possible within this limit
+ /// the word is simply split at the end of the line.
+ ///
+ /// This is automatically hard-limited to a quarter of the viewport to ensure correct display on small views.
+ ///
+ /// Default to 20
+ pub max_wrap: Option<u16>,
+ /// Maximum number of indentation that can be carried over from the previous line when softwrapping.
+ /// If a line is indented further then this limit it is rendered at the start of the viewport instead.
+ ///
+ /// This is automatically hard-limited to a quarter of the viewport to ensure correct display on small views.
+ ///
+ /// Default to 40
+ pub max_indent_retain: Option<u16>,
+ /// Indicator placed at the beginning of softwrapped lines
+ ///
+ /// Defaults to ↪
+ pub wrap_indicator: Option<String>,
+ /// Softwrap at `text_width` instead of viewport width if it is shorter
+ pub wrap_at_text_width: Option<bool>,
}
-pub fn read_query(lang: &str, query_filename: &str) -> String {
- tree_house::read_query(lang, |language| {
- helix_loader::grammar::load_runtime_file(language, query_filename).unwrap_or_default()
- })
-}
+// Expose loader as Lazy<> global since it's always static?
-#[derive(Debug, Default)]
+#[derive(Debug)]
pub struct Loader {
- languages: Vec<LanguageData>,
- languages_by_extension: HashMap<String, Language>,
- languages_by_shebang: HashMap<String, Language>,
- languages_glob_matcher: FileTypeGlobMatcher,
+ // highlight_names ?
+ language_configs: Vec<Arc<LanguageConfiguration>>,
+ language_config_ids_by_extension: HashMap<String, usize>, // Vec<usize>
+ language_config_ids_by_suffix: HashMap<String, usize>,
+ language_config_ids_by_shebang: HashMap<String, usize>,
+
language_server_configs: HashMap<String, LanguageServerConfiguration>,
+
scopes: ArcSwap<Vec<String>>,
}
-pub type LoaderError = globset::Error;
-
impl Loader {
- pub fn new(config: Configuration) -> Result<Self, LoaderError> {
- let mut languages = Vec::with_capacity(config.language.len());
- let mut languages_by_extension = HashMap::new();
- let mut languages_by_shebang = HashMap::new();
- let mut file_type_globs = Vec::new();
+ pub fn new(config: Configuration) -> Self {
+ let mut loader = Self {
+ language_configs: Vec::new(),
+ language_server_configs: config.language_server,
+ language_config_ids_by_extension: HashMap::new(),
+ language_config_ids_by_suffix: HashMap::new(),
+ language_config_ids_by_shebang: HashMap::new(),
+ scopes: ArcSwap::from_pointee(Vec::new()),
+ };
- for mut config in config.language {
- let language = Language(languages.len() as u32);
- config.language = Some(language);
+ for config in config.language {
+ // get the next id
+ let language_id = loader.language_configs.len();
for file_type in &config.file_types {
+ // entry().or_insert(Vec::new).push(language_id);
match file_type {
- FileType::Extension(extension) => {
- languages_by_extension.insert(extension.clone(), language);
- }
- FileType::Glob(glob) => {
- file_type_globs.push(FileTypeGlob::new(glob.to_owned(), language));
- }
+ FileType::Extension(extension) => loader
+ .language_config_ids_by_extension
+ .insert(extension.clone(), language_id),
+ FileType::Suffix(suffix) => loader
+ .language_config_ids_by_suffix
+ .insert(suffix.clone(), language_id),
};
}
for shebang in &config.shebangs {
- languages_by_shebang.insert(shebang.clone(), language);
+ loader
+ .language_config_ids_by_shebang
+ .insert(shebang.clone(), language_id);
}
- languages.push(LanguageData::new(config));
+ loader.language_configs.push(Arc::new(config));
}
- Ok(Self {
- languages,
- languages_by_extension,
- languages_by_shebang,
- languages_glob_matcher: FileTypeGlobMatcher::new(file_type_globs)?,
- language_server_configs: config.language_server,
- scopes: ArcSwap::from_pointee(Vec::new()),
- })
+ loader
}
- pub fn languages(&self) -> impl ExactSizeIterator<Item = (Language, &LanguageData)> {
- self.languages
- .iter()
- .enumerate()
- .map(|(idx, data)| (Language(idx as u32), data))
- }
+ pub fn language_config_for_file_name(&self, path: &Path) -> Option<Arc<LanguageConfiguration>> {
+ // Find all the language configurations that match this file name
+ // or a suffix of the file name.
+ let configuration_id = path
+ .file_name()
+ .and_then(|n| n.to_str())
+ .and_then(|file_name| self.language_config_ids_by_extension.get(file_name))
+ .or_else(|| {
+ path.extension()
+ .and_then(|extension| extension.to_str())
+ .and_then(|extension| self.language_config_ids_by_extension.get(extension))
+ })
+ .or_else(|| {
+ self.language_config_ids_by_suffix
+ .iter()
+ .find_map(|(file_type, id)| {
+ if path.to_str()?.ends_with(file_type) {
+ Some(id)
+ } else {
+ None
+ }
+ })
+ });
- pub fn language_configs(&self) -> impl ExactSizeIterator<Item = &LanguageConfiguration> {
- self.languages.iter().map(|language| &*language.config)
- }
+ configuration_id.and_then(|&id| self.language_configs.get(id).cloned())
- pub fn language(&self, lang: Language) -> &LanguageData {
- &self.languages[lang.idx()]
+ // TODO: content_regex handling conflict resolution
}
- pub fn language_for_name(&self, name: impl PartialEq<String>) -> Option<Language> {
- self.languages.iter().enumerate().find_map(|(idx, config)| {
- (name == config.config.language_id).then_some(Language(idx as u32))
- })
- }
+ pub fn language_config_for_shebang(
+ &self,
+ source: RopeSlice,
+ ) -> Option<Arc<LanguageConfiguration>> {
+ let line = Cow::from(source.line(0));
+ static SHEBANG_REGEX: Lazy<Regex> =
+ Lazy::new(|| Regex::new(&["^", SHEBANG].concat()).unwrap());
+ let configuration_id = SHEBANG_REGEX
+ .captures(&line)
+ .and_then(|cap| self.language_config_ids_by_shebang.get(&cap[1]));
- pub fn language_for_scope(&self, scope: &str) -> Option<Language> {
- self.languages.iter().enumerate().find_map(|(idx, config)| {
- (scope == config.config.scope).then_some(Language(idx as u32))
- })
+ configuration_id.and_then(|&id| self.language_configs.get(id).cloned())
}
- pub fn language_for_match(&self, text: RopeSlice) -> Option<Language> {
- // PERF: If the name matches up with the id, then this saves the need to do expensive regex.
- let shortcircuit = self.language_for_name(text);
- if shortcircuit.is_some() {
- return shortcircuit;
- }
-
- // If the name did not match up with a known id, then match on injection regex.
+ pub fn language_config_for_language_id(&self, id: &str) -> Option<Arc<LanguageConfiguration>> {
+ self.language_configs
+ .iter()
+ .find(|config| config.language_id == id)
+ .cloned()
+ }
+ /// Unlike language_config_for_language_id, which only returns Some for an exact id, this
+ /// function will perform a regex match on the given string to find the closest language match.
+ pub fn language_config_for_name(&self, name: &str) -> Option<Arc<LanguageConfiguration>> {
let mut best_match_length = 0;
let mut best_match_position = None;
- for (idx, data) in self.languages.iter().enumerate() {
- if let Some(injection_regex) = &data.config.injection_regex {
- if let Some(mat) = injection_regex.find(text.regex_input()) {
+ for (i, configuration) in self.language_configs.iter().enumerate() {
+ if let Some(injection_regex) = &configuration.injection_regex {
+ if let Some(mat) = injection_regex.find(name) {
let length = mat.end() - mat.start();
if length > best_match_length {
- best_match_position = Some(idx);
+ best_match_position = Some(i);
best_match_length = length;
}
}
}
}
- best_match_position.map(|i| Language(i as u32))
- }
-
- pub fn language_for_filename(&self, path: &Path) -> Option<Language> {
- // Find all the language configurations that match this file name
- // or a suffix of the file name.
-
- // TODO: content_regex handling conflict resolution
- self.languages_glob_matcher
- .language_for_path(path)
- .or_else(|| {
- path.extension()
- .and_then(|extension| extension.to_str())
- .and_then(|extension| self.languages_by_extension.get(extension).copied())
- })
- }
-
- pub fn language_for_shebang(&self, text: RopeSlice) -> Option<Language> {
- // NOTE: this is slightly different than the one for injection markers in tree-house. It
- // is anchored at the beginning.
- use helix_stdx::rope::Regex;
- use once_cell::sync::Lazy;
- const SHEBANG: &str = r"^#!\s*(?:\S*[/\\](?:env\s+(?:\-\S+\s+)*)?)?([^\s\.\d]+)";
- static SHEBANG_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(SHEBANG).unwrap());
-
- let marker = SHEBANG_REGEX
- .captures_iter(regex_cursor::Input::new(text))
- .map(|cap| text.byte_slice(cap.get_group(1).unwrap().range()))
- .next()?;
- self.language_for_shebang_marker(marker)
- }
-
- fn language_for_shebang_marker(&self, marker: RopeSlice) -> Option<Language> {
- let shebang: Cow<str> = marker.into();
- self.languages_by_shebang.get(shebang.as_ref()).copied()
- }
-
- pub fn indent_query(&self, lang: Language) -> Option<&IndentQuery> {
- self.language(lang).indent_query(self)
- }
-
- pub fn textobject_query(&self, lang: Language) -> Option<&TextObjectQuery> {
- self.language(lang).textobject_query(self)
+ best_match_position.map(|i| self.language_configs[i].clone())
}
- pub fn tag_query(&self, lang: Language) -> Option<&TagQuery> {
- self.language(lang).tag_query(self)
+ pub fn language_configuration_for_injection_string(
+ &self,
+ capture: &InjectionLanguageMarker,
+ ) -> Option<Arc<LanguageConfiguration>> {
+ match capture {
+ InjectionLanguageMarker::Name(string) => self.language_config_for_name(string),
+ InjectionLanguageMarker::Filename(file) => self.language_config_for_file_name(file),
+ InjectionLanguageMarker::Shebang(shebang) => {
+ self.language_config_for_language_id(shebang)
+ }
+ }
}
- fn rainbow_query(&self, lang: Language) -> Option<&RainbowQuery> {
- self.language(lang).rainbow_query(self)
+ pub fn language_configs(&self) -> impl Iterator<Item = &Arc<LanguageConfiguration>> {
+ self.language_configs.iter()
}
pub fn language_server_configs(&self) -> &HashMap<String, LanguageServerConfiguration> {
&self.language_server_configs
}
- pub fn scopes(&self) -> Guard<Arc<Vec<String>>> {
- self.scopes.load()
- }
-
pub fn set_scopes(&self, scopes: Vec<String>) {
self.scopes.store(Arc::new(scopes));
// Reconfigure existing grammars
- for data in &self.languages {
- data.reconfigure(&self.scopes());
- }
- }
-}
-
-impl LanguageLoader for Loader {
- fn language_for_marker(&self, marker: InjectionLanguageMarker) -> Option<Language> {
- match marker {
- InjectionLanguageMarker::Name(name) => self.language_for_name(name),
- InjectionLanguageMarker::Match(text) => self.language_for_match(text),
- InjectionLanguageMarker::Filename(text) => {
- let path: Cow<str> = text.into();
- self.language_for_filename(Path::new(path.as_ref()))
- }
- InjectionLanguageMarker::Shebang(text) => self.language_for_shebang_marker(text),
+ for config in self
+ .language_configs
+ .iter()
+ .filter(|cfg| cfg.is_highlight_initialized())
+ {
+ config.reconfigure(&self.scopes());
}
}
- fn get_config(&self, lang: Language) -> Option<&SyntaxConfig> {
- self.languages[lang.idx()].syntax_config(self)
+ pub fn scopes(&self) -> Guard<Arc<Vec<String>>> {
+ self.scopes.load()
}
}
-#[derive(Debug)]
-struct FileTypeGlob {
- glob: globset::Glob,
- language: Language,
+pub struct TsParser {
+ parser: tree_sitter::Parser,
+ pub cursors: Vec<QueryCursor>,
}
-impl FileTypeGlob {
- pub fn new(glob: globset::Glob, language: Language) -> Self {
- Self { glob, language }
- }
+// could also just use a pool, or a single instance?
+thread_local! {
+ pub static PARSER: RefCell<TsParser> = RefCell::new(TsParser {
+ parser: Parser::new(),
+ cursors: Vec::new(),
+ })
}
#[derive(Debug)]
-struct FileTypeGlobMatcher {
- matcher: globset::GlobSet,
- file_types: Vec<FileTypeGlob>,
+pub struct Syntax {
+ layers: HopSlotMap<LayerId, LanguageLayer>,
+ root: LayerId,
+ loader: Arc<Loader>,
}
-impl Default for FileTypeGlobMatcher {
- fn default() -> Self {
- Self {
- matcher: globset::GlobSet::empty(),
- file_types: Default::default(),
- }
- }
+fn byte_range_to_str(range: std::ops::Range<usize>, source: RopeSlice) -> Cow<str> {
+ Cow::from(source.byte_slice(range))
}
-impl FileTypeGlobMatcher {
- fn new(file_types: Vec<FileTypeGlob>) -> Result<Self, globset::Error> {
- let mut builder = globset::GlobSetBuilder::new();
- for file_type in &file_types {
- builder.add(file_type.glob.clone());
- }
+impl Syntax {
+ pub fn new(
+ source: RopeSlice,
+ config: Arc<HighlightConfiguration>,
+ loader: Arc<Loader>,
+ ) -> Option<Self> {
+ let root_layer = LanguageLayer {
+ tree: None,
+ config,
+ depth: 0,
+ flags: LayerUpdateFlags::empty(),
+ ranges: vec![Range {
+ start_byte: 0,
+ end_byte: usize::MAX,
+ start_point: Point::new(0, 0),
+ end_point: Point::new(usize::MAX, usize::MAX),
+ }],
+ };
- Ok(Self {
- matcher: builder.build()?,
- file_types,
- })
- }
+ // track scope_descriptor: a Vec of scopes for item in tree
- fn language_for_path(&self, path: &Path) -> Option<Language> {
- self.matcher
- .matches(path)
- .iter()
- .filter_map(|idx| self.file_types.get(*idx))
- .max_by_key(|file_type| file_type.glob.glob().len())
- .map(|file_type| file_type.language)
- }
-}
+ let mut layers = HopSlotMap::default();
+ let root = layers.insert(root_layer);
-#[derive(Debug)]
-pub struct Syntax {
- pub inner: tree_house::Syntax,
-}
+ let mut syntax = Self {
+ root,
+ layers,
+ loader,
+ };
-const PARSE_TIMEOUT: Duration = Duration::from_millis(500); // half a second is pretty generous
+ let res = syntax.update(source, source, &ChangeSet::new(source));
-impl Syntax {
- pub fn new(source: RopeSlice, language: Language, loader: &Loader) -> Result<Self, Error> {
- let inner = tree_house::Syntax::new(source, language, PARSE_TIMEOUT, loader)?;
- Ok(Self { inner })
+ if res.is_err() {
+ log::error!("TS parser failed, disabling TS for the current buffer: {res:?}");
+ return None;
+ }
+ Some(syntax)
}
pub fn update(
@@ -528,168 +565,458 @@ impl Syntax {
old_source: RopeSlice,
source: RopeSlice,
changeset: &ChangeSet,
- loader: &Loader,
) -> Result<(), Error> {
+ let mut queue = VecDeque::new();
+ queue.push_back(self.root);
+
+ let scopes = self.loader.scopes.load();
+ let injection_callback = |language: &InjectionLanguageMarker| {
+ self.loader
+ .language_configuration_for_injection_string(language)
+ .and_then(|language_config| language_config.highlight_config(&scopes))
+ };
+
+ // Convert the changeset into tree sitter edits.
let edits = generate_edits(old_source, changeset);
- if edits.is_empty() {
- Ok(())
- } else {
- self.inner.update(source, PARSE_TIMEOUT, &edits, loader)
+
+ // This table allows inverse indexing of `layers`.
+ // That is by hashing a `Layer` you can find
+ // the `LayerId` of an existing equivalent `Layer` in `layers`.
+ //
+ // It is used to determine if a new layer exists for an injection
+ // or if an existing layer needs to be updated.
+ let mut layers_table = RawTable::with_capacity(self.layers.len());
+ let layers_hasher = RandomState::new();
+ // Use the edits to update all layers markers
+ fn point_add(a: Point, b: Point) -> Point {
+ if b.row > 0 {
+ Point::new(a.row.saturating_add(b.row), b.column)
+ } else {
+ Point::new(0, a.column.saturating_add(b.column))
+ }
+ }
+ fn point_sub(a: Point, b: Point) -> Point {
+ if a.row > b.row {
+ Point::new(a.row.saturating_sub(b.row), a.column)
+ } else {
+ Point::new(0, a.column.saturating_sub(b.column))
+ }
}
- }
- pub fn layer(&self, layer: Layer) -> &tree_house::LayerData {
- self.inner.layer(layer)
- }
+ for (layer_id, layer) in self.layers.iter_mut() {
+ // The root layer always covers the whole range (0..usize::MAX)
+ if layer.depth == 0 {
+ layer.flags = LayerUpdateFlags::MODIFIED;
+ continue;
+ }
- pub fn root_layer(&self) -> Layer {
- self.inner.root()
- }
+ if !edits.is_empty() {
+ for range in &mut layer.ranges {
+ // Roughly based on https://github.com/tree-sitter/tree-sitter/blob/ddeaa0c7f534268b35b4f6cb39b52df082754413/lib/src/subtree.c#L691-L720
+ for edit in edits.iter().rev() {
+ let is_pure_insertion = edit.old_end_byte == edit.start_byte;
+
+ // if edit is after range, skip
+ if edit.start_byte > range.end_byte {
+ // TODO: || (is_noop && edit.start_byte == range.end_byte)
+ continue;
+ }
+
+ // if edit is before range, shift entire range by len
+ if edit.old_end_byte < range.start_byte {
+ range.start_byte =
+ edit.new_end_byte + (range.start_byte - edit.old_end_byte);
+ range.start_point = point_add(
+ edit.new_end_position,
+ point_sub(range.start_point, edit.old_end_position),
+ );
+
+ range.end_byte = edit
+ .new_end_byte
+ .saturating_add(range.end_byte - edit.old_end_byte);
+ range.end_point = point_add(
+ edit.new_end_position,
+ point_sub(range.end_point, edit.old_end_position),
+ );
+
+ layer.flags |= LayerUpdateFlags::MOVED;
+ }
+ // if the edit starts in the space before and extends into the range
+ else if edit.start_byte < range.start_byte {
+ range.start_byte = edit.new_end_byte;
+ range.start_point = edit.new_end_position;
+
+ range.end_byte = range
+ .end_byte
+ .saturating_sub(edit.old_end_byte)
+ .saturating_add(edit.new_end_byte);
+ range.end_point = point_add(
+ edit.new_end_position,
+ point_sub(range.end_point, edit.old_end_position),
+ );
+ layer.flags = LayerUpdateFlags::MODIFIED;
+ }
+ // If the edit is an insertion at the start of the tree, shift
+ else if edit.start_byte == range.start_byte && is_pure_insertion {
+ range.start_byte = edit.new_end_byte;
+ range.start_point = edit.new_end_position;
+ layer.flags |= LayerUpdateFlags::MOVED;
+ } else {
+ range.end_byte = range
+ .end_byte
+ .saturating_sub(edit.old_end_byte)
+ .saturating_add(edit.new_end_byte);
+ range.end_point = point_add(
+ edit.new_end_position,
+ point_sub(range.end_point, edit.old_end_position),
+ );
+ layer.flags = LayerUpdateFlags::MODIFIED;
+ }
+ }
+ }
+ }
- pub fn layer_for_byte_range(&self, start: u32, end: u32) -> Layer {
- self.inner.layer_for_byte_range(start, end)
- }
+ let hash = layers_hasher.hash_one(layer);
+ // Safety: insert_no_grow is unsafe because it assumes that the table
+ // has enough capacity to hold additional elements.
+ // This is always the case as we reserved enough capacity above.
+ unsafe { layers_table.insert_no_grow(hash, layer_id) };
+ }
- pub fn root_language(&self) -> Language {
- self.layer(self.root_layer()).language
- }
+ PARSER.with(|ts_parser| {
+ let ts_parser = &mut ts_parser.borrow_mut();
+ ts_parser.parser.set_timeout_micros(1000 * 500); // half a second is pretty generours
+ let mut cursor = ts_parser.cursors.pop().unwrap_or_else(QueryCursor::new);
+ // TODO: might need to set cursor range
+ cursor.set_byte_range(0..usize::MAX);
+ cursor.set_match_limit(TREE_SITTER_MATCH_LIMIT);
- pub fn tree(&self) -> &Tree {
- self.inner.tree()
- }
+ let source_slice = source.slice(..);
- pub fn tree_for_byte_range(&self, start: u32, end: u32) -> &Tree {
- self.inner.tree_for_byte_range(start, end)
- }
+ while let Some(layer_id) = queue.pop_front() {
+ let layer = &mut self.layers[layer_id];
- pub fn named_descendant_for_byte_range(&self, start: u32, end: u32) -> Option<Node<'_>> {
- self.inner.named_descendant_for_byte_range(start, end)
- }
+ // Mark the layer as touched
+ layer.flags |= LayerUpdateFlags::TOUCHED;
- pub fn descendant_for_byte_range(&self, start: u32, end: u32) -> Option<Node<'_>> {
- self.inner.descendant_for_byte_range(start, end)
- }
+ // If a tree already exists, notify it of changes.
+ if let Some(tree) = &mut layer.tree {
+ if layer
+ .flags
+ .intersects(LayerUpdateFlags::MODIFIED | LayerUpdateFlags::MOVED)
+ {
+ for edit in edits.iter().rev() {
+ // Apply the edits in reverse.
+ // If we applied them in order then edit 1 would disrupt the positioning of edit 2.
+ tree.edit(edit);
+ }
+ }
- pub fn walk(&self) -> TreeCursor<'_> {
- self.inner.walk()
- }
+ if layer.flags.contains(LayerUpdateFlags::MODIFIED) {
+ // Re-parse the tree.
+ layer.parse(&mut ts_parser.parser, source)?;
+ }
+ } else {
+ // always parse if this layer has never been parsed before
+ layer.parse(&mut ts_parser.parser, source)?;
+ }
- pub fn highlighter<'a>(
- &'a self,
- source: RopeSlice<'a>,
- loader: &'a Loader,
- range: impl RangeBounds<u32>,
- ) -> Highlighter<'a> {
- Highlighter::new(&self.inner, source, loader, range)
+ // Switch to an immutable borrow.
+ let layer = &self.layers[layer_id];
+
+ // Process injections.
+ let matches = cursor.matches(
+ &layer.config.injections_query,
+ layer.tree().root_node(),
+ RopeProvider(source_slice),
+ );
+ let mut combined_injections = vec![
+ (None, Vec::new(), IncludedChildren::default());
+ layer.config.combined_injections_patterns.len()
+ ];
+ let mut injections = Vec::new();
+ let mut last_injection_end = 0;
+ for mat in matches {
+ let (injection_capture, content_node, included_children) = layer
+ .config
+ .injection_for_match(&layer.config.injections_query, &mat, source_slice);
+
+ // in case this is a combined injection save it for more processing later
+ if let Some(combined_injection_idx) = layer
+ .config
+ .combined_injections_patterns
+ .iter()
+ .position(|&pattern| pattern == mat.pattern_index)
+ {
+ let entry = &mut combined_injections[combined_injection_idx];
+ if injection_capture.is_some() {
+ entry.0 = injection_capture;
+ }
+ if let Some(content_node) = content_node {
+ if content_node.start_byte() >= last_injection_end {
+ entry.1.push(content_node);
+ last_injection_end = content_node.end_byte();
+ }
+ }
+ entry.2 = included_children;
+ continue;
+ }
+
+ // Explicitly remove this match so that none of its other captures will remain
+ // in the stream of captures.
+ mat.remove();
+
+ // If a language is found with the given name, then add a new language layer
+ // to the highlighted document.
+ if let (Some(injection_capture), Some(content_node)) =
+ (injection_capture, content_node)
+ {
+ if let Some(config) = (injection_callback)(&injection_capture) {
+ let ranges =
+ intersect_ranges(&layer.ranges, &[content_node], included_children);
+
+ if !ranges.is_empty() {
+ if content_node.start_byte() < last_injection_end {
+ continue;
+ }
+ last_injection_end = content_node.end_byte();
+ injections.push((config, ranges));
+ }
+ }
+ }
+ }
+
+ for (lang_name, content_nodes, included_children) in combined_injections {
+ if let (Some(lang_name), false) = (lang_name, content_nodes.is_empty()) {
+ if let Some(config) = (injection_callback)(&lang_name) {
+ let ranges =
+ intersect_ranges(&layer.ranges, &content_nodes, included_children);
+ if !ranges.is_empty() {
+ injections.push((config, ranges));
+ }
+ }
+ }
+ }
+
+ let depth = layer.depth + 1;
+ // TODO: can't inline this since matches borrows self.layers
+ for (config, ranges) in injections {
+ let new_layer = LanguageLayer {
+ tree: None,
+ config,
+ depth,
+ ranges,
+ flags: LayerUpdateFlags::empty(),
+ };
+
+ // Find an identical existing layer
+ let layer = layers_table
+ .get(layers_hasher.hash_one(&new_layer), |&it| {
+ self.layers[it] == new_layer
+ })
+ .copied();
+
+ // ...or insert a new one.
+ let layer_id = layer.unwrap_or_else(|| self.layers.insert(new_layer));
+
+ queue.push_back(layer_id);
+ }
+
+ // TODO: pre-process local scopes at this time, rather than highlight?
+ // would solve problems with locals not working across boundaries
+ }
+
+ // Return the cursor back in the pool.
+ ts_parser.cursors.push(cursor);
+
+ // Reset all `LayerUpdateFlags` and remove all untouched layers
+ self.layers.retain(|_, layer| {
+ replace(&mut layer.flags, LayerUpdateFlags::empty())
+ .contains(LayerUpdateFlags::TOUCHED)
+ });
+
+ Ok(())
+ })
}
- pub fn query_iter<'a, QueryLoader, LayerState, Range>(
- &'a self,
- source: RopeSlice<'a>,
- loader: QueryLoader,
- range: Range,
- ) -> QueryIter<'a, 'a, QueryLoader, LayerState>
- where
- QueryLoader: FnMut(Language) -> Option<&'a Query> + 'a,
- LayerState: Default,
- Range: RangeBounds<u32>,
- {
- QueryIter::new(&self.inner, source, loader, range)
+ pub fn tree(&self) -> &Tree {
+ self.layers[self.root].tree()
}
- pub fn tags<'a>(
+ /// Iterate over the highlighted regions for a given slice of source code.
+ pub fn highlight_iter<'a>(
&'a self,
source: RopeSlice<'a>,
- loader: &'a Loader,
- range: impl RangeBounds<u32>,
- ) -> QueryIter<'a, 'a, impl FnMut(Language) -> Option<&'a Query> + 'a, ()> {
- self.query_iter(
+ range: Option<std::ops::Range<usize>>,
+ cancellation_flag: Option<&'a AtomicUsize>,
+ ) -> impl Iterator<Item = Result<HighlightEvent, Error>> + 'a {
+ let mut layers = self
+ .layers
+ .iter()
+ .filter_map(|(_, layer)| {
+ // TODO: if range doesn't overlap layer range, skip it
+
+ // Reuse a cursor from the pool if available.
+ let mut cursor = PARSER.with(|ts_parser| {
+ let highlighter = &mut ts_parser.borrow_mut();
+ highlighter.cursors.pop().unwrap_or_else(QueryCursor::new)
+ });
+
+ // The `captures` iterator borrows the `Tree` and the `QueryCursor`, which
+ // prevents them from being moved. But both of these values are really just
+ // pointers, so it's actually ok to move them.
+ let cursor_ref =
+ unsafe { mem::transmute::<_, &'static mut QueryCursor>(&mut cursor) };
+
+ // if reusing cursors & no range this resets to whole range
+ cursor_ref.set_byte_range(range.clone().unwrap_or(0..usize::MAX));
+ cursor_ref.set_match_limit(TREE_SITTER_MATCH_LIMIT);
+
+ let mut captures = cursor_ref
+ .captures(
+ &layer.config.query,
+ layer.tree().root_node(),
+ RopeProvider(source),
+ )
+ .peekable();
+
+ // If there's no captures, skip the layer
+ captures.peek()?;
+
+ Some(HighlightIterLayer {
+ highlight_end_stack: Vec::new(),
+ scope_stack: vec![LocalScope {
+ inherits: false,
+ range: 0..usize::MAX,
+ local_defs: Vec::new(),
+ }],
+ cursor,
+ _tree: None,
+ captures: RefCell::new(captures),
+ config: layer.config.as_ref(), // TODO: just reuse `layer`
+ depth: layer.depth, // TODO: just reuse `layer`
+ })
+ })
+ .collect::<Vec<_>>();
+
+ layers.sort_unstable_by_key(|layer| layer.sort_key());
+
+ let mut result = HighlightIter {
source,
- |lang| loader.tag_query(lang).map(|q| &q.query),
- range,
- )
+ byte_offset: range.map_or(0, |r| r.start),
+ cancellation_flag,
+ iter_count: 0,
+ layers,
+ next_event: None,
+ last_highlight_range: None,
+ };
+ result.sort_layers();
+ result
}
- pub fn rainbow_highlights(
- &self,
- source: RopeSlice,
- rainbow_length: usize,
- loader: &Loader,
- range: impl RangeBounds<u32>,
- ) -> OverlayHighlights {
- struct RainbowScope<'tree> {
- end: u32,
- node: Option<Node<'tree>>,
- highlight: Highlight,
- }
+ // Commenting
+ // comment_strings_for_pos
+ // is_commented
- let mut scope_stack = Vec::<RainbowScope>::new();
- let mut highlights = Vec::new();
- let mut query_iter = self.query_iter::<_, (), _>(
- source,
- |lang| loader.rainbow_query(lang).map(|q| &q.query),
- range,
- );
+ // Indentation
+ // suggested_indent_for_line_at_buffer_row
+ // suggested_indent_for_buffer_row
+ // indent_level_for_line
- while let Some(event) = query_iter.next() {
- let QueryIterEvent::Match(mat) = event else {
- continue;
- };
+ // TODO: Folding
+}
- let rainbow_query = loader
- .rainbow_query(query_iter.current_language())
- .expect("language must have a rainbow query to emit matches");
-
- let byte_range = mat.node.byte_range();
- // Pop any scopes that end before this capture begins.
- while scope_stack
- .last()
- .is_some_and(|scope| byte_range.start >= scope.end)
- {
- scope_stack.pop();
- }
+bitflags! {
+ /// Flags that track the status of a layer
+ /// in the `Sytaxn::update` function
+ #[derive(Debug)]
+ struct LayerUpdateFlags : u32{
+ const MODIFIED = 0b001;
+ const MOVED = 0b010;
+ const TOUCHED = 0b100;
+ }
+}
- let capture = Some(mat.capture);
- if capture == rainbow_query.scope_capture {
- scope_stack.push(RainbowScope {
- end: byte_range.end,
- node: if rainbow_query
- .include_children_patterns
- .contains(&mat.pattern)
- {
- None
- } else {
- Some(mat.node.clone())
- },
- highlight: Highlight::new((scope_stack.len() % rainbow_length) as u32),
- });
- } else if capture == rainbow_query.bracket_capture {
- if let Some(scope) = scope_stack.last() {
- if !scope
- .node
- .as_ref()
- .is_some_and(|node| mat.node.parent().as_ref() != Some(node))
- {
- let start = source
- .byte_to_char(source.floor_char_boundary(byte_range.start as usize));
- let end =
- source.byte_to_char(source.ceil_char_boundary(byte_range.end as usize));
- highlights.push((scope.highlight, start..end));
- }
- }
- }
- }
+#[derive(Debug)]
+pub struct LanguageLayer {
+ // mode
+ // grammar
+ pub config: Arc<HighlightConfiguration>,
+ pub(crate) tree: Option<Tree>,
+ pub ranges: Vec<Range>,
+ pub depth: u32,
+ flags: LayerUpdateFlags,
+}
- OverlayHighlights::Heterogenous { highlights }
+/// This PartialEq implementation only checks if that
+/// two layers are theoretically identical (meaning they highlight the same text range with the same language).
+/// It does not check whether the layers have the same internal treesitter
+/// state.
+impl PartialEq for LanguageLayer {
+ fn eq(&self, other: &Self) -> bool {
+ self.depth == other.depth
+ && self.config.language == other.config.language
+ && self.ranges == other.ranges
}
}
-pub type Highlighter<'a> = highlighter::Highlighter<'a, 'a, Loader>;
+/// Hash implementation belongs to PartialEq implementation above.
+/// See its documentation for details.
+impl Hash for LanguageLayer {
+ fn hash<H: Hasher>(&self, state: &mut H) {
+ self.depth.hash(state);
+ // The transmute is necessary here because tree_sitter::Language does not derive Hash at the moment.
+ // However it does use #[repr] transparent so the transmute here is safe
+ // as `Language` (which `Grammar` is an alias for) is just a newtype wrapper around a (thin) pointer.
+ // This is also compatible with the PartialEq implementation of language
+ // as that is just a pointer comparison.
+ let language: *const () = unsafe { transmute(self.config.language) };
+ language.hash(state);
+ self.ranges.hash(state);
+ }
+}
-fn generate_edits(old_text: RopeSlice, changeset: &ChangeSet) -> Vec<InputEdit> {
- use crate::Operation::*;
- use tree_sitter::Point;
+impl LanguageLayer {
+ pub fn tree(&self) -> &Tree {
+ // TODO: no unwrap
+ self.tree.as_ref().unwrap()
+ }
+
+ fn parse(&mut self, parser: &mut Parser, source: RopeSlice) -> Result<(), Error> {
+ parser
+ .set_included_ranges(&self.ranges)
+ .map_err(|_| Error::InvalidRanges)?;
+
+ parser
+ .set_language(self.config.language)
+ .map_err(|_| Error::InvalidLanguage)?;
+
+ // unsafe { syntax.parser.set_cancellation_flag(cancellation_flag) };
+ let tree = parser
+ .parse_with(
+ &mut |byte, _| {
+ if byte <= source.len_bytes() {
+ let (chunk, start_byte, _, _) = source.chunk_at_byte(byte);
+ &chunk.as_bytes()[byte - start_byte..]
+ } else {
+ // out of range
+ &[]
+ }
+ },
+ self.tree.as_ref(),
+ )
+ .ok_or(Error::Cancelled)?;
+ // unsafe { ts_parser.parser.set_cancellation_flag(None) };
+ self.tree = Some(tree);
+ Ok(())
+ }
+}
+pub(crate) fn generate_edits(
+ old_text: RopeSlice,
+ changeset: &ChangeSet,
+) -> Vec<tree_sitter::InputEdit> {
+ use Operation::*;
let mut old_pos = 0;
let mut edits = Vec::new();
@@ -701,6 +1028,35 @@ fn generate_edits(old_text: RopeSlice, changeset: &ChangeSet) -> Vec<InputEdit>
let mut iter = changeset.changes.iter().peekable();
// TODO; this is a lot easier with Change instead of Operation.
+
+ fn point_at_pos(text: RopeSlice, pos: usize) -> (usize, Point) {
+ let byte = text.char_to_byte(pos); // <- attempted to index past end
+ let line = text.char_to_line(pos);
+ let line_start_byte = text.line_to_byte(line);
+ let col = byte - line_start_byte;
+
+ (byte, Point::new(line, col))
+ }
+
+ fn traverse(point: Point, text: &Tendril) -> Point {
+ let Point {
+ mut row,
+ mut column,
+ } = point;
+
+ // TODO: there should be a better way here.
+ let mut chars = text.chars().peekable();
+ while let Some(ch) = chars.next() {
+ if char_is_line_ending(ch) && !(ch == '\r' && chars.peek() == Some(&'\n')) {
+ row += 1;
+ column = 0;
+ } else {
+ column += 1;
+ }
+ }
+ Point { row, column }
+ }
+
while let Some(change) = iter.next() {
let len = match change {
Delete(i) | Retain(i) => *i,
@@ -711,47 +1067,47 @@ fn generate_edits(old_text: RopeSlice, changeset: &ChangeSet) -> Vec<InputEdit>
match change {
Retain(_) => {}
Delete(_) => {
- let start_byte = old_text.char_to_byte(old_pos) as u32;
- let old_end_byte = old_text.char_to_byte(old_end) as u32;
+ let (start_byte, start_position) = point_at_pos(old_text, old_pos);
+ let (old_end_byte, old_end_position) = point_at_pos(old_text, old_end);
// deletion
- edits.push(InputEdit {
- start_byte, // old_pos to byte
- old_end_byte, // old_end to byte
- new_end_byte: start_byte, // old_pos to byte
- start_point: Point::ZERO,
- old_end_point: Point::ZERO,
- new_end_point: Point::ZERO,
+ edits.push(tree_sitter::InputEdit {
+ start_byte, // old_pos to byte
+ old_end_byte, // old_end to byte
+ new_end_byte: start_byte, // old_pos to byte
+ start_position, // old pos to coords
+ old_end_position, // old_end to coords
+ new_end_position: start_position, // old pos to coords
});
}
Insert(s) => {
- let start_byte = old_text.char_to_byte(old_pos) as u32;
+ let (start_byte, start_position) = point_at_pos(old_text, old_pos);
// a subsequent delete means a replace, consume it
if let Some(Delete(len)) = iter.peek() {
old_end = old_pos + len;
- let old_end_byte = old_text.char_to_byte(old_end) as u32;
+ let (old_end_byte, old_end_position) = point_at_pos(old_text, old_end);
iter.next();
// replacement
- edits.push(InputEdit {
- start_byte, // old_pos to byte
- old_end_byte, // old_end to byte
- new_end_byte: start_byte + s.len() as u32, // old_pos to byte + s.len()
- start_point: Point::ZERO,
- old_end_point: Point::ZERO,
- new_end_point: Point::ZERO,
+ edits.push(tree_sitter::InputEdit {
+ start_byte, // old_pos to byte
+ old_end_byte, // old_end to byte
+ new_end_byte: start_byte + s.len(), // old_pos to byte + s.len()
+ start_position, // old pos to coords
+ old_end_position, // old_end to coords
+ new_end_position: traverse(start_position, s), // old pos + chars, newlines matter too (iter over)
});
} else {
// insert
- edits.push(InputEdit {
- start_byte, // old_pos to byte
- old_end_byte: start_byte, // same
- new_end_byte: start_byte + s.len() as u32, // old_pos + s.len()
- start_point: Point::ZERO,
- old_end_point: Point::ZERO,
- new_end_point: Point::ZERO,
+ edits.push(tree_sitter::InputEdit {
+ start_byte, // old_pos to byte
+ old_end_byte: start_byte, // same
+ new_end_byte: start_byte + s.len(), // old_pos + s.len()
+ start_position, // old pos to coords
+ old_end_position: start_position, // same
+ new_end_position: traverse(start_position, s), // old pos + chars, newlines matter too (iter over)
});
}
}
@@ -761,300 +1117,922 @@ fn generate_edits(old_text: RopeSlice, changeset: &ChangeSet) -> Vec<InputEdit>
edits
}
-/// A set of "overlay" highlights and ranges they apply to.
+use std::sync::atomic::{AtomicUsize, Ordering};
+use std::{iter, mem, ops, str, usize};
+use tree_sitter::{
+ Language as Grammar, Node, Parser, Point, Query, QueryCaptures, QueryCursor, QueryError,
+ QueryMatch, Range, TextProvider, Tree, TreeCursor,
+};
+
+const CANCELLATION_CHECK_INTERVAL: usize = 100;
+
+/// Indicates which highlight should be applied to a region of source code.
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+pub struct Highlight(pub usize);
+
+/// Represents the reason why syntax highlighting failed.
+#[derive(Debug, PartialEq, Eq)]
+pub enum Error {
+ Cancelled,
+ InvalidLanguage,
+ InvalidRanges,
+ Unknown,
+}
+
+/// Represents a single step in rendering a syntax-highlighted document.
+#[derive(Copy, Clone, Debug)]
+pub enum HighlightEvent {
+ Source { start: usize, end: usize },
+ HighlightStart(Highlight),
+ HighlightEnd,
+}
+
+/// Contains the data needed to highlight code written in a particular language.
///
-/// As overlays, the styles for the given `Highlight`s are merged on top of the syntax highlights.
+/// This struct is immutable and can be shared between threads.
#[derive(Debug)]
-pub enum OverlayHighlights {
- /// All highlights use a single `Highlight`.
- ///
- /// Note that, currently, all ranges are assumed to be non-overlapping. This could change in
- /// the future though.
- Homogeneous {
- highlight: Highlight,
- ranges: Vec<ops::Range<usize>>,
- },
- /// A collection of different highlights for given ranges.
- ///
- /// Note that the ranges **must be non-overlapping**.
- Heterogenous {
- highlights: Vec<(Highlight, ops::Range<usize>)>,
- },
+pub struct HighlightConfiguration {
+ pub language: Grammar,
+ pub query: Query,
+ injections_query: Query,
+ combined_injections_patterns: Vec<usize>,
+ highlights_pattern_index: usize,
+ highlight_indices: ArcSwap<Vec<Option<Highlight>>>,
+ non_local_variable_patterns: Vec<bool>,
+ injection_content_capture_index: Option<u32>,
+ injection_language_capture_index: Option<u32>,
+ injection_filename_capture_index: Option<u32>,
+ injection_shebang_capture_index: Option<u32>,
+ local_scope_capture_index: Option<u32>,
+ local_def_capture_index: Option<u32>,
+ local_def_value_capture_index: Option<u32>,
+ local_ref_capture_index: Option<u32>,
}
-impl OverlayHighlights {
- pub fn single(highlight: Highlight, range: ops::Range<usize>) -> Self {
- Self::Homogeneous {
- highlight,
- ranges: vec![range],
- }
+#[derive(Debug)]
+struct LocalDef<'a> {
+ name: Cow<'a, str>,
+ value_range: ops::Range<usize>,
+ highlight: Option<Highlight>,
+}
+
+#[derive(Debug)]
+struct LocalScope<'a> {
+ inherits: bool,
+ range: ops::Range<usize>,
+ local_defs: Vec<LocalDef<'a>>,
+}
+
+#[derive(Debug)]
+struct HighlightIter<'a> {
+ source: RopeSlice<'a>,
+ byte_offset: usize,
+ cancellation_flag: Option<&'a AtomicUsize>,
+ layers: Vec<HighlightIterLayer<'a>>,
+ iter_count: usize,
+ next_event: Option<HighlightEvent>,
+ last_highlight_range: Option<(usize, usize, u32)>,
+}
+
+// Adapter to convert rope chunks to bytes
+pub struct ChunksBytes<'a> {
+ chunks: ropey::iter::Chunks<'a>,
+}
+impl<'a> Iterator for ChunksBytes<'a> {
+ type Item = &'a [u8];
+ fn next(&mut self) -> Option<Self::Item> {
+ self.chunks.next().map(str::as_bytes)
}
+}
- fn is_empty(&self) -> bool {
- match self {
- Self::Homogeneous { ranges, .. } => ranges.is_empty(),
- Self::Heterogenous { highlights } => highlights.is_empty(),
+pub struct RopeProvider<'a>(pub RopeSlice<'a>);
+impl<'a> TextProvider<&'a [u8]> for RopeProvider<'a> {
+ type I = ChunksBytes<'a>;
+
+ fn text(&mut self, node: Node) -> Self::I {
+ let fragment = self.0.byte_slice(node.start_byte()..node.end_byte());
+ ChunksBytes {
+ chunks: fragment.chunks(),
}
}
}
-#[derive(Debug)]
-struct Overlay {
- highlights: OverlayHighlights,
- /// The position of the highlighter into the Vec of ranges of the overlays.
+struct HighlightIterLayer<'a> {
+ _tree: Option<Tree>,
+ cursor: QueryCursor,
+ captures: RefCell<iter::Peekable<QueryCaptures<'a, 'a, RopeProvider<'a>, &'a [u8]>>>,
+ config: &'a HighlightConfiguration,
+ highlight_end_stack: Vec<usize>,
+ scope_stack: Vec<LocalScope<'a>>,
+ depth: u32,
+}
+
+impl<'a> fmt::Debug for HighlightIterLayer<'a> {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ f.debug_struct("HighlightIterLayer").finish()
+ }
+}
+
+impl HighlightConfiguration {
+ /// Creates a `HighlightConfiguration` for a given `Grammar` and set of highlighting
+ /// queries.
///
- /// Used by the `OverlayHighlighter`.
- idx: usize,
- /// The currently active highlight (and the ending character index) for this overlay.
+ /// # Parameters
///
- /// Used by the `OverlayHighlighter`.
- active_highlight: Option<(Highlight, usize)>,
-}
+ /// * `language` - The Tree-sitter `Grammar` that should be used for parsing.
+ /// * `highlights_query` - A string containing tree patterns for syntax highlighting. This
+ /// should be non-empty, otherwise no syntax highlights will be added.
+ /// * `injections_query` - A string containing tree patterns for injecting other languages
+ /// into the document. This can be empty if no injections are desired.
+ /// * `locals_query` - A string containing tree patterns for tracking local variable
+ /// definitions and references. This can be empty if local variable tracking is not needed.
+ ///
+ /// Returns a `HighlightConfiguration` that can then be used with the `highlight` method.
+ pub fn new(
+ language: Grammar,
+ highlights_query: &str,
+ injection_query: &str,
+ locals_query: &str,
+ ) -> Result<Self, QueryError> {
+ // Concatenate the query strings, keeping track of the start offset of each section.
+ let mut query_source = String::new();
+ query_source.push_str(locals_query);
+ let highlights_query_offset = query_source.len();
+ query_source.push_str(highlights_query);
+
+ // Construct a single query by concatenating the three query strings, but record the
+ // range of pattern indices that belong to each individual string.
+ let query = Query::new(language, &query_source)?;
+ let mut highlights_pattern_index = 0;
+ for i in 0..(query.pattern_count()) {
+ let pattern_offset = query.start_byte_for_pattern(i);
+ if pattern_offset < highlights_query_offset {
+ highlights_pattern_index += 1;
+ }
+ }
+
+ let injections_query = Query::new(language, injection_query)?;
+ let combined_injections_patterns = (0..injections_query.pattern_count())
+ .filter(|&i| {
+ injections_query
+ .property_settings(i)
+ .iter()
+ .any(|s| &*s.key == "injection.combined")
+ })
+ .collect();
+
+ // Find all of the highlighting patterns that are disabled for nodes that
+ // have been identified as local variables.
+ let non_local_variable_patterns = (0..query.pattern_count())
+ .map(|i| {
+ query
+ .property_predicates(i)
+ .iter()
+ .any(|(prop, positive)| !*positive && prop.key.as_ref() == "local")
+ })
+ .collect();
+
+ // Store the numeric ids for all of the special captures.
+ let mut injection_content_capture_index = None;
+ let mut injection_language_capture_index = None;
+ let mut injection_filename_capture_index = None;
+ let mut injection_shebang_capture_index = None;
+ let mut local_def_capture_index = None;
+ let mut local_def_value_capture_index = None;
+ let mut local_ref_capture_index = None;
+ let mut local_scope_capture_index = None;
+ for (i, name) in query.capture_names().iter().enumerate() {
+ let i = Some(i as u32);
+ match name.as_str() {
+ "local.definition" => local_def_capture_index = i,
+ "local.definition-value" => local_def_value_capture_index = i,
+ "local.reference" => local_ref_capture_index = i,
+ "local.scope" => local_scope_capture_index = i,
+ _ => {}
+ }
+ }
+
+ for (i, name) in injections_query.capture_names().iter().enumerate() {
+ let i = Some(i as u32);
+ match name.as_str() {
+ "injection.content" => injection_content_capture_index = i,
+ "injection.language" => injection_language_capture_index = i,
+ "injection.filename" => injection_filename_capture_index = i,
+ "injection.shebang" => injection_shebang_capture_index = i,
+ _ => {}
+ }
+ }
-impl Overlay {
- fn new(highlights: OverlayHighlights) -> Option<Self> {
- (!highlights.is_empty()).then_some(Self {
- highlights,
- idx: 0,
- active_highlight: None,
+ let highlight_indices = ArcSwap::from_pointee(vec![None; query.capture_names().len()]);
+ Ok(Self {
+ language,
+ query,
+ injections_query,
+ combined_injections_patterns,
+ highlights_pattern_index,
+ highlight_indices,
+ non_local_variable_patterns,
+ injection_content_capture_index,
+ injection_language_capture_index,
+ injection_filename_capture_index,
+ injection_shebang_capture_index,
+ local_scope_capture_index,
+ local_def_capture_index,
+ local_def_value_capture_index,
+ local_ref_capture_index,
})
}
- fn current(&self) -> Option<(Highlight, ops::Range<usize>)> {
- match &self.highlights {
- OverlayHighlights::Homogeneous { highlight, ranges } => ranges
- .get(self.idx)
- .map(|range| (*highlight, range.clone())),
- OverlayHighlights::Heterogenous { highlights } => highlights.get(self.idx).cloned(),
+ /// Get a slice containing all of the highlight names used in the configuration.
+ pub fn names(&self) -> &[String] {
+ self.query.capture_names()
+ }
+
+ /// Set the list of recognized highlight names.
+ ///
+ /// Tree-sitter syntax-highlighting queries specify highlights in the form of dot-separated
+ /// highlight names like `punctuation.bracket` and `function.method.builtin`. Consumers of
+ /// these queries can choose to recognize highlights with different levels of specificity.
+ /// For example, the string `function.builtin` will match against `function.builtin.constructor`
+ /// but will not match `function.method.builtin` and `function.method`.
+ ///
+ /// When highlighting, results are returned as `Highlight` values, which contain the index
+ /// of the matched highlight this list of highlight names.
+ pub fn configure(&self, recognized_names: &[String]) {
+ let mut capture_parts = Vec::new();
+ let indices: Vec<_> = self
+ .query
+ .capture_names()
+ .iter()
+ .map(move |capture_name| {
+ capture_parts.clear();
+ capture_parts.extend(capture_name.split('.'));
+
+ let mut best_index = None;
+ let mut best_match_len = 0;
+ for (i, recognized_name) in recognized_names.iter().enumerate() {
+ let mut len = 0;
+ let mut matches = true;
+ for (i, part) in recognized_name.split('.').enumerate() {
+ match capture_parts.get(i) {
+ Some(capture_part) if *capture_part == part => len += 1,
+ _ => {
+ matches = false;
+ break;
+ }
+ }
+ }
+ if matches && len > best_match_len {
+ best_index = Some(i);
+ best_match_len = len;
+ }
+ }
+ best_index.map(Highlight)
+ })
+ .collect();
+
+ self.highlight_indices.store(Arc::new(indices));
+ }
+
+ fn injection_pair<'a>(
+ &self,
+ query_match: &QueryMatch<'a, 'a>,
+ source: RopeSlice<'a>,
+ ) -> (Option<InjectionLanguageMarker<'a>>, Option<Node<'a>>) {
+ let mut injection_capture = None;
+ let mut content_node = None;
+
+ for capture in query_match.captures {
+ let index = Some(capture.index);
+ if index == self.injection_language_capture_index {
+ let name = byte_range_to_str(capture.node.byte_range(), source);
+ injection_capture = Some(InjectionLanguageMarker::Name(name));
+ } else if index == self.injection_filename_capture_index {
+ let name = byte_range_to_str(capture.node.byte_range(), source);
+ let path = Path::new(name.as_ref()).to_path_buf();
+ injection_capture = Some(InjectionLanguageMarker::Filename(path.into()));
+ } else if index == self.injection_shebang_capture_index {
+ let node_slice = source.byte_slice(capture.node.byte_range());
+
+ // some languages allow space and newlines before the actual string content
+ // so a shebang could be on either the first or second line
+ let lines = if let Ok(end) = node_slice.try_line_to_byte(2) {
+ node_slice.byte_slice(..end)
+ } else {
+ node_slice
+ };
+
+ static SHEBANG_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(SHEBANG).unwrap());
+
+ injection_capture = SHEBANG_REGEX
+ .captures(&Cow::from(lines))
+ .map(|cap| InjectionLanguageMarker::Shebang(cap[1].to_owned()))
+ } else if index == self.injection_content_capture_index {
+ content_node = Some(capture.node);
+ }
}
+ (injection_capture, content_node)
}
- fn start(&self) -> Option<usize> {
- match &self.highlights {
- OverlayHighlights::Homogeneous { ranges, .. } => {
- ranges.get(self.idx).map(|range| range.start)
+ fn injection_for_match<'a>(
+ &self,
+ query: &'a Query,
+ query_match: &QueryMatch<'a, 'a>,
+ source: RopeSlice<'a>,
+ ) -> (
+ Option<InjectionLanguageMarker<'a>>,
+ Option<Node<'a>>,
+ IncludedChildren,
+ ) {
+ let (mut injection_capture, content_node) = self.injection_pair(query_match, source);
+
+ let mut included_children = IncludedChildren::default();
+ for prop in query.property_settings(query_match.pattern_index) {
+ match prop.key.as_ref() {
+ // In addition to specifying the language name via the text of a
+ // captured node, it can also be hard-coded via a `#set!` predicate
+ // that sets the injection.language key.
+ "injection.language" if injection_capture.is_none() => {
+ injection_capture = prop
+ .value
+ .as_ref()
+ .map(|s| InjectionLanguageMarker::Name(s.as_ref().into()));
+ }
+
+ // By default, injections do not include the *children* of an
+ // `injection.content` node - only the ranges that belong to the
+ // node itself. This can be changed using a `#set!` predicate that
+ // sets the `injection.include-children` key.
+ "injection.include-children" => included_children = IncludedChildren::All,
+
+ // Some queries might only exclude named children but include unnamed
+ // children in their `injection.content` node. This can be enabled using
+ // a `#set!` predicate that sets the `injection.include-unnamed-children` key.
+ "injection.include-unnamed-children" => {
+ included_children = IncludedChildren::Unnamed
+ }
+ _ => {}
}
- OverlayHighlights::Heterogenous { highlights } => highlights
- .get(self.idx)
- .map(|(_highlight, range)| range.start),
}
+
+ (injection_capture, content_node, included_children)
}
}
-/// A collection of highlights to apply when rendering which merge on top of syntax highlights.
-#[derive(Debug)]
-pub struct OverlayHighlighter {
- overlays: Vec<Overlay>,
- next_highlight_start: usize,
- next_highlight_end: usize,
+impl<'a> HighlightIterLayer<'a> {
+ // First, sort scope boundaries by their byte offset in the document. At a
+ // given position, emit scope endings before scope beginnings. Finally, emit
+ // scope boundaries from deeper layers first.
+ fn sort_key(&self) -> Option<(usize, bool, isize)> {
+ let depth = -(self.depth as isize);
+ let next_start = self
+ .captures
+ .borrow_mut()
+ .peek()
+ .map(|(m, i)| m.captures[*i].node.start_byte());
+ let next_end = self.highlight_end_stack.last().cloned();
+ match (next_start, next_end) {
+ (Some(start), Some(end)) => {
+ if start < end {
+ Some((start, true, depth))
+ } else {
+ Some((end, false, depth))
+ }
+ }
+ (Some(i), None) => Some((i, true, depth)),
+ (None, Some(j)) => Some((j, false, depth)),
+ _ => None,
+ }
+ }
}
-impl OverlayHighlighter {
- pub fn new(overlays: impl IntoIterator<Item = OverlayHighlights>) -> Self {
- let overlays: Vec<_> = overlays.into_iter().filter_map(Overlay::new).collect();
- let next_highlight_start = overlays
- .iter()
- .filter_map(|overlay| overlay.start())
- .min()
- .unwrap_or(usize::MAX);
-
- Self {
- overlays,
- next_highlight_start,
- next_highlight_end: usize::MAX,
+#[derive(Clone)]
+enum IncludedChildren {
+ None,
+ All,
+ Unnamed,
+}
+
+impl Default for IncludedChildren {
+ fn default() -> Self {
+ Self::None
+ }
+}
+
+// Compute the ranges that should be included when parsing an injection.
+// This takes into account three things:
+// * `parent_ranges` - The ranges must all fall within the *current* layer's ranges.
+// * `nodes` - Every injection takes place within a set of nodes. The injection ranges
+// are the ranges of those nodes.
+// * `includes_children` - For some injections, the content nodes' children should be
+// excluded from the nested document, so that only the content nodes' *own* content
+// is reparsed. For other injections, the content nodes' entire ranges should be
+// reparsed, including the ranges of their children.
+fn intersect_ranges(
+ parent_ranges: &[Range],
+ nodes: &[Node],
+ included_children: IncludedChildren,
+) -> Vec<Range> {
+ let mut cursor = nodes[0].walk();
+ let mut result = Vec::new();
+ let mut parent_range_iter = parent_ranges.iter();
+ let mut parent_range = parent_range_iter
+ .next()
+ .expect("Layers should only be constructed with non-empty ranges vectors");
+ for node in nodes.iter() {
+ let mut preceding_range = Range {
+ start_byte: 0,
+ start_point: Point::new(0, 0),
+ end_byte: node.start_byte(),
+ end_point: node.start_position(),
+ };
+ let following_range = Range {
+ start_byte: node.end_byte(),
+ start_point: node.end_position(),
+ end_byte: usize::MAX,
+ end_point: Point::new(usize::MAX, usize::MAX),
+ };
+
+ for excluded_range in node
+ .children(&mut cursor)
+ .filter_map(|child| match included_children {
+ IncludedChildren::None => Some(child.range()),
+ IncludedChildren::All => None,
+ IncludedChildren::Unnamed => {
+ if child.is_named() {
+ Some(child.range())
+ } else {
+ None
+ }
+ }
+ })
+ .chain([following_range].iter().cloned())
+ {
+ let mut range = Range {
+ start_byte: preceding_range.end_byte,
+ start_point: preceding_range.end_point,
+ end_byte: excluded_range.start_byte,
+ end_point: excluded_range.start_point,
+ };
+ preceding_range = excluded_range;
+
+ if range.end_byte < parent_range.start_byte {
+ continue;
+ }
+
+ while parent_range.start_byte <= range.end_byte {
+ if parent_range.end_byte > range.start_byte {
+ if range.start_byte < parent_range.start_byte {
+ range.start_byte = parent_range.start_byte;
+ range.start_point = parent_range.start_point;
+ }
+
+ if parent_range.end_byte < range.end_byte {
+ if range.start_byte < parent_range.end_byte {
+ result.push(Range {
+ start_byte: range.start_byte,
+ start_point: range.start_point,
+ end_byte: parent_range.end_byte,
+ end_point: parent_range.end_point,
+ });
+ }
+ range.start_byte = parent_range.end_byte;
+ range.start_point = parent_range.end_point;
+ } else {
+ if range.start_byte < range.end_byte {
+ result.push(range);
+ }
+ break;
+ }
+ }
+
+ if let Some(next_range) = parent_range_iter.next() {
+ parent_range = next_range;
+ } else {
+ return result;
+ }
+ }
}
}
+ result
+}
- /// The current position in the overlay highlights.
- ///
- /// This method is meant to be used when treating this type as a cursor over the overlay
- /// highlights.
- ///
- /// `usize::MAX` is returned when there are no more overlay highlights.
- pub fn next_event_offset(&self) -> usize {
- self.next_highlight_start.min(self.next_highlight_end)
+impl<'a> HighlightIter<'a> {
+ fn emit_event(
+ &mut self,
+ offset: usize,
+ event: Option<HighlightEvent>,
+ ) -> Option<Result<HighlightEvent, Error>> {
+ let result;
+ if self.byte_offset < offset {
+ result = Some(Ok(HighlightEvent::Source {
+ start: self.byte_offset,
+ end: offset,
+ }));
+ self.byte_offset = offset;
+ self.next_event = event;
+ } else {
+ result = event.map(Ok);
+ }
+ self.sort_layers();
+ result
+ }
+
+ fn sort_layers(&mut self) {
+ while !self.layers.is_empty() {
+ if let Some(sort_key) = self.layers[0].sort_key() {
+ let mut i = 0;
+ while i + 1 < self.layers.len() {
+ if let Some(next_offset) = self.layers[i + 1].sort_key() {
+ if next_offset < sort_key {
+ i += 1;
+ continue;
+ }
+ } else {
+ let layer = self.layers.remove(i + 1);
+ PARSER.with(|ts_parser| {
+ let highlighter = &mut ts_parser.borrow_mut();
+ highlighter.cursors.push(layer.cursor);
+ });
+ }
+ break;
+ }
+ if i > 0 {
+ self.layers[0..(i + 1)].rotate_left(1);
+ }
+ break;
+ } else {
+ let layer = self.layers.remove(0);
+ PARSER.with(|ts_parser| {
+ let highlighter = &mut ts_parser.borrow_mut();
+ highlighter.cursors.push(layer.cursor);
+ });
+ }
+ }
}
+}
- pub fn advance(&mut self) -> (HighlightEvent, impl Iterator<Item = Highlight> + '_) {
- let mut refresh = false;
- let prev_stack_size = self
- .overlays
- .iter()
- .filter(|overlay| overlay.active_highlight.is_some())
- .count();
- let pos = self.next_event_offset();
-
- if self.next_highlight_end == pos {
- for overlay in self.overlays.iter_mut() {
- if overlay
- .active_highlight
- .is_some_and(|(_highlight, end)| end == pos)
+impl<'a> Iterator for HighlightIter<'a> {
+ type Item = Result<HighlightEvent, Error>;
+
+ fn next(&mut self) -> Option<Self::Item> {
+ 'main: loop {
+ // If we've already determined the next highlight boundary, just return it.
+ if let Some(e) = self.next_event.take() {
+ return Some(Ok(e));
+ }
+
+ // Periodically check for cancellation, returning `Cancelled` error if the
+ // cancellation flag was flipped.
+ if let Some(cancellation_flag) = self.cancellation_flag {
+ self.iter_count += 1;
+ if self.iter_count >= CANCELLATION_CHECK_INTERVAL {
+ self.iter_count = 0;
+ if cancellation_flag.load(Ordering::Relaxed) != 0 {
+ return Some(Err(Error::Cancelled));
+ }
+ }
+ }
+
+ // If none of the layers have any more highlight boundaries, terminate.
+ if self.layers.is_empty() {
+ let len = self.source.len_bytes();
+ return if self.byte_offset < len {
+ let result = Some(Ok(HighlightEvent::Source {
+ start: self.byte_offset,
+ end: len,
+ }));
+ self.byte_offset = len;
+ result
+ } else {
+ None
+ };
+ }
+
+ // Get the next capture from whichever layer has the earliest highlight boundary.
+ let range;
+ let layer = &mut self.layers[0];
+ let captures = layer.captures.get_mut();
+ if let Some((next_match, capture_index)) = captures.peek() {
+ let next_capture = next_match.captures[*capture_index];
+ range = next_capture.node.byte_range();
+
+ // If any previous highlight ends before this node starts, then before
+ // processing this capture, emit the source code up until the end of the
+ // previous highlight, and an end event for that highlight.
+ if let Some(end_byte) = layer.highlight_end_stack.last().cloned() {
+ if end_byte <= range.start {
+ layer.highlight_end_stack.pop();
+ return self.emit_event(end_byte, Some(HighlightEvent::HighlightEnd));
+ }
+ }
+ }
+ // If there are no more captures, then emit any remaining highlight end events.
+ // And if there are none of those, then just advance to the end of the document.
+ else if let Some(end_byte) = layer.highlight_end_stack.last().cloned() {
+ layer.highlight_end_stack.pop();
+ return self.emit_event(end_byte, Some(HighlightEvent::HighlightEnd));
+ } else {
+ return self.emit_event(self.source.len_bytes(), None);
+ };
+
+ let (mut match_, capture_index) = captures.next().unwrap();
+ let mut capture = match_.captures[capture_index];
+
+ // Remove from the local scope stack any local scopes that have already ended.
+ while range.start > layer.scope_stack.last().unwrap().range.end {
+ layer.scope_stack.pop();
+ }
+
+ // If this capture is for tracking local variables, then process the
+ // local variable info.
+ let mut reference_highlight = None;
+ let mut definition_highlight = None;
+ while match_.pattern_index < layer.config.highlights_pattern_index {
+ // If the node represents a local scope, push a new local scope onto
+ // the scope stack.
+ if Some(capture.index) == layer.config.local_scope_capture_index {
+ definition_highlight = None;
+ let mut scope = LocalScope {
+ inherits: true,
+ range: range.clone(),
+ local_defs: Vec::new(),
+ };
+ for prop in layer.config.query.property_settings(match_.pattern_index) {
+ if let "local.scope-inherits" = prop.key.as_ref() {
+ scope.inherits =
+ prop.value.as_ref().map_or(true, |r| r.as_ref() == "true");
+ }
+ }
+ layer.scope_stack.push(scope);
+ }
+ // If the node represents a definition, add a new definition to the
+ // local scope at the top of the scope stack.
+ else if Some(capture.index) == layer.config.local_def_capture_index {
+ reference_highlight = None;
+ let scope = layer.scope_stack.last_mut().unwrap();
+
+ let mut value_range = 0..0;
+ for capture in match_.captures {
+ if Some(capture.index) == layer.config.local_def_value_capture_index {
+ value_range = capture.node.byte_range();
+ }
+ }
+
+ let name = byte_range_to_str(range.clone(), self.source);
+ scope.local_defs.push(LocalDef {
+ name,
+ value_range,
+ highlight: None,
+ });
+ definition_highlight = scope.local_defs.last_mut().map(|s| &mut s.highlight);
+ }
+ // If the node represents a reference, then try to find the corresponding
+ // definition in the scope stack.
+ else if Some(capture.index) == layer.config.local_ref_capture_index
+ && definition_highlight.is_none()
{
- overlay.active_highlight.take();
+ definition_highlight = None;
+ let name = byte_range_to_str(range.clone(), self.source);
+ for scope in layer.scope_stack.iter().rev() {
+ if let Some(highlight) = scope.local_defs.iter().rev().find_map(|def| {
+ if def.name == name && range.start >= def.value_range.end {
+ Some(def.highlight)
+ } else {
+ None
+ }
+ }) {
+ reference_highlight = highlight;
+ break;
+ }
+ if !scope.inherits {
+ break;
+ }
+ }
+ }
+
+ // Continue processing any additional matches for the same node.
+ if let Some((next_match, next_capture_index)) = captures.peek() {
+ let next_capture = next_match.captures[*next_capture_index];
+ if next_capture.node == capture.node {
+ capture = next_capture;
+ match_ = captures.next().unwrap().0;
+ continue;
+ }
}
+
+ self.sort_layers();
+ continue 'main;
}
- refresh = true;
- }
+ // Otherwise, this capture must represent a highlight.
+ // If this exact range has already been highlighted by an earlier pattern, or by
+ // a different layer, then skip over this one.
+ if let Some((last_start, last_end, last_depth)) = self.last_highlight_range {
+ if range.start == last_start && range.end == last_end && layer.depth < last_depth {
+ self.sort_layers();
+ continue 'main;
+ }
+ }
- while self.next_highlight_start == pos {
- let mut activated_idx = usize::MAX;
- for (idx, overlay) in self.overlays.iter_mut().enumerate() {
- let Some((highlight, range)) = overlay.current() else {
- continue;
- };
- if range.start != self.next_highlight_start {
- continue;
+ // If the current node was found to be a local variable, then skip over any
+ // highlighting patterns that are disabled for local variables.
+ if definition_highlight.is_some() || reference_highlight.is_some() {
+ while layer.config.non_local_variable_patterns[match_.pattern_index] {
+ if let Some((next_match, next_capture_index)) = captures.peek() {
+ let next_capture = next_match.captures[*next_capture_index];
+ if next_capture.node == capture.node {
+ capture = next_capture;
+ match_ = captures.next().unwrap().0;
+ continue;
+ }
+ }
+
+ self.sort_layers();
+ continue 'main;
+ }
+ }
+
+ // Once a highlighting pattern is found for the current node, skip over
+ // any later highlighting patterns that also match this node. Captures
+ // for a given node are ordered by pattern index, so these subsequent
+ // captures are guaranteed to be for highlighting, not injections or
+ // local variables.
+ while let Some((next_match, next_capture_index)) = captures.peek() {
+ let next_capture = next_match.captures[*next_capture_index];
+ if next_capture.node == capture.node {
+ captures.next();
+ } else {
+ break;
}
+ }
+
+ let current_highlight = layer.config.highlight_indices.load()[capture.index as usize];
- // If this overlay has a highlight at this start index, set its active highlight
- // and increment the cursor position within the overlay.
- overlay.active_highlight = Some((highlight, range.end));
- overlay.idx += 1;
+ // If this node represents a local definition, then store the current
+ // highlight value on the local scope entry representing this node.
+ if let Some(definition_highlight) = definition_highlight {
+ *definition_highlight = current_highlight;
+ }
- activated_idx = activated_idx.min(idx);
+ // Emit a scope start event and push the node's end position to the stack.
+ if let Some(highlight) = reference_highlight.or(current_highlight) {
+ self.last_highlight_range = Some((range.start, range.end, layer.depth));
+ layer.highlight_end_stack.push(range.end);
+ return self
+ .emit_event(range.start, Some(HighlightEvent::HighlightStart(highlight)));
}
- // If `self.next_highlight_start == pos` that means that some overlay was ready to
- // emit a highlight, so `activated_idx` must have been set to an existing index.
- assert!(
- (0..self.overlays.len()).contains(&activated_idx),
- "expected an overlay to highlight (at pos {pos}, there are {} overlays)",
- self.overlays.len()
- );
-
- // If any overlays are active after the (lowest) one which was just activated, the
- // highlights need to be refreshed.
- refresh |= self.overlays[activated_idx..]
- .iter()
- .any(|overlay| overlay.active_highlight.is_some());
-
- self.next_highlight_start = self
- .overlays
- .iter()
- .filter_map(|overlay| overlay.start())
- .min()
- .unwrap_or(usize::MAX);
+ self.sort_layers();
}
+ }
+}
- self.next_highlight_end = self
- .overlays
- .iter()
- .filter_map(|overlay| Some(overlay.active_highlight?.1))
- .min()
- .unwrap_or(usize::MAX);
+#[derive(Debug, Clone)]
+pub enum InjectionLanguageMarker<'a> {
+ Name(Cow<'a, str>),
+ Filename(Cow<'a, Path>),
+ Shebang(String),
+}
- let (event, start) = if refresh {
- (HighlightEvent::Refresh, 0)
- } else {
- (HighlightEvent::Push, prev_stack_size)
- };
+const SHEBANG: &str = r"#!\s*(?:\S*[/\\](?:env\s+(?:\-\S+\s+)*)?)?([^\s\.\d]+)";
- (
- event,
- self.overlays
- .iter()
- .flat_map(|overlay| overlay.active_highlight)
- .map(|(highlight, _end)| highlight)
- .skip(start),
- )
- }
+pub struct Merge<I> {
+ iter: I,
+ spans: Box<dyn Iterator<Item = (usize, std::ops::Range<usize>)>>,
+
+ next_event: Option<HighlightEvent>,
+ next_span: Option<(usize, std::ops::Range<usize>)>,
+
+ queue: Vec<HighlightEvent>,
}
-#[derive(Debug)]
-pub enum CapturedNode<'a> {
- Single(Node<'a>),
- /// Guaranteed to be not empty
- Grouped(Vec<Node<'a>>),
+/// Merge a list of spans into the highlight event stream.
+pub fn merge<I: Iterator<Item = HighlightEvent>>(
+ iter: I,
+ spans: Vec<(usize, std::ops::Range<usize>)>,
+) -> Merge<I> {
+ let spans = Box::new(spans.into_iter());
+ let mut merge = Merge {
+ iter,
+ spans,
+ next_event: None,
+ next_span: None,
+ queue: Vec::new(),
+ };
+ merge.next_event = merge.iter.next();
+ merge.next_span = merge.spans.next();
+ merge
}
-impl CapturedNode<'_> {
- pub fn start_byte(&self) -> usize {
- match self {
- Self::Single(n) => n.start_byte() as usize,
- Self::Grouped(ns) => ns[0].start_byte() as usize,
+impl<I: Iterator<Item = HighlightEvent>> Iterator for Merge<I> {
+ type Item = HighlightEvent;
+ fn next(&mut self) -> Option<Self::Item> {
+ use HighlightEvent::*;
+ if let Some(event) = self.queue.pop() {
+ return Some(event);
}
- }
- pub fn end_byte(&self) -> usize {
- match self {
- Self::Single(n) => n.end_byte() as usize,
- Self::Grouped(ns) => ns.last().unwrap().end_byte() as usize,
+ loop {
+ match (self.next_event, &self.next_span) {
+ // this happens when range is partially or fully offscreen
+ (Some(Source { start, .. }), Some((span, range))) if start > range.start => {
+ if start > range.end {
+ self.next_span = self.spans.next();
+ } else {
+ self.next_span = Some((*span, start..range.end));
+ };
+ }
+ _ => break,
+ }
}
- }
- pub fn byte_range(&self) -> ops::Range<usize> {
- self.start_byte()..self.end_byte()
- }
-}
+ match (self.next_event, &self.next_span) {
+ (Some(HighlightStart(i)), _) => {
+ self.next_event = self.iter.next();
+ Some(HighlightStart(i))
+ }
+ (Some(HighlightEnd), _) => {
+ self.next_event = self.iter.next();
+ Some(HighlightEnd)
+ }
+ (Some(Source { start, end }), Some((_, range))) if start < range.start => {
+ let intersect = range.start.min(end);
+ let event = Source {
+ start,
+ end: intersect,
+ };
-#[derive(Debug)]
-pub struct TextObjectQuery {
- query: Query,
-}
+ if end == intersect {
+ // the event is complete
+ self.next_event = self.iter.next();
+ } else {
+ // subslice the event
+ self.next_event = Some(Source {
+ start: intersect,
+ end,
+ });
+ };
-impl TextObjectQuery {
- pub fn new(query: Query) -> Self {
- Self { query }
- }
+ Some(event)
+ }
+ (Some(Source { start, end }), Some((span, range))) if start == range.start => {
+ let intersect = range.end.min(end);
+ let event = HighlightStart(Highlight(*span));
+
+ // enqueue in reverse order
+ self.queue.push(HighlightEnd);
+ self.queue.push(Source {
+ start,
+ end: intersect,
+ });
- /// Run the query on the given node and return sub nodes which match given
- /// capture ("function.inside", "class.around", etc).
- ///
- /// Captures may contain multiple nodes by using quantifiers (+, *, etc),
- /// and support for this is partial and could use improvement.
- ///
- /// ```query
- /// (comment)+ @capture
- ///
- /// ; OR
- /// (
- /// (comment)*
- /// .
- /// (function)
- /// ) @capture
- /// ```
- pub fn capture_nodes<'a>(
- &'a self,
- capture_name: &str,
- node: &Node<'a>,
- slice: RopeSlice<'a>,
- ) -> Option<impl Iterator<Item = CapturedNode<'a>>> {
- self.capture_nodes_any(&[capture_name], node, slice)
- }
+ if end == intersect {
+ // the event is complete
+ self.next_event = self.iter.next();
+ } else {
+ // subslice the event
+ self.next_event = Some(Source {
+ start: intersect,
+ end,
+ });
+ };
- /// Find the first capture that exists out of all given `capture_names`
- /// and return sub nodes that match this capture.
- pub fn capture_nodes_any<'a>(
- &'a self,
- capture_names: &[&str],
- node: &Node<'a>,
- slice: RopeSlice<'a>,
- ) -> Option<impl Iterator<Item = CapturedNode<'a>>> {
- let capture = capture_names
- .iter()
- .find_map(|cap| self.query.get_capture(cap))?;
+ if intersect == range.end {
+ self.next_span = self.spans.next();
+ } else {
+ self.next_span = Some((*span, intersect..range.end));
+ }
- let mut cursor = InactiveQueryCursor::new(0..u32::MAX, TREE_SITTER_MATCH_LIMIT)
- .execute_query(&self.query, node, RopeInput::new(slice));
- let capture_node = iter::from_fn(move || {
- let (mat, _) = cursor.next_matched_node()?;
- Some(mat.nodes_for_capture(capture).cloned().collect())
- })
- .filter_map(move |nodes: Vec<_>| {
- if nodes.len() > 1 {
- Some(CapturedNode::Grouped(nodes))
- } else {
- nodes.into_iter().map(CapturedNode::Single).next()
+ Some(event)
}
- });
- Some(capture_node)
+ (Some(event), None) => {
+ self.next_event = self.iter.next();
+ Some(event)
+ }
+ // Can happen if cursor at EOF and/or diagnostic reaches past the end.
+ // We need to actually emit events for the cursor-at-EOF situation,
+ // even though the range is past the end of the text. This needs to be
+ // handled appropriately by the drawing code by not assuming that
+ // all `Source` events point to valid indices in the rope.
+ (None, Some((span, range))) => {
+ let event = HighlightStart(Highlight(*span));
+ self.queue.push(HighlightEnd);
+ self.queue.push(Source {
+ start: range.start,
+ end: range.end,
+ });
+ self.next_span = self.spans.next();
+ Some(event)
+ }
+ (None, None) => None,
+ e => unreachable!("{:?}", e),
+ }
}
}
-#[derive(Debug)]
-pub struct TagQuery {
- pub query: Query,
+fn node_is_visible(node: &Node) -> bool {
+ node.is_missing() || (node.is_named() && node.language().node_kind_is_visible(node.kind_id()))
}
pub fn pretty_print_tree<W: fmt::Write>(fmt: &mut W, node: Node) -> fmt::Result {
@@ -1062,28 +2040,16 @@ pub fn pretty_print_tree<W: fmt::Write>(fmt: &mut W, node: Node) -> fmt::Result
if node_is_visible(&node) {
write!(fmt, "({})", node.kind())
} else {
- write!(fmt, "\"{}\"", format_anonymous_node_kind(node.kind()))
+ write!(fmt, "\"{}\"", node.kind())
}
} else {
pretty_print_tree_impl(fmt, &mut node.walk(), 0)
}
}
-fn node_is_visible(node: &Node) -> bool {
- node.is_missing() || (node.is_named() && node.grammar().node_kind_is_visible(node.kind_id()))
-}
-
-fn format_anonymous_node_kind(kind: &str) -> Cow<'_, str> {
- if kind.contains('"') {
- Cow::Owned(kind.replace('"', "\\\""))
- } else {
- Cow::Borrowed(kind)
- }
-}
-
fn pretty_print_tree_impl<W: fmt::Write>(
fmt: &mut W,
- cursor: &mut tree_sitter::TreeCursor,
+ cursor: &mut TreeCursor,
depth: usize,
) -> fmt::Result {
let node = cursor.node();
@@ -1098,8 +2064,6 @@ fn pretty_print_tree_impl<W: fmt::Write>(
}
write!(fmt, "({}", node.kind())?;
- } else {
- write!(fmt, " \"{}\"", format_anonymous_node_kind(node.kind()))?;
}
// Handle children.
@@ -1129,65 +2093,11 @@ fn pretty_print_tree_impl<W: fmt::Write>(
Ok(())
}
-/// Finds the child of `node` which contains the given byte range.
-pub fn child_for_byte_range<'a>(node: &Node<'a>, range: ops::Range<u32>) -> Option<Node<'a>> {
- for child in node.children() {
- let child_range = child.byte_range();
-
- if range.start >= child_range.start && range.end <= child_range.end {
- return Some(child);
- }
- }
-
- None
-}
-
-#[derive(Debug)]
-pub struct RainbowQuery {
- query: Query,
- include_children_patterns: HashSet<Pattern>,
- scope_capture: Option<Capture>,
- bracket_capture: Option<Capture>,
-}
-
-impl RainbowQuery {
- fn new(grammar: Grammar, source: &str) -> Result<Self, tree_sitter::query::ParseError> {
- let mut include_children_patterns = HashSet::default();
-
- let query = Query::new(grammar, source, |pattern, predicate| match predicate {
- UserPredicate::SetProperty {
- key: "rainbow.include-children",
- val,
- } => {
- if val.is_some() {
- return Err(
- "property 'rainbow.include-children' does not take an argument".into(),
- );
- }
- include_children_patterns.insert(pattern);
- Ok(())
- }
- _ => Err(InvalidPredicateError::unknown(predicate)),
- })?;
-
- Ok(Self {
- include_children_patterns,
- scope_capture: query.get_capture("rainbow.scope"),
- bracket_capture: query.get_capture("rainbow.bracket"),
- query,
- })
- }
-}
-
#[cfg(test)]
mod test {
- use once_cell::sync::Lazy;
-
use super::*;
use crate::{Rope, Transaction};
- static LOADER: Lazy<Loader> = Lazy::new(crate::config::default_lang_loader);
-
#[test]
fn test_textobject_queries() {
let query_str = r#"
@@ -1202,33 +2112,23 @@ mod test {
"#,
);
- let language = LOADER.language_for_name("rust").unwrap();
- dbg!(language);
- let grammar = LOADER.get_config(language).unwrap().grammar;
- dbg!(grammar);
- let syntax = Syntax::new(source.slice(..), language, &LOADER).unwrap();
- let mut h = syntax.highlighter(
- "fn main() { 4 + 2; }".into(),
- &LOADER,
- 0.."fn main() { 4 + 2; }".len() as u32,
- );
+ let loader = Loader::new(Configuration {
+ language: vec![],
+ language_server: HashMap::new(),
+ });
+ let language = get_language("rust").unwrap();
- for n in 0..5 {
- dbg!(h.active_highlights().collect::<Vec<_>>());
- dbg!(h.next_event_offset());
- let (e, h) = h.advance();
- dbg!(h.collect::<Vec<_>>(), e);
- // panic!()
- }
+ let query = Query::new(language, query_str).unwrap();
+ let textobject = TextObjectQuery { query };
+ let mut cursor = QueryCursor::new();
- let query = Query::new(grammar, query_str, |_, _| Ok(())).unwrap();
- let textobject = TextObjectQuery::new(query);
- let syntax = Syntax::new(source.slice(..), language, &LOADER).unwrap();
+ let config = HighlightConfiguration::new(language, "", "", "").unwrap();
+ let syntax = Syntax::new(source.slice(..), Arc::new(config), Arc::new(loader)).unwrap();
let root = syntax.tree().root_node();
- let test = |capture, range| {
+ let mut test = |capture, range| {
let matches: Vec<_> = textobject
- .capture_nodes(capture, &root, source.slice(..))
+ .capture_nodes(capture, root, source.slice(..), &mut cursor)
.unwrap()
.collect();
@@ -1241,15 +2141,83 @@ mod test {
)
};
- test("quantified_nodes", 1..37);
+ test("quantified_nodes", 1..36);
// NOTE: Enable after implementing proper node group capturing
- // test("quantified_nodes_grouped", 1..37);
- // test("multiple_nodes_grouped", 1..37);
+ // test("quantified_nodes_grouped", 1..36);
+ // test("multiple_nodes_grouped", 1..36);
+ }
+
+ #[test]
+ fn test_parser() {
+ let highlight_names: Vec<String> = [
+ "attribute",
+ "constant",
+ "function.builtin",
+ "function",
+ "keyword",
+ "operator",
+ "property",
+ "punctuation",
+ "punctuation.bracket",
+ "punctuation.delimiter",
+ "string",
+ "string.special",
+ "tag",
+ "type",
+ "type.builtin",
+ "variable",
+ "variable.builtin",
+ "variable.parameter",
+ ]
+ .iter()
+ .cloned()
+ .map(String::from)
+ .collect();
+
+ let loader = Loader::new(Configuration {
+ language: vec![],
+ language_server: HashMap::new(),
+ });
+
+ let language = get_language("rust").unwrap();
+ let config = HighlightConfiguration::new(
+ language,
+ &std::fs::read_to_string("../runtime/grammars/sources/rust/queries/highlights.scm")
+ .unwrap(),
+ &std::fs::read_to_string("../runtime/grammars/sources/rust/queries/injections.scm")
+ .unwrap(),
+ "", // locals.scm
+ )
+ .unwrap();
+ config.configure(&highlight_names);
+
+ let source = Rope::from_str(
+ "
+ struct Stuff {}
+ fn main() {}
+ ",
+ );
+ let syntax = Syntax::new(source.slice(..), Arc::new(config), Arc::new(loader)).unwrap();
+ let tree = syntax.tree();
+ let root = tree.root_node();
+ assert_eq!(root.kind(), "source_file");
+
+ assert_eq!(
+ root.to_sexp(),
+ concat!(
+ "(source_file ",
+ "(struct_item name: (type_identifier) body: (field_declaration_list)) ",
+ "(function_item name: (identifier) parameters: (parameters) body: (block)))"
+ )
+ );
+
+ let struct_node = root.child(0).unwrap();
+ assert_eq!(struct_node.kind(), "struct_item");
}
#[test]
fn test_input_edits() {
- use tree_sitter::{InputEdit, Point};
+ use tree_sitter::InputEdit;
let doc = Rope::from("hello world!\ntest 123");
let transaction = Transaction::change(
@@ -1266,17 +2234,17 @@ mod test {
start_byte: 6,
old_end_byte: 11,
new_end_byte: 10,
- start_point: Point::ZERO,
- old_end_point: Point::ZERO,
- new_end_point: Point::ZERO
+ start_position: Point { row: 0, column: 6 },
+ old_end_position: Point { row: 0, column: 11 },
+ new_end_position: Point { row: 0, column: 10 }
},
InputEdit {
start_byte: 12,
old_end_byte: 17,
new_end_byte: 12,
- start_point: Point::ZERO,
- old_end_point: Point::ZERO,
- new_end_point: Point::ZERO
+ start_position: Point { row: 0, column: 12 },
+ old_end_position: Point { row: 1, column: 4 },
+ new_end_position: Point { row: 0, column: 12 }
}
]
);
@@ -1295,9 +2263,9 @@ mod test {
start_byte: 8,
old_end_byte: 8,
new_end_byte: 14,
- start_point: Point::ZERO,
- old_end_point: Point::ZERO,
- new_end_point: Point::ZERO
+ start_position: Point { row: 0, column: 8 },
+ old_end_position: Point { row: 0, column: 8 },
+ new_end_position: Point { row: 0, column: 14 }
}]
);
}
@@ -1311,13 +2279,20 @@ mod test {
end: usize,
) {
let source = Rope::from_str(source);
- let language = LOADER.language_for_name(language_name).unwrap();
- let syntax = Syntax::new(source.slice(..), language, &LOADER).unwrap();
+
+ let loader = Loader::new(Configuration {
+ language: vec![],
+ language_server: HashMap::new(),
+ });
+ let language = get_language(language_name).unwrap();
+
+ let config = HighlightConfiguration::new(language, "", "", "").unwrap();
+ let syntax = Syntax::new(source.slice(..), Arc::new(config), Arc::new(loader)).unwrap();
let root = syntax
.tree()
.root_node()
- .descendant_for_byte_range(start as u32, end as u32)
+ .descendant_for_byte_range(start, end)
.unwrap();
let mut output = String::new();
@@ -1328,8 +2303,8 @@ mod test {
#[test]
fn test_pretty_print() {
- let source = r#"// Hello"#;
- assert_pretty_print("rust", source, "(line_comment \"//\")", 0, source.len());
+ let source = r#"/// Hello"#;
+ assert_pretty_print("rust", source, "(line_comment)", 0, source.len());
// A large tree should be indented with fields:
let source = r#"fn main() {
@@ -1339,16 +2314,15 @@ mod test {
"rust",
source,
concat!(
- "(function_item \"fn\"\n",
+ "(function_item\n",
" name: (identifier)\n",
- " parameters: (parameters \"(\" \")\")\n",
- " body: (block \"{\"\n",
+ " parameters: (parameters)\n",
+ " body: (block\n",
" (expression_statement\n",
" (macro_invocation\n",
- " macro: (identifier) \"!\"\n",
- " (token_tree \"(\"\n",
- " (string_literal \"\\\"\"\n",
- " (string_content) \"\\\"\") \")\")) \";\") \"}\"))",
+ " macro: (identifier)\n",
+ " (token_tree\n",
+ " (string_literal))))))",
),
0,
source.len(),
@@ -1360,14 +2334,14 @@ mod test {
// Error nodes are printed as errors:
let source = r#"}{"#;
- assert_pretty_print("rust", source, "(ERROR \"}\" \"{\")", 0, source.len());
+ assert_pretty_print("rust", source, "(ERROR)", 0, source.len());
// Fields broken under unnamed nodes are determined correctly.
// In the following source, `object` belongs to the `singleton_method`
// rule but `name` and `body` belong to an unnamed helper `_method_rest`.
// This can cause a bug with a pretty-printing implementation that
// uses `Node::field_name_for_child` to determine field names but is
- // fixed when using `tree_sitter::TreeCursor::field_name`.
+ // fixed when using `TreeCursor::field_name`.
let source = "def self.method_name
true
end";
@@ -1375,34 +2349,24 @@ mod test {
"ruby",
source,
concat!(
- "(singleton_method \"def\"\n",
- " object: (self) \".\"\n",
+ "(singleton_method\n",
+ " object: (self)\n",
" name: (identifier)\n",
" body: (body_statement\n",
- " (true)) \"end\")"
+ " (true)))"
),
0,
source.len(),
);
}
+
#[test]
- fn highlight() {
- let source = Rope::from_str(r#"assert_eq!(0, Some(0));"#);
- let loader = crate::config::default_lang_loader();
- loader.set_scopes(vec!["punctuation".to_string()]);
- let language = loader.language_for_name("rust").unwrap();
-
- let syntax = Syntax::new(source.slice(..), language, &loader).unwrap();
- println!(
- "{}",
- tree_house::fixtures::highlighter_fixture(
- "",
- &loader,
- |_| "punct".to_string(),
- &syntax.inner,
- source.slice(..),
- ..,
- )
- );
+ fn test_load_runtime_file() {
+ // Test to make sure we can load some data from the runtime directory.
+ let contents = load_runtime_file("rust", "indents.scm").unwrap();
+ assert!(!contents.is_empty());
+
+ let results = load_runtime_file("rust", "does-not-exist");
+ assert!(results.is_err());
}
}