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

feat: don't highlight the whole fn on return-type mismatch

Browse source
This commit is contained in:
Aleksey Kladov 2022-07-23 21:16:59 +01:00
parent 2be00623e4
commit a436be44b2
1 changed files with 34 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

37
crates/ide-diagnostics/src/handlers/type_mismatch.rs
View file

@ -1,7 +1,12 @@
use hir::{db::AstDatabase, HirDisplay, Type}; use hir::{db::AstDatabase, HirDisplay, Type};
use ide_db::{famous_defs::FamousDefs, source_change::SourceChange}; use ide_db::{
base_db::{FileRange, SourceDatabase},
famous_defs::FamousDefs,
source_change::SourceChange,
};
use syntax::{ use syntax::{
ast::{BlockExpr, ExprStmt}, algo::find_node_at_range,
ast::{self, BlockExpr, ExprStmt},
AstNode, AstNode,
}; };
use text_edit::TextEdit; use text_edit::TextEdit;
@ -13,6 +18,18 @@ use crate::{fix, Assist, Diagnostic, DiagnosticsContext};
// This diagnostic is triggered when the type of an expression does not match // This diagnostic is triggered when the type of an expression does not match
// the expected type. // the expected type.
pub(crate) fn type_mismatch(ctx: &DiagnosticsContext<'_>, d: &hir::TypeMismatch) -> Diagnostic { pub(crate) fn type_mismatch(ctx: &DiagnosticsContext<'_>, d: &hir::TypeMismatch) -> Diagnostic {
let FileRange { file_id, range } =
ctx.sema.diagnostics_display_range(d.expr.clone().map(|it| it.into()));
let source_file = ctx.sema.db.parse(file_id);
let block = find_node_at_range::<ast::BlockExpr>(&source_file.syntax_node(), range)
.filter(|it| it.syntax().text_range() == range);
let display_range = block
.and_then(|it| it.stmt_list())
.and_then(|it| it.r_curly_token())
.map(|it| it.text_range())
.unwrap_or(range);
let mut diag = Diagnostic::new( let mut diag = Diagnostic::new(
"type-mismatch", "type-mismatch",
format!( format!(
@ -20,7 +37,7 @@ pub(crate) fn type_mismatch(ctx: &DiagnosticsContext<'_>, d: &hir::TypeMismatch)
d.expected.display(ctx.sema.db), d.expected.display(ctx.sema.db),
d.actual.display(ctx.sema.db) d.actual.display(ctx.sema.db)
), ),
ctx.sema.diagnostics_display_range(d.expr.clone().map(|it| it.into())).range, display_range,
) )
.with_fixes(fixes(ctx, d)); .with_fixes(fixes(ctx, d));
if diag.fixes.is_none() { if diag.fixes.is_none() {
@ -545,4 +562,18 @@ fn test() -> String {
"#, "#,
); );
} }
#[test]
fn type_mismatch_on_block() {
check_diagnostics(
r#"
fn f() -> i32 {
let x = 1;
let y = 2;
let _ = x + y;
}
//^ error: expected i32, found ()
"#,
);
}
} }