oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into picker

Browse Source
This commit is contained in:
Max Brunsfeld
2023-11-07 11:27:14 -08:00
parent 6928ad1335 4bf3a4e3d4
commit d690fb038d
38 changed files with 1117 additions and 585 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/zed2/src/main.rs
+16 -14
View File
@@ -20,7 +20,8 @@ use node_runtime::RealNodeRuntime;
use parking_lot::Mutex;
use serde::{Deserialize, Serialize};
use settings::{
default_settings, handle_settings_file_changes, watch_config_file, Settings, SettingsStore,
default_settings, handle_keymap_file_changes, handle_settings_file_changes, watch_config_file,
Settings, SettingsStore,
};
use simplelog::ConfigBuilder;
use smol::process::Command;
@@ -76,7 +77,7 @@ fn main() {
fs.clone(),
paths::SETTINGS.clone(),
);
let _user_keymap_file_rx = watch_config_file(
let user_keymap_file_rx = watch_config_file(
&app.background_executor(),
fs.clone(),
paths::KEYMAP.clone(),
@@ -116,7 +117,7 @@ fn main() {
.unwrap();
cx.set_global(store);
handle_settings_file_changes(user_settings_file_rx, cx);
// handle_keymap_file_changes(user_keymap_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);
@@ -140,17 +141,6 @@ fn main() {
// 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(),
@@ -193,6 +183,18 @@ fn main() {
workspace::init(app_state.clone(), cx);
// recent_projects::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);
// journal2::init(app_state.clone(), cx);
// language_selector::init(cx);
// theme_selector::init(cx);