mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-06 20:37:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

refactor: collapse 2 map intoa a single map

Browse source
This commit is contained in:
Nikita Revenco 2025-02-03 21:40:57 +00:00 • committed by Nik Revenco
parent 18aaf93da0
commit ec94fbdf3b
1 changed files with 16 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

45
helix-core/src/comment.rs
View file

@ -22,7 +22,7 @@ pub fn get_comment_token(
let start_char = text.line_to_char(line_num) + start; let start_char = text.line_to_char(line_num) + start;
let injected_tokens = get_injected_tokens(syntax, start_char, start_char) let injected_tokens = get_injected_tokens(syntax, start_char, start_char)
// we don't care about block comment tokens // we only care about line comment tokens
.0 .0
.and_then(|tokens| { .and_then(|tokens| {
tokens tokens
@ -32,7 +32,7 @@ pub fn get_comment_token(
}); });
injected_tokens.or( injected_tokens.or(
// no comment tokens found for injection. Use doc tokens instead // no comment tokens found for injection, use doc comments if exists
doc_default_tokens.and_then(|tokens| { doc_default_tokens.and_then(|tokens| {
tokens tokens
.iter() .iter()
@ -51,14 +51,13 @@ pub fn get_injected_tokens(
// Find the injection with the most tightly encompassing range. // Find the injection with the most tightly encompassing range.
syntax syntax
.and_then(|syntax| { .and_then(|syntax| {
injection_for_range(syntax, start, end) injection_for_range(syntax, start, end).map(|language_id| {
.map(|language_id| syntax.layer_config(language_id)) let config = syntax.layer_config(language_id);
.map(|config| { (
( config.comment_tokens.clone(),
config.comment_tokens.clone(), config.block_comment_tokens.clone(),
config.block_comment_tokens.clone(), )
) })
})
}) })
.unwrap_or_default() .unwrap_or_default()
} }
@ -73,20 +72,18 @@ pub fn injection_for_range(syntax: &Syntax, from: usize, to: usize) -> Option<La
for ts_range in &layer.ranges { for ts_range in &layer.ranges {
let is_encompassing = ts_range.start_byte <= from && ts_range.end_byte >= to; let is_encompassing = ts_range.start_byte <= from && ts_range.end_byte >= to;
if is_encompassing { if is_encompassing {
let this_gap = ts_range.end_byte - ts_range.start_byte; let gap = ts_range.end_byte - ts_range.start_byte;
let config = syntax.layer_config(layer_id); let config = syntax.layer_config(layer_id);
// ignore the language family for which it won't make
// sense to consider their comment.
//
// This includes, for instance, `comment`, `jsdoc`, `regex`
let has_comment_tokens = let has_comment_tokens =
config.comment_tokens.is_some() || config.block_comment_tokens.is_some(); config.comment_tokens.is_some() || config.block_comment_tokens.is_some();
if this_gap < min_gap if gap < min_gap && has_comment_tokens {
// ignore the language family for which it won't make
// sense to consider their comment.
//
// This includes, for instance, `comment`, `jsdoc`, `regex`
&& has_comment_tokens
{
best_fit = Some(layer_id); best_fit = Some(layer_id);
min_gap = this_gap; min_gap = gap;
} }
} }
} }
@ -145,16 +142,6 @@ fn find_line_comment(
(commented, to_change, min, margin) (commented, to_change, min, margin)
} }
// for a given range and syntax, determine if there are additional tokens to consider
pub type GetInjectedTokens<'a> = Box<
dyn FnMut(
Option<&Syntax>,
usize,
usize,
) -> (Option<Vec<String>>, Option<Vec<BlockCommentToken>>)
+ 'a,
>;
#[must_use] #[must_use]
pub fn toggle_line_comments(doc: &Rope, range: &Range, token: Option<&str>) -> Vec<Change> { pub fn toggle_line_comments(doc: &Rope, range: &Range, token: Option<&str>) -> Vec<Change> {
let text = doc.slice(..); let text = doc.slice(..);