Skip to content

Commit 33fdfb4

Browse files
committed
Auto merge of #17735 - alibektas:ratoml_workspaces, r=Veykril
feat: Introduce workspace `rust-analyzer.toml`s In order to globally configure a project it was, prior to this PR, possible to have a `ratoml` at the root path of a project. This is not the case anymore. Instead we now let ratoml files that are placed at the root of any workspace have a new scope called `workspace`. Although there is not a difference between a `workspace` scope and and a `global` scope, future PRs will change that.
2 parents cd266e0 + dc471c1 commit 33fdfb4

File tree

6 files changed

+337
-276
lines changed

6 files changed

+337
-276
lines changed

src/tools/rust-analyzer/crates/rust-analyzer/src/capabilities.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ pub fn server_capabilities(config: &Config) -> ServerCapabilities {
6767
code_action_provider: Some(config.caps().code_action_capabilities()),
6868
code_lens_provider: Some(CodeLensOptions { resolve_provider: Some(true) }),
6969
document_formatting_provider: Some(OneOf::Left(true)),
70-
document_range_formatting_provider: match config.rustfmt() {
70+
document_range_formatting_provider: match config.rustfmt(None) {
7171
RustfmtConfig::Rustfmt { enable_range_formatting: true, .. } => Some(OneOf::Left(true)),
7272
_ => Some(OneOf::Left(false)),
7373
},

0 commit comments

Comments
 (0)