1712: fix default for the exlude key r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2019-08-21 14:31:35 +00:00 committed by GitHub
commit 5fd9a5be09
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions

View file

@ -48,9 +48,12 @@ fn main_inner() -> Result<()> {
let opts = params
.initialization_options
.and_then(|v| ServerConfig::deserialize(v).ok())
.and_then(|v| {
ServerConfig::deserialize(v)
.map_err(|e| log::error!("failed to deserialize config: {}", e))
.ok()
})
.unwrap_or_default();
ra_lsp_server::main_loop(workspace_roots, params.capabilities, opts, r, s)
})?;
log::info!("shutting down IO...");

View file

@ -586,6 +586,7 @@ fn update_file_notifications_on_threadpool(
sender: Sender<Task>,
subscriptions: Vec<FileId>,
) {
log::trace!("updating notifications for {:?}", subscriptions);
pool.execute(move || {
for file_id in subscriptions {
match handlers::publish_diagnostics(&world, file_id) {

View file

@ -199,7 +199,7 @@
},
"rust-analyzer.excludeGlobs": {
"type": "array",
"default": "[]",
"default": [],
"description": "Paths to exclude from analysis"
},
"rust-analyzer.cargo-watch.arguments": {