language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 06:11:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge #326

Browse source 
326: resolved #324: remove unnecessary braces in use statement. r=matklad a=gfreezy

Add inspection for unnecessary braces in use statement

Co-authored-by: gfreezy <gfreezy@gmail.com>
This commit is contained in:
bors[bot] 2018-12-24 18:39:31 +00:00
commit b65ba8f1d6
7 changed files with 79 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ra_lsp_server/src/main_loop.rs
View file

@ -13,7 +13,7 @@ use gen_lsp_server::{
};
use languageserver_types::NumberOrString;
use ra_analysis::{Canceled, FileId, LibraryData};
use ra_vfs::{VfsTask};
use ra_vfs::VfsTask;
use rayon;
use threadpool::ThreadPool;
use rustc_hash::FxHashSet;
@ -23,7 +23,7 @@ use failure_derive::Fail;
use crate::{
main_loop::subscriptions::Subscriptions,
project_model::{workspace_loader},
project_model::workspace_loader,
req,
server_world::{ServerWorld, ServerWorldState},
Result,

15
crates/ra_lsp_server/src/main_loop/handlers.rs
View file

@ -8,7 +8,7 @@ use languageserver_types::{
PrepareRenameResponse, RenameParams, SymbolInformation, TextDocumentIdentifier, TextEdit,
WorkspaceEdit, ParameterInformation, ParameterLabel, SignatureInformation, Hover, HoverContents,
};
use ra_analysis::{FileId, FoldKind, Query, RunnableKind, FilePosition};
use ra_analysis::{FileId, FoldKind, Query, RunnableKind, FilePosition, Severity};
use ra_syntax::{TextUnit, text_utils::intersect};
use ra_text_edit::text_utils::contains_offset_nonstrict;
use rustc_hash::FxHashMap;
@ -650,7 +650,7 @@ pub fn publish_diagnostics(
.into_iter()
.map(|d| Diagnostic {
range: d.range.conv_with(&line_index),
severity: Some(DiagnosticSeverity::Error),
severity: Some(to_diagnostic_severity(d.severity)),
code: None,
source: Some("rust-analyzer".to_string()),
message: d.message,
@ -684,3 +684,14 @@ fn highlight(world: &ServerWorld, file_id: FileId) -> Result<Vec<Decoration>> {
.collect();
Ok(res)
}
fn to_diagnostic_severity(severity: Severity) -> DiagnosticSeverity {
use ra_analysis::Severity::*;
match severity {
Error => DiagnosticSeverity::Error,
Warning => DiagnosticSeverity::Warning,
Information => DiagnosticSeverity::Information,
Hint => DiagnosticSeverity::Hint,
}
}