aboutsummaryrefslogtreecommitdiff
path: root/helix-core/src
diff options
context:
space:
mode:
authorBlaž Hrastnik2021-04-08 14:18:25 +0000
committerBlaž Hrastnik2021-04-08 14:25:35 +0000
commit71c06c11cb2f3831326ec10035b66ac6df075c8a (patch)
tree96ae0b2a88a393bbbe75a2fc56ccb1aedb9a05d7 /helix-core/src
parent52da68e49a582f960ebf3ec26ae3279b102b01f2 (diff)
Import tree sitter queries.
Diffstat (limited to 'helix-core/src')
-rw-r--r--helix-core/src/syntax.rs52
1 files changed, 42 insertions, 10 deletions
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index e108d030..4c890170 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -1,4 +1,4 @@
-use crate::{Change, Rope, RopeSlice, Transaction};
+use crate::{regex::Regex, Change, Rope, RopeSlice, Transaction};
pub use helix_syntax::{get_language, get_language_name, Lang};
use std::{
@@ -59,21 +59,53 @@ pub struct IndentationConfiguration {
pub unit: String,
}
+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 root = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+
+ let path = root
+ .join("../runtime/queries")
+ .join(language)
+ .join(filename);
+
+ let query = std::fs::read_to_string(&path).unwrap_or_default();
+
+ // TODO: the collect() is not ideal
+ let inherits = INHERITS_REGEX
+ .captures_iter(&query)
+ .flat_map(|captures| {
+ captures[1]
+ .split(',')
+ .map(str::to_owned)
+ .collect::<Vec<_>>()
+ })
+ .collect::<Vec<_>>();
+
+ if inherits.is_empty() {
+ return query;
+ }
+
+ let mut queries = inherits
+ .iter()
+ .map(|language| read_query(language, filename))
+ .collect::<Vec<_>>();
+
+ queries.push(query);
+
+ queries.concat()
+}
+
impl LanguageConfiguration {
pub fn highlight_config(&self, scopes: &[String]) -> Option<Arc<HighlightConfiguration>> {
self.highlight_config
.get_or_init(|| {
- // let name = get_language_name(&self.language_id);
-
- let root = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+ let language = get_language_name(self.language_id).to_ascii_lowercase();
- let highlights_query =
- std::fs::read_to_string(root.join(&self.path).join("queries/highlights.scm"))
- .unwrap_or_default();
+ let highlights_query = read_query(&language, "highlights.scm");
- let injections_query =
- std::fs::read_to_string(root.join(&self.path).join("queries/injections.scm"))
- .unwrap_or_default();
+ let injections_query = read_query(&language, "injections.scm");
let locals_query = "";