internal: report errors on failure; clippy

davidbarsky · davidbarsky · commit 10038083d7c2 · 2024-05-22T17:22:22.000-04:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/flycheck/src/json_workspace.rs b/crates/flycheck/src/json_workspace.rs
@@ -46,16 +46,16 @@ pub struct JsonWorkspaceHandle {
 #[derive(Debug, Clone, Deserialize, Serialize)]
 #[serde(tag = "type")]
 pub enum DiscoverProjectMessage {
+    Error { message: String },
     Progress { message: String },
     Finished { project_json: Vec<ProjectJsonData> },
 }
 
 impl ParseFromLine for DiscoverProjectMessage {
     fn from_line(line: &str, _error: &mut String) -> Option<Self> {
-        let value = serde_json::from_str::<serde_json::Value>(&line).unwrap();
-
-        // let mut deserializer = serde_json::Deserializer::from_str(line);
-        // deserializer.disable_recursion_limit();
+        let Ok(value) = serde_json::from_str::<serde_json::Value>(line) else {
+            return Some(DiscoverProjectMessage::Error { message: line.to_owned() });
+        };
 
         if let Ok(project) = serde_json::from_value::<ProjectJsonData>(value.clone()) {
             return Some(DiscoverProjectMessage::Finished { project_json: vec![project] });
diff --git a/crates/project-model/Cargo.toml b/crates/project-model/Cargo.toml
@@ -14,7 +14,6 @@ doctest = false
 [dependencies]
 anyhow.workspace = true
 cargo_metadata.workspace = true
-crossbeam-channel.workspace = true
 rustc-hash.workspace = true
 semver.workspace = true
 serde_json.workspace = true
diff --git a/crates/project-model/src/project_json.rs b/crates/project-model/src/project_json.rs
@@ -175,7 +175,7 @@ impl ProjectJson {
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct ProjectJsonData {
-    pub sysroot: Option<Utf8PathBuf>,
+    sysroot: Option<Utf8PathBuf>,
     sysroot_src: Option<Utf8PathBuf>,
     crates: Vec<CrateData>,
 }
diff --git a/crates/project-model/src/workspace.rs b/crates/project-model/src/workspace.rs
@@ -30,7 +30,7 @@ use crate::{
     utf8_stdout, CargoConfig, CargoWorkspace, InvocationStrategy, ManifestPath, Package,
     ProjectJson, ProjectManifest, Sysroot, TargetData, TargetKind, WorkspaceBuildScripts,
 };
-use tracing::{info, Level, error, debug};
+use tracing::{debug, error, info, Level};
 
 pub type FileLoader<'a> = &'a mut dyn for<'b> FnMut(&'b AbsPath) -> Option<FileId>;
 
@@ -357,7 +357,6 @@ impl ProjectWorkspace {
     ) -> ProjectWorkspace {
         let sysroot = match (project_json.sysroot.clone(), project_json.sysroot_src.clone()) {
             (Some(sysroot), Some(sysroot_src)) => {
-
                 Ok(Sysroot::load(sysroot, Some(Ok(sysroot_src)), false))
             }
             (Some(sysroot), None) => {
diff --git a/crates/rust-analyzer/src/bin/main.rs b/crates/rust-analyzer/src/bin/main.rs
@@ -257,10 +257,11 @@ fn run_server() -> anyhow::Result<()> {
         return Err(e.into());
     }
 
-    if config.discover_command().is_none() {
-        if !config.has_linked_projects() && config.detached_files().is_empty() {
-            config.rediscover_workspaces();
-        }
+    if config.discover_command().is_none()
+        && !config.has_linked_projects()
+        && config.detached_files().is_empty()
+    {
+        config.rediscover_workspaces();
     }
 
     // If the io_threads have an error, there's usually an error on the main
diff --git a/crates/rust-analyzer/src/config.rs b/crates/rust-analyzer/src/config.rs
@@ -272,11 +272,6 @@ config_data! {
         /// The warnings will be indicated by a blue squiggly underline in code
         /// and a blue icon in the `Problems Panel`.
         diagnostics_warningsAsInfo: Vec<String> = vec![],
-        /// Enables automatic discovery of projects using the discoverCommand.
-        ///
-        /// Setting this command will result in rust-analyzer starting indexing
-        /// only once a Rust file has been opened.
-        discoverCommand: Option<Vec<String>> = None,
         /// These directories will be ignored by rust-analyzer. They are
         /// relative to the workspace root, and globs are not supported. You may
         /// also need to add the folders to Code's `files.watcherExclude`.
@@ -441,6 +436,12 @@ config_data! {
         /// Whether to insert closing angle brackets when typing an opening angle bracket of a generic argument list.
         typing_autoClosingAngleBrackets_enable: bool = false,
 
+        /// Enables automatic discovery of projects using the discoverCommand.
+        ///
+        /// Setting this command will result in rust-analyzer starting indexing
+        /// only once a Rust file has been opened.
+        workspace_discoverCommand: Option<Vec<String>> = None,
+
         /// Workspace symbol search kind.
         workspace_symbol_search_kind: WorkspaceSymbolSearchKindDef = WorkspaceSymbolSearchKindDef::OnlyTypes,
         /// Limits the number of items returned from a workspace symbol search (Defaults to 128).
@@ -656,7 +657,7 @@ config_data! {
 
 #[derive(Debug, Clone)]
 pub struct Config {
-    pub(crate) discovered_projects: Vec<ProjectManifest>,
+    discovered_projects: Vec<ProjectManifest>,
     /// The workspace roots as registered by the LSP client
     workspace_roots: Vec<AbsPathBuf>,
     caps: lsp_types::ClientCapabilities,
@@ -933,12 +934,10 @@ impl Config {
     pub fn add_linked_projects(&mut self, projects: Vec<ProjectJsonData>) {
         let linked_projects = &mut self.client_config.global.linkedProjects;
 
-        let mut new_projects: Vec<_> =
-            projects.into_iter().map(ManifestOrProjectJson::ProjectJson).collect();
-
+        let new_projects = projects.into_iter().map(ManifestOrProjectJson::ProjectJson);
         match linked_projects {
-            Some(projects) => projects.append(&mut new_projects),
-            None => *linked_projects = Some(new_projects),
+            Some(projects) => projects.append(&mut new_projects.collect::<Vec<_>>()),
+            None => *linked_projects = Some(new_projects.collect::<Vec<_>>()),
         }
     }
 
@@ -1322,7 +1321,7 @@ impl Config {
     }
 
     pub fn discover_command(&self) -> Option<Vec<String>> {
-        self.discoverCommand().clone()
+        self.workspace_discoverCommand().clone()
     }
 
     pub fn linked_or_discovered_projects(&self) -> Vec<LinkedProject> {
@@ -1589,7 +1588,7 @@ impl Config {
     }
 
     pub fn cargo_autoreload_config(&self) -> bool {
-        self.cargo_autoreload().to_owned() && self.discoverCommand().is_none()
+        self.cargo_autoreload().to_owned() && self.workspace_discoverCommand().is_none()
     }
 
     pub fn run_build_scripts(&self) -> bool {
diff --git a/crates/rust-analyzer/src/lsp/utils.rs b/crates/rust-analyzer/src/lsp/utils.rs
@@ -75,25 +75,21 @@ impl GlobalState {
     }
 
     /// Sends a notification to the client containing the error `message`.
-    /// If `additional_info` is [`Some`], appends a note to the notification telling to check the logs.
-    /// This will always log `message` + `additional_info` to the server's error log.
+    /// If `additional_info` is [`Some`], the details will be included in the server's logs.
     pub(crate) fn show_and_log_error(&mut self, message: String, additional_info: Option<String>) {
         match additional_info {
             Some(additional_info) => {
                 tracing::error!("{}:\n{}", &message, &additional_info);
-                self.show_message(
-                    lsp_types::MessageType::ERROR,
-                    message,
-                    tracing::enabled!(tracing::Level::ERROR),
-                );
             }
             None => {
                 tracing::error!("{}", &message);
-                self.send_notification::<lsp_types::notification::ShowMessage>(
-                    lsp_types::ShowMessageParams { typ: lsp_types::MessageType::ERROR, message },
-                );
             }
         }
+        self.show_message(
+            lsp_types::MessageType::ERROR,
+            message,
+            tracing::enabled!(tracing::Level::ERROR),
+        );
     }
 
     /// rust-analyzer is resilient -- if it fails, this doesn't usually affect
diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs
@@ -343,7 +343,7 @@ impl GlobalState {
             }
             Event::DiscoverProject(message) => {
                 self.handle_discover_msg(message);
-                // Coalesce many project discovery events into a single loop turn
+                // Coalesce many project discovery events into a single loop turn.
                 while let Ok(message) = self.discover_receiver.try_recv() {
                     self.handle_discover_msg(message);
                 }
@@ -752,7 +752,7 @@ impl GlobalState {
                     let id = from_proto::file_id(&snap, &uri).expect("unable to get FileId");
                     if let Ok(crates) = &snap.analysis.crates_for(id) {
                         if crates.is_empty() {
-                            if let Some(_) = snap.config.discover_command() {
+                            if snap.config.discover_command().is_some() {
                                 sender.send(Task::DiscoverLinkedProjects(uri)).unwrap();
                             }
                         } else {
@@ -794,6 +794,10 @@ impl GlobalState {
             flycheck::DiscoverProjectMessage::Progress { message } => {
                 self.report_progress("Buck", Progress::Report, Some(message), None, None)
             }
+            flycheck::DiscoverProjectMessage::Error { message } => {
+                self.show_and_log_error(message.clone(), None);
+                self.report_progress("Buck", Progress::End, Some(message), None, None)
+            }
         }
     }
 
diff --git a/crates/rust-analyzer/src/reload.rs b/crates/rust-analyzer/src/reload.rs
@@ -83,7 +83,8 @@ impl GlobalState {
             );
         }
 
-        if self.config.linked_or_discovered_projects() != old_config.linked_or_discovered_projects() {
+        if self.config.linked_or_discovered_projects() != old_config.linked_or_discovered_projects()
+        {
             self.fetch_workspaces_queue.request_op("discovered projects changed".to_owned(), true)
         } else if self.config.flycheck() != old_config.flycheck() {
             self.reload_flycheck();
diff --git a/docs/user/generated_config.adoc b/docs/user/generated_config.adoc
@@ -426,14 +426,6 @@ List of warnings that should be displayed with info severity.
 The warnings will be indicated by a blue squiggly underline in code
 and a blue icon in the `Problems Panel`.
 --
-[[rust-analyzer.discoverCommand]]rust-analyzer.discoverCommand (default: `null`)::
-+
---
-Enables automatic discovery of projects using the discoverCommand.
-
-Setting this command will result in rust-analyzer starting indexing
-only once a Rust file has been opened.
---
 [[rust-analyzer.files.excludeDirs]]rust-analyzer.files.excludeDirs (default: `[]`)::
 +
 --
@@ -993,6 +985,14 @@ Show documentation.
 --
 Whether to insert closing angle brackets when typing an opening angle bracket of a generic argument list.
 --
+[[rust-analyzer.workspace.discoverCommand]]rust-analyzer.workspace.discoverCommand (default: `null`)::
++
+--
+Enables automatic discovery of projects using the discoverCommand.
+
+Setting this command will result in rust-analyzer starting indexing
+only once a Rust file has been opened.
+--
 [[rust-analyzer.workspace.symbol.search.kind]]rust-analyzer.workspace.symbol.search.kind (default: `"only_types"`)::
 +
 --
diff --git a/editors/code/package.json b/editors/code/package.json
@@ -979,17 +979,6 @@
                         "type": "string"
                     }
                 },
-                "rust-analyzer.discoverCommand": {
-                    "markdownDescription": "Enables automatic discovery of projects using the discoverCommand.\n\nSetting this command will result in rust-analyzer starting indexing\nonly once a Rust file has been opened.",
-                    "default": null,
-                    "type": [
-                        "null",
-                        "array"
-                    ],
-                    "items": {
-                        "type": "string"
-                    }
-                },
                 "rust-analyzer.files.excludeDirs": {
                     "markdownDescription": "These directories will be ignored by rust-analyzer. They are\nrelative to the workspace root, and globs are not supported. You may\nalso need to add the folders to Code's `files.watcherExclude`.",
                     "default": [],
@@ -1711,6 +1700,17 @@
                     "default": false,
                     "type": "boolean"
                 },
+                "rust-analyzer.workspace.discoverCommand": {
+                    "markdownDescription": "Enables automatic discovery of projects using the discoverCommand.\n\nSetting this command will result in rust-analyzer starting indexing\nonly once a Rust file has been opened.",
+                    "default": null,
+                    "type": [
+                        "null",
+                        "array"
+                    ],
+                    "items": {
+                        "type": "string"
+                    }
+                },
                 "rust-analyzer.workspace.symbol.search.kind": {
                     "markdownDescription": "Workspace symbol search kind.",
                     "default": "only_types",

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ impl ProjectJson {`
`175`	`175`
`176`	`176`	`#[derive(Serialize, Deserialize, Debug, Clone)]`
`177`	`177`	`pub struct ProjectJsonData {`
`178`		`- pub sysroot: Option<Utf8PathBuf>,`
	`178`	`+ sysroot: Option<Utf8PathBuf>,`
`179`	`179`	`sysroot_src: Option<Utf8PathBuf>,`
`180`	`180`	`crates: Vec<CrateData>,`
`181`	`181`	`}`
Original file line number	Diff line number	Diff line change
`@@ -257,10 +257,11 @@ fn run_server() -> anyhow::Result<()> {`
`257`	`257`	`return Err(e.into());`
`258`	`258`	`}`
`259`	`259`
`260`		`- if config.discover_command().is_none() {`
`261`		`- if !config.has_linked_projects() && config.detached_files().is_empty() {`
`262`		`- config.rediscover_workspaces();`
`263`		`- }`
	`260`	`+ if config.discover_command().is_none()`
	`261`	`+ && !config.has_linked_projects()`
	`262`	`+ && config.detached_files().is_empty()`
	`263`	`+ {`
	`264`	`+ config.rediscover_workspaces();`
`264`	`265`	`}`
`265`	`266`
`266`	`267`	`// If the io_threads have an error, there's usually an error on the main`
Original file line number	Diff line number	Diff line change
`@@ -343,7 +343,7 @@ impl GlobalState {`
`343`	`343`	`}`
`344`	`344`	`Event::DiscoverProject(message) => {`
`345`	`345`	`self.handle_discover_msg(message);`
`346`		`- // Coalesce many project discovery events into a single loop turn`
	`346`	`+ // Coalesce many project discovery events into a single loop turn.`
`347`	`347`	`while let Ok(message) = self.discover_receiver.try_recv() {`
`348`	`348`	`self.handle_discover_msg(message);`
`349`	`349`	`}`
`@@ -752,7 +752,7 @@ impl GlobalState {`
`752`	`752`	`let id = from_proto::file_id(&snap, &uri).expect("unable to get FileId");`
`753`	`753`	`if let Ok(crates) = &snap.analysis.crates_for(id) {`
`754`	`754`	`if crates.is_empty() {`
`755`		`- if let Some(_) = snap.config.discover_command() {`
	`755`	`+ if snap.config.discover_command().is_some() {`
`756`	`756`	`sender.send(Task::DiscoverLinkedProjects(uri)).unwrap();`
`757`	`757`	`}`
`758`	`758`	`} else {`
`@@ -794,6 +794,10 @@ impl GlobalState {`
`794`	`794`	`flycheck::DiscoverProjectMessage::Progress { message } => {`
`795`	`795`	`self.report_progress("Buck", Progress::Report, Some(message), None, None)`
`796`	`796`	`}`
	`797`	`+ flycheck::DiscoverProjectMessage::Error { message } => {`
	`798`	`+ self.show_and_log_error(message.clone(), None);`
	`799`	`+ self.report_progress("Buck", Progress::End, Some(message), None, None)`
	`800`	`+ }`
`797`	`801`	`}`
`798`	`802`	`}`
`799`	`803`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,8 @@ impl GlobalState {`
`83`	`83`	`);`
`84`	`84`	`}`
`85`	`85`
`86`		`- if self.config.linked_or_discovered_projects() != old_config.linked_or_discovered_projects() {`
	`86`	`+ if self.config.linked_or_discovered_projects() != old_config.linked_or_discovered_projects()`
	`87`	`+ {`
`87`	`88`	`self.fetch_workspaces_queue.request_op("discovered projects changed".to_owned(), true)`
`88`	`89`	`} else if self.config.flycheck() != old_config.flycheck() {`
`89`	`90`	`self.reload_flycheck();`