aboutsummaryrefslogtreecommitdiff
path: root/helix-core/src
diff options
context:
space:
mode:
Diffstat (limited to 'helix-core/src')
-rw-r--r--helix-core/src/syntax.rs23
1 files changed, 15 insertions, 8 deletions
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 005e985d..f36c985e 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -768,7 +768,11 @@ fn byte_range_to_str(range: std::ops::Range<usize>, source: RopeSlice) -> Cow<st
}
impl Syntax {
- pub fn new(source: &Rope, config: Arc<HighlightConfiguration>, loader: Arc<Loader>) -> Self {
+ pub fn new(
+ source: &Rope,
+ config: Arc<HighlightConfiguration>,
+ loader: Arc<Loader>,
+ ) -> Option<Self> {
let root_layer = LanguageLayer {
tree: None,
config,
@@ -793,11 +797,13 @@ impl Syntax {
loader,
};
- syntax
- .update(source, source, &ChangeSet::new(source))
- .unwrap();
+ let res = syntax.update(source, source, &ChangeSet::new(source));
- syntax
+ if res.is_err() {
+ log::error!("TS parser failed, disabeling TS for the current buffer: {res:?}");
+ return None;
+ }
+ Some(syntax)
}
pub fn update(
@@ -925,6 +931,7 @@ impl Syntax {
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);
@@ -2371,7 +2378,7 @@ mod test {
let mut cursor = QueryCursor::new();
let config = HighlightConfiguration::new(language, "", "", "").unwrap();
- let syntax = Syntax::new(&source, Arc::new(config), Arc::new(loader));
+ let syntax = Syntax::new(&source, Arc::new(config), Arc::new(loader)).unwrap();
let root = syntax.tree().root_node();
let mut test = |capture, range| {
@@ -2442,7 +2449,7 @@ mod test {
fn main() {}
",
);
- let syntax = Syntax::new(&source, Arc::new(config), Arc::new(loader));
+ let syntax = Syntax::new(&source, Arc::new(config), Arc::new(loader)).unwrap();
let tree = syntax.tree();
let root = tree.root_node();
assert_eq!(root.kind(), "source_file");
@@ -2529,7 +2536,7 @@ mod test {
let language = get_language(language_name).unwrap();
let config = HighlightConfiguration::new(language, "", "", "").unwrap();
- let syntax = Syntax::new(&source, Arc::new(config), Arc::new(loader));
+ let syntax = Syntax::new(&source, Arc::new(config), Arc::new(loader)).unwrap();
let root = syntax
.tree()