cmakefmt 2.3.0__tar.gz → 2.3.1__tar.gz

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

@@ -64,7 +64,7 @@ version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys",
 ]
 
 [[package]]
@@ -75,7 +75,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
 dependencies = [
  "anstyle",
  "once_cell_polyfill",
- "windows-sys 0.61.2",
+ "windows-sys",
 ]
 
 [[package]]
@@ -324,7 +324,7 @@ dependencies = [
 
 [[package]]
 name = "cmakefmt-rust"
-version = "2.3.0"
+version = "2.3.1"
 dependencies = [
  "clap",
  "clap_complete",
@@ -351,7 +351,7 @@ dependencies = [
  "serde",
  "serde-saphyr",
  "serde_json",
- "similar 3.2.0",
+ "similar 3.2.1",
  "tempfile",
  "thiserror",
  "toml",
@@ -361,16 +361,15 @@ dependencies = [
 
 [[package]]
 name = "codspeed"
-version = "5.0.3"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cade51e6e6e30e7ea2cd9599fa5d5d5f48255a6b221bbd0cab1cf32f3c23c65"
+checksum = "7e7c21807b937b8e535f2745cd83c525fc250524021cd662b9ba4d3e399bb504"
 dependencies = [
  "anyhow",
  "cc",
  "colored",
  "getrandom",
  "glob",
- "libc",
  "nix",
  "serde",
  "serde_json",
@@ -379,9 +378,9 @@ dependencies = [
 
 [[package]]
 name = "codspeed-criterion-compat"
-version = "5.0.3"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5d1640d31b122c8d754939c6ae4040709a9602f289d11e43075476a21285020"
+checksum = "8a14939cf9e46182bdfbf6de618a8a110361c15a27eccff8f5ad4380249e9c14"
 dependencies = [
  "clap",
  "codspeed",
@@ -392,9 +391,9 @@ dependencies = [
 
 [[package]]
 name = "codspeed-criterion-compat-walltime"
-version = "5.0.3"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a83eed387b8f84aad4cb29607758bec3ab3f53b1734af934ddae7fee626d8ce"
+checksum = "af785573a72d17af663e661a45e1d617a2bab9f3a13a219ca0ae6ef9412ea1d8"
 dependencies = [
  "anes",
  "cast",
@@ -429,7 +428,7 @@ version = "3.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys",
 ]
 
 [[package]]
@@ -441,7 +440,7 @@ dependencies = [
  "encode_unicode",
  "libc",
  "unicode-width",
- "windows-sys 0.61.2",
+ "windows-sys",
 ]
 
 [[package]]
@@ -517,7 +516,7 @@ checksum = "e0b1fab2ae45819af2d0731d60f2afe17227ebb1a1538a236da84c93e9a60162"
 dependencies = [
  "dispatch2",
  "nix",
- "windows-sys 0.61.2",
+ "windows-sys",
 ]
 
 [[package]]
@@ -604,7 +603,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys",
 ]
 
 [[package]]
@@ -640,15 +639,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
 
-[[package]]
-name = "fsevent-sys"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "futures-core"
 version = "0.3.34"
@@ -824,7 +814,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
 dependencies = [
  "hermit-abi",
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys",
 ]
 
 [[package]]
@@ -938,7 +928,7 @@ dependencies = [
  "libc",
  "log",
  "wasi",
- "windows-sys 0.61.2",
+ "windows-sys",
 ]
 
 [[package]]
@@ -967,20 +957,21 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
 
 [[package]]
 name = "notify"
-version = "8.2.0"
+version = "8.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3"
+checksum = "82f812702fbc75d35416d3f884e04925be7e9498f4eceea2e24ba34559284674"
 dependencies = [
  "bitflags 2.13.2",
- "fsevent-sys",
  "inotify",
  "kqueue",
  "libc",
  "log",
  "mio",
  "notify-types",
+ "objc2-core-foundation",
+ "objc2-core-services",
  "walkdir",
- "windows-sys 0.60.2",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1022,6 +1013,25 @@ dependencies = [
  "objc2-encode",
 ]
 
+[[package]]
+name = "objc2-core-foundation"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
+dependencies = [
+ "bitflags 2.13.2",
+]
+
+[[package]]
+name = "objc2-core-services"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "583300ad934cba24ff5292aee751ecc070f7ca6b39a574cc21b7b5e588e06a0b"
+dependencies = [
+ "libc",
+ "objc2-core-foundation",
+]
+
 [[package]]
 name = "objc2-encode"
 version = "4.1.0"
@@ -1048,21 +1058,20 @@ checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
 
 [[package]]
 name = "pest"
-version = "2.9.4"
+version = "2.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd47a460a9cbc3b3429c7e22bf0d76653e779319bae45a499ca010c9a990bb23"
+checksum = "a8db75153506001cb36ed924f08cadc862eb3f8c4d0d534139f29074769d7660"
 dependencies = [
  "memchr",
- "psm",
- "stacker",
+ "pest_stack_guard",
  "ucd-trie",
 ]
 
 [[package]]
 name = "pest_derive"
-version = "2.9.4"
+version = "2.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "203e46697708f7519ab1608393cf89239cafb46b8e6d08a8ffe359359b11ef44"
+checksum = "20aa17e11fb35664b67d5214a0afac57a360d231b6ec53d6eba0700b27d933b4"
 dependencies = [
  "pest",
  "pest_generator",
@@ -1070,9 +1079,9 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.9.4"
+version = "2.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e84ae6340a458d3d6cfc73cf328cf3cfe90b2484cd0de25eb66aa954615ed4d5"
+checksum = "626ec5afccf44ccbfeb2b232316510bb55b4bf34d891afcb0fb07d2b17d7fe9d"
 dependencies = [
  "pest",
  "pest_meta",
@@ -1083,13 +1092,23 @@ dependencies = [
 
 [[package]]
 name = "pest_meta"
-version = "2.9.4"
+version = "2.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b57f92f32b3dbce6598fd8f5cdf1f06a6072570b8103fa21728fa9036923e710"
+checksum = "b3f45b6caa65c1b08186832745159c2529994146340a7bf44168095469720f5d"
 dependencies = [
  "pest",
 ]
 
+[[package]]
+name = "pest_stack_guard"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97e6cd2217057fa86b6eaa512917e58089d875b957a31e35e7ab729977e0a5f2"
+dependencies = [
+ "psm",
+ "stacker",
+]
+
 [[package]]
 name = "pin-project-lite"
 version = "0.2.17"
@@ -1327,7 +1346,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.61.2",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1501,9 +1520,9 @@ checksum = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa"
 
 [[package]]
 name = "similar"
-version = "3.2.0"
+version = "3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f66ca1f7aca2474dc10c942eb22feffc897735f54cd1db90138c2fddb490987"
+checksum = "d2f8bec09ae8fae0f4f265a4559a9334be3929d8504e9b536df0a41302bd1733"
 dependencies = [
  "bstr",
 ]
@@ -1530,7 +1549,7 @@ dependencies = [
  "cfg-if",
  "libc",
  "psm",
- "windows-sys 0.61.2",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1581,7 +1600,7 @@ dependencies = [
  "getrandom",
  "once_cell",
  "rustix",
- "windows-sys 0.61.2",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1797,7 +1816,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1806,15 +1825,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
-[[package]]
-name = "windows-sys"
-version = "0.60.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
-dependencies = [
- "windows-targets",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.61.2"
@@ -1824,71 +1834,6 @@ dependencies = [
  "windows-link",
 ]
 
-[[package]]
-name = "windows-targets"
-version = "0.53.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
-dependencies = [
- "windows-link",
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_gnullvm",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
-
 [[package]]
 name = "winnow"
 version = "1.0.4"

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

@@ -1,6 +1,6 @@
 [package]
 name = "cmakefmt-rust"
-version = "2.3.0"
+version = "2.3.1"
 edition = "2021"
 description = "A fast, correct CMake formatter"
 license = "MIT OR Apache-2.0"
@@ -36,7 +36,7 @@ crate-type = ["cdylib", "rlib"]
 default = ["cli"]
 browser-wasm = ["dep:wasm-bindgen"]
 dprint-plugin = ["dep:dprint-core"]
-lsp = ["lsp-server", "lsp-types"]
+lsp = ["lsp-server", "lsp-types", "ec4rs"]
 cli = [
   "lsp",
   "clap",
@@ -92,7 +92,7 @@ rmp-serde = "1"
 
 [dev-dependencies]
 insta = "1"
-codspeed-criterion-compat = { version = "5.0", features = ["html_reports"] }
+codspeed-criterion-compat = { version = "6.0", features = ["html_reports"] }
 tempfile = "3"
 pest = "2"
 pest_derive = "2"

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

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

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

@@ -1012,11 +1012,7 @@ pub(crate) fn build_context(
 ) -> Result<(Config, CommandRegistry, ConfigContext), cmakefmt::Error> {
     let config_context = resolve_config_context(cli, file_path);
 
-    let mut config = Config::from_files(&config_context.sources)?;
-    let mut registry = CommandRegistry::builtins().clone();
-    for path in &config_context.sources {
-        registry.merge_override_file(path)?;
-    }
+    let (mut config, registry) = Config::from_files_with_registry(&config_context.sources)?;
 
     // Apply .editorconfig fallback when no cmakefmt config file was found.
     if matches!(config_context.mode, ConfigSourceMode::DefaultsOnly)

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

@@ -69,7 +69,7 @@ struct FormatSection {
     max_hanging_wrap_lines: Option<usize>,
     /// Maximum positional arguments to keep in a hanging-wrap layout. Default: `6`.
     max_hanging_wrap_positional_args: Option<usize>,
-    /// Maximum keyword/flag subgroups to keep in a hanging-wrap layout. Default: `2`.
+    /// Maximum argument subgroups to keep together in a hanging-wrap layout. Default: `0` (vertical).
     max_hanging_wrap_groups: Option<usize>,
     /// Maximum rows a hanging-wrap positional group may consume before nesting is forced. Default: `2`.
     max_rows_cmdline: Option<usize>,
@@ -688,6 +688,20 @@ impl Config {
         Ok(config)
     }
 
+    /// Load formatting options and command specs from the same config files.
+    ///
+    /// Later files override earlier files in both the config and registry.
+    #[cfg(all(not(target_arch = "wasm32"), any(feature = "cli", feature = "lsp")))]
+    #[cfg_attr(docsrs, doc(cfg(any(feature = "cli", feature = "lsp"))))]
+    pub fn from_files_with_registry(paths: &[PathBuf]) -> Result<(Self, crate::CommandRegistry)> {
+        let config = Self::from_files(paths)?;
+        let mut registry = crate::CommandRegistry::builtins().clone();
+        for path in paths {
+            registry.merge_override_file(path)?;
+        }
+        Ok((config, registry))
+    }
+
     /// Parse a YAML config string through the same `FileConfig` schema used by
     /// config files and return the resolved runtime [`Config`].
     ///
@@ -1155,6 +1169,7 @@ command_case = "upper"
         );
     }
 
+    #[cfg(feature = "cli")]
     #[test]
     fn toml_config_template_parses() {
         let template = default_config_template_for(DumpConfigFormat::Toml);
@@ -1449,6 +1464,7 @@ per_command_overrides:
 
     // ── from_yaml_str tests ─────────────────────────────────────────────
 
+    #[cfg(feature = "cli")]
     #[test]
     fn effective_yaml_config_roundtrips_non_default_values() {
         let original = Config::from_yaml_str(

{cmakefmt-2.3.0 → cmakefmt-2.3.1}/src/config/mod.rs

@@ -25,7 +25,7 @@
 //! [`Config::for_file`] load these files and return a resolved
 //! runtime [`Config`]. Unknown fields are rejected.
 
-#[cfg(all(not(target_arch = "wasm32"), feature = "cli"))]
+#[cfg(all(not(target_arch = "wasm32"), any(feature = "cli", feature = "lsp")))]
 #[doc(hidden)]
 pub mod editorconfig;
 pub mod file;
@@ -272,7 +272,7 @@ pub enum ArgumentCommentStyle {
 /// | `max_empty_lines` | `1` |
 /// | `max_lines_hwrap` | `2` |
 /// | `max_pargs_hwrap` | `6` |
-/// | `max_subgroups_hwrap` | `2` |
+/// | `max_subgroups_hwrap` | `0` |
 /// | `max_rows_cmdline` | `2` |
 /// | `command_case` | [`CaseStyle::Lower`] |
 /// | `keyword_case` | [`CaseStyle::Upper`] |
@@ -315,7 +315,8 @@ pub struct Config {
     /// Maximum number of positional arguments to keep in a hanging-wrap layout
     /// before going vertical.
     pub max_pargs_hwrap: usize,
-    /// Maximum number of keyword/flag subgroups to keep in a horizontal wrap.
+    /// Maximum number of argument subgroups to keep together in a horizontal wrap.
+    /// Defaults to `0` to preserve vertical layouts for wrapped grouped calls.
     pub max_subgroups_hwrap: usize,
     /// Maximum rows a hanging-wrap positional group may consume before the
     /// layout is rejected and nesting is forced.
@@ -462,7 +463,7 @@ impl Default for Config {
             max_empty_lines: 1,
             max_lines_hwrap: 2,
             max_pargs_hwrap: 6,
-            max_subgroups_hwrap: 2,
+            max_subgroups_hwrap: 0,
             max_rows_cmdline: 2,
             always_wrap: Vec::new(),
             require_valid_layout: false,

{cmakefmt-2.3.0 → cmakefmt-2.3.1}/src/formatter/node.rs

@@ -190,6 +190,15 @@ pub(crate) fn format_command(
             cmd_config.max_pargs_hwrap()
         ));
         hanging
+    } else if let Some(grouped) = (!wrap_after_first_arg)
+        .then(|| try_format_grouped(command, &sections, form, &cmd_config, block_depth))
+        .flatten()
+    {
+        debug.log(format!(
+            "formatter: command {} layout=grouped-hanging-wrap",
+            command.name
+        ));
+        grouped
     } else {
         debug.log(format!(
             "formatter: command {} layout=vertical thresholds(line_width={}, max_hanging_wrap_lines={}, max_hanging_wrap_positional_args={}, max_hanging_wrap_groups={})",
@@ -607,6 +616,92 @@ fn try_format_hanging(
     ))
 }
 
+/// Pack simple argument sections into an indented command body, keeping each
+/// keyword's wrapped values aligned under its first value. Structural groups
+/// and comments retain the dedicated vertical writers below.
+fn try_format_grouped(
+    command: &CommandInvocation,
+    sections: &[Section<'_>],
+    form: &CommandForm,
+    cmd_config: &CommandConfig<'_>,
+    block_depth: usize,
+) -> Option<String> {
+    if sections.len() < 2
+        || sections.len() > cmd_config.max_subgroups_hwrap()
+        || sections.iter().any(|section| {
+            section.arguments.len() > cmd_config.max_pargs_hwrap()
+                || section
+                    .arguments
+                    .iter()
+                    .any(|arg| arg.is_comment() || argument_has_newline(arg))
+                || section.header.is_some_and(|header| {
+                    lookup_kwarg(form, header)
+                        .is_some_and(|spec| !spec.kwargs.is_empty() || !spec.flags.is_empty())
+                })
+        })
+    {
+        return None;
+    }
+
+    let base_indent = cmd_config.indent_str().repeat(block_depth);
+    let indent = format!("{base_indent}{}", cmd_config.indent_str());
+    let name = format_name(command, cmd_config);
+    let mut lines = vec![format!("{base_indent}{name}("), indent.clone()];
+    let mut width = indent.chars().count();
+    for section in sections {
+        let start_line = lines.len();
+        if let Some(header) = section.header {
+            if width > indent.chars().count() {
+                lines.last_mut()?.push(' ');
+                width += 1;
+            }
+            let header = apply_case(cmd_config.keyword_case(), header);
+            lines.last_mut()?.push_str(&header);
+            width += header.chars().count();
+        }
+        let continuation_width = if section.header.is_some() {
+            width + 1
+        } else {
+            width
+        };
+        let continuation = " ".repeat(continuation_width);
+        for (index, argument) in section.arguments.iter().enumerate() {
+            let needs_space = section.header.is_some() || index > 0;
+            let token = argument.as_str();
+            let candidate_width = width + usize::from(needs_space) + token.chars().count();
+            if candidate_width <= cmd_config.line_width() {
+                if needs_space {
+                    lines.last_mut()?.push(' ');
+                }
+                lines.last_mut()?.push_str(token);
+                width = candidate_width;
+            } else {
+                // A keyword must retain at least its first value. If that
+                // pair cannot fit here, let the vertical layout separate groups.
+                if index == 0
+                    || continuation_width + token.chars().count() > cmd_config.line_width()
+                {
+                    return None;
+                }
+                lines.push(format!("{continuation}{token}"));
+                width = continuation_width + token.chars().count();
+            }
+        }
+        let rows = lines.len() - start_line + 1;
+        if rows > cmd_config.global().max_lines_hwrap
+            || (section.header.is_none() && rows > cmd_config.global().max_rows_cmdline)
+            || width > cmd_config.line_width()
+        {
+            return None;
+        }
+    }
+    let output = close_multiline(lines, &base_indent, name.len(), cmd_config);
+    output
+        .lines()
+        .all(|line| line.chars().count() <= cmd_config.line_width())
+        .then_some(output)
+}
+
 fn format_command_vertical(
     command: &CommandInvocation,
     sections: &[Section<'_>],