rust-analyzer.toml tracking

Cargo.toml

@@ -100,6 +100,7 @@ nohash-hasher = "0.2.0"
 text-size = "1.1.0"
 serde = { version = "1.0.156", features = ["derive"] }
 serde_json = "1.0.96"
+salsa  = "0.17.0-pre.2"
 triomphe = { version = "0.1.8", default-features = false, features = ["std"] }
 # can't upgrade due to dashmap depending on 0.12.3 currently
 hashbrown = { version = "0.12.3", features = [

crates/base-db/Cargo.toml

@@ -12,7 +12,7 @@ rust-version.workspace = true
 doctest = false
 
 [dependencies]
-salsa = "0.17.0-pre.2"
+salsa.workspace = true
 rustc-hash = "1.1.0"
 
 triomphe.workspace = true
@@ -27,3 +27,4 @@ syntax.workspace = true
 test-utils.workspace = true
 tt.workspace = true
 vfs.workspace = true
+serde.workspace = true

crates/base-db/src/change.rs

@@ -25,7 +25,8 @@ impl fmt::Debug for Change {
             d.field("roots", roots);
         }
         if !self.files_changed.is_empty() {
-            d.field("files_changed", &self.files_changed.len());
+            d.field("files_changed", &self.files_changed);
+            // d.field("files_changed", &self.files_changed.len());
         }
         if self.crate_graph.is_some() {
             d.field("crate_graph", &self.crate_graph);

crates/base-db/src/input.rs

@@ -11,6 +11,7 @@ use std::{fmt, mem, ops, panic::RefUnwindSafe, str::FromStr, sync};
 use cfg::CfgOptions;
 use la_arena::{Arena, Idx};
 use rustc_hash::{FxHashMap, FxHashSet};
+use serde::Serialize;
 use syntax::SmolStr;
 use triomphe::Arc;
 use tt::token_id::Subtree;
@@ -21,33 +22,40 @@ use vfs::{file_set::FileSet, AbsPathBuf, AnchoredPath, FileId, VfsPath};
 pub type ProcMacroPaths = FxHashMap<CrateId, Result<(Option<String>, AbsPathBuf), String>>;
 pub type ProcMacros = FxHashMap<CrateId, ProcMacroLoadResult>;
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
+pub struct SourceRootId(pub u32);
+
 /// 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)]
-pub struct SourceRootId(pub u32);
-
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct SourceRoot {
     /// Sysroot or crates.io library.
     ///
     /// Libraries are considered mostly immutable, this assumption is used to
     /// optimize salsa's query structure
     pub is_library: bool,
+    cargo_file_id: Option<FileId>,
+    /// FIXME : @alibektas We know that this is wrong.
+    /// base-db must stay as a level of abstraction
+    /// that has no knowledge of such specific files
+    /// so this should be moved somewhere else.
+    ratoml_file_id: Option<FileId>,
     file_set: FileSet,
 }
 
 impl SourceRoot {
     pub fn new_local(file_set: FileSet) -> SourceRoot {
-        SourceRoot { is_library: false, file_set }
+        eprintln!("{:#?}", file_set);
+        SourceRoot { is_library: false, file_set, cargo_file_id: None, ratoml_file_id: None }
     }
 
     pub fn new_library(file_set: FileSet) -> SourceRoot {
-        SourceRoot { is_library: true, file_set }
+        SourceRoot { is_library: true, file_set, cargo_file_id: None, ratoml_file_id: None }
     }
 
     pub fn path_for_file(&self, file: &FileId) -> Option<&VfsPath> {
@@ -65,6 +73,16 @@ impl SourceRoot {
     pub fn iter(&self) -> impl Iterator<Item = FileId> + '_ {
         self.file_set.iter()
     }
+
+    /// Get `FileId` of the `Cargo.toml` if one present in `SourceRoot`
+    pub fn cargo_toml(&self) -> Option<FileId> {
+        self.cargo_file_id
+    }
+
+    /// Get `FileId` of the `rust-analyzer.toml` if one present in `SourceRoot`
+    pub fn ratoml(&self) -> Option<FileId> {
+        self.ratoml_file_id
+    }
 }
 
 /// `CrateGraph` is a bit of information which turns a set of text files into a
@@ -103,6 +121,15 @@ pub type CrateId = Idx<CrateData>;
 #[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
 pub struct CrateName(SmolStr);
 
+impl Serialize for CrateName {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        serializer.serialize_str(self)
+    }
+}
+
 impl CrateName {
     /// Creates a crate name, checking for dashes in the string provided.
     /// Dashes are not allowed in the crate names,

crates/load-cargo/src/lib.rs

@@ -208,6 +208,7 @@ impl ProjectFolders {
             let entry = {
                 let mut dirs = vfs::loader::Directories::default();
                 dirs.extensions.push("rs".into());
+                dirs.extensions.push("toml".into());
                 dirs.include.extend(root.include);
                 dirs.exclude.extend(root.exclude);
                 for excl in global_excludes {

crates/paths/src/lib.rs

@@ -136,7 +136,8 @@ impl AbsPath {
     /// # Panics
     ///
     /// Panics if `path` is not absolute.
-    pub fn assert(path: &Path) -> &AbsPath {
+    pub fn assert<P: AsRef<Path> + ?Sized>(path: &P) -> &AbsPath {
+        let path = path.as_ref();
         assert!(path.is_absolute());
         unsafe { &*(path as *const Path as *const AbsPath) }
     }
@@ -194,6 +195,10 @@ impl AbsPath {
         self.0.ends_with(&suffix.0)
     }
 
+    pub fn ancestors(&self) -> impl Iterator<Item = &AbsPath> {
+        self.0.ancestors().map(AbsPath::assert)
+    }
+
     pub fn name_and_extension(&self) -> Option<(&str, Option<&str>)> {
         Some((
             self.file_stem()?.to_str()?,

crates/project-model/src/cfg_flag.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)]
 pub enum CfgFlag {
     Atom(String),
     KeyValue { key: String, value: String },

crates/project-model/src/project_json.rs

@@ -53,7 +53,7 @@ use base_db::{CrateDisplayName, CrateId, CrateName, Dependency, Edition};
 use la_arena::RawIdx;
 use paths::{AbsPath, AbsPathBuf};
 use rustc_hash::FxHashMap;
-use serde::{de, Deserialize};
+use serde::{de, Deserialize, Serialize};
 use std::path::PathBuf;
 
 use crate::cfg_flag::CfgFlag;
@@ -174,14 +174,14 @@ impl ProjectJson {
     }
 }
 
-#[derive(Deserialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct ProjectJsonData {
     sysroot: Option<PathBuf>,
     sysroot_src: Option<PathBuf>,
     crates: Vec<CrateData>,
 }
 
-#[derive(Deserialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 struct CrateData {
     display_name: Option<String>,
     root_module: PathBuf,
@@ -203,7 +203,7 @@ struct CrateData {
     repository: Option<String>,
 }
 
-#[derive(Deserialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(rename = "edition")]
 enum EditionData {
     #[serde(rename = "2015")]
@@ -224,7 +224,7 @@ impl From<EditionData> for Edition {
     }
 }
 
-#[derive(Deserialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 struct DepData {
     /// Identifies a crate by position in the crates array.
     #[serde(rename = "crate")]
@@ -233,7 +233,7 @@ struct DepData {
     name: CrateName,
 }
 
-#[derive(Deserialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 struct CrateSource {
     include_dirs: Vec<PathBuf>,
     exclude_dirs: Vec<PathBuf>,

crates/rust-analyzer/Cargo.toml

@@ -44,10 +44,12 @@ tracing-subscriber = { version = "0.3.16", default-features = false, features =
 tracing-log = "0.1.3"
 tracing-tree = "0.2.1"
 triomphe.workspace = true
+toml = "0.8.8"
 nohash-hasher.workspace = true
 always-assert = "0.1.2"
+indexmap = { version = "2.0.0", features = ["serde"] }
 
-# These 3 deps are not used by r-a directly, but we list them here to lock in their versions
+# These 2 deps are not used by r-a directly, but we list them here to lock in their versions
 # in our transitive deps to prevent them from pulling in windows-sys 0.45.0
 mio = "=0.8.5"
 parking_lot_core = "=0.9.6"
@@ -72,6 +74,8 @@ parser.workspace = true
 toolchain.workspace = true
 vfs-notify.workspace = true
 vfs.workspace = true
+la-arena.workspace = true
+salsa.workspace = true
 
 [target.'cfg(windows)'.dependencies]
 winapi = "0.3.9"