git.iko.soy/helix
on master help sign in
Fix piping to Helix on macOS (#5468)
commit0e0501c510148e7bfa99778c4d561c186c1155bb authorJonathan <jonagn@gmail.com> dateThu 13 Jul 2023, 06:01 (3 years ago) parente86bb64
3 files changed+15−5
compare with master
unifiedsplit
Cargo.lock+12 helix-term/Cargo.toml+3 helix-term/src/application.rs−5
Cargo.lock+12
@@ -263,6 +263,7 @@ checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13"
263263dependencies = [
264264 "bitflags 1.3.2",
265265 "crossterm_winapi",
266+ "filedescriptor",
266267 "futures-core",
267268 "libc",
268269 "mio",
@@ -427,6 +428,17 @@ dependencies = [
427428 "log",
428429]
429430
431+[[package]]
432+name = "filedescriptor"
433+version = "0.8.2"
434+source = "registry+https://github.com/rust-lang/crates.io-index"
435+checksum = "7199d965852c3bac31f779ef99cbb4537f80e952e2d6aa0ffeb30cce00f4f46e"
436+dependencies = [
437+ "libc",
438+ "thiserror",
439+ "winapi",
440+]
441+
430442[[package]]
431443name = "filetime"
432444version = "0.2.21"
helix-term/Cargo.toml+3
@@ -70,6 +70,9 @@ grep-searcher = "0.1.11"
7070signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
7171libc = "0.2.147"
7272
73+[target.'cfg(target_os = "macos")'.dependencies]
74+crossterm = { version = "0.26", features = ["event-stream", "use-dev-tty"] }
75+
7376[build-dependencies]
7477helix-loader = { version = "0.6", path = "../helix-loader" }
7578
helix-term/src/application.rs−5
@@ -211,11 +211,6 @@ impl Application {
211211 }
212212 } else if stdin().is_tty() || cfg!(feature = "integration") {
213213 editor.new_file(Action::VerticalSplit);
214− } else if cfg!(target_os = "macos") {
215− // On Linux and Windows, we allow the output of a command to be piped into the new buffer.
216− // This doesn't currently work on macOS because of the following issue:
217− // https://github.com/crossterm-rs/crossterm/issues/500
218− anyhow::bail!("Piping into helix-term is currently not supported on macOS");
219214 } else {
220215 editor
221216 .new_file_from_stdin(Action::VerticalSplit)