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

vim2 compiling (but mostly commented out)

Browse source
This commit is contained in:
Conrad Irwin 2023-12-08 18:47:14 +00:00
parent 7a9f764aa0
commit 32837d67be
146 changed files with 22013 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/zed2/Cargo.toml
View file

@ -69,7 +69,7 @@ theme = { package = "theme2", path = "../theme2" }
theme_selector = { package = "theme_selector2", path = "../theme_selector2" }
util = { path = "../util" }
semantic_index = { package = "semantic_index2", path = "../semantic_index2" }
# vim = { path = "../vim" }
vim = { package = "vim2", path = "../vim2" }
workspace = { package = "workspace2", path = "../workspace2" }
welcome = { package = "welcome2", path = "../welcome2" }
zed_actions = {package = "zed_actions2", path = "../zed_actions2"}

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

@ -211,7 +211,7 @@ fn main() {
// diagnostics::init(cx);
search::init(cx);
semantic_index::init(fs.clone(), http.clone(), languages.clone(), cx);
// vim::init(cx);
vim::init(cx);
terminal_view::init(cx);
// journal2::init(app_state.clone(), cx);

6
crates/zed2/src/zed2.rs
View file

@ -124,7 +124,7 @@ pub fn initialize_workspace(app_state: Arc<AppState>, cx: &mut AppContext) {
activity_indicator::ActivityIndicator::new(workspace, app_state.languages.clone(), cx);
let active_buffer_language =
cx.build_view(|_| language_selector::ActiveBufferLanguage::new(workspace));
// let vim_mode_indicator = cx.add_view(|cx| vim::ModeIndicator::new(cx));
let vim_mode_indicator = cx.build_view(|cx| vim::ModeIndicator::new(cx));
let feedback_button = cx
.build_view(|_| feedback::deploy_feedback_button::DeployFeedbackButton::new(workspace));
// let cursor_position = cx.add_view(|_| editor::items::CursorPosition::new());
@ -136,13 +136,13 @@ pub fn initialize_workspace(app_state: Arc<AppState>, cx: &mut AppContext) {
// status_bar.add_right_item(copilot, cx);
status_bar.add_right_item(copilot, cx);
status_bar.add_right_item(active_buffer_language, cx);
// status_bar.add_right_item(vim_mode_indicator, cx);
status_bar.add_right_item(vim_mode_indicator, cx);
status_bar.add_right_item(cursor_position, cx);
});
auto_update::notify_of_any_new_update(cx);
// vim::observe_keystrokes(cx);
vim::observe_keystrokes(cx);
let handle = cx.view().downgrade();
cx.on_window_should_close(move |cx| {