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

Mark TODOs and prep for merging main

Browse source
This commit is contained in:
Mikayla 2024-02-07 11:39:26 -08:00
parent e3ae7c4fe0
commit 3734a390b2
No known key found for this signature in database
13 changed files with 77 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/zed/src/languages.rs
View file

@ -280,7 +280,8 @@ pub fn init(
],
);
/// Produces a link error on linux due to duplicated `state_new` symbol
// Produces a link error on linux due to duplicated `state_new` symbol
// todo!(linux): Restore purescript
#[cfg(not(target_os = "linux"))]
language(
"purescript",

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

@ -257,7 +257,7 @@ fn main() {
initialize_workspace(app_state.clone(), cx);
if stdout_is_a_pty() {
//TODO: unblock this
//todo!(linux): unblock this
#[cfg(not(target_os = "linux"))]
upload_panics_and_crashes(http.clone(), cx);
cx.activate(true);
@ -919,6 +919,7 @@ fn load_user_themes_in_background(fs: Arc<dyn fs::Fs>, cx: &mut AppContext) {
.detach();
}
//todo!(linux): Port fsevents to linux
/// Spawns a background task to watch the themes directory for changes.
#[cfg(target_os = "macos")]
fn watch_themes(fs: Arc<dyn fs::Fs>, cx: &mut AppContext) {