Bump crossterm version to 0.26

Use the `use-dev-tty` feature flag, which fixes piping on macOS. Remove the error message preventing this usage
helix-editor · Jan 29, 2023 · cd53770 · cd53770
1 parent 77860bd
commit cd53770
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml
@@ -41,7 +41,7 @@ which = "4.2"
 
 tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot"] }
 tui = { path = "../helix-tui", package = "helix-tui", default-features = false, features = ["crossterm"] }
-crossterm = { version = "0.25", features = ["event-stream"] }
+crossterm = { version = "0.26", features = ["event-stream", "use-dev-tty"] }
 signal-hook = "0.3"
 tokio-stream = "0.1"
 futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
@@ -239,11 +239,6 @@ impl Application {
             }
         } else if stdin().is_tty() || cfg!(feature = "integration") {
             editor.new_file(Action::VerticalSplit);
-        } else if cfg!(target_os = "macos") {
-            // On Linux and Windows, we allow the output of a command to be piped into the new buffer.
-            // This doesn't currently work on macOS because of the following issue:
-            //   https://github.com/crossterm-rs/crossterm/issues/500
-            anyhow::bail!("Piping into helix-term is currently not supported on macOS");
         } else {
             editor
                 .new_file_from_stdin(Action::VerticalSplit)

diff --git a/helix-tui/Cargo.toml b/helix-tui/Cargo.toml
@@ -19,7 +19,7 @@ default = ["crossterm"]
 bitflags = "1.3"
 cassowary = "0.3"
 unicode-segmentation = "1.10"
-crossterm = { version = "0.25", optional = true }
+crossterm = { version = "0.26", optional = true }
 termini = "0.1"
 serde = { version = "1", "optional" = true, features = ["derive"]}
 helix-view = { version = "0.6", path = "../helix-view", features = ["term"] }

diff --git a/helix-tui/src/backend/crossterm.rs b/helix-tui/src/backend/crossterm.rs
@@ -1,6 +1,6 @@
 use crate::{backend::Backend, buffer::Cell};
 use crossterm::{
-    cursor::{CursorShape, Hide, MoveTo, SetCursorShape, Show},
+    cursor::{Hide, MoveTo, SetCursorStyle, Show},
     execute, queue,
     style::{
         Attribute as CAttribute, Color as CColor, Print, SetAttribute, SetBackgroundColor,
@@ -155,13 +155,16 @@ where
     }
 
     fn show_cursor(&mut self, kind: CursorKind) -> io::Result<()> {
-        let shape = match kind {
-            CursorKind::Block => CursorShape::Block,
-            CursorKind::Bar => CursorShape::Line,
-            CursorKind::Underline => CursorShape::UnderScore,
-            CursorKind::Hidden => unreachable!(),
-        };
-        map_error(execute!(self.buffer, Show, SetCursorShape(shape)))
+        map_error(execute!(
+            self.buffer,
+            Show,
+            match kind {
+                CursorKind::Block => SetCursorStyle::SteadyBlock,
+                CursorKind::Bar => SetCursorStyle::SteadyBar,
+                CursorKind::Underline => SetCursorStyle::SteadyUnderScore,
+                CursorKind::Hidden => unreachable!(),
+            }
+        ))
     }
 
     fn get_cursor(&mut self) -> io::Result<(u16, u16)> {

diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml
@@ -20,7 +20,7 @@ helix-core = { version = "0.6", path = "../helix-core" }
 helix-loader = { version = "0.6", path = "../helix-loader" }
 helix-lsp = { version = "0.6", path = "../helix-lsp" }
 helix-dap = { version = "0.6", path = "../helix-dap" }
-crossterm = { version = "0.25", optional = true }
+crossterm = { version = "0.26", optional = true }
 helix-vcs = { version = "0.6", path = "../helix-vcs" }
 
 # Conversion traits