suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 1580445e35 into 205e7ece70

chtenb 2025-06-14 23:57:52 +03:00 committed by GitHub
parent 205e7ece70 1580445e35
commit ee14b55f15
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
helix-core/src/indent.rs
View File

@ -24,9 +24,9 @@ pub enum IndentStyle {
Spaces(u8), Spaces(u8),
} }
// 16 spaces // 128 spaces
const INDENTS: &str = " "; const INDENTS: &str = " ";
pub const MAX_INDENT: u8 = 16; pub const MAX_INDENT: u8 = 128;
impl IndentStyle { impl IndentStyle {
/// Creates an `IndentStyle` from an indentation string. /// Creates an `IndentStyle` from an indentation string.

11
helix-core/src/syntax/config.rs
View File

@ -1,4 +1,4 @@
use crate::{auto_pairs::AutoPairs, diagnostic::Severity, Language}; use crate::{auto_pairs::AutoPairs, diagnostic::Severity, indent::MAX_INDENT, Language};
use globset::GlobSet; use globset::GlobSet;
use helix_stdx::rope; use helix_stdx::rope;
@ -595,12 +595,13 @@ where
D: serde::Deserializer<'de>, D: serde::Deserializer<'de>,
{ {
usize::deserialize(deserializer).and_then(|n| { usize::deserialize(deserializer).and_then(|n| {
if n > 0 && n <= 16 { if n > 0 && n <= MAX_INDENT.into() {
Ok(n) Ok(n)
} else { } else {
Err(serde::de::Error::custom( Err(serde::de::Error::custom(format!(
"tab width must be a value from 1 to 16 inclusive", "tab width must be a value from 1 to {} inclusive",
)) MAX_INDENT
)))
} }
}) })
} }