Properly prevent crossterm features being used when `feature = "ter…

…m"` not enabled in `helix-view` (#12734)
helix-editor · Jan 30, 2025 · 6906164 · 6906164
1 parent d285a8a
commit 6906164
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/helix-view/src/clipboard.rs b/helix-view/src/clipboard.rs
@@ -122,10 +122,11 @@ mod external {
                 Self::Tmux
             } else if binary_exists("pbcopy") && binary_exists("pbpaste") {
                 Self::Pasteboard
-            } else if cfg!(feature = "term") {
-                Self::Termcode
             } else {
-                Self::None
+                #[cfg(feature = "term")]
+                return Self::Termcode;
+                #[cfg(not(feature = "term"))]
+                return Self::None;
             }
         }
 

diff --git a/helix-view/src/graphics.rs b/helix-view/src/graphics.rs
@@ -342,6 +342,7 @@ impl FromStr for UnderlineStyle {
     }
 }
 
+#[cfg(feature = "term")]
 impl From<UnderlineStyle> for crossterm::style::Attribute {
     fn from(style: UnderlineStyle) -> Self {
         match style {