PolytreeDE
/
alacritty
mirror of https://github.com/alacritty/alacritty.git
1
0
Fork 0
Code Releases Activity

Fix highlighting multiple hints in the same line 

Fixes #5010.
This commit is contained in:
Christian Duerr 2021-04-30 00:23:09 +00:00 committed by GitHub
parent 4d982894a6
commit edf0faf98f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
alacritty/src/display/hint.rs
View File

@ -3,8 +3,8 @@ use std::cmp::{max, min};
use glutin::event::ModifiersState;
use alacritty_terminal::grid::BidirectionalIterator;
use alacritty_terminal::index::{Boundary, Point};
use alacritty_terminal::term::search::{Match, RegexSearch};
use alacritty_terminal::index::{Boundary, Direction, Point};
use alacritty_terminal::term::search::{Match, RegexIter, RegexSearch};
use alacritty_terminal::term::{Term, TermMode};
use crate::config::ui_config::{Hint, HintAction};
@ -266,11 +266,12 @@ pub fn highlighted_at<T>(
let mut end = term.line_search_right(point);
end.line = min(end.line, point.line + MAX_SEARCH_LINES);
// Function to verify if the specified point is inside the match.
let at_point = |rm: &Match| *rm.start() <= point && *rm.end() >= point;
// Function to verify that the specified point is inside the match.
let at_point = |rm: &Match| *rm.end() >= point && *rm.start() <= point;
// Check if there's any match at the specified point.
let regex_match = term.regex_search_right(regex, start, end).filter(at_point)?;
let mut iter = RegexIter::new(start, end, Direction::Right, term, regex);
let regex_match = iter.find(at_point)?;
// Apply post-processing and search for sub-matches if necessary.
let regex_match = if hint.post_processing {