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

Start wiring up assistant2

Browse source
This commit is contained in:
Antonio Scandurra 2023-12-06 12:51:25 +01:00
parent b29cea287b
commit 1de02cf6e5
6 changed files with 136 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/zed2/Cargo.toml
View file

@ -49,7 +49,7 @@ lsp = { package = "lsp2", path = "../lsp2" }
menu = { package = "menu2", path = "../menu2" }
# language_tools = { path = "../language_tools" }
node_runtime = { path = "../node_runtime" }
# assistant = { path = "../assistant" }
assistant = { package = "assistant2", path = "../assistant2" }
outline = { package = "outline2", path = "../outline2" }
# plugin_runtime = { path = "../plugin_runtime",optional = true }
project = { package = "project2", path = "../project2" }
@ -68,7 +68,7 @@ terminal_view = { package = "terminal_view2", path = "../terminal_view2" }
theme = { package = "theme2", path = "../theme2" }
theme_selector = { package = "theme_selector2", path = "../theme_selector2" }
util = { path = "../util" }
# semantic_index = { path = "../semantic_index" }
semantic_index = { package = "semantic_index2", path = "../semantic_index2" }
# vim = { path = "../vim" }
workspace = { package = "workspace2", path = "../workspace2" }
welcome = { package = "welcome2", path = "../welcome2" }

12
crates/zed2/src/main.rs
View file

@ -161,11 +161,11 @@ fn main() {
node_runtime.clone(),
cx,
);
// assistant::init(cx);
assistant::init(cx);
// component_test::init(cx);
// cx.spawn(|_| watch_languages(fs.clone(), languages.clone()))
// .detach();
cx.spawn(|_| watch_languages(fs.clone(), languages.clone()))
.detach();
watch_file_types(fs.clone(), cx);
languages.set_theme(cx.theme().clone());
@ -186,10 +186,10 @@ fn main() {
.report_app_event(telemetry_settings, event_operation);
let app_state = Arc::new(AppState {
languages,
languages: languages.clone(),
client: client.clone(),
user_store: user_store.clone(),
fs,
fs: fs.clone(),
build_window_options,
workspace_store,
node_runtime,
@ -210,7 +210,7 @@ fn main() {
channel::init(&client, user_store.clone(), cx);
// diagnostics::init(cx);
search::init(cx);
// semantic_index::init(fs.clone(), http.clone(), languages.clone(), cx);
semantic_index::init(fs.clone(), http.clone(), languages.clone(), cx);
// vim::init(cx);
terminal_view::init(cx);