Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 13:33:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: don't wavy-underline iterator chains

Browse source
This commit is contained in:
Aleksey Kladov 2023-04-29 16:45:38 +01:00
parent 07e535b6df
commit f3de9d8f54
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,6 @@
use either::Either; use either::Either;
use hir::{db::ExpandDatabase, ClosureStyle, HirDisplay, InFile, Type}; use hir::{db::ExpandDatabase, ClosureStyle, HirDisplay, InFile, Type};
use ide_db::{famous_defs::FamousDefs, source_change::SourceChange}; use ide_db::{famous_defs::FamousDefs, source_change::SourceChange};
use stdx::never;
use syntax::{ use syntax::{
ast::{self, BlockExpr, ExprStmt}, ast::{self, BlockExpr, ExprStmt},
AstNode, AstPtr, AstNode, AstPtr,
@ -18,10 +17,6 @@ pub(crate) fn type_mismatch(ctx: &DiagnosticsContext<'_>, d: &hir::TypeMismatch)
let display_range = match &d.expr_or_pat { let display_range = match &d.expr_or_pat {
Either::Left(expr) => { Either::Left(expr) => {
adjusted_display_range::<ast::Expr>(ctx, expr.clone().map(|it| it.into()), &|expr| { adjusted_display_range::<ast::Expr>(ctx, expr.clone().map(|it| it.into()), &|expr| {
if !expr.is_block_like() {
return None;
}
let salient_token_range = match expr { let salient_token_range = match expr {
ast::Expr::IfExpr(it) => it.if_token()?.text_range(), ast::Expr::IfExpr(it) => it.if_token()?.text_range(),
ast::Expr::LoopExpr(it) => it.loop_token()?.text_range(), ast::Expr::LoopExpr(it) => it.loop_token()?.text_range(),
@ -29,13 +24,13 @@ pub(crate) fn type_mismatch(ctx: &DiagnosticsContext<'_>, d: &hir::TypeMismatch)
ast::Expr::WhileExpr(it) => it.while_token()?.text_range(), ast::Expr::WhileExpr(it) => it.while_token()?.text_range(),
ast::Expr::BlockExpr(it) => it.stmt_list()?.r_curly_token()?.text_range(), ast::Expr::BlockExpr(it) => it.stmt_list()?.r_curly_token()?.text_range(),
ast::Expr::MatchExpr(it) => it.match_token()?.text_range(), ast::Expr::MatchExpr(it) => it.match_token()?.text_range(),
_ => { ast::Expr::MethodCallExpr(it) => it.name_ref()?.ident_token()?.text_range(),
never!(); ast::Expr::FieldExpr(it) => it.name_ref()?.ident_token()?.text_range(),
return None; ast::Expr::AwaitExpr(it) => it.await_token()?.text_range(),
} _ => return None,
}; };
cov_mark::hit!(type_mismatch_on_block); cov_mark::hit!(type_mismatch_range_adjustment);
Some(salient_token_range) Some(salient_token_range)
}) })
} }
@ -625,8 +620,8 @@ fn f() {
} }
#[test] #[test]
fn type_mismatch_on_block() { fn type_mismatch_range_adjustment() {
cov_mark::check!(type_mismatch_on_block); cov_mark::check!(type_mismatch_range_adjustment);
check_diagnostics( check_diagnostics(
r#" r#"
fn f() -> i32 { fn f() -> i32 {
@ -636,9 +631,15 @@ fn f() -> i32 {
} }
//^ error: expected i32, found () //^ error: expected i32, found ()
fn h() -> i32 { fn g() -> i32 {
while true {} while true {}
} //^^^^^ error: expected i32, found () } //^^^^^ error: expected i32, found ()
struct S;
impl S { fn foo(&self) -> &S { self } }
fn h() {
let _: i32 = S.foo().foo().foo();
} //^^^ error: expected i32, found &S
"#, "#,
); );
} }