Skip to content

New config names #3824

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 2, 2020
Merged

New config names #3824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0dde0f9
Reorder fields
matklad Apr 2, 2020
e4cf40a
New config in package.json
matklad Apr 2, 2020
48c5830
Lean onto default implementation of configs
matklad Apr 2, 2020
e21bf1b
Siplify
matklad Apr 2, 2020
7a4ebd2
Remove vscode_lldb setting
matklad Apr 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
119 changes: 66 additions & 53 deletions crates/rust-analyzer/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,33 @@ use serde::Deserialize;
#[derive(Debug, Clone)]
pub struct Config {
pub client_caps: ClientCapsConfig,

pub with_sysroot: bool,
pub publish_diagnostics: bool,
pub lru_capacity: Option<usize>,
pub proc_macro_srv: Option<String>,
pub files: FilesConfig,
pub notifications: NotificationsConfig,

pub cargo: CargoConfig,
pub rustfmt: RustfmtConfig,
pub check: Option<FlycheckConfig>,

pub inlay_hints: InlayHintsConfig,
pub completion: CompletionConfig,
pub call_info_full: bool,
pub rustfmt: RustfmtConfig,
pub check: Option<FlycheckConfig>,
pub vscode_lldb: bool,
pub proc_macro_srv: Option<String>,
pub lru_capacity: Option<usize>,
pub use_client_watching: bool,
pub exclude_globs: Vec<String>,
pub cargo: CargoConfig,
pub with_sysroot: bool,
}

#[derive(Debug, Clone)]
pub struct FilesConfig {
pub watcher: FilesWatcher,
pub exclude: Vec<String>,
}

#[derive(Debug, Clone)]
pub enum FilesWatcher {
Client,
Notify,
}

#[derive(Debug, Clone)]
Expand Down Expand Up @@ -59,12 +72,26 @@ pub struct ClientCapsConfig {
impl Default for Config {
fn default() -> Self {
Config {
client_caps: ClientCapsConfig::default(),

with_sysroot: true,
publish_diagnostics: true,
lru_capacity: None,
proc_macro_srv: None,
files: FilesConfig { watcher: FilesWatcher::Notify, exclude: Vec::new() },
notifications: NotificationsConfig {
workspace_loaded: true,
cargo_toml_not_found: true,
},
client_caps: ClientCapsConfig::default(),

cargo: CargoConfig::default(),
rustfmt: RustfmtConfig::Rustfmt { extra_args: Vec::new() },
check: Some(FlycheckConfig::CargoCommand {
command: "check".to_string(),
all_targets: true,
extra_args: Vec::new(),
}),

inlay_hints: InlayHintsConfig {
type_hints: true,
parameter_hints: true,
Expand All @@ -77,19 +104,6 @@ impl Default for Config {
add_call_argument_snippets: true,
},
call_info_full: true,
rustfmt: RustfmtConfig::Rustfmt { extra_args: Vec::new() },
check: Some(FlycheckConfig::CargoCommand {
command: "check".to_string(),
all_targets: true,
extra_args: Vec::new(),
}),
vscode_lldb: false,
proc_macro_srv: None,
lru_capacity: None,
use_client_watching: false,
exclude_globs: Vec::new(),
cargo: CargoConfig::default(),
with_sysroot: true,
}
}
}
Expand All @@ -103,45 +117,44 @@ impl Config {
*self = Default::default();
self.client_caps = client_caps;

set(value, "/excludeGlobs", &mut self.exclude_globs);
set(value, "/useClientWatching", &mut self.use_client_watching);
set(value, "/withSysroot", &mut self.with_sysroot);
set(value, "/featureFlags/lsp.diagnostics", &mut self.publish_diagnostics);
set(value, "/lruCapacity", &mut self.lru_capacity);
if let Some(watcher) = get::<String>(value, "/files/watcher") {
self.files.watcher = match watcher.as_str() {
"client" => FilesWatcher::Client,
"notify"| _ => FilesWatcher::Notify,
}
}
set(value, "/notifications/workspaceLoaded", &mut self.notifications.workspace_loaded);
set(value, "/notifications/cargoTomlNotFound", &mut self.notifications.cargo_toml_not_found);

set(value, "/inlayHintsType", &mut self.inlay_hints.type_hints);
set(value, "/inlayHintsParameter", &mut self.inlay_hints.parameter_hints);
set(value, "/inlayHintsChaining", &mut self.inlay_hints.chaining_hints);
set(value, "/inlayHintsMaxLength", &mut self.inlay_hints.max_length);

if let Some(false) = get(value, "cargo_watch_enable") {
set(value, "/cargo/noDefaultFeatures", &mut self.cargo.no_default_features);
set(value, "/cargo/allFeatures", &mut self.cargo.all_features);
set(value, "/cargo/features", &mut self.cargo.features);
set(value, "/cargo/loadOutDirsFromCheck", &mut self.cargo.load_out_dirs_from_check);
if let RustfmtConfig::Rustfmt { extra_args } = &mut self.rustfmt {
set(value, "/rustfmt/extraArgs", extra_args);
}
if let Some(false) = get(value, "/checkOnSave/enable") {
self.check = None
} else {
if let Some(FlycheckConfig::CargoCommand { command, extra_args, all_targets }) = &mut self.check
{
set(value, "/cargoWatchArgs", extra_args);
set(value, "/cargoWatchCommand", command);
set(value, "/cargoWatchAllTargets", all_targets);
set(value, "/checkOnSave/extraArgs", extra_args);
set(value, "/checkOnSave/command", command);
set(value, "/checkOnSave/allTargets", all_targets);
}
};

set(value, "/withSysroot", &mut self.with_sysroot);
if let RustfmtConfig::Rustfmt { extra_args } = &mut self.rustfmt {
set(value, "/rustfmtArgs", extra_args);
}

set(value, "/cargoFeatures/noDefaultFeatures", &mut self.cargo.no_default_features);
set(value, "/cargoFeatures/allFeatures", &mut self.cargo.all_features);
set(value, "/cargoFeatures/features", &mut self.cargo.features);
set(value, "/cargoFeatures/loadOutDirsFromCheck", &mut self.cargo.load_out_dirs_from_check);

set(value, "/vscodeLldb", &mut self.vscode_lldb);

set(value, "/featureFlags/lsp.diagnostics", &mut self.publish_diagnostics);
set(value, "/featureFlags/notifications.workspace-loaded", &mut self.notifications.workspace_loaded);
set(value, "/featureFlags/notifications.cargo-toml-not-found", &mut self.notifications.cargo_toml_not_found);
set(value, "/featureFlags/completion.enable-postfix", &mut self.completion.enable_postfix_completions);
set(value, "/featureFlags/completion.insertion.add-call-parenthesis", &mut self.completion.add_call_parenthesis);
set(value, "/featureFlags/completion.insertion.add-argument-snippets", &mut self.completion.add_call_argument_snippets);
set(value, "/featureFlags/call-info.full", &mut self.call_info_full);
set(value, "/inlayHints/typeHints", &mut self.inlay_hints.type_hints);
set(value, "/inlayHints/parameterHints", &mut self.inlay_hints.parameter_hints);
set(value, "/inlayHints/chainingHints", &mut self.inlay_hints.chaining_hints);
set(value, "/inlayHints/maxLength", &mut self.inlay_hints.max_length);
set(value, "/completion/postfix/enable", &mut self.completion.enable_postfix_completions);
set(value, "/completion/addCallParenthesis", &mut self.completion.add_call_parenthesis);
set(value, "/completion/addCallArgumentSnippets", &mut self.completion.add_call_argument_snippets);
set(value, "/callInfo/full", &mut self.call_info_full);

log::info!("Config::update() = {:#?}", self);

Expand Down
28 changes: 16 additions & 12 deletions crates/rust-analyzer/src/main_loop.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ use serde::{de::DeserializeOwned, Serialize};
use threadpool::ThreadPool;

use crate::{
config::Config,
config::{Config, FilesWatcher},
diagnostics::DiagnosticTask,
main_loop::{
pending_requests::{PendingRequest, PendingRequests},
Expand All @@ -40,7 +40,6 @@ use crate::{
world::{WorldSnapshot, WorldState},
Result,
};
use req::ConfigurationParams;

#[derive(Debug)]
pub struct LspError {
Expand Down Expand Up @@ -122,12 +121,13 @@ pub fn main_loop(ws_roots: Vec<PathBuf>, config: Config, connection: Connection)
};

let globs = config
.exclude_globs
.files
.exclude
.iter()
.map(|glob| crate::vfs_glob::Glob::new(glob))
.collect::<std::result::Result<Vec<_>, _>>()?;

if config.use_client_watching {
if let FilesWatcher::Client = config.files.watcher {
let registration_options = req::DidChangeWatchedFilesRegistrationOptions {
watchers: workspaces
.iter()
Expand All @@ -153,7 +153,7 @@ pub fn main_loop(ws_roots: Vec<PathBuf>, config: Config, connection: Connection)
workspaces,
config.lru_capacity,
&globs,
Watch(!config.use_client_watching),
Watch(matches!(config.files.watcher, FilesWatcher::Notify)),
config,
)
};
Expand Down Expand Up @@ -607,7 +607,12 @@ fn on_notification(
let request_id = loop_state.next_request_id();
let request = request_new::<req::WorkspaceConfiguration>(
request_id.clone(),
ConfigurationParams::default(),
req::ConfigurationParams {
items: vec![req::ConfigurationItem {
scope_uri: None,
section: Some("rust-analyzer".to_string()),
}],
},
);
msg_sender.send(request.into())?;
loop_state.configuration_request_id = Some(request_id);
Expand Down Expand Up @@ -884,10 +889,9 @@ fn update_file_notifications_on_threadpool(
subscriptions: Vec<FileId>,
) {
log::trace!("updating notifications for {:?}", subscriptions);
let publish_diagnostics = world.config.publish_diagnostics;
pool.execute(move || {
for file_id in subscriptions {
if publish_diagnostics {
if world.config.publish_diagnostics {
pool.execute(move || {
for file_id in subscriptions {
match handlers::publish_diagnostics(&world, file_id) {
Err(e) => {
if !is_canceled(&e) {
Expand All @@ -899,8 +903,8 @@ fn update_file_notifications_on_threadpool(
}
}
}
}
});
})
}
}

pub fn show_message(typ: req::MessageType, message: impl Into<String>, sender: &Sender<Message>) {
Expand Down
30 changes: 14 additions & 16 deletions crates/rust-analyzer/src/main_loop/handlers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -810,23 +810,21 @@ pub fn handle_code_lens(
};
lenses.push(lens);

if world.config.vscode_lldb {
if r.args[0] == "run" {
r.args[0] = "build".into();
} else {
r.args.push("--no-run".into());
}
let debug_lens = CodeLens {
range: r.range,
command: Some(Command {
title: "Debug".into(),
command: "rust-analyzer.debugSingle".into(),
arguments: Some(vec![to_value(r).unwrap()]),
}),
data: None,
};
lenses.push(debug_lens);
if r.args[0] == "run" {
r.args[0] = "build".into();
} else {
r.args.push("--no-run".into());
}
let debug_lens = CodeLens {
range: r.range,
command: Some(Command {
title: "Debug".into(),
command: "rust-analyzer.debugSingle".into(),
arguments: Some(vec![to_value(r).unwrap()]),
}),
data: None,
};
lenses.push(debug_lens);
}

// Handle impls
Expand Down
4 changes: 2 additions & 2 deletions crates/rust-analyzer/src/req.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ use serde::{Deserialize, Serialize};

pub use lsp_types::{
notification::*, request::*, ApplyWorkspaceEditParams, CodeActionParams, CodeLens,
CodeLensParams, CompletionParams, CompletionResponse, ConfigurationParams, DiagnosticTag,
DidChangeConfigurationParams, DidChangeWatchedFilesParams,
CodeLensParams, CompletionParams, CompletionResponse, ConfigurationItem, ConfigurationParams,
DiagnosticTag, DidChangeConfigurationParams, DidChangeWatchedFilesParams,
DidChangeWatchedFilesRegistrationOptions, DocumentOnTypeFormattingParams, DocumentSymbolParams,
DocumentSymbolResponse, FileSystemWatcher, Hover, InitializeResult, MessageType,
PartialResultParams, ProgressParams, ProgressParamsValue, ProgressToken,
Expand Down
Loading