diff options
| -rw-r--r-- | crates/ide-assists/src/handlers/auto_import.rs | 8 | ||||
| -rw-r--r-- | crates/ide-completion/src/completions/flyimport.rs | 2 | ||||
| -rw-r--r-- | docs/user/manual.adoc | 8 |
3 files changed, 10 insertions, 8 deletions
diff --git a/crates/ide-assists/src/handlers/auto_import.rs b/crates/ide-assists/src/handlers/auto_import.rs index 1ec24d8fcc3..802449f8588 100644 --- a/crates/ide-assists/src/handlers/auto_import.rs +++ b/crates/ide-assists/src/handlers/auto_import.rs @@ -40,7 +40,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists, GroupLabel}; // // .Import Granularity // -// It is possible to configure how use-trees are merged with the `importGranularity` setting. +// It is possible to configure how use-trees are merged with the `imports.granularity.group` setting. // It has the following configurations: // // - `crate`: Merge imports from the same crate into a single use statement. This kind of @@ -50,11 +50,11 @@ use crate::{AssistContext, AssistId, AssistKind, Assists, GroupLabel}; // - `preserve`: Do not change the granularity of any imports. For auto-import this has the same // effect as `item`. // -// In `VS Code` the configuration for this is `rust-analyzer.assist.importGranularity`. +// In `VS Code` the configuration for this is `rust-analyzer.imports.granularity.group`. // // .Import Prefix // -// The style of imports in the same crate is configurable through the `importPrefix` setting. +// The style of imports in the same crate is configurable through the `imports.prefix` setting. // It has the following configurations: // // - `crate`: This setting will force paths to be always absolute, starting with the `crate` @@ -64,7 +64,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists, GroupLabel}; // `super` or an extern crate identifier. // - `plain`: This setting does not impose any restrictions in imports. // -// In `VS Code` the configuration for this is `rust-analyzer.assist.importPrefix`. +// In `VS Code` the configuration for this is `rust-analyzer.imports.prefix`. // // image::https://user-images.githubusercontent.com/48062697/113020673-b85be580-917a-11eb-9022-59585f35d4f8.gif[] diff --git a/crates/ide-completion/src/completions/flyimport.rs b/crates/ide-completion/src/completions/flyimport.rs index 1c62347fb5b..6dbcfb0a5d7 100644 --- a/crates/ide-completion/src/completions/flyimport.rs +++ b/crates/ide-completion/src/completions/flyimport.rs @@ -95,7 +95,7 @@ use super::Completions; // // .Import configuration // -// It is possible to configure how use-trees are merged with the `importMergeBehavior` setting. +// It is possible to configure how use-trees are merged with the `imports.granularity.group` setting. // Mimics the corresponding behavior of the `Auto Import` feature. // // .LSP and performance implications diff --git a/docs/user/manual.adoc b/docs/user/manual.adoc index f55dfd47033..5185218abd9 100644 --- a/docs/user/manual.adoc +++ b/docs/user/manual.adoc @@ -308,9 +308,11 @@ nvim_lsp.rust_analyzer.setup({ on_attach=on_attach, settings = { ["rust-analyzer"] = { - assist = { - importGranularity = "module", - importPrefix = "self", + imports = { + granularity = { + group = "module", + }, + prefix = "self", }, cargo = { loadOutDirsFromCheck = true |