Auto merge of #16639 - alibektas:13529/config_restruct, r=Veykril

internal : redesign rust-analyzer::config
This PR aims to cover the infrastructural requirements for the `rust-analyzer.toml` ( #13529 ) issue. This means, that
1. We no longer have a single config base. The once single `ConfigData` has been divided into 4 : A tree of `.ratoml` files, a set of configs coming from the client ( this is what was called before the `CrateData` except that now values do not default to anything when they are not defined) , a set of configs that will reflect what the contents of a `ratoml` file defined in user's config directory ( e.g `~/.config/rust-analyzer/.rust-analyzer.toml` and finally a tree root that is populated by default values only.
2. Configs have also been divided into 3 different blocks : `global` , `local` , `client`. The current status of a config may change until #13529 got merged.
Once again many thanks to `@cormacrelf` for doing all the serde work.

Author: bors

Cargo.lock

@@ -19,16 +19,17 @@ use vfs::{file_set::FileSet, AbsPathBuf, AnchoredPath, FileId, VfsPath};
 // Map from crate id to the name of the crate and path of the proc-macro. If the value is `None`,
 // then the crate for the proc-macro hasn't been build yet as the build data is missing.
 pubtypeProcMacroPaths = FxHashMap<CrateId,Result<(Option<String>,AbsPathBuf),String>>;
+
+#[derive(Debug,Clone,Copy,PartialEq,Eq,Hash,PartialOrd,Ord)]
+pubstructSourceRootId(pubu32);
+
 /// Files are grouped into source roots. A source root is a directory on the
 /// file systems which is watched for changes. Typically it corresponds to a
 /// Rust crate. Source roots *might* be nested: in this case, a file belongs to
 /// the nearest enclosing source root. Paths to files are always relative to a
 /// source root, and the analyzer does not know the root path of the source root at
 /// all. So, a file from one source root can't refer to a file in another source
 /// root by path.
-#[derive(Debug,Clone,Copy,PartialEq,Eq,Hash,PartialOrd,Ord)]
-pubstructSourceRootId(pubu32);
-
 #[derive(Clone,Debug,PartialEq,Eq)]
 pubstructSourceRoot{
 /// Sysroot or crates.io library.

crates/base-db/src/input.rs

@@ -177,7 +177,9 @@ fn _format(
 use ide_db::base_db::{FileLoader,SourceDatabase};
 // hack until we get hygiene working (same character amount to preserve formatting as much as possible)
 constDOLLAR_CRATE_REPLACE:&str = "__r_a_";
-let expansion = expansion.replace("$crate",DOLLAR_CRATE_REPLACE);
+constBUILTIN_REPLACE:&str = "builtin__POUND";
+let expansion =
+ expansion.replace("$crate",DOLLAR_CRATE_REPLACE).replace("builtin #",BUILTIN_REPLACE);
 let(prefix, suffix) = match kind {
 SyntaxKind::MACRO_PAT => ("fn __(",": u32);"),
 SyntaxKind::MACRO_EXPR | SyntaxKind::MACRO_STMTS => ("fn __() {","}"),
@@ -206,7 +208,9 @@ fn _format(
 let captured_stdout = String::from_utf8(output.stdout).ok()?;
 
 if output.status.success() && !captured_stdout.trim().is_empty(){
-let output = captured_stdout.replace(DOLLAR_CRATE_REPLACE,"$crate");
+let output = captured_stdout
+.replace(DOLLAR_CRATE_REPLACE,"$crate")
+.replace(BUILTIN_REPLACE,"builtin #");
 let output = output.trim().strip_prefix(prefix)?;
 let output = match kind {
 SyntaxKind::MACRO_PAT => {

crates/ide/src/expand_macro.rs

@@ -66,7 +66,7 @@ use hir::ChangeWithProcMacros;
 use ide_db::{
  base_db::{
  salsa::{self,ParallelDatabase},
-CrateOrigin,Env,FileLoader,FileSet,SourceDatabase,VfsPath,
+CrateOrigin,Env,FileLoader,FileSet,SourceDatabase,SourceDatabaseExt,VfsPath,
 },
  prime_caches, symbol_index,FxHashMap,FxIndexSet,LineIndexDatabase,
 };
@@ -273,6 +273,10 @@ impl Analysis {
 self.with_db(|db| status::status(db, file_id))
 }
 
+pubfnsource_root(&self,file_id:FileId) -> Cancellable<SourceRootId>{
+self.with_db(|db| db.file_source_root(file_id))
+}
+
 pubfnparallel_prime_caches<F>(&self,num_worker_threads:u8,cb:F) -> Cancellable<()>
 where
 F:Fn(ParallelPrimeCachesProgress) + Sync + std::panic::UnwindSafe,
@@ -282,7 +286,7 @@ impl Analysis {
 
 /// Gets the text of the source file.
 pubfnfile_text(&self,file_id:FileId) -> Cancellable<Arc<str>>{
-self.with_db(|db| db.file_text(file_id))
+self.with_db(|db| SourceDatabaseExt::file_text(db,file_id))
 }
 
 /// Gets the syntax tree of the file.
@@ -292,7 +296,6 @@ impl Analysis {
 
 /// Returns true if this file belongs to an immutable library.
 pubfnis_library_file(&self,file_id:FileId) -> Cancellable<bool>{
-use ide_db::base_db::SourceDatabaseExt;
 self.with_db(|db| db.source_root(db.file_source_root(file_id)).is_library)
 }
 

crates/ide/src/lib.rs

@@ -4,8 +4,9 @@
 use std::{fmt, str::FromStr};
 
 use cfg::CfgOptions;
+use serde::Serialize;
 
-#[derive(Clone,Eq,PartialEq,Debug)]
+#[derive(Clone,Eq,PartialEq,Debug,Serialize)]
 pubenumCfgFlag{
 Atom(String),
 KeyValue{key:String,value:String},

crates/project-model/src/cfg_flag.rs

@@ -52,7 +52,7 @@
 use base_db::{CrateDisplayName,CrateName};
 use paths::{AbsPath,AbsPathBuf,Utf8PathBuf};
 use rustc_hash::FxHashMap;
-use serde::{de,Deserialize};
+use serde::{de,Deserialize,Serialize};
 use span::Edition;
 
 usecrate::cfg_flag::CfgFlag;
@@ -161,14 +161,14 @@ impl ProjectJson {
 }
 }
 
-#[derive(Deserialize,Debug,Clone)]
+#[derive(Serialize,Deserialize,Debug,Clone)]
 pubstructProjectJsonData{
 sysroot:Option<Utf8PathBuf>,
 sysroot_src:Option<Utf8PathBuf>,
 crates:Vec<CrateData>,
 }
 
-#[derive(Deserialize,Debug,Clone)]
+#[derive(Serialize,Deserialize,Debug,Clone)]
 structCrateData{
 display_name:Option<String>,
 root_module:Utf8PathBuf,
@@ -190,7 +190,7 @@ struct CrateData {
 repository:Option<String>,
 }
 
-#[derive(Deserialize,Debug,Clone)]
+#[derive(Serialize,Deserialize,Debug,Clone)]
 #[serde(rename = "edition")]
 enumEditionData{
 #[serde(rename = "2015")]
@@ -218,20 +218,21 @@ impl From<EditionData> for Edition {
 ///
 /// This will differ from `CrateId` when multiple `ProjectJson`
 /// workspaces are loaded.
-#[derive(Deserialize,Debug,Clone,Copy,Eq,PartialEq,Hash)]
+#[derive(Serialize,Deserialize,Debug,Clone,Copy,Eq,PartialEq,Hash)]
 #[serde(transparent)]
 pubstructCrateArrayIdx(pubusize);
 
-#[derive(Deserialize,Debug,Clone,Eq,PartialEq)]
+#[derive(Serialize,Deserialize,Debug,Clone,Eq,PartialEq)]
 pub(crate)structDep{
 /// Identifies a crate by position in the crates array.
 #[serde(rename = "crate")]
 pub(crate)krate:CrateArrayIdx,
+#[serde(serialize_with = "serialize_crate_name")]
 #[serde(deserialize_with = "deserialize_crate_name")]
 pub(crate)name:CrateName,
 }
 
-#[derive(Deserialize,Debug,Clone)]
+#[derive(Serialize,Deserialize,Debug,Clone)]
 structCrateSource{
 include_dirs:Vec<Utf8PathBuf>,
 exclude_dirs:Vec<Utf8PathBuf>,
@@ -244,3 +245,10 @@ where
 let name = String::deserialize(de)?;
 CrateName::new(&name).map_err(|err| de::Error::custom(format!("invalid crate name: {err:?}")))
 }
+
+fnserialize_crate_name<S>(name:&CrateName,se:S) -> Result<S::Ok,S::Error>
+where
+S: serde::Serializer,
+{
+ se.serialize_str(name)
+}

crates/project-model/src/project_json.rs

@@ -39,11 +39,13 @@ tracing.workspace = true
 tracing-subscriber.workspace = true
 tracing-tree.workspace = true
 triomphe.workspace = true
+toml = "0.8.8"
 nohash-hasher.workspace = true
 always-assert = "0.2.0"
 walkdir = "2.3.2"
 semver.workspace = true
 memchr = "2.7.1"
+indexmap = { workspace = true, features = ["serde"] }
 
 cfg.workspace = true
 flycheck.workspace = true