Rust: downgrade uncompiled source files from warning to info #20288
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,3 +1,4 @@ | ||||||
| use crate::trap; | ||||||
| use itertools::Itertools; | ||||||
| use ra_ap_base_db::{EditionedFileId, FileText, RootQueryDb, SourceDatabase}; | ||||||
| use ra_ap_hir::Semantics; | ||||||
|
|
@@ -23,16 +24,47 @@ use std::rc::Rc; | |||||
| use tracing::{debug, error, info, trace, warn}; | ||||||
| use triomphe::Arc; | ||||||
|
|
||||||
| #[derive(Clone, Default)] | ||||||
| pub struct RustAnalyzerNoSemantics { | ||||||
| pub severity: trap::DiagnosticSeverity, | ||||||
| pub reason: &'static str, | ||||||
| } | ||||||
|
|
||||||
| impl RustAnalyzerNoSemantics { | ||||||
| pub fn warning(reason: &'static str) -> Self { | ||||||
| RustAnalyzerNoSemantics { | ||||||
| severity: trap::DiagnosticSeverity::Warning, | ||||||
| reason, | ||||||
| } | ||||||
| } | ||||||
| pub fn info(reason: &'static str) -> Self { | ||||||
| RustAnalyzerNoSemantics { | ||||||
| severity: trap::DiagnosticSeverity::Info, | ||||||
| reason, | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| pub enum RustAnalyzer<'a> { | ||||||
| WithSemantics { | ||||||
| vfs: &'a Vfs, | ||||||
| semantics: &'a Semantics<'a, RootDatabase>, | ||||||
| }, | ||||||
| WithoutSemantics { | ||||||
| severity: trap::DiagnosticSeverity, | ||||||
| reason: &'static str, | ||||||
| }, | ||||||
| } | ||||||
|
|
||||||
| impl From<RustAnalyzerNoSemantics> for RustAnalyzer<'static> { | ||||||
| fn from(value: RustAnalyzerNoSemantics) -> Self { | ||||||
| RustAnalyzer::WithoutSemantics { | ||||||
| severity: value.severity, | ||||||
| reason: value.reason, | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| pub struct FileSemanticInformation<'a> { | ||||||
| pub file_id: EditionedFileId, | ||||||
| pub semantics: &'a Semantics<'a, RootDatabase>, | ||||||
|
|
@@ -42,7 +74,7 @@ pub struct ParseResult<'a> { | |||||
| pub ast: SourceFile, | ||||||
| pub text: Arc<str>, | ||||||
| pub errors: Vec<SyntaxError>, | ||||||
| pub semantics_info: Result<FileSemanticInformation<'a>, RustAnalyzerNoSemantics>, | ||||||
| } | ||||||
|
|
||||||
| impl<'a> RustAnalyzer<'a> { | ||||||
|
|
@@ -52,7 +84,7 @@ impl<'a> RustAnalyzer<'a> { | |||||
| load_config: &LoadCargoConfig, | ||||||
| ) -> Option<(RootDatabase, Vfs)> { | ||||||
| let progress = |t| trace!("progress: {t}"); | ||||||
| let manifest: &ManifestPath = project.manifest_path(); | ||||||
|
There was a problem hiding this comment. [nitpick] This explicit type annotation is unnecessary since the type can be inferred from context. Consider removing it to reduce code noise.
Suggested change
|
||||||
| match load_workspace_at(manifest.as_ref(), config, load_config, &progress) { | ||||||
| Ok((db, vfs, _macro_server)) => Some((db, vfs)), | ||||||
| Err(err) => { | ||||||
|
|
@@ -67,16 +99,25 @@ impl<'a> RustAnalyzer<'a> { | |||||
| fn get_file_data( | ||||||
| &self, | ||||||
| path: &Path, | ||||||
| ) -> Result<(&Semantics<'_, RootDatabase>, EditionedFileId, FileText), RustAnalyzerNoSemantics> | ||||||
| { | ||||||
| match self { | ||||||
| RustAnalyzer::WithoutSemantics { severity, reason } => Err(RustAnalyzerNoSemantics { | ||||||
| severity: *severity, | ||||||
| reason, | ||||||
| }), | ||||||
| RustAnalyzer::WithSemantics { vfs, semantics } => { | ||||||
| let file_id = path_to_file_id(path, vfs).ok_or( | ||||||
| RustAnalyzerNoSemantics::warning("file not found in project"), | ||||||
| )?; | ||||||
| let input = std::panic::catch_unwind(|| semantics.db.file_text(file_id)).or( | ||||||
| Err(RustAnalyzerNoSemantics::warning( | ||||||
| "no text available for the file in the project", | ||||||
| )), | ||||||
| )?; | ||||||
| let editioned_file_id = semantics.attach_first_edition(file_id).ok_or( | ||||||
| RustAnalyzerNoSemantics::warning("failed to determine rust edition"), | ||||||
| )?; | ||||||
| Ok((semantics, editioned_file_id, input)) | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +0,0 @@ | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,2 @@ | ||
| extractionWarning | ||
| | macro_expansion.rs:56:9:56:31 | macro expansion failed for 'concat' | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[nitpick] The message should be consistent with standard punctuation. Consider removing the period at the end for consistency with other diagnostic messages, or ensure all diagnostic messages follow the same punctuation pattern.