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

StyledBuffer::set_style: check overwrite first

Browse Source
This commit is contained in:
klensy 2021-04-16 05:23:40 +03:00
parent 7e9d3c6f6c
commit 247d74f207
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_errors/src/styled_buffer.rs
View File

@ -148,11 +148,11 @@ pub fn set_style_range(
/// Set `style` for `line`, `col` if: /// Set `style` for `line`, `col` if:
/// 1. That line and column exist in `StyledBuffer` /// 1. That line and column exist in `StyledBuffer`
/// 2. Existing style is `Style::NoStyle` or `Style::Quotation` or `overwrite` is `true` /// 2. `overwrite` is `true` or existing style is `Style::NoStyle` or `Style::Quotation`
pub fn set_style(&mut self, line: usize, col: usize, style: Style, overwrite: bool) { pub fn set_style(&mut self, line: usize, col: usize, style: Style, overwrite: bool) {
if let Some(ref mut line) = self.text.get_mut(line) { if let Some(ref mut line) = self.text.get_mut(line) {
if let Some(StyledChar { style: s, .. }) = line.get_mut(col) { if let Some(StyledChar { style: s, .. }) = line.get_mut(col) {
if *s == Style::NoStyle || *s == Style::Quotation || overwrite { if overwrite || *s == Style::NoStyle || *s == Style::Quotation {
*s = style; *s = style;
} }
} }