move session.rs from helix-term to helix-loader

pull/9143/head
Ingrid 11 months ago
parent 6f6f3495d5
commit b5c5e5d715

26
Cargo.lock generated

@ -93,25 +93,6 @@ dependencies = [
"rustc-demangle", "rustc-demangle",
] ]
[[package]]
name = "bincode"
version = "2.0.0-rc.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f11ea1a0346b94ef188834a65c068a03aec181c94896d481d7a0a40d85b0ce95"
dependencies = [
"bincode_derive",
"serde",
]
[[package]]
name = "bincode_derive"
version = "2.0.0-rc.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e30759b3b99a1b802a7a3aa21c85c3ded5c28e1c83170d82d70f08bbf7f3e4c"
dependencies = [
"virtue",
]
[[package]] [[package]]
name = "bitflags" name = "bitflags"
version = "1.3.2" version = "1.3.2"
@ -1439,7 +1420,6 @@ version = "24.7.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"arc-swap", "arc-swap",
"bincode",
"chrono", "chrono",
"content_inspector", "content_inspector",
"crossterm", "crossterm",
@ -2571,12 +2551,6 @@ version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]]
name = "virtue"
version = "0.0.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9dcc60c0624df774c82a0ef104151231d37da4962957d691c011c852b2473314"
[[package]] [[package]]
name = "walkdir" name = "walkdir"
version = "2.4.0" version = "2.4.0"

@ -1,5 +1,6 @@
pub mod config; pub mod config;
pub mod grammar; pub mod grammar;
pub mod session;
use helix_stdx::{env::current_working_dir, path}; use helix_stdx::{env::current_working_dir, path};

@ -1,4 +1,4 @@
use helix_loader::{command_histfile, search_histfile}; use crate::{command_histfile, search_histfile};
use std::{ use std::{
fs::{File, OpenOptions}, fs::{File, OpenOptions},
io::{self, BufRead, BufReader, Write}, io::{self, BufRead, BufReader, Write},

@ -68,9 +68,6 @@ toml = "0.8"
serde_json = "1.0" serde_json = "1.0"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
# session persistence
bincode = "2.0.0-rc.3"
# ripgrep for global search # ripgrep for global search
grep-regex = "0.1.12" grep-regex = "0.1.12"
grep-searcher = "0.1.13" grep-searcher = "0.1.13"

@ -1,6 +1,7 @@
use arc_swap::{access::Map, ArcSwap}; use arc_swap::{access::Map, ArcSwap};
use futures_util::Stream; use futures_util::Stream;
use helix_core::{diagnostic::Severity, pos_at_coords, syntax, Selection}; use helix_core::{diagnostic::Severity, pos_at_coords, syntax, Selection};
use helix_loader::session;
use helix_lsp::{ use helix_lsp::{
lsp::{self, notification::Notification}, lsp::{self, notification::Notification},
util::lsp_range_to_range, util::lsp_range_to_range,
@ -27,7 +28,6 @@ use crate::{
handlers, handlers,
job::Jobs, job::Jobs,
keymap::Keymaps, keymap::Keymaps,
session,
ui::{self, overlay::overlaid}, ui::{self, overlay::overlaid},
}; };

@ -10,7 +10,6 @@ pub mod events;
pub mod health; pub mod health;
pub mod job; pub mod job;
pub mod keymap; pub mod keymap;
pub mod session;
pub mod ui; pub mod ui;
use std::path::Path; use std::path::Path;

@ -1,7 +1,8 @@
use crate::compositor::{Component, Compositor, Context, Event, EventResult}; use crate::compositor::{Component, Compositor, Context, Event, EventResult};
use crate::{alt, ctrl, key, session, shift, ui}; use crate::{alt, ctrl, key, shift, ui};
use arc_swap::ArcSwap; use arc_swap::ArcSwap;
use helix_core::syntax; use helix_core::syntax;
use helix_loader::session;
use helix_view::document::Mode; use helix_view::document::Mode;
use helix_view::input::KeyEvent; use helix_view::input::KeyEvent;
use helix_view::keyboard::KeyCode; use helix_view::keyboard::KeyCode;

Loading…
Cancel
Save