suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui: Simplify conditional

pull/373/head^2
Blaž Hrastnik 2021-06-27 23:21:25 +09:00
parent bcca152ad5
commit 82fc28a0ce
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
helix-term/src/ui/editor.rs
View File

@ -361,27 +361,26 @@ impl EditorView {
if let Some(syntax) = doc.syntax() { if let Some(syntax) = doc.syntax() {
use helix_core::match_brackets; use helix_core::match_brackets;
let pos = doc.selection(view.id).cursor(); let pos = doc.selection(view.id).cursor();
let pos = match_brackets::find(syntax, doc.text(), pos); let pos = match_brackets::find(syntax, doc.text(), pos)
if let Some(pos) = pos { .and_then(|pos| view.screen_coords_at_pos(doc, text, pos));
let pos = view.screen_coords_at_pos(doc, text, pos);
if let Some(pos) = pos {
if (pos.col as u16) < viewport.width + view.first_col as u16
&& pos.col >= view.first_col
{
let style =
theme.try_get("ui.cursor.match").unwrap_or_else(|| {
Style::default()
.add_modifier(Modifier::REVERSED)
.add_modifier(Modifier::DIM)
});
surface if let Some(pos) = pos {
.get_mut( // ensure col is on screen
viewport.x + pos.col as u16, if (pos.col as u16) < viewport.width + view.first_col as u16
viewport.y + pos.row as u16, && pos.col >= view.first_col
) {
.set_style(style); let style = theme.try_get("ui.cursor.match").unwrap_or_else(|| {
} Style::default()
.add_modifier(Modifier::REVERSED)
.add_modifier(Modifier::DIM)
});
surface
.get_mut(
viewport.x + pos.col as u16,
viewport.y + pos.row as u16,
)
.set_style(style);
} }
} }
} }