mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-05 11:57:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix erroneous indent between closers of auto-pairs (#5330)

Browse source 
inserting a newline between 2 closers of an auto-pair.
This commit is contained in:
Triton171 2022-12-29 16:23:40 +01:00 • committed by GitHub
parent 7ac72a39cb
commit 5f2fe5fca5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
helix-core/src/auto_pairs.rs
View file

@ -17,7 +17,7 @@ pub const DEFAULT_PAIRS: &[(char, char)] = &[
]; ];
/// The type that represents the collection of auto pairs, /// The type that represents the collection of auto pairs,
/// keyed by the opener. /// keyed by both opener and closer.
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct AutoPairs(HashMap<char, Pair>); pub struct AutoPairs(HashMap<char, Pair>);

3
helix-term/src/commands.rs
View file

@ -3173,8 +3173,7 @@ pub mod insert {
let on_auto_pair = doc let on_auto_pair = doc
.auto_pairs(cx.editor) .auto_pairs(cx.editor)
.and_then(|pairs| pairs.get(prev)) .and_then(|pairs| pairs.get(prev))
.and_then(|pair| if pair.close == curr { Some(pair) } else { None }) .map_or(false, |pair| pair.open == prev && pair.close == curr);
.is_some();
let local_offs = if on_auto_pair { let local_offs = if on_auto_pair {
let inner_indent = indent.clone() + doc.indent_style.as_str(); let inner_indent = indent.clone() + doc.indent_style.as_str();