cmakefmt 2.2.0__tar.gz → 2.3.0__tar.gz

{cmakefmt-2.2.0 → cmakefmt-2.3.0}/Cargo.lock

@@ -19,9 +19,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
 [[package]]
 name = "annotate-snippets"
-version = "0.12.16"
+version = "0.12.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f211a51805bc641f3ad5b7664c77d2547af685cc33b4cd8d31964027a46f13f1"
+checksum = "b2a5b0a5ab8561c603f16c3b78c24a386b1f70e7fc1b1b1e8c15738828e4a176"
 dependencies = [
  "anstyle",
  "memchr",
@@ -205,9 +205,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.8.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6651c9ed80effdc7db0ff72512157f901af5e3549e341e24b1dd4887d836d838"
+checksum = "86e055fa6e3e40ad6187ba25b6855eeb635d5271f8e0f0e1e9a5826b8d75bea0"
 dependencies = [
  "find-msvc-tools",
  "shlex",
@@ -324,7 +324,7 @@ dependencies = [
 
 [[package]]
 name = "cmakefmt-rust"
-version = "2.2.0"
+version = "2.3.0"
 dependencies = [
  "clap",
  "clap_complete",
@@ -361,9 +361,9 @@ dependencies = [
 
 [[package]]
 name = "codspeed"
-version = "5.0.2"
+version = "5.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0379da47d0de730b2f7900e3f2d9c3b5efc21b46875282305300b4851f03e70"
+checksum = "1cade51e6e6e30e7ea2cd9599fa5d5d5f48255a6b221bbd0cab1cf32f3c23c65"
 dependencies = [
  "anyhow",
  "cc",
@@ -379,9 +379,9 @@ dependencies = [
 
 [[package]]
 name = "codspeed-criterion-compat"
-version = "5.0.2"
+version = "5.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65f64942456bd4514b06ba4c72623bf197931d05d3d1db61b8a0c6289b30b2c7"
+checksum = "b5d1640d31b122c8d754939c6ae4040709a9602f289d11e43075476a21285020"
 dependencies = [
  "clap",
  "codspeed",
@@ -392,9 +392,9 @@ dependencies = [
 
 [[package]]
 name = "codspeed-criterion-compat-walltime"
-version = "5.0.2"
+version = "5.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86691354129085562c025293f9e8b35bf9054813bb9981be3a96aa8490c07d1"
+checksum = "2a83eed387b8f84aad4cb29607758bec3ab3f53b1734af934ddae7fee626d8ce"
 dependencies = [
  "anes",
  "cast",
@@ -534,9 +534,9 @@ dependencies = [
 
 [[package]]
 name = "dprint-core"
-version = "0.70.0"
+version = "0.71.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6c66c17f6a0648b838e9a54fcf6ce2e237d060edbd3a65a724687d563fb8f28"
+checksum = "670d3c17cf65d37f5324b4fc198993148beb8c44e56fa4fe3676dd3c033d4e8c"
 dependencies = [
  "indexmap",
  "serde",
@@ -593,9 +593,9 @@ dependencies = [
 
 [[package]]
 name = "equivalent"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+checksum = "00d174d5400e5e8fd687ad1049e2f578285fa914201b1af7e8b112a4546bd826"
 
 [[package]]
 name = "errno"
@@ -615,9 +615,9 @@ checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223"
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aedcfb3409746eddb02b9e19ebda1c3394f759a152e48ee875a0844d1b955484"
+checksum = "1c66915cc5391097de7a2b0b972e8505aa33c0df401fd3a6811dbdb32881ba48"
 
 [[package]]
 name = "fluent-uri"
@@ -706,9 +706,9 @@ dependencies = [
 
 [[package]]
 name = "granit-parser"
-version = "1.3.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e20f99e46474f56bd905c56e817ebddcf377a611f94c53ac4649e4d3fa3c0cd0"
+checksum = "da55feca5d1625466bae068f9fd4b87892caeae70c3fe671ddb0f50d41aebf37"
 dependencies = [
  "arraydeque",
  "smallvec",
@@ -881,9 +881,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.190"
+version = "0.2.191"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce5d3ddc6d3fa000eb1536d85e147bfe31aacaba692ed6a876f95cb7c855be78"
+checksum = "65cd87c9a6d60536580b316ad985726104730a5151c99845f2490428ef91240a"
 
 [[package]]
 name = "linux-raw-sys"
@@ -1048,9 +1048,9 @@ checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
 
 [[package]]
 name = "pest"
-version = "2.9.3"
+version = "2.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b568374ba38b33a6c627141f891faf16902b08d2db26b8ede1bcb0a15b1919fa"
+checksum = "fd47a460a9cbc3b3429c7e22bf0d76653e779319bae45a499ca010c9a990bb23"
 dependencies = [
  "memchr",
  "psm",
@@ -1060,9 +1060,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.9.3"
+version = "2.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b66e184b924cebaaff20ab2256ca52f12332d528a39aa76553b5d96f92aacf7f"
+checksum = "203e46697708f7519ab1608393cf89239cafb46b8e6d08a8ffe359359b11ef44"
 dependencies = [
  "pest",
  "pest_generator",
@@ -1070,9 +1070,9 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.9.3"
+version = "2.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a87478d267e4de54a626af9754f2f0f58e927aac6ed0575fe89bc05ad6851694"
+checksum = "e84ae6340a458d3d6cfc73cf328cf3cfe90b2484cd0de25eb66aa954615ed4d5"
 dependencies = [
  "pest",
  "pest_meta",
@@ -1083,9 +1083,9 @@ dependencies = [
 
 [[package]]
 name = "pest_meta"
-version = "2.9.3"
+version = "2.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f986f248b4241ac359b831f6139aaa34e03b08a37b6caf7e201a33f95c869e1"
+checksum = "b57f92f32b3dbce6598fd8f5cdf1f06a6072570b8103fa21728fa9036923e710"
 dependencies = [
  "pest",
 ]
@@ -1400,9 +1400,9 @@ dependencies = [
 
 [[package]]
 name = "serde-saphyr"
-version = "1.3.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8050abb251097357e24aff63ba2c52a6309ecb7d23a5474023df960a02694d8"
+checksum = "a253edfdea34032da21af84e16fcc94f4c7a6ba237f9f3bc2dbf43cea8535c44"
 dependencies = [
  "annotate-snippets",
  "base64",
@@ -1516,9 +1516,9 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
 
 [[package]]
 name = "smallvec"
-version = "1.16.3"
+version = "1.16.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b3dc8af474f516a851ff4bd12db780f948b9250ad37211e4eec0bccea54e01b"
+checksum = "d0d5d4b1981b8bbbb7aed204cae5726d683d5d6ac7e74ec54122ea28f315e7c8"
 
 [[package]]
 name = "stacker"
@@ -1900,18 +1900,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.62"
+version = "0.8.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86502bf56ac7c77571a32e2647bb2a15894565e981fb2a48d7bde2d91c965a9d"
+checksum = "e5fe1f8f1b06191a00962174c61aa5005e0bb391a6d80d07e24d115c01a92ed8"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.62"
+version = "0.8.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5457206954b06561e2608c7e19cf58b1926586d999c246eebe4502f7e2039d1a"
+checksum = "863ad3ac83293fb4d740aedbfdc9240dd8d1a50c1099acd76ce80ce7c7230c7f"
 dependencies = [
  "proc-macro2",
  "quote",

{cmakefmt-2.2.0 → cmakefmt-2.3.0}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cmakefmt-rust"
-version = "2.2.0"
+version = "2.3.0"
 edition = "2021"
 description = "A fast, correct CMake formatter"
 license = "MIT OR Apache-2.0"
@@ -58,7 +58,7 @@ cli = [
 [dependencies]
 serde = { version = "1", features = ["derive"] }
 serde_json = { version = "1", features = ["preserve_order"] }
-serde-saphyr = "1.3"
+serde-saphyr = "2.0"
 toml = "1.1.2"
 thiserror = "2.0.19"
 indexmap = { version = "2.13", features = ["serde"] }
@@ -80,13 +80,13 @@ ctrlc = { version = "3", optional = true }
 schemars = { version = "^1.2", optional = true }
 lsp-server = { version = "0.10", optional = true }
 lsp-types = { version = "0.97", optional = true }
-dprint-core = { version = "0.70.0", default-features = false, features = ["wasm"], optional = true }
+dprint-core = { version = "0.71.0", default-features = false, features = ["wasm"], optional = true }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 wasm-bindgen = { version = "0.2", optional = true }
 
 [build-dependencies]
-serde-saphyr = "1.3"
+serde-saphyr = "2.0"
 serde_json = { version = "1", features = ["preserve_order"] }
 rmp-serde = "1"
 

{cmakefmt-2.2.0 → cmakefmt-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cmakefmt
-Version: 2.2.0
+Version: 2.3.0
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License

{cmakefmt-2.2.0 → cmakefmt-2.3.0}/src/cli/errors.rs

@@ -429,8 +429,6 @@ fn renamed_config_key(key: &str) -> Option<&'static str> {
         "max_subgroups_hwrap" => Some("max_hanging_wrap_groups"),
         "min_prefix_chars" => Some("min_prefix_length"),
         "max_prefix_chars" => Some("max_prefix_length"),
-        "separate_ctrl_name_with_space" => Some("space_before_control_paren"),
-        "separate_fn_name_with_space" => Some("space_before_definition_paren"),
         _ => None,
     }
 }

{cmakefmt-2.2.0 → cmakefmt-2.3.0}/src/cli/process.rs

@@ -1064,6 +1064,12 @@ pub(crate) fn build_context(
     if let Some(v) = cli.config_overrides.keyword_case {
         config.keyword_case = v;
     }
+    if let Some(v) = cli.config_overrides.separate_fn_name_with_space {
+        config.separate_fn_name_with_space = v;
+    }
+    if let Some(v) = cli.config_overrides.separate_ctrl_name_with_space {
+        config.separate_ctrl_name_with_space = v;
+    }
     if let Some(v) = cli.config_overrides.dangle_parens {
         config.dangle_parens = v;
     }
@@ -1143,6 +1149,12 @@ pub(crate) fn describe_cli_overrides(cli: &Cli) -> String {
     if let Some(keyword_case) = cli.config_overrides.keyword_case {
         parts.push(format!("keyword_case={keyword_case:?}"));
     }
+    if let Some(value) = cli.config_overrides.separate_fn_name_with_space {
+        parts.push(format!("separate_fn_name_with_space={value}"));
+    }
+    if let Some(value) = cli.config_overrides.separate_ctrl_name_with_space {
+        parts.push(format!("separate_ctrl_name_with_space={value}"));
+    }
     if let Some(dangle_parens) = cli.config_overrides.dangle_parens {
         parts.push(format!("dangle_parens={dangle_parens}"));
     }

{cmakefmt-2.2.0 → cmakefmt-2.3.0}/src/config/file.rs

@@ -13,7 +13,7 @@ use serde::Serialize;
 
 use crate::config::{
     ArgumentCommentStyle, CaseStyle, Config, ContinuationAlign, DangleAlign, FractionalTabPolicy,
-    LineEnding, PerCommandConfig,
+    LineEnding, PerCommandConfig, WrapAfterFirstArgAlign,
 };
 use crate::error::{Error, IoResultExt, Result};
 
@@ -79,6 +79,8 @@ struct FormatSection {
     require_valid_layout: Option<bool>,
     /// Keep the first positional argument on the command line when wrapping.
     wrap_after_first_arg: Option<bool>,
+    /// Where a `wrap_after_first_arg` continuation starts: `under-first-arg` or `default-indent`.
+    wrap_after_first_arg_align: Option<WrapAfterFirstArgAlign>,
     /// How to indent continuation lines: `same-indent` or `under-first-value`.
     continuation_align: Option<ContinuationAlign>,
     /// Sort arguments in keyword sections marked `sortable` in the command spec.
@@ -95,10 +97,14 @@ struct FormatSection {
     min_prefix_length: Option<usize>,
     /// Upper heuristic bound used when deciding between compact and wrapped layouts. Default: `10`.
     max_prefix_length: Option<usize>,
-    /// Insert a space before `(` for control-flow commands such as `if`, `foreach`, `while`.
-    space_before_control_paren: Option<bool>,
-    /// Insert a space before `(` for `function()` and `macro()` definitions.
+    /// Insert a space before `(` for structural commands, including function/macro definitions.
+    #[serde(alias = "space_before_control_paren")]
+    separate_ctrl_name_with_space: Option<bool>,
+    /// Deprecated fallback for structural-command spacing. An explicit control setting takes precedence.
+    #[cfg_attr(feature = "cli", schemars(extend("deprecated" = true)))]
     space_before_definition_paren: Option<bool>,
+    /// Insert a space before `(` for ordinary commands and custom function calls.
+    separate_fn_name_with_space: Option<bool>,
     /// Output casing for command names: `lower`, `upper`, or `unchanged`.
     command_case: Option<CaseStyle>,
     /// Output casing for recognized keywords and flags: `lower`, `upper`, or `unchanged`.
@@ -207,7 +213,27 @@ pub fn default_config_template() -> String {
 /// The output is a pretty-printed JSON string suitable for publishing to
 /// `cmakefmt.dev/schemas/v{version}/schema.json`.
 pub fn generate_json_schema() -> String {
-    let schema = schemars::schema_for!(FileConfig);
+    let mut schema = schemars::schema_for!(FileConfig);
+    // Schemars omits serde input aliases. Keep the released alias valid in
+    // editors while configuration dumps use the canonical name.
+    if let Some(properties) = schema
+        .get_mut("$defs")
+        .and_then(|defs| defs.pointer_mut("/FormatSection/properties"))
+        .and_then(serde_json::Value::as_object_mut)
+    {
+        if let Some(mut alias) = properties.get("separate_ctrl_name_with_space").cloned() {
+            if let Some(object) = alias.as_object_mut() {
+                object.insert("deprecated".into(), serde_json::json!(true));
+                object.insert(
+                    "description".into(),
+                    serde_json::json!(
+                        "Deprecated input alias for `separate_ctrl_name_with_space`."
+                    ),
+                );
+            }
+            properties.insert("space_before_control_paren".into(), alias);
+        }
+    }
     serde_json::to_string_pretty(&schema).expect("JSON schema serialization failed")
 }
 
@@ -247,6 +273,10 @@ fn default_config_template_toml() -> String {
             "# require_valid_layout = true\n\n",
             "# Keep the first positional argument on the command line when wrapping.\n",
             "# wrap_after_first_arg = true\n\n",
+            "# Where a wrap_after_first_arg continuation starts: under-first-arg\n",
+            "# (default, aligned past the opening paren) or default-indent (one\n",
+            "# indentation level in from the command, as in the vertical layout).\n",
+            "# wrap_after_first_arg_align = \"default-indent\"\n\n",
             "# Continuation-line alignment when a wrapped keyword section overflows\n",
             "# line_width: under-first-value (default, cmake-format hanging-indent) or\n",
             "# same-indent (wrap at the keyword's own indent).\n",
@@ -265,10 +295,10 @@ fn default_config_template_toml() -> String {
             "min_prefix_length = {min_prefix_chars}\n\n",
             "# Upper heuristic bound used when deciding between compact and wrapped layouts.\n",
             "max_prefix_length = {max_prefix_chars}\n\n",
-            "# Insert a space before '(' for control-flow commands like if/foreach.\n",
-            "# space_before_control_paren = true\n\n",
-            "# Insert a space before '(' for function() and macro() definitions.\n",
-            "# space_before_definition_paren = true\n\n",
+            "# Insert a space before '(' for structural commands, including function/macro definitions.\n",
+            "# separate_ctrl_name_with_space = true\n\n",
+            "# Insert a space before '(' for ordinary command and custom function calls.\n",
+            "# separate_fn_name_with_space = true\n\n",
             "# Output casing for command names: lower, upper, or unchanged.\n",
             "command_case = \"{command_case}\"\n\n",
             "# Output casing for recognized keywords and flags: lower, upper, or unchanged.\n",
@@ -380,6 +410,7 @@ struct EffectiveFormatSection {
     require_valid_layout: bool,
     #[serde(skip_serializing_if = "std::ops::Not::not")]
     wrap_after_first_arg: bool,
+    wrap_after_first_arg_align: WrapAfterFirstArgAlign,
     continuation_align: ContinuationAlign,
     #[serde(skip_serializing_if = "std::ops::Not::not")]
     enable_sort: bool,
@@ -390,8 +421,8 @@ struct EffectiveFormatSection {
     dangle_align: DangleAlign,
     min_prefix_length: usize,
     max_prefix_length: usize,
-    space_before_control_paren: bool,
-    space_before_definition_paren: bool,
+    separate_ctrl_name_with_space: bool,
+    separate_fn_name_with_space: bool,
     command_case: CaseStyle,
     keyword_case: CaseStyle,
 }
@@ -429,6 +460,7 @@ impl From<&Config> for EffectiveConfigFile {
                 always_wrap: config.always_wrap.clone(),
                 require_valid_layout: config.require_valid_layout,
                 wrap_after_first_arg: config.wrap_after_first_arg,
+                wrap_after_first_arg_align: config.wrap_after_first_arg_align,
                 continuation_align: config.continuation_align,
                 enable_sort: config.enable_sort,
                 autosort: config.autosort,
@@ -437,8 +469,8 @@ impl From<&Config> for EffectiveConfigFile {
                 dangle_align: config.dangle_align,
                 min_prefix_length: config.min_prefix_chars,
                 max_prefix_length: config.max_prefix_chars,
-                space_before_control_paren: config.separate_ctrl_name_with_space,
-                space_before_definition_paren: config.separate_fn_name_with_space,
+                separate_ctrl_name_with_space: config.separate_ctrl_name_with_space,
+                separate_fn_name_with_space: config.separate_fn_name_with_space,
                 command_case: config.command_case,
                 keyword_case: config.keyword_case,
             },
@@ -495,6 +527,10 @@ fn default_config_template_yaml() -> String {
             "  # require_valid_layout: true\n\n",
             "  # Keep the first positional argument on the command line when wrapping.\n",
             "  # wrap_after_first_arg: true\n\n",
+            "  # Where a wrap_after_first_arg continuation starts: under-first-arg\n",
+            "  # (default, aligned past the opening parenthesis) or default-indent (one\n",
+            "  # indentation level in from the command, as in the vertical layout).\n",
+            "  # wrap_after_first_arg_align: default-indent\n\n",
             "  # Continuation-line alignment when a wrapped keyword section overflows\n",
             "  # line_width: under-first-value (default, cmake-format hanging-indent) or\n",
             "  # same-indent (wrap at the keyword's own indent).\n",
@@ -513,10 +549,10 @@ fn default_config_template_yaml() -> String {
             "  min_prefix_length: {min_prefix_chars}\n\n",
             "  # Upper heuristic bound used when deciding between compact and wrapped layouts.\n",
             "  max_prefix_length: {max_prefix_chars}\n\n",
-            "  # Insert a space before '(' for control-flow commands like if/foreach.\n",
-            "  # space_before_control_paren: true\n\n",
-            "  # Insert a space before '(' for function() and macro() definitions.\n",
-            "  # space_before_definition_paren: true\n\n",
+            "  # Insert a space before '(' for structural commands, including function/macro definitions.\n",
+            "  # separate_ctrl_name_with_space: true\n\n",
+            "  # Insert a space before '(' for ordinary command and custom function calls.\n",
+            "  # separate_fn_name_with_space: true\n\n",
             "  # Output casing for command names: lower, upper, or unchanged.\n",
             "  command_case: {command_case}\n\n",
             "  # Output casing for recognized keywords and flags: lower, upper, or unchanged.\n",
@@ -725,6 +761,9 @@ impl Config {
         if let Some(v) = fc.format.wrap_after_first_arg {
             self.wrap_after_first_arg = v;
         }
+        if let Some(v) = fc.format.wrap_after_first_arg_align {
+            self.wrap_after_first_arg_align = v;
+        }
         if let Some(v) = fc.format.continuation_align {
             self.continuation_align = v;
         }
@@ -749,10 +788,14 @@ impl Config {
         if let Some(v) = fc.format.max_prefix_length {
             self.max_prefix_chars = v;
         }
-        if let Some(v) = fc.format.space_before_control_paren {
+        if let Some(v) = fc
+            .format
+            .separate_ctrl_name_with_space
+            .or(fc.format.space_before_definition_paren)
+        {
             self.separate_ctrl_name_with_space = v;
         }
-        if let Some(v) = fc.format.space_before_definition_paren {
+        if let Some(v) = fc.format.separate_fn_name_with_space {
             self.separate_fn_name_with_space = v;
         }
         if let Some(v) = fc.format.command_case {
@@ -1024,8 +1067,8 @@ use_tabs = true
 max_empty_lines = 2
 dangle_parens = true
 dangle_align = "open"
-space_before_control_paren = true
-space_before_definition_paren = true
+separate_ctrl_name_with_space = true
+separate_fn_name_with_space = true
 max_hanging_wrap_positional_args = 3
 max_hanging_wrap_groups = 1
 command_case = "upper"
@@ -1285,8 +1328,8 @@ format:
   dangle_align: open
   min_prefix_length: 2
   max_prefix_length: 12
-  space_before_control_paren: true
-  space_before_definition_paren: true
+  separate_ctrl_name_with_space: true
+  separate_fn_name_with_space: true
   command_case: unchanged
   keyword_case: lower
 markup:

{cmakefmt-2.2.0 → cmakefmt-2.3.0}/src/config/legacy.rs

@@ -16,7 +16,7 @@ use serde::{Deserialize, Deserializer, Serialize};
 
 use crate::config::{
     file::DumpConfigFormat, CaseStyle, ContinuationAlign, DangleAlign, FractionalTabPolicy,
-    LineEnding, PerCommandConfig,
+    LineEnding, PerCommandConfig, WrapAfterFirstArgAlign,
 };
 use crate::error::{Error, IoResultExt, Result};
 use crate::spec::{
@@ -217,7 +217,7 @@ fn parse_legacy_config(path: &Path, source: &str) -> Result<BTreeMap<String, Leg
                 // Retain non-finite scalars as strings so unsupported options
                 // can still be skipped. Only legacy conversion is permissive;
                 // ordinary configuration parsing keeps the default policy.
-                reject_non_finite_typeless_float: false,
+                non_finite_float_policy: serde_saphyr::NonFiniteFloatPolicy::AsString,
             },
         )
         .map_err(|err| Error::LegacyMigration {
@@ -761,9 +761,9 @@ struct OutputFormatSection {
     #[serde(skip_serializing_if = "Option::is_none")]
     max_prefix_length: Option<usize>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    space_before_control_paren: Option<bool>,
+    separate_ctrl_name_with_space: Option<bool>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    space_before_definition_paren: Option<bool>,
+    separate_fn_name_with_space: Option<bool>,
     #[serde(skip_serializing_if = "Option::is_none")]
     command_case: Option<CaseStyle>,
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -775,6 +775,8 @@ struct OutputFormatSection {
     #[serde(skip_serializing_if = "Option::is_none")]
     wrap_after_first_arg: Option<bool>,
     #[serde(skip_serializing_if = "Option::is_none")]
+    wrap_after_first_arg_align: Option<WrapAfterFirstArgAlign>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     continuation_align: Option<ContinuationAlign>,
 }
 
@@ -797,13 +799,14 @@ impl OutputFormatSection {
             || self.dangle_align.is_some()
             || self.min_prefix_length.is_some()
             || self.max_prefix_length.is_some()
-            || self.space_before_control_paren.is_some()
-            || self.space_before_definition_paren.is_some()
+            || self.separate_ctrl_name_with_space.is_some()
+            || self.separate_fn_name_with_space.is_some()
             || self.command_case.is_some()
             || self.keyword_case.is_some()
             || self.enable_sort.is_some()
             || self.autosort.is_some()
             || self.wrap_after_first_arg.is_some()
+            || self.wrap_after_first_arg_align.is_some()
             || self.continuation_align.is_some()
     }
 }
@@ -935,10 +938,21 @@ fn merge_format_section(converted: &mut ConvertedConfig, path: &Path, value: &Le
                 converted.format.max_prefix_length = as_usize(value)
             }
             "separate_ctrl_name_with_space" | "space_before_control_paren" => {
-                converted.format.space_before_control_paren = as_bool(value)
+                converted.format.separate_ctrl_name_with_space = as_bool(value)
+            }
+            "space_before_definition_paren" => {
+                if !table.contains_key("separate_ctrl_name_with_space")
+                    && !table.contains_key("space_before_control_paren")
+                {
+                    converted.format.separate_ctrl_name_with_space = as_bool(value);
+                }
+                converted.notes.push(format!(
+                    "{}: space_before_definition_paren is a fallback for separate_ctrl_name_with_space; this also affects other structural commands, and an explicit control setting takes precedence",
+                    path.display()
+                ));
             }
-            "separate_fn_name_with_space" | "space_before_definition_paren" => {
-                converted.format.space_before_definition_paren = as_bool(value)
+            "separate_fn_name_with_space" => {
+                converted.format.separate_fn_name_with_space = as_bool(value)
             }
             "command_case" => {
                 converted.format.command_case = convert_case_style(path, converted, key, value)
@@ -949,6 +963,9 @@ fn merge_format_section(converted: &mut ConvertedConfig, path: &Path, value: &Le
             "enable_sort" => converted.format.enable_sort = as_bool(value),
             "autosort" => converted.format.autosort = as_bool(value),
             "wrap_after_first_arg" => converted.format.wrap_after_first_arg = as_bool(value),
+            "wrap_after_first_arg_align" => {
+                converted.format.wrap_after_first_arg_align = as_wrap_after_first_arg_align(value)
+            }
             "continuation_align" => {
                 converted.format.continuation_align = as_continuation_align(value)
             }
@@ -1205,6 +1222,9 @@ fn convert_layout_overrides(value: &LegacyValue) -> Option<LayoutOverridesOverri
             "always_wrap" => layout.always_wrap = as_bool(value),
             "max_pargs_hwrap" => layout.max_pargs_hwrap = as_usize(value),
             "wrap_after_first_arg" => layout.wrap_after_first_arg = as_bool(value),
+            "wrap_after_first_arg_align" => {
+                layout.wrap_after_first_arg_align = as_wrap_after_first_arg_align(value)
+            }
             "continuation_align" => layout.continuation_align = as_continuation_align(value),
             _ => {}
         }
@@ -1304,6 +1324,14 @@ fn as_dangle_align(value: &LegacyValue) -> Option<DangleAlign> {
     }
 }
 
+fn as_wrap_after_first_arg_align(value: &LegacyValue) -> Option<WrapAfterFirstArgAlign> {
+    match value.as_str()?.to_ascii_lowercase().as_str() {
+        "default-indent" => Some(WrapAfterFirstArgAlign::DefaultIndent),
+        "under-first-arg" => Some(WrapAfterFirstArgAlign::UnderFirstArg),
+        _ => None,
+    }
+}
+
 fn as_continuation_align(value: &LegacyValue) -> Option<ContinuationAlign> {
     match value.as_str()?.to_ascii_lowercase().as_str() {
         "same-indent" => Some(ContinuationAlign::SameIndent),
@@ -1994,7 +2022,8 @@ misc:
         std::fs::write(&path, "format:\n  separate_ctrl_name_with_space: true\n").unwrap();
 
         let converted = convert_legacy_config_files(&[path], DumpConfigFormat::Toml).unwrap();
-        assert!(converted.contains("space_before_control_paren = true"));
+        assert!(converted.contains("separate_ctrl_name_with_space = true"));
+        assert!(!converted.contains("space_before_definition_paren"));
     }
 
     #[test]
@@ -2004,7 +2033,7 @@ misc:
         std::fs::write(&path, "format:\n  separate_fn_name_with_space: false\n").unwrap();
 
         let converted = convert_legacy_config_files(&[path], DumpConfigFormat::Toml).unwrap();
-        assert!(converted.contains("space_before_definition_paren = false"));
+        assert!(converted.contains("separate_fn_name_with_space = false"));
     }
 
     #[test]