kc/helix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Reuse the source slice between layers

Browse source
This commit is contained in:
Blaž Hrastnik 2022-01-03 15:35:05 +09:00
parent 53d881f172
commit 5135fa37eb
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -493,18 +493,19 @@ impl Syntax {
let mut cursor = ts_parser.cursors.pop().unwrap_or_else(QueryCursor::new);
// TODO: might need to set cursor range
let source_slice = source.slice(..);
while let Some(layer_id) = queue.pop_front() {
// Re-parse the tree.
self.layers[layer_id].parse(ts_parser, source)?;
let source = source.slice(..);
let layer = &self.layers[layer_id];
// Process injections.
let matches = cursor.matches(
&layer.config.injections_query,
layer.tree().root_node(),
RopeProvider(source),
RopeProvider(source_slice),
);
let mut injections = Vec::new();
for mat in matches {
@ -512,12 +513,12 @@ impl Syntax {
&layer.config,
&layer.config.injections_query,
&mat,
source,
source_slice,
);
// Explicitly remove this match so that none of its other captures will remain
// in the stream of captures.
mat.remove(); // TODO: is this still necessary?
mat.remove();
// If a language is found with the given name, then add a new language layer
// to the highlighted document.
@ -542,7 +543,7 @@ impl Syntax {
let matches = cursor.matches(
combined_injections_query,
layer.tree().root_node(),
RopeProvider(source),
RopeProvider(source_slice),
);
for mat in matches {
let entry = &mut injections_by_pattern_index[mat.pattern_index];
@ -550,7 +551,7 @@ impl Syntax {
&layer.config,
combined_injections_query,
&mat,
source,
source_slice,
);
if language_name.is_some() {
entry.0 = language_name;