Skip to content

Fix ts-plugin startup failure after update error in Zed #253

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix ts-plugin startup failure after update error in Zed #253

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions crates/zed/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use zed_extension_api::{self as zed, Result, serde_json};
const TS_PLUGIN_PACKAGE_NAME: &str = "@css-modules-kit/ts-plugin";

/// Install ts-plugin in "{extension_work_dir}/node_modules"
fn install_ts_plugin_if_needed() -> Result<()> {
fn install_or_update_ts_plugin_if_needed() -> Result<()> {
let installed_plugin_version = zed::npm_package_installed_version(TS_PLUGIN_PACKAGE_NAME)?;
let latest_plugin_version = zed::npm_package_latest_version(TS_PLUGIN_PACKAGE_NAME)?;

Expand All @@ -32,8 +32,8 @@ fn get_ts_plugin_search_location(worktree: &zed::Worktree) -> String {
return worktree.root_path();
}

if let Err(_) = install_ts_plugin_if_needed() {
return worktree.root_path();
if let Err(_) = install_or_update_ts_plugin_if_needed() {
println!("Failed to install or update ts-plugin. Please try again later.")
}

// The cwd for the extension is "~/Library/Application Support/Zed/extensions/work/css-modules-kit" on macOS.
Expand Down