WIP
This commit is contained in:
parent
e4fe9538d7
commit
b7d30fca2b
30 changed files with 3644 additions and 29 deletions
912
crates/zed2/src/main.rs
Normal file
912
crates/zed2/src/main.rs
Normal file
|
@ -0,0 +1,912 @@
|
|||
// Allow binary to be called Zed for a nice application menu when running executable directly
|
||||
#![allow(non_snake_case)]
|
||||
|
||||
use crate::open_listener::{OpenListener, OpenRequest};
|
||||
use anyhow::{anyhow, Context, Result};
|
||||
use cli::{
|
||||
ipc::{self, IpcSender},
|
||||
CliRequest, CliResponse, IpcHandshake, FORCE_CLI_MODE_ENV_VAR_NAME,
|
||||
};
|
||||
use fs::RealFs;
|
||||
use futures::{channel::mpsc, SinkExt, StreamExt};
|
||||
use gpui2::{App, AsyncAppContext, Task};
|
||||
use log::LevelFilter;
|
||||
|
||||
use parking_lot::Mutex;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use settings::{default_settings, handle_settings_file_changes, watch_config_file, SettingsStore};
|
||||
use simplelog::ConfigBuilder;
|
||||
use smol::process::Command;
|
||||
use std::{
|
||||
collections::HashMap,
|
||||
env,
|
||||
fs::OpenOptions,
|
||||
io::IsTerminal,
|
||||
path::Path,
|
||||
sync::{
|
||||
atomic::{AtomicU32, Ordering},
|
||||
Arc, Weak,
|
||||
},
|
||||
thread,
|
||||
};
|
||||
use util::{channel::RELEASE_CHANNEL, http, paths, ResultExt};
|
||||
use zed2::{ensure_only_instance, AppState, Assets, IsOnlyInstance};
|
||||
// use zed2::{
|
||||
// assets::Assets,
|
||||
// build_window_options, handle_keymap_file_changes, initialize_workspace, languages, menus,
|
||||
// only_instance::{ensure_only_instance, IsOnlyInstance},
|
||||
// };
|
||||
|
||||
mod open_listener;
|
||||
|
||||
fn main() {
|
||||
let http = http::client();
|
||||
init_paths();
|
||||
init_logger();
|
||||
|
||||
if ensure_only_instance() != IsOnlyInstance::Yes {
|
||||
return;
|
||||
}
|
||||
|
||||
log::info!("========== starting zed ==========");
|
||||
let mut app = App::production(Arc::new(Assets));
|
||||
|
||||
// let installation_id = app.background().block(installation_id()).ok();
|
||||
// let session_id = Uuid::new_v4().to_string();
|
||||
// init_panic_hook(&app, installation_id.clone(), session_id.clone());
|
||||
|
||||
load_embedded_fonts(&app);
|
||||
|
||||
let fs = Arc::new(RealFs);
|
||||
let user_settings_file_rx =
|
||||
watch_config_file(app.executor(), fs.clone(), paths::SETTINGS.clone());
|
||||
let user_keymap_file_rx = watch_config_file(app.executor(), fs.clone(), paths::KEYMAP.clone());
|
||||
|
||||
let login_shell_env_loaded = if stdout_is_a_pty() {
|
||||
Task::ready(())
|
||||
} else {
|
||||
app.executor().spawn(async {
|
||||
load_login_shell_environment().await.log_err();
|
||||
})
|
||||
};
|
||||
|
||||
let (listener, mut open_rx) = OpenListener::new();
|
||||
let listener = Arc::new(listener);
|
||||
let callback_listener = listener.clone();
|
||||
app.on_open_urls(move |urls, _| callback_listener.open_urls(urls))
|
||||
.on_reopen(move |cx| {
|
||||
if cx.has_global::<Weak<AppState>>() {
|
||||
if let Some(app_state) = cx.global::<Weak<AppState>>().upgrade() {
|
||||
// todo!("workspace")
|
||||
// workspace::open_new(&app_state, cx, |workspace, cx| {
|
||||
// Editor::new_file(workspace, &Default::default(), cx)
|
||||
// })
|
||||
// .detach();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
app.run(move |cx| {
|
||||
cx.set_global(*RELEASE_CHANNEL);
|
||||
|
||||
let mut store = SettingsStore::default();
|
||||
store
|
||||
.set_default_settings(default_settings().as_ref(), cx)
|
||||
.unwrap();
|
||||
cx.set_global(store);
|
||||
handle_settings_file_changes(user_settings_file_rx, cx);
|
||||
// handle_keymap_file_changes(user_keymap_file_rx, cx);
|
||||
|
||||
// let client = client::Client::new(http.clone(), cx);
|
||||
// let mut languages = LanguageRegistry::new(login_shell_env_loaded);
|
||||
// let copilot_language_server_id = languages.next_language_server_id();
|
||||
// languages.set_executor(cx.background().clone());
|
||||
// languages.set_language_server_download_dir(paths::LANGUAGES_DIR.clone());
|
||||
// let languages = Arc::new(languages);
|
||||
// let node_runtime = RealNodeRuntime::new(http.clone());
|
||||
|
||||
// languages::init(languages.clone(), node_runtime.clone(), cx);
|
||||
// let user_store = cx.add_model(|cx| UserStore::new(client.clone(), http.clone(), cx));
|
||||
// let workspace_store = cx.add_model(|cx| WorkspaceStore::new(client.clone(), cx));
|
||||
|
||||
// cx.set_global(client.clone());
|
||||
|
||||
// theme::init(Assets, cx);
|
||||
// context_menu::init(cx);
|
||||
// project::Project::init(&client, cx);
|
||||
// client::init(&client, cx);
|
||||
// command_palette::init(cx);
|
||||
// language::init(cx);
|
||||
// editor::init(cx);
|
||||
// go_to_line::init(cx);
|
||||
// file_finder::init(cx);
|
||||
// outline::init(cx);
|
||||
// project_symbols::init(cx);
|
||||
// project_panel::init(Assets, cx);
|
||||
// channel::init(&client, user_store.clone(), cx);
|
||||
// diagnostics::init(cx);
|
||||
// search::init(cx);
|
||||
// semantic_index::init(fs.clone(), http.clone(), languages.clone(), cx);
|
||||
// vim::init(cx);
|
||||
// terminal_view::init(cx);
|
||||
// copilot::init(
|
||||
// copilot_language_server_id,
|
||||
// http.clone(),
|
||||
// node_runtime.clone(),
|
||||
// cx,
|
||||
// );
|
||||
// assistant::init(cx);
|
||||
// component_test::init(cx);
|
||||
|
||||
// cx.spawn(|cx| watch_themes(fs.clone(), cx)).detach();
|
||||
// cx.spawn(|_| watch_languages(fs.clone(), languages.clone()))
|
||||
// .detach();
|
||||
// watch_file_types(fs.clone(), cx);
|
||||
|
||||
// languages.set_theme(theme::current(cx).clone());
|
||||
// cx.observe_global::<SettingsStore, _>({
|
||||
// let languages = languages.clone();
|
||||
// move |cx| languages.set_theme(theme::current(cx).clone())
|
||||
// })
|
||||
// .detach();
|
||||
|
||||
// client.telemetry().start(installation_id, session_id, cx);
|
||||
|
||||
// todo!("app_state")
|
||||
let app_state = Arc::new(AppState);
|
||||
// let app_state = Arc::new(AppState {
|
||||
// languages,
|
||||
// client: client.clone(),
|
||||
// user_store,
|
||||
// fs,
|
||||
// build_window_options,
|
||||
// initialize_workspace,
|
||||
// background_actions,
|
||||
// workspace_store,
|
||||
// node_runtime,
|
||||
// });
|
||||
// cx.set_global(Arc::downgrade(&app_state));
|
||||
|
||||
// audio::init(Assets, cx);
|
||||
// auto_update::init(http.clone(), client::ZED_SERVER_URL.clone(), cx);
|
||||
|
||||
// todo!("workspace")
|
||||
// workspace::init(app_state.clone(), cx);
|
||||
// recent_projects::init(cx);
|
||||
|
||||
// journal::init(app_state.clone(), cx);
|
||||
// language_selector::init(cx);
|
||||
// theme_selector::init(cx);
|
||||
// activity_indicator::init(cx);
|
||||
// language_tools::init(cx);
|
||||
// call::init(app_state.client.clone(), app_state.user_store.clone(), cx);
|
||||
// collab_ui::init(&app_state, cx);
|
||||
// feedback::init(cx);
|
||||
// welcome::init(cx);
|
||||
// zed::init(&app_state, cx);
|
||||
|
||||
// cx.set_menus(menus::menus());
|
||||
|
||||
if stdout_is_a_pty() {
|
||||
cx.activate(true);
|
||||
let urls = collect_url_args();
|
||||
if !urls.is_empty() {
|
||||
listener.open_urls(urls)
|
||||
}
|
||||
} else {
|
||||
upload_previous_panics(http.clone(), cx);
|
||||
|
||||
// TODO Development mode that forces the CLI mode usually runs Zed binary as is instead
|
||||
// of an *app, hence gets no specific callbacks run. Emulate them here, if needed.
|
||||
if std::env::var(FORCE_CLI_MODE_ENV_VAR_NAME).ok().is_some()
|
||||
&& !listener.triggered.load(Ordering::Acquire)
|
||||
{
|
||||
listener.open_urls(collect_url_args())
|
||||
}
|
||||
}
|
||||
|
||||
let mut triggered_authentication = false;
|
||||
|
||||
match open_rx.try_next() {
|
||||
Ok(Some(OpenRequest::Paths { paths })) => {
|
||||
// todo!("workspace")
|
||||
// cx.update(|cx| workspace::open_paths(&paths, &app_state, None, cx))
|
||||
// .detach();
|
||||
}
|
||||
Ok(Some(OpenRequest::CliConnection { connection })) => {
|
||||
cx.spawn(|cx| handle_cli_connection(connection, app_state.clone(), cx))
|
||||
.detach();
|
||||
}
|
||||
Ok(Some(OpenRequest::JoinChannel { channel_id })) => {
|
||||
// triggered_authentication = true;
|
||||
// let app_state = app_state.clone();
|
||||
// let client = client.clone();
|
||||
// cx.spawn(|mut cx| async move {
|
||||
// // ignore errors here, we'll show a generic "not signed in"
|
||||
// let _ = authenticate(client, &cx).await;
|
||||
// cx.update(|cx| workspace::join_channel(channel_id, app_state, None, cx))
|
||||
// .await
|
||||
// })
|
||||
// .detach_and_log_err(cx)
|
||||
}
|
||||
Ok(None) | Err(_) => cx
|
||||
.spawn({
|
||||
let app_state = app_state.clone();
|
||||
|cx| async move { restore_or_create_workspace(&app_state, cx).await }
|
||||
})
|
||||
.detach(),
|
||||
}
|
||||
|
||||
cx.spawn(|mut cx| {
|
||||
let app_state = app_state.clone();
|
||||
async move {
|
||||
while let Some(request) = open_rx.next().await {
|
||||
match request {
|
||||
OpenRequest::Paths { paths } => {
|
||||
// todo!("workspace")
|
||||
// cx.update(|cx| workspace::open_paths(&paths, &app_state, None, cx))
|
||||
// .detach();
|
||||
}
|
||||
OpenRequest::CliConnection { connection } => {
|
||||
cx.spawn(|cx| handle_cli_connection(connection, app_state.clone(), cx))
|
||||
.detach();
|
||||
}
|
||||
OpenRequest::JoinChannel { channel_id } => {
|
||||
// cx
|
||||
// .update(|cx| {
|
||||
// workspace::join_channel(channel_id, app_state.clone(), None, cx)
|
||||
// })
|
||||
// .detach()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
.detach();
|
||||
|
||||
// if !triggered_authentication {
|
||||
// cx.spawn(|cx| async move { authenticate(client, &cx).await })
|
||||
// .detach_and_log_err(cx);
|
||||
// }
|
||||
});
|
||||
}
|
||||
|
||||
// async fn authenticate(client: Arc<Client>, cx: &AsyncAppContext) -> Result<()> {
|
||||
// if stdout_is_a_pty() {
|
||||
// if client::IMPERSONATE_LOGIN.is_some() {
|
||||
// client.authenticate_and_connect(false, &cx).await?;
|
||||
// }
|
||||
// } else if client.has_keychain_credentials(&cx) {
|
||||
// client.authenticate_and_connect(true, &cx).await?;
|
||||
// }
|
||||
// Ok::<_, anyhow::Error>(())
|
||||
// }
|
||||
|
||||
// async fn installation_id() -> Result<String> {
|
||||
// let legacy_key_name = "device_id";
|
||||
|
||||
// if let Ok(Some(installation_id)) = KEY_VALUE_STORE.read_kvp(legacy_key_name) {
|
||||
// Ok(installation_id)
|
||||
// } else {
|
||||
// let installation_id = Uuid::new_v4().to_string();
|
||||
|
||||
// KEY_VALUE_STORE
|
||||
// .write_kvp(legacy_key_name.to_string(), installation_id.clone())
|
||||
// .await?;
|
||||
|
||||
// Ok(installation_id)
|
||||
// }
|
||||
// }
|
||||
|
||||
async fn restore_or_create_workspace(app_state: &Arc<AppState>, mut cx: AsyncAppContext) {
|
||||
todo!("workspace")
|
||||
// if let Some(location) = workspace::last_opened_workspace_paths().await {
|
||||
// cx.update(|cx| workspace::open_paths(location.paths().as_ref(), app_state, None, cx))
|
||||
// .await
|
||||
// .log_err();
|
||||
// } else if matches!(KEY_VALUE_STORE.read_kvp(FIRST_OPEN), Ok(None)) {
|
||||
// cx.update(|cx| show_welcome_experience(app_state, cx));
|
||||
// } else {
|
||||
// cx.update(|cx| {
|
||||
// workspace::open_new(app_state, cx, |workspace, cx| {
|
||||
// Editor::new_file(workspace, &Default::default(), cx)
|
||||
// })
|
||||
// .detach();
|
||||
// });
|
||||
// }
|
||||
}
|
||||
|
||||
fn init_paths() {
|
||||
std::fs::create_dir_all(&*util::paths::CONFIG_DIR).expect("could not create config path");
|
||||
std::fs::create_dir_all(&*util::paths::LANGUAGES_DIR).expect("could not create languages path");
|
||||
std::fs::create_dir_all(&*util::paths::DB_DIR).expect("could not create database path");
|
||||
std::fs::create_dir_all(&*util::paths::LOGS_DIR).expect("could not create logs path");
|
||||
}
|
||||
|
||||
fn init_logger() {
|
||||
if stdout_is_a_pty() {
|
||||
env_logger::init();
|
||||
} else {
|
||||
let level = LevelFilter::Info;
|
||||
|
||||
// Prevent log file from becoming too large.
|
||||
const KIB: u64 = 1024;
|
||||
const MIB: u64 = 1024 * KIB;
|
||||
const MAX_LOG_BYTES: u64 = MIB;
|
||||
if std::fs::metadata(&*paths::LOG).map_or(false, |metadata| metadata.len() > MAX_LOG_BYTES)
|
||||
{
|
||||
let _ = std::fs::rename(&*paths::LOG, &*paths::OLD_LOG);
|
||||
}
|
||||
|
||||
let log_file = OpenOptions::new()
|
||||
.create(true)
|
||||
.append(true)
|
||||
.open(&*paths::LOG)
|
||||
.expect("could not open logfile");
|
||||
|
||||
let config = ConfigBuilder::new()
|
||||
.set_time_format_str("%Y-%m-%dT%T") //All timestamps are UTC
|
||||
.build();
|
||||
|
||||
simplelog::WriteLogger::init(level, config, log_file).expect("could not initialize logger");
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize)]
|
||||
struct LocationData {
|
||||
file: String,
|
||||
line: u32,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize)]
|
||||
struct Panic {
|
||||
thread: String,
|
||||
payload: String,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
location_data: Option<LocationData>,
|
||||
backtrace: Vec<String>,
|
||||
app_version: String,
|
||||
release_channel: String,
|
||||
os_name: String,
|
||||
os_version: Option<String>,
|
||||
architecture: String,
|
||||
panicked_on: u128,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
installation_id: Option<String>,
|
||||
session_id: String,
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
struct PanicRequest {
|
||||
panic: Panic,
|
||||
token: String,
|
||||
}
|
||||
|
||||
static PANIC_COUNT: AtomicU32 = AtomicU32::new(0);
|
||||
|
||||
// fn init_panic_hook(app: &App, installation_id: Option<String>, session_id: String) {
|
||||
// let is_pty = stdout_is_a_pty();
|
||||
// let platform = app.platform();
|
||||
|
||||
// panic::set_hook(Box::new(move |info| {
|
||||
// let prior_panic_count = PANIC_COUNT.fetch_add(1, Ordering::SeqCst);
|
||||
// if prior_panic_count > 0 {
|
||||
// // Give the panic-ing thread time to write the panic file
|
||||
// loop {
|
||||
// std::thread::yield_now();
|
||||
// }
|
||||
// }
|
||||
|
||||
// let thread = thread::current();
|
||||
// let thread_name = thread.name().unwrap_or("<unnamed>");
|
||||
|
||||
// let payload = info
|
||||
// .payload()
|
||||
// .downcast_ref::<&str>()
|
||||
// .map(|s| s.to_string())
|
||||
// .or_else(|| info.payload().downcast_ref::<String>().map(|s| s.clone()))
|
||||
// .unwrap_or_else(|| "Box<Any>".to_string());
|
||||
|
||||
// if *util::channel::RELEASE_CHANNEL == ReleaseChannel::Dev {
|
||||
// let location = info.location().unwrap();
|
||||
// let backtrace = Backtrace::new();
|
||||
// eprintln!(
|
||||
// "Thread {:?} panicked with {:?} at {}:{}:{}\n{:?}",
|
||||
// thread_name,
|
||||
// payload,
|
||||
// location.file(),
|
||||
// location.line(),
|
||||
// location.column(),
|
||||
// backtrace,
|
||||
// );
|
||||
// std::process::exit(-1);
|
||||
// }
|
||||
|
||||
// let app_version = ZED_APP_VERSION
|
||||
// .or_else(|| platform.app_version().ok())
|
||||
// .map_or("dev".to_string(), |v| v.to_string());
|
||||
|
||||
// let backtrace = Backtrace::new();
|
||||
// let mut backtrace = backtrace
|
||||
// .frames()
|
||||
// .iter()
|
||||
// .filter_map(|frame| Some(format!("{:#}", frame.symbols().first()?.name()?)))
|
||||
// .collect::<Vec<_>>();
|
||||
|
||||
// // Strip out leading stack frames for rust panic-handling.
|
||||
// if let Some(ix) = backtrace
|
||||
// .iter()
|
||||
// .position(|name| name == "rust_begin_unwind")
|
||||
// {
|
||||
// backtrace.drain(0..=ix);
|
||||
// }
|
||||
|
||||
// let panic_data = Panic {
|
||||
// thread: thread_name.into(),
|
||||
// payload: payload.into(),
|
||||
// location_data: info.location().map(|location| LocationData {
|
||||
// file: location.file().into(),
|
||||
// line: location.line(),
|
||||
// }),
|
||||
// app_version: app_version.clone(),
|
||||
// release_channel: RELEASE_CHANNEL.display_name().into(),
|
||||
// os_name: platform.os_name().into(),
|
||||
// os_version: platform
|
||||
// .os_version()
|
||||
// .ok()
|
||||
// .map(|os_version| os_version.to_string()),
|
||||
// architecture: env::consts::ARCH.into(),
|
||||
// panicked_on: SystemTime::now()
|
||||
// .duration_since(UNIX_EPOCH)
|
||||
// .unwrap()
|
||||
// .as_millis(),
|
||||
// backtrace,
|
||||
// installation_id: installation_id.clone(),
|
||||
// session_id: session_id.clone(),
|
||||
// };
|
||||
|
||||
// if let Some(panic_data_json) = serde_json::to_string_pretty(&panic_data).log_err() {
|
||||
// log::error!("{}", panic_data_json);
|
||||
// }
|
||||
|
||||
// if !is_pty {
|
||||
// if let Some(panic_data_json) = serde_json::to_string(&panic_data).log_err() {
|
||||
// let timestamp = chrono::Utc::now().format("%Y_%m_%d %H_%M_%S").to_string();
|
||||
// let panic_file_path = paths::LOGS_DIR.join(format!("zed-{}.panic", timestamp));
|
||||
// let panic_file = std::fs::OpenOptions::new()
|
||||
// .append(true)
|
||||
// .create(true)
|
||||
// .open(&panic_file_path)
|
||||
// .log_err();
|
||||
// if let Some(mut panic_file) = panic_file {
|
||||
// writeln!(&mut panic_file, "{}", panic_data_json).log_err();
|
||||
// panic_file.flush().log_err();
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
// std::process::abort();
|
||||
// }));
|
||||
// }
|
||||
|
||||
// fn upload_previous_panics(http: Arc<dyn HttpClient>, cx: &mut AppContext) {
|
||||
// let telemetry_settings = *settings::get::<TelemetrySettings>(cx);
|
||||
|
||||
// cx.background()
|
||||
// .spawn({
|
||||
// async move {
|
||||
// let panic_report_url = format!("{}/api/panic", &*client::ZED_SERVER_URL);
|
||||
// let mut children = smol::fs::read_dir(&*paths::LOGS_DIR).await?;
|
||||
// while let Some(child) = children.next().await {
|
||||
// let child = child?;
|
||||
// let child_path = child.path();
|
||||
|
||||
// if child_path.extension() != Some(OsStr::new("panic")) {
|
||||
// continue;
|
||||
// }
|
||||
// let filename = if let Some(filename) = child_path.file_name() {
|
||||
// filename.to_string_lossy()
|
||||
// } else {
|
||||
// continue;
|
||||
// };
|
||||
|
||||
// if !filename.starts_with("zed") {
|
||||
// continue;
|
||||
// }
|
||||
|
||||
// if telemetry_settings.diagnostics {
|
||||
// let panic_file_content = smol::fs::read_to_string(&child_path)
|
||||
// .await
|
||||
// .context("error reading panic file")?;
|
||||
|
||||
// let panic = serde_json::from_str(&panic_file_content)
|
||||
// .ok()
|
||||
// .or_else(|| {
|
||||
// panic_file_content
|
||||
// .lines()
|
||||
// .next()
|
||||
// .and_then(|line| serde_json::from_str(line).ok())
|
||||
// })
|
||||
// .unwrap_or_else(|| {
|
||||
// log::error!(
|
||||
// "failed to deserialize panic file {:?}",
|
||||
// panic_file_content
|
||||
// );
|
||||
// None
|
||||
// });
|
||||
|
||||
// if let Some(panic) = panic {
|
||||
// let body = serde_json::to_string(&PanicRequest {
|
||||
// panic,
|
||||
// token: ZED_SECRET_CLIENT_TOKEN.into(),
|
||||
// })
|
||||
// .unwrap();
|
||||
|
||||
// let request = Request::post(&panic_report_url)
|
||||
// .redirect_policy(isahc::config::RedirectPolicy::Follow)
|
||||
// .header("Content-Type", "application/json")
|
||||
// .body(body.into())?;
|
||||
// let response =
|
||||
// http.send(request).await.context("error sending panic")?;
|
||||
// if !response.status().is_success() {
|
||||
// log::error!(
|
||||
// "Error uploading panic to server: {}",
|
||||
// response.status()
|
||||
// );
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
// // We've done what we can, delete the file
|
||||
// std::fs::remove_file(child_path)
|
||||
// .context("error removing panic")
|
||||
// .log_err();
|
||||
// }
|
||||
// Ok::<_, anyhow::Error>(())
|
||||
// }
|
||||
// .log_err()
|
||||
// })
|
||||
// .detach();
|
||||
// }
|
||||
|
||||
async fn load_login_shell_environment() -> Result<()> {
|
||||
let marker = "ZED_LOGIN_SHELL_START";
|
||||
let shell = env::var("SHELL").context(
|
||||
"SHELL environment variable is not assigned so we can't source login environment variables",
|
||||
)?;
|
||||
let output = Command::new(&shell)
|
||||
.args(["-lic", &format!("echo {marker} && /usr/bin/env -0")])
|
||||
.output()
|
||||
.await
|
||||
.context("failed to spawn login shell to source login environment variables")?;
|
||||
if !output.status.success() {
|
||||
Err(anyhow!("login shell exited with error"))?;
|
||||
}
|
||||
|
||||
let stdout = String::from_utf8_lossy(&output.stdout);
|
||||
|
||||
if let Some(env_output_start) = stdout.find(marker) {
|
||||
let env_output = &stdout[env_output_start + marker.len()..];
|
||||
for line in env_output.split_terminator('\0') {
|
||||
if let Some(separator_index) = line.find('=') {
|
||||
let key = &line[..separator_index];
|
||||
let value = &line[separator_index + 1..];
|
||||
env::set_var(key, value);
|
||||
}
|
||||
}
|
||||
log::info!(
|
||||
"set environment variables from shell:{}, path:{}",
|
||||
shell,
|
||||
env::var("PATH").unwrap_or_default(),
|
||||
);
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn stdout_is_a_pty() -> bool {
|
||||
std::env::var(FORCE_CLI_MODE_ENV_VAR_NAME).ok().is_none() && std::io::stdout().is_terminal()
|
||||
}
|
||||
|
||||
fn collect_url_args() -> Vec<String> {
|
||||
env::args()
|
||||
.skip(1)
|
||||
.filter_map(|arg| match std::fs::canonicalize(Path::new(&arg)) {
|
||||
Ok(path) => Some(format!("file://{}", path.to_string_lossy())),
|
||||
Err(error) => {
|
||||
if let Some(_) = parse_zed_link(&arg) {
|
||||
Some(arg)
|
||||
} else {
|
||||
log::error!("error parsing path argument: {}", error);
|
||||
None
|
||||
}
|
||||
}
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
fn load_embedded_fonts(app: &App) {
|
||||
let font_paths = Assets.list("fonts");
|
||||
let embedded_fonts = Mutex::new(Vec::new());
|
||||
smol::block_on(app.background().scoped(|scope| {
|
||||
for font_path in &font_paths {
|
||||
if !font_path.ends_with(".ttf") {
|
||||
continue;
|
||||
}
|
||||
|
||||
scope.spawn(async {
|
||||
let font_path = &*font_path;
|
||||
let font_bytes = Assets.load(font_path).unwrap().to_vec();
|
||||
embedded_fonts.lock().push(Arc::from(font_bytes));
|
||||
});
|
||||
}
|
||||
}));
|
||||
app.platform()
|
||||
.fonts()
|
||||
.add_fonts(&embedded_fonts.into_inner())
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
// #[cfg(debug_assertions)]
|
||||
// async fn watch_themes(fs: Arc<dyn Fs>, mut cx: AsyncAppContext) -> Option<()> {
|
||||
// let mut events = fs
|
||||
// .watch("styles/src".as_ref(), Duration::from_millis(100))
|
||||
// .await;
|
||||
// while (events.next().await).is_some() {
|
||||
// let output = Command::new("npm")
|
||||
// .current_dir("styles")
|
||||
// .args(["run", "build"])
|
||||
// .output()
|
||||
// .await
|
||||
// .log_err()?;
|
||||
// if output.status.success() {
|
||||
// cx.update(|cx| theme_selector::reload(cx))
|
||||
// } else {
|
||||
// eprintln!(
|
||||
// "build script failed {}",
|
||||
// String::from_utf8_lossy(&output.stderr)
|
||||
// );
|
||||
// }
|
||||
// }
|
||||
// Some(())
|
||||
// }
|
||||
|
||||
// #[cfg(debug_assertions)]
|
||||
// async fn watch_languages(fs: Arc<dyn Fs>, languages: Arc<LanguageRegistry>) -> Option<()> {
|
||||
// let mut events = fs
|
||||
// .watch(
|
||||
// "crates/zed/src/languages".as_ref(),
|
||||
// Duration::from_millis(100),
|
||||
// )
|
||||
// .await;
|
||||
// while (events.next().await).is_some() {
|
||||
// languages.reload();
|
||||
// }
|
||||
// Some(())
|
||||
// }
|
||||
|
||||
// #[cfg(debug_assertions)]
|
||||
// fn watch_file_types(fs: Arc<dyn Fs>, cx: &mut AppContext) {
|
||||
// cx.spawn(|mut cx| async move {
|
||||
// let mut events = fs
|
||||
// .watch(
|
||||
// "assets/icons/file_icons/file_types.json".as_ref(),
|
||||
// Duration::from_millis(100),
|
||||
// )
|
||||
// .await;
|
||||
// while (events.next().await).is_some() {
|
||||
// cx.update(|cx| {
|
||||
// cx.update_global(|file_types, _| {
|
||||
// *file_types = project_panel::file_associations::FileAssociations::new(Assets);
|
||||
// });
|
||||
// })
|
||||
// }
|
||||
// })
|
||||
// .detach()
|
||||
// }
|
||||
|
||||
// #[cfg(not(debug_assertions))]
|
||||
// async fn watch_themes(_fs: Arc<dyn Fs>, _cx: AsyncAppContext) -> Option<()> {
|
||||
// None
|
||||
// }
|
||||
|
||||
// #[cfg(not(debug_assertions))]
|
||||
// async fn watch_languages(_: Arc<dyn Fs>, _: Arc<LanguageRegistry>) -> Option<()> {
|
||||
// None
|
||||
// }
|
||||
|
||||
// #[cfg(not(debug_assertions))]
|
||||
// fn watch_file_types(_fs: Arc<dyn Fs>, _cx: &mut AppContext) {}
|
||||
|
||||
fn connect_to_cli(
|
||||
server_name: &str,
|
||||
) -> Result<(mpsc::Receiver<CliRequest>, IpcSender<CliResponse>)> {
|
||||
let handshake_tx = cli::ipc::IpcSender::<IpcHandshake>::connect(server_name.to_string())
|
||||
.context("error connecting to cli")?;
|
||||
let (request_tx, request_rx) = ipc::channel::<CliRequest>()?;
|
||||
let (response_tx, response_rx) = ipc::channel::<CliResponse>()?;
|
||||
|
||||
handshake_tx
|
||||
.send(IpcHandshake {
|
||||
requests: request_tx,
|
||||
responses: response_rx,
|
||||
})
|
||||
.context("error sending ipc handshake")?;
|
||||
|
||||
let (mut async_request_tx, async_request_rx) =
|
||||
futures::channel::mpsc::channel::<CliRequest>(16);
|
||||
thread::spawn(move || {
|
||||
while let Ok(cli_request) = request_rx.recv() {
|
||||
if smol::block_on(async_request_tx.send(cli_request)).is_err() {
|
||||
break;
|
||||
}
|
||||
}
|
||||
Ok::<_, anyhow::Error>(())
|
||||
});
|
||||
|
||||
Ok((async_request_rx, response_tx))
|
||||
}
|
||||
|
||||
async fn handle_cli_connection(
|
||||
(mut requests, responses): (mpsc::Receiver<CliRequest>, IpcSender<CliResponse>),
|
||||
app_state: Arc<AppState>,
|
||||
mut cx: AsyncAppContext,
|
||||
) {
|
||||
if let Some(request) = requests.next().await {
|
||||
match request {
|
||||
CliRequest::Open { paths, wait } => {
|
||||
let mut caret_positions = HashMap::new();
|
||||
|
||||
// todo!("workspace")
|
||||
// let paths = if paths.is_empty() {
|
||||
// workspace::last_opened_workspace_paths()
|
||||
// .await
|
||||
// .map(|location| location.paths().to_vec())
|
||||
// .unwrap_or_default()
|
||||
// } else {
|
||||
// paths
|
||||
// .into_iter()
|
||||
// .filter_map(|path_with_position_string| {
|
||||
// let path_with_position = PathLikeWithPosition::parse_str(
|
||||
// &path_with_position_string,
|
||||
// |path_str| {
|
||||
// Ok::<_, std::convert::Infallible>(
|
||||
// Path::new(path_str).to_path_buf(),
|
||||
// )
|
||||
// },
|
||||
// )
|
||||
// .expect("Infallible");
|
||||
// let path = path_with_position.path_like;
|
||||
// if let Some(row) = path_with_position.row {
|
||||
// if path.is_file() {
|
||||
// let row = row.saturating_sub(1);
|
||||
// let col =
|
||||
// path_with_position.column.unwrap_or(0).saturating_sub(1);
|
||||
// caret_positions.insert(path.clone(), Point::new(row, col));
|
||||
// }
|
||||
// }
|
||||
// Some(path)
|
||||
// })
|
||||
// .collect()
|
||||
// };
|
||||
|
||||
// let mut errored = false;
|
||||
// match cx
|
||||
// .update(|cx| workspace::open_paths(&paths, &app_state, None, cx))
|
||||
// .await
|
||||
// {
|
||||
// Ok((workspace, items)) => {
|
||||
// let mut item_release_futures = Vec::new();
|
||||
|
||||
// for (item, path) in items.into_iter().zip(&paths) {
|
||||
// match item {
|
||||
// Some(Ok(item)) => {
|
||||
// if let Some(point) = caret_positions.remove(path) {
|
||||
// if let Some(active_editor) = item.downcast::<Editor>() {
|
||||
// active_editor
|
||||
// .downgrade()
|
||||
// .update(&mut cx, |editor, cx| {
|
||||
// let snapshot =
|
||||
// editor.snapshot(cx).display_snapshot;
|
||||
// let point = snapshot
|
||||
// .buffer_snapshot
|
||||
// .clip_point(point, Bias::Left);
|
||||
// editor.change_selections(
|
||||
// Some(Autoscroll::center()),
|
||||
// cx,
|
||||
// |s| s.select_ranges([point..point]),
|
||||
// );
|
||||
// })
|
||||
// .log_err();
|
||||
// }
|
||||
// }
|
||||
|
||||
// let released = oneshot::channel();
|
||||
// cx.update(|cx| {
|
||||
// item.on_release(
|
||||
// cx,
|
||||
// Box::new(move |_| {
|
||||
// let _ = released.0.send(());
|
||||
// }),
|
||||
// )
|
||||
// .detach();
|
||||
// });
|
||||
// item_release_futures.push(released.1);
|
||||
// }
|
||||
// Some(Err(err)) => {
|
||||
// responses
|
||||
// .send(CliResponse::Stderr {
|
||||
// message: format!("error opening {:?}: {}", path, err),
|
||||
// })
|
||||
// .log_err();
|
||||
// errored = true;
|
||||
// }
|
||||
// None => {}
|
||||
// }
|
||||
// }
|
||||
|
||||
// if wait {
|
||||
// let background = cx.background();
|
||||
// let wait = async move {
|
||||
// if paths.is_empty() {
|
||||
// let (done_tx, done_rx) = oneshot::channel();
|
||||
// if let Some(workspace) = workspace.upgrade(&cx) {
|
||||
// let _subscription = cx.update(|cx| {
|
||||
// cx.observe_release(&workspace, move |_, _| {
|
||||
// let _ = done_tx.send(());
|
||||
// })
|
||||
// });
|
||||
// drop(workspace);
|
||||
// let _ = done_rx.await;
|
||||
// }
|
||||
// } else {
|
||||
// let _ =
|
||||
// futures::future::try_join_all(item_release_futures).await;
|
||||
// };
|
||||
// }
|
||||
// .fuse();
|
||||
// futures::pin_mut!(wait);
|
||||
|
||||
// loop {
|
||||
// // Repeatedly check if CLI is still open to avoid wasting resources
|
||||
// // waiting for files or workspaces to close.
|
||||
// let mut timer = background.timer(Duration::from_secs(1)).fuse();
|
||||
// futures::select_biased! {
|
||||
// _ = wait => break,
|
||||
// _ = timer => {
|
||||
// if responses.send(CliResponse::Ping).is_err() {
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// Err(error) => {
|
||||
// errored = true;
|
||||
// responses
|
||||
// .send(CliResponse::Stderr {
|
||||
// message: format!("error opening {:?}: {}", paths, error),
|
||||
// })
|
||||
// .log_err();
|
||||
// }
|
||||
// }
|
||||
|
||||
// responses
|
||||
// .send(CliResponse::Exit {
|
||||
// status: i32::from(errored),
|
||||
// })
|
||||
// .log_err();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// pub fn background_actions() -> &'static [(&'static str, &'static dyn Action)] {
|
||||
// &[
|
||||
// ("Go to file", &file_finder::Toggle),
|
||||
// ("Open command palette", &command_palette::Toggle),
|
||||
// ("Open recent projects", &recent_projects::OpenRecent),
|
||||
// ("Change your settings", &zed_actions::OpenSettings),
|
||||
// ]
|
||||
// }
|
Loading…
Add table
Add a link
Reference in a new issue