Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rerun command if it is a file and the file changes

Browse source
This commit is contained in:
Michael Sloan 2025-08-19 15:47:14 -06:00
parent 2755cd8ec7
commit 11ad0b5793
No known key found for this signature in database
1 changed files with 77 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

105
crates/zed/src/main.rs
View file

@ -14,7 +14,7 @@ use editor::Editor;
use extension::ExtensionHostProxy; use extension::ExtensionHostProxy;
use extension_host::ExtensionStore; use extension_host::ExtensionStore;
use fs::{Fs, RealFs}; use fs::{Fs, RealFs};
use futures::{StreamExt, channel::oneshot, future}; use futures::{FutureExt, StreamExt, channel::oneshot, future, select_biased};
use git::GitHostingProviderRegistry; use git::GitHostingProviderRegistry;
use gpui::{App, AppContext as _, Application, AsyncApp, Focusable as _, UpdateGlobal as _}; use gpui::{App, AppContext as _, Application, AsyncApp, Focusable as _, UpdateGlobal as _};
use postage::stream::Stream as _; use postage::stream::Stream as _;
@ -733,6 +733,8 @@ pub fn main() {
} }
} }
// todo! cleanup
let fs = app_state.fs.clone();
let app_state = app_state.clone(); let app_state = app_state.clone();
crate::zed::component_preview::init(app_state.clone(), cx); crate::zed::component_preview::init(app_state.clone(), cx);
@ -754,38 +756,85 @@ pub fn main() {
"Will run {} when the selection changes", "Will run {} when the selection changes",
selection_change_command selection_change_command
); );
let mut cursor_reciever = editor::LAST_CURSOR_POSITION_WATCH.1.clone();
let mut cursor_receiver = editor::LAST_CURSOR_POSITION_WATCH.1.clone();
cx.background_spawn(async move { cx.background_spawn(async move {
while let Some(mut cursor) = cursor_reciever.recv().await { // Set up file watcher for the command file
loop { let command_path = PathBuf::from(&selection_change_command);
// todo! Check if it's changed meanwhile and refresh. let mut file_changes = if command_path.exists() {
if let Some(cursor) = dbg!(&cursor) { let (events, _) = fs
let status = smol::process::Command::new(&selection_change_command) .watch(&command_path, std::time::Duration::from_millis(100))
.arg(cursor.worktree_path.as_ref()) .await;
.arg(format!( Some(events)
"{}:{}:{}", } else {
cursor.path.display(), log::warn!(
cursor.point.row + 1, "Command file {} does not exist, only watching selection changes",
cursor.point.column + 1 command_path.display()
)) );
.status() None
.await; };
match status {
Ok(status) => { loop {
if !status.success() { select_biased! {
log::error!("Command failed with status {}", status); // Handle cursor position changes
} cursor_update = cursor_receiver.recv().fuse() => {
} if cursor_update.is_none() {
Err(err) => { // Cursor watcher ended
log::error!("Command failed with error {}", err); log::warn!("Cursor watcher for {} ended", command_path.display());
} break;
}
},
// Handle file changes to the command file
file_change = async {
if let Some(ref mut events) = file_changes {
events.next().await
} else {
future::pending().await
}
}.fuse() => {
if file_change.is_none() {
// File watcher ended
log::warn!("File watcher for {} ended", command_path.display());
file_changes = None;
} }
} }
let new_cursor = cursor_reciever.borrow(); }
if *new_cursor == cursor {
// TODO: Could be more efficient
let Some(mut cursor) = cursor_receiver.borrow().clone() else {
continue;
};
loop {
let status = smol::process::Command::new(&selection_change_command)
.arg(cursor.worktree_path.as_ref())
.arg(format!(
"{}:{}:{}",
cursor.path.display(),
cursor.point.row + 1,
cursor.point.column + 1
))
.status()
.await;
match status {
Ok(status) => {
if !status.success() {
log::error!("Command failed with status {}", status);
}
}
Err(err) => {
log::error!("Command failed with error {}", err);
}
}
let Some(new_cursor) = cursor_receiver.borrow().clone() else {
break;
};
if new_cursor == cursor {
break; break;
} }
cursor = new_cursor.clone(); cursor = new_cursor;
} }
} }
}) })