TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Bump tree-sitter to 0.22.2

Browse source
This commit is contained in:
Michael Davis 2024-03-17 09:42:16 -04:00 • committed by Blaž Hrastnik
parent 476e6baf8f
commit 38af99f05f
4 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Cargo.lock generated
View file

@ -2404,8 +2404,9 @@ dependencies = [
[[package]] [[package]]
name = "tree-sitter" name = "tree-sitter"
version = "0.20.10" version = "0.22.2"
source = "git+https://github.com/helix-editor/tree-sitter?rev=660481dbf71413eba5a928b0b0ab8da50c1109e0#660481dbf71413eba5a928b0b0ab8da50c1109e0" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdb9c9f15eae91dcd00ee0d86a281d16e6263786991b662b34fa9632c21a046b"
dependencies = [ dependencies = [
"cc", "cc",
"regex", "regex",

2
Cargo.toml
View file

@ -37,7 +37,7 @@ package.helix-tui.opt-level = 2
package.helix-term.opt-level = 2 package.helix-term.opt-level = 2
[workspace.dependencies] [workspace.dependencies]
tree-sitter = { version = "0.20", git = "https://github.com/helix-editor/tree-sitter", rev = "660481dbf71413eba5a928b0b0ab8da50c1109e0" } tree-sitter = { version = "0.22" }
nucleo = "0.2.0" nucleo = "0.2.0"
[workspace.package] [workspace.package]

20
helix-core/src/syntax.rs
View file

@ -21,7 +21,7 @@ use std::{
collections::{HashMap, HashSet, VecDeque}, collections::{HashMap, HashSet, VecDeque},
fmt::{self, Display}, fmt::{self, Display},
hash::{Hash, Hasher}, hash::{Hash, Hasher},
mem::{replace, transmute}, mem::replace,
path::{Path, PathBuf}, path::{Path, PathBuf},
str::FromStr, str::FromStr,
sync::Arc, sync::Arc,
@ -805,7 +805,7 @@ impl LanguageConfiguration {
if query_text.is_empty() { if query_text.is_empty() {
return None; return None;
} }
let lang = self.highlight_config.get()?.as_ref()?.language; let lang = &self.highlight_config.get()?.as_ref()?.language;
Query::new(lang, &query_text) Query::new(lang, &query_text)
.map_err(|e| { .map_err(|e| {
log::error!( log::error!(
@ -1544,13 +1544,7 @@ impl PartialEq for LanguageLayer {
impl Hash for LanguageLayer { impl Hash for LanguageLayer {
fn hash<H: Hasher>(&self, state: &mut H) { fn hash<H: Hasher>(&self, state: &mut H) {
self.depth.hash(state); self.depth.hash(state);
// The transmute is necessary here because tree_sitter::Language does not derive Hash at the moment. self.config.language.hash(state);
// 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); self.ranges.hash(state);
} }
} }
@ -1567,7 +1561,7 @@ impl LanguageLayer {
.map_err(|_| Error::InvalidRanges)?; .map_err(|_| Error::InvalidRanges)?;
parser parser
.set_language(self.config.language) .set_language(&self.config.language)
.map_err(|_| Error::InvalidLanguage)?; .map_err(|_| Error::InvalidLanguage)?;
// unsafe { syntax.parser.set_cancellation_flag(cancellation_flag) }; // unsafe { syntax.parser.set_cancellation_flag(cancellation_flag) };
@ -1867,7 +1861,7 @@ impl HighlightConfiguration {
// Construct a single query by concatenating the three query strings, but record the // Construct a single query by concatenating the three query strings, but record the
// range of pattern indices that belong to each individual string. // range of pattern indices that belong to each individual string.
let query = Query::new(language, &query_source)?; let query = Query::new(&language, &query_source)?;
let mut highlights_pattern_index = 0; let mut highlights_pattern_index = 0;
for i in 0..(query.pattern_count()) { for i in 0..(query.pattern_count()) {
let pattern_offset = query.start_byte_for_pattern(i); let pattern_offset = query.start_byte_for_pattern(i);
@ -1876,7 +1870,7 @@ impl HighlightConfiguration {
} }
} }
let injections_query = Query::new(language, injection_query)?; let injections_query = Query::new(&language, injection_query)?;
let combined_injections_patterns = (0..injections_query.pattern_count()) let combined_injections_patterns = (0..injections_query.pattern_count())
.filter(|&i| { .filter(|&i| {
injections_query injections_query
@ -2730,7 +2724,7 @@ mod test {
.unwrap(); .unwrap();
let language = get_language("rust").unwrap(); let language = get_language("rust").unwrap();
let query = Query::new(language, query_str).unwrap(); let query = Query::new(&language, query_str).unwrap();
let textobject = TextObjectQuery { query }; let textobject = TextObjectQuery { query };
let mut cursor = QueryCursor::new(); let mut cursor = QueryCursor::new();

2
xtask/src/querycheck.rs
View file

@ -21,7 +21,7 @@ pub fn query_check() -> Result<(), DynError> {
let query_text = read_query(language_name, query_file); let query_text = read_query(language_name, query_file);
if let Ok(lang) = language { if let Ok(lang) = language {
if !query_text.is_empty() { if !query_text.is_empty() {
if let Err(reason) = Query::new(lang, &query_text) { if let Err(reason) = Query::new(&lang, &query_text) {
return Err(format!( return Err(format!(
"Failed to parse {} queries for {}: {}", "Failed to parse {} queries for {}: {}",
query_file, language_name, reason query_file, language_name, reason