traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: use SIGINT instead of stdin for interruption to don't mess up piped commands

Browse source
This commit is contained in:
Andrew Hlynskyi 2023-05-02 10:34:55 +03:00
parent 321a652626
commit e966c5ad5b
6 changed files with 64 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cli/src/highlight.rs
View file

@ -391,7 +391,7 @@ pub fn html(
let stdout = io::stdout();
let mut stdout = stdout.lock();
let time = Instant::now();
let cancellation_flag = util::cancel_on_stdin();
let cancellation_flag = util::cancel_on_signal();
let mut highlighter = Highlighter::new();
let events = highlighter.highlight(config, source, Some(&cancellation_flag), |string| {

4
cli/src/main.rs
View file

@ -403,7 +403,7 @@ fn run() -> Result<()> {
let edits = matches
.values_of("edits")
.map_or(Vec::new(), |e| e.collect());
let cancellation_flag = util::cancel_on_stdin();
let cancellation_flag = util::cancel_on_signal();
if debug {
// For augmenting debug logging in external scanners
@ -530,7 +530,7 @@ fn run() -> Result<()> {
println!("{}", highlight::HTML_HEADER);
}
let cancellation_flag = util::cancel_on_stdin();
let cancellation_flag = util::cancel_on_signal();
let mut lang = None;
if let Some(scope) = matches.value_of("scope") {

2
cli/src/tags.rs
View file

@ -23,7 +23,7 @@ pub fn generate_tags(
}
let mut context = TagsContext::new();
let cancellation_flag = util::cancel_on_stdin();
let cancellation_flag = util::cancel_on_signal();
let stdout = io::stdout();
let mut stdout = stdout.lock();

21
cli/src/util.rs
View file

@ -1,8 +1,6 @@
use anyhow::Result;
use std::io;
use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::Arc;
use std::thread;
use tree_sitter::{Parser, Tree};
#[cfg(unix)]
@ -22,18 +20,15 @@ svg { width: 100%; }
";
pub fn cancel_on_stdin() -> Arc<AtomicUsize> {
pub fn cancel_on_signal() -> Arc<AtomicUsize> {
let result = Arc::new(AtomicUsize::new(0));
if atty::is(atty::Stream::Stdin) {
thread::spawn({
let flag = result.clone();
move || {
let mut line = String::new();
io::stdin().read_line(&mut line).unwrap();
flag.store(1, Ordering::Relaxed);
}
});
}
ctrlc::set_handler({
let flag = result.clone();
move || {
flag.store(1, Ordering::Relaxed);
}
})
.expect("Error setting Ctrl-C handler");
result
}