Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-15 01:17:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: Only show unlinked-file diagnostic on first line during startup

Browse source 
This partially reverts #17350, based on the feedback in #17397.

If we don't have an autofix, it's more annoying to highlight the whole line.
This heuristic fixes the diagnostic overwhelming the user during startup.
This commit is contained in:
Wilfred Hughes 2024-06-13 11:52:34 -07:00
parent e059feadef
commit 495c0cb1ea
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
crates/ide-diagnostics/src/handlers/unlinked_file.rs
View file

@ -11,7 +11,7 @@ use ide_db::{
use paths::Utf8Component;
use syntax::{
ast::{self, edit::IndentLevel, HasModuleItem, HasName},
AstNode,
AstNode, TextRange,
};
use text_edit::TextEdit;
@ -35,7 +35,27 @@ pub(crate) fn unlinked_file(
"file not included in module tree"
};
let range = ctx.sema.db.parse(file_id).syntax_node().text_range();
let mut range = ctx.sema.db.parse(file_id).syntax_node().text_range();
let mut unused = true;
if fixes.is_none() {
// If we don't have a fix, the unlinked-file diagnostic is not
// actionable. This generally means that rust-analyzer hasn't
// finished startup, or we couldn't find the Cargo.toml.
//
// Only show this diagnostic on the first three characters of
// the file, to avoid overwhelming the user during startup.
range = FileLoader::file_text(ctx.sema.db, file_id)
.char_indices()
.take(3)
.last()
.map(|(i, _)| i)
.map(|i| TextRange::up_to(i.try_into().unwrap()))
.unwrap_or(range);
// Prefer a diagnostic underline over graying out the text,
// since we're only highlighting a small region.
unused = false;
}
acc.push(
Diagnostic::new(
@ -43,7 +63,7 @@ pub(crate) fn unlinked_file(
message,
FileRange { file_id, range },
)
.with_unused(true)
.with_unused(unused)
.with_fixes(fixes),
);
}