git.iko.soy/helix
on master help sign in
Add check for a non-zero value for tab width (#7178)
77e9a22Ilya Sovtsov
helix-core/src/syntax.rs+16
compare with master
unifiedsplit
@@ -48,6 +48,21 @@ where
48 .transpose()
48 .transpose()
49}
49}
50
50
51+fn deserialize_tab_width<'de, D>(deserializer: D) -> Result<usize, D::Error>
52+where
53+ D: serde::Deserializer<'de>,
54+{
55+ usize::deserialize(deserializer).and_then(|n| {
56+ if n > 0 && n <= 16 {
57+ Ok(n)
58+ } else {
59+ Err(serde::de::Error::custom(
60+ "tab width must be a value from 1 to 16 inclusive",
61+ ))
62+ }
63+ })
64+}
65+
51pub fn deserialize_auto_pairs<'de, D>(deserializer: D) -> Result<Option<AutoPairs>, D::Error>
66pub fn deserialize_auto_pairs<'de, D>(deserializer: D) -> Result<Option<AutoPairs>, D::Error>
52where
67where
53 D: serde::Deserializer<'de>,
68 D: serde::Deserializer<'de>,
@@ -424,6 +439,7 @@ pub struct DebuggerQuirks {
424#[derive(Debug, Serialize, Deserialize)]
439#[derive(Debug, Serialize, Deserialize)]
425#[serde(rename_all = "kebab-case")]
440#[serde(rename_all = "kebab-case")]
426pub struct IndentationConfiguration {
441pub struct IndentationConfiguration {
442+ #[serde(deserialize_with = "deserialize_tab_width")]
427 pub tab_width: usize,
443 pub tab_width: usize,
428 pub unit: String,
444 pub unit: String,
429}
445}