mirror of
https://github.com/rust-lang/rust-analyzer
synced 2024-12-25 12:33:33 +00:00
Improve logging
This commit is contained in:
parent
b4bc346498
commit
3a72afed8c
5 changed files with 32 additions and 14 deletions
|
@ -6,6 +6,7 @@ mod sysroot;
|
||||||
mod cfg_flag;
|
mod cfg_flag;
|
||||||
|
|
||||||
use std::{
|
use std::{
|
||||||
|
fmt,
|
||||||
fs::{self, read_dir, ReadDir},
|
fs::{self, read_dir, ReadDir},
|
||||||
io,
|
io,
|
||||||
process::Command,
|
process::Command,
|
||||||
|
@ -27,7 +28,7 @@ pub use crate::{
|
||||||
|
|
||||||
pub use proc_macro_api::ProcMacroClient;
|
pub use proc_macro_api::ProcMacroClient;
|
||||||
|
|
||||||
#[derive(Debug, Clone, Eq, PartialEq)]
|
#[derive(Clone, Eq, PartialEq)]
|
||||||
pub enum ProjectWorkspace {
|
pub enum ProjectWorkspace {
|
||||||
/// Project workspace was discovered by running `cargo metadata` and `rustc --print sysroot`.
|
/// Project workspace was discovered by running `cargo metadata` and `rustc --print sysroot`.
|
||||||
Cargo { cargo: CargoWorkspace, sysroot: Sysroot },
|
Cargo { cargo: CargoWorkspace, sysroot: Sysroot },
|
||||||
|
@ -35,6 +36,19 @@ pub enum ProjectWorkspace {
|
||||||
Json { project: ProjectJson },
|
Json { project: ProjectJson },
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl fmt::Debug for ProjectWorkspace {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
|
match self {
|
||||||
|
ProjectWorkspace::Cargo { cargo, .. } => {
|
||||||
|
f.debug_struct("Cargo").field("n_packages", &cargo.packages().len()).finish()
|
||||||
|
}
|
||||||
|
ProjectWorkspace::Json { project } => {
|
||||||
|
f.debug_struct("Json").field("n_crates", &project.crates.len()).finish()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// `PackageRoot` describes a package root folder.
|
/// `PackageRoot` describes a package root folder.
|
||||||
/// Which may be an external dependency, or a member of
|
/// Which may be an external dependency, or a member of
|
||||||
/// the current workspace.
|
/// the current workspace.
|
||||||
|
|
|
@ -60,11 +60,12 @@ fn setup_logging() -> Result<()> {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn run_server() -> Result<()> {
|
fn run_server() -> Result<()> {
|
||||||
log::info!("lifecycle: server started");
|
log::info!("server will start");
|
||||||
|
|
||||||
let (connection, io_threads) = Connection::stdio();
|
let (connection, io_threads) = Connection::stdio();
|
||||||
|
|
||||||
let (initialize_id, initialize_params) = connection.initialize_start()?;
|
let (initialize_id, initialize_params) = connection.initialize_start()?;
|
||||||
|
log::info!("InitializeParams: {}", initialize_params);
|
||||||
let initialize_params =
|
let initialize_params =
|
||||||
from_json::<lsp_types::InitializeParams>("InitializeParams", initialize_params)?;
|
from_json::<lsp_types::InitializeParams>("InitializeParams", initialize_params)?;
|
||||||
|
|
||||||
|
@ -118,10 +119,9 @@ fn run_server() -> Result<()> {
|
||||||
.filter(|workspaces| !workspaces.is_empty())
|
.filter(|workspaces| !workspaces.is_empty())
|
||||||
.unwrap_or_else(|| vec![config.root_path.clone()]);
|
.unwrap_or_else(|| vec![config.root_path.clone()]);
|
||||||
|
|
||||||
config.linked_projects = ProjectManifest::discover_all(&workspace_roots)
|
let discovered = ProjectManifest::discover_all(&workspace_roots);
|
||||||
.into_iter()
|
log::info!("discovered projects: {:?}", discovered);
|
||||||
.map(LinkedProject::from)
|
config.linked_projects = discovered.into_iter().map(LinkedProject::from).collect();
|
||||||
.collect();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
config
|
config
|
||||||
|
@ -129,8 +129,7 @@ fn run_server() -> Result<()> {
|
||||||
|
|
||||||
rust_analyzer::main_loop(config, connection)?;
|
rust_analyzer::main_loop(config, connection)?;
|
||||||
|
|
||||||
log::info!("shutting down IO...");
|
|
||||||
io_threads.join()?;
|
io_threads.join()?;
|
||||||
log::info!("... IO is down");
|
log::info!("server did shut down");
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,6 +10,8 @@ use crossbeam_channel::{select, Receiver};
|
||||||
use ide::{Canceled, FileId};
|
use ide::{Canceled, FileId};
|
||||||
use lsp_server::{Connection, Notification, Request, Response};
|
use lsp_server::{Connection, Notification, Request, Response};
|
||||||
use lsp_types::notification::Notification as _;
|
use lsp_types::notification::Notification as _;
|
||||||
|
use project_model::ProjectWorkspace;
|
||||||
|
use vfs::ChangeKind;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
config::Config,
|
config::Config,
|
||||||
|
@ -21,8 +23,6 @@ use crate::{
|
||||||
lsp_utils::{apply_document_changes, is_canceled, notification_is, Progress},
|
lsp_utils::{apply_document_changes, is_canceled, notification_is, Progress},
|
||||||
Result,
|
Result,
|
||||||
};
|
};
|
||||||
use project_model::ProjectWorkspace;
|
|
||||||
use vfs::ChangeKind;
|
|
||||||
|
|
||||||
pub fn main_loop(config: Config, connection: Connection) -> Result<()> {
|
pub fn main_loop(config: Config, connection: Connection) -> Result<()> {
|
||||||
log::info!("initial config: {:#?}", config);
|
log::info!("initial config: {:#?}", config);
|
||||||
|
@ -175,9 +175,9 @@ impl GlobalState {
|
||||||
let _p = profile::span("GlobalState::handle_event");
|
let _p = profile::span("GlobalState::handle_event");
|
||||||
|
|
||||||
log::info!("handle_event({:?})", event);
|
log::info!("handle_event({:?})", event);
|
||||||
let queue_count = self.task_pool.handle.len();
|
let task_queue_len = self.task_pool.handle.len();
|
||||||
if queue_count > 0 {
|
if task_queue_len > 0 {
|
||||||
log::info!("queued count = {}", queue_count);
|
log::info!("task queue len: {}", task_queue_len);
|
||||||
}
|
}
|
||||||
|
|
||||||
let prev_status = self.status;
|
let prev_status = self.status;
|
||||||
|
|
|
@ -92,6 +92,7 @@ impl GlobalState {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pub(crate) fn fetch_workspaces(&mut self) {
|
pub(crate) fn fetch_workspaces(&mut self) {
|
||||||
|
log::info!("will fetch workspaces");
|
||||||
self.task_pool.handle.spawn({
|
self.task_pool.handle.spawn({
|
||||||
let linked_projects = self.config.linked_projects.clone();
|
let linked_projects = self.config.linked_projects.clone();
|
||||||
let cargo_config = self.config.cargo.clone();
|
let cargo_config = self.config.cargo.clone();
|
||||||
|
@ -112,13 +113,14 @@ impl GlobalState {
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.collect::<Vec<_>>();
|
.collect::<Vec<_>>();
|
||||||
|
log::info!("did fetch workspaces {:?}", workspaces);
|
||||||
Task::Workspaces(workspaces)
|
Task::Workspaces(workspaces)
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
pub(crate) fn switch_workspaces(&mut self, workspaces: Vec<anyhow::Result<ProjectWorkspace>>) {
|
pub(crate) fn switch_workspaces(&mut self, workspaces: Vec<anyhow::Result<ProjectWorkspace>>) {
|
||||||
let _p = profile::span("GlobalState::switch_workspaces");
|
let _p = profile::span("GlobalState::switch_workspaces");
|
||||||
log::info!("reloading projects: {:?}", self.config.linked_projects);
|
log::info!("will switch workspaces: {:?}", workspaces);
|
||||||
|
|
||||||
let mut has_errors = false;
|
let mut has_errors = false;
|
||||||
let workspaces = workspaces
|
let workspaces = workspaces
|
||||||
|
@ -223,6 +225,7 @@ impl GlobalState {
|
||||||
self.analysis_host.apply_change(change);
|
self.analysis_host.apply_change(change);
|
||||||
self.process_changes();
|
self.process_changes();
|
||||||
self.reload_flycheck();
|
self.reload_flycheck();
|
||||||
|
log::info!("did switch workspaces");
|
||||||
}
|
}
|
||||||
|
|
||||||
fn reload_flycheck(&mut self) {
|
fn reload_flycheck(&mut self) {
|
||||||
|
|
|
@ -341,6 +341,8 @@ Relative paths are interpreted relative to `rust-project.json` file location or
|
||||||
|
|
||||||
See https://github.com/rust-analyzer/rust-project.json-example for a small example.
|
See https://github.com/rust-analyzer/rust-project.json-example for a small example.
|
||||||
|
|
||||||
|
You can set `RA_LOG` environmental variable to `"'rust_analyzer=info"` to inspect how rust-analyzer handles config and project loading.
|
||||||
|
|
||||||
== Features
|
== Features
|
||||||
|
|
||||||
include::./generated_features.adoc[]
|
include::./generated_features.adoc[]
|
||||||
|
|
Loading…
Reference in a new issue