bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Use underline suggestions for purely 'additive' replacements

Browse source
This commit is contained in:
Michael Goulet 2025-02-13 02:54:07 +00:00 • committed by Jubilee Young
parent 6dfeab5c9e
commit b480a9214a
110 changed files with 369 additions and 535 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_errors/src/emitter.rs
View file

@ -1982,7 +1982,8 @@ impl HumanEmitter {
{
debug!(?complete, ?parts, ?highlights);
let has_deletion = parts.iter().any(|p| p.is_deletion(sm) || p.is_replacement(sm));
let has_deletion =
parts.iter().any(|p| p.is_deletion(sm) || p.is_destructive_replacement(sm));
let is_multiline = complete.lines().count() > 1;
if i == 0 {

11
compiler/rustc_errors/src/lib.rs
View file

@ -230,6 +230,17 @@ impl SubstitutionPart {
!self.snippet.is_empty() && self.replaces_meaningful_content(sm)
}
/// Whether this is a replacement that overwrites source with a snippet
/// in a way that isn't a superset of the original string. For example,
/// replacing "abc" with "abcde" is not destructive, but replacing it
/// it with "abx" is, since the "c" character is lost.
pub fn is_destructive_replacement(&self, sm: &SourceMap) -> bool {
self.is_replacement(sm)
&& !sm
.span_to_snippet(self.span)
.is_ok_and(|snippet| self.snippet.trim_start().starts_with(snippet.trim_start()))
}
fn replaces_meaningful_content(&self, sm: &SourceMap) -> bool {
sm.span_to_snippet(self.span)
.map_or(!self.span.is_empty(), |snippet| !snippet.trim().is_empty())