From 0e1e4edc5ee987f8037d6e73d6da2196773dc234 Mon Sep 17 00:00:00 2001
From: Dmitry Sharshakov
Date: Sun, 5 Sep 2021 08:51:33 +0300
Subject: different display for conditional logpoints

---
 helix-term/src/ui/editor.rs | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'helix-term')

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index b6757ca0..e151611a 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -503,13 +503,16 @@ impl EditorView {
             if let Some(bps) = breakpoints.as_ref() {
                 if let Some(breakpoint) = bps.iter().find(|breakpoint| breakpoint.line - 1 == line)
                 {
-                    let style = if breakpoint.condition.is_some() {
-                        error
-                    } else if breakpoint.log_message.is_some() {
-                        info
-                    } else {
-                        warning
-                    };
+                    let style =
+                        if breakpoint.condition.is_some() && breakpoint.log_message.is_some() {
+                            error.add_modifier(Modifier::CROSSED_OUT)
+                        } else if breakpoint.condition.is_some() {
+                            error
+                        } else if breakpoint.log_message.is_some() {
+                            info
+                        } else {
+                            warning
+                        };
                     surface.set_stringn(viewport.x, viewport.y + i as u16, "▲", 1, style);
                 }
             }
@@ -607,7 +610,8 @@ impl EditorView {
                 {
                     if let Some(condition) = &breakpoint.condition {
                         lines.extend(
-                            Text::styled(condition, info.add_modifier(Modifier::UNDERLINED)).lines,
+                            Text::styled(condition, warning.add_modifier(Modifier::UNDERLINED))
+                                .lines,
                         );
                     }
                     if let Some(log_message) = &breakpoint.log_message {
-- 
cgit v1.2.3-70-g09d2