Skip to content

Dev/lsp #765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cooffeeRequired wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Dev/lsp #765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a393f6b
LSP
coffeerequiredev Jun 8, 2026
1340ae3
LSP
coffeerequiredev Jun 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 35 additions & 1 deletion src-tauri/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions src-tauri/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,17 @@ tauri-plugin-notification = "2"
reqwest = { version = "0.12", default-features = false, features = [
"rustls-tls",
"stream",
"blocking",
"json",
] }
bytes = "1"
futures-util = "0.3"
tokio = { version = "1", default-features = false, features = ["rt"] }
tempfile = "3"
notify = "8.2.0"
zip = { version = "2", default-features = false, features = ["deflate"] }
tar = "0.4"
flate2 = "1"

[dev-dependencies]
proptest = "1"
Expand Down
19 changes: 15 additions & 4 deletions src-tauri/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pub mod modules;

use modules::{agent, fs, git, history, net, pty, secrets, shell, workspace};
use modules::{agent, fs, git, history, lsp, net, pty, secrets, shell, workspace};
use std::sync::Mutex;
use tauri::{Emitter, Manager, State, WebviewUrl, WebviewWindowBuilder};
#[cfg(target_os = "macos")]
Expand Down Expand Up @@ -136,12 +136,13 @@ pub fn run() {
.build(),
)
.plugin(tauri_plugin_opener::init())
.setup(|_app| {
.setup(|app| {
lsp::init(&app.handle());
// macOS skips parent() for the settings window, so tie its lifecycle
// to the main window here instead. Other platforms keep parent().
#[cfg(target_os = "macos")]
if let Some(main) = _app.get_webview_window("main") {
let handle = _app.handle().clone();
if let Some(main) = app.get_webview_window("main") {
let handle = app.handle().clone();
main.on_window_event(move |event| {
if matches!(
event,
Expand All @@ -157,6 +158,7 @@ pub fn run() {
})
.manage(pty::PtyState::default())
.manage(shell::ShellState::default())
.manage(lsp::LspState::default())
.manage(secrets::SecretsState::default())
.manage(fs::watch::FsWatchState::default())
.manage(history::HistoryState::default())
Expand Down Expand Up @@ -220,6 +222,15 @@ pub fn run() {
shell::shell_bg_logs,
shell::shell_bg_kill,
shell::shell_bg_list,
lsp::lsp_probe_binary,
lsp::lsp_install,
lsp::lsp_link_binary,
lsp::lsp_unlink_binary,
lsp::lsp_probe_wsl_binary,
lsp::lsp_resolve_root,
lsp::lsp_spawn,
lsp::lsp_send,
lsp::lsp_close,
workspace::wsl_list_distros,
workspace::wsl_default_distro,
workspace::wsl_home,
Expand Down
Loading