From 563bd9c24a0620906e4640f57262ea33e48687f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Tue, 21 Feb 2023 12:22:38 +0200 Subject: [PATCH] Try to improve the rustfmt.overrideCommand docs --- crates/rust-analyzer/src/config.rs | 5 ++++- docs/user/generated_config.adoc | 5 ++++- editors/code/package.json | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs index f609a50a05..48d3fd0e2b 100644 --- a/crates/rust-analyzer/src/config.rs +++ b/crates/rust-analyzer/src/config.rs @@ -456,7 +456,10 @@ config_data! { /// Additional arguments to `rustfmt`. rustfmt_extraArgs: Vec = "[]", /// Advanced option, fully override the command rust-analyzer uses for - /// formatting. + /// formatting. This should be the equivalent of `rustfmt` here, and + /// not that of `cargo fmt`. The file contents will be passed on the + /// standard input and the formatted result will be read from the + /// standard output. rustfmt_overrideCommand: Option> = "null", /// Enables the use of rustfmt's unstable range formatting command for the /// `textDocument/rangeFormatting` request. The rustfmt option is unstable and only diff --git a/docs/user/generated_config.adoc b/docs/user/generated_config.adoc index 50e3670a7a..ed7df3eac3 100644 --- a/docs/user/generated_config.adoc +++ b/docs/user/generated_config.adoc @@ -699,7 +699,10 @@ Additional arguments to `rustfmt`. + -- Advanced option, fully override the command rust-analyzer uses for -formatting. +formatting. This should be the equivalent of `rustfmt` here, and +not that of `cargo fmt`. The file contents will be passed on the +standard input and the formatted result will be read from the +standard output. -- [[rust-analyzer.rustfmt.rangeFormatting.enable]]rust-analyzer.rustfmt.rangeFormatting.enable (default: `false`):: + diff --git a/editors/code/package.json b/editors/code/package.json index 3610e993f8..42a23eb16f 100644 --- a/editors/code/package.json +++ b/editors/code/package.json @@ -1283,7 +1283,7 @@ } }, "rust-analyzer.rustfmt.overrideCommand": { - "markdownDescription": "Advanced option, fully override the command rust-analyzer uses for\nformatting.", + "markdownDescription": "Advanced option, fully override the command rust-analyzer uses for\nformatting. This should be the equivalent of `rustfmt` here, and\nnot that of `cargo fmt`. The file contents will be passed on the\nstandard input and the formatted result will be read from the\nstandard output.", "default": null, "type": [ "null",