mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #14538 - Veykril:project-link-fix, r=Veykril

Browse Source 
fix: Fix project linking popup appearing for modules that can be linked to a crate

should fix https://github.com/rust-lang/rust-analyzer/issues/14523
This commit is contained in:
bors 2023-04-09 08:18:12 +00:00
commit 51d5862caf
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
crates/ide-diagnostics/src/handlers/unlinked_file.rs
View File

@ -10,7 +10,7 @@
}; };
use syntax::{ use syntax::{
ast::{self, edit::IndentLevel, HasModuleItem, HasName}, ast::{self, edit::IndentLevel, HasModuleItem, HasName},
AstNode, TextRange, TextSize, AstNode, TextRange,
}; };
use text_edit::TextEdit; use text_edit::TextEdit;
@ -27,14 +27,28 @@ pub(crate) fn unlinked_file(
) { ) {
// Limit diagnostic to the first few characters in the file. This matches how VS Code // Limit diagnostic to the first few characters in the file. This matches how VS Code
// renders it with the full span, but on other editors, and is less invasive. // renders it with the full span, but on other editors, and is less invasive.
let fixes = fixes(ctx, file_id);
// FIXME: This is a hack for the vscode extension to notice whether there is an autofix or not before having to resolve diagnostics.
// This is to prevent project linking popups from appearing when there is an autofix. https://github.com/rust-lang/rust-analyzer/issues/14523
let message = if fixes.is_none() {
"file not included in crate hierarchy"
} else {
"file not included in module tree"
};
let range = ctx.sema.db.parse(file_id).syntax_node().text_range(); let range = ctx.sema.db.parse(file_id).syntax_node().text_range();
// FIXME: This is wrong if one of the first three characters is not ascii: `//Ы`. let range = FileLoader::file_text(ctx.sema.db, file_id)
let range = range.intersect(TextRange::up_to(TextSize::of("..."))).unwrap_or(range); .char_indices()
.take(3)
.last()
.map(|(i, _)| i)
.map(|i| TextRange::up_to(i.try_into().unwrap()))
.unwrap_or(range);
acc.push( acc.push(
Diagnostic::new("unlinked-file", "file not included in module tree", range) Diagnostic::new("unlinked-file", message, range)
.severity(Severity::WeakWarning) .severity(Severity::WeakWarning)
.with_fixes(fixes(ctx, file_id)), .with_fixes(fixes),
); );
} }

6
editors/code/src/client.ts
View File

@ -125,7 +125,11 @@ export async function createClient(
typeof diag.code === "string" || typeof diag.code === "number" typeof diag.code === "string" || typeof diag.code === "number"
? diag.code ? diag.code
: diag.code?.value; : diag.code?.value;
if (value === "unlinked-file" && !unlinkedFiles.includes(uri)) { if (
value === "unlinked-file" &&
!unlinkedFiles.includes(uri) &&
diag.message !== "file not included in module tree"
) {
const config = vscode.workspace.getConfiguration("rust-analyzer"); const config = vscode.workspace.getConfiguration("rust-analyzer");
if (config.get("showUnlinkedFileNotification")) { if (config.get("showUnlinkedFileNotification")) {
unlinkedFiles.push(uri); unlinkedFiles.push(uri);