Fix not disable string escape highlights #21420
Merged
Conversation
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
rustbot
added
the
S-waiting-on-review
A4-Tacks
commented
Jan 8, 2026
| let mut hl = highlights::Highlights::new(root.text_range()); | ||
| let krate = sema.scope(&root).map(|it| it.krate()); | ||
| traverse(&mut hl, &sema, config, InRealFile::new(file_id, &root), krate, range_to_highlight); | ||
| hl.retain_mut(|hl_range| filter_by_config(&mut hl_range.highlight, config)); |
Member
Author
There was a problem hiding this comment.
Is it better to filter the entire tree here, or is it better to pass config to each add?
Contributor
There was a problem hiding this comment.
I believe it's better to filter on the spot, not the entire tree. This is faster, and the tree can be large.
| self.root.add(hl_range); | ||
| } | ||
|
|
||
| pub(crate) fn retain_mut(&mut self, mut f: impl FnMut(&mut HlRange) -> bool) { |
Contributor
There was a problem hiding this comment.
Can call this just retain(), the reason Vec::retain_mut() is named this way is due to a past mistake and it's IMO not a good name. Ditto for below.
| let mut hl = highlights::Highlights::new(root.text_range()); | ||
| let krate = sema.scope(&root).map(|it| it.krate()); | ||
| traverse(&mut hl, &sema, config, InRealFile::new(file_id, &root), krate, range_to_highlight); | ||
| hl.retain_mut(|hl_range| filter_by_config(&mut hl_range.highlight, config)); |
Contributor
There was a problem hiding this comment.
I believe it's better to filter on the spot, not the entire tree. This is faster, and the tree can be large.
Example
---
with config `strings: false`
```rust
fn main() {
format_args!("foo\nbar\invalid");
}
```
**Before this PR**
```rust
fn main() {
format_args!("foo\nbar\invalid");
// ^^ EscapeSequence
// ^^ InvalidEscapeSequence
}
```
**After this PR**
```rust
fn main() {
format_args!("foo\nbar\invalid");
}
```
A4-Tacks
force-pushed
the
disable-string-hl
branch
from
50de646 to
fa3d8af
Compare
rustbot
removed
the
S-waiting-on-review
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Example
with config
strings: falseBefore this PR
After this PR