Skip to content

Fix use .CMD server for windows #17

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

Merged
camc314 merged 4 commits into from
Aug 19, 2025
Merged

Fix use .CMD server for windows #17

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a002aab
fix: use `exe` server for windows
Sysix Aug 10, 2025
7ea5d63
fix: use `cmd` for windows
Sysix Aug 10, 2025
d5ce537
use `zed::current_platform()`
Sysix Aug 15, 2025
5793cb0
create `is_windows` variable
Sysix Aug 15, 2025
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
20 changes: 13 additions & 7 deletions src/oxc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
use std::{env, fs, path::Path};
use zed_extension_api::{
self as zed,
self as zed, LanguageServerId, Result,
serde_json::{self, Value},
settings::LspSettings,
LanguageServerId, Result,
};

// the general expected server path (excluded for windows)
Comment thread
camc314 marked this conversation as resolved.
const SERVER_PATH: &str = "node_modules/oxlint/bin/oxc_language_server";
const PACKAGE_NAME: &str = "oxlint";
const FALLBACK_SERVER_PATH: &str = "./node_modules/.bin/oxc_language_server";

// fallback to the wrapper script
const FALLBACK_SERVER_PATH: &str = if cfg!(windows) {
Comment thread
Sysix marked this conversation as resolved.
Outdated
"./node_modules/.bin/oxc_language_server.CMD"
} else {
"./node_modules/.bin/oxc_language_server"
};
Comment thread
Sysix marked this conversation as resolved.
Outdated
const PACKAGE_NAME: &str = "oxlint";
const OXC_CONFIG_PATHS: &[&str] = &[".oxlintrc.json"];

struct OxcExtension;
Expand Down Expand Up @@ -37,7 +42,8 @@ impl OxcExtension {
|| !f["devDependencies"][PACKAGE_NAME].is_null()
});

if server_package_exists {
// windows needs the `.CMD` file, which is only inside `node_modules/.bin`.
Comment thread
Sysix marked this conversation as resolved.
Outdated
if server_package_exists && !cfg!(windows) {
let worktree_root_path = worktree.root_path();
let path = Path::new(worktree_root_path.as_str())
.join(SERVER_PATH)
Expand Down Expand Up @@ -67,8 +73,8 @@ impl OxcExtension {
Ok(()) => {
if !self.server_exists(fallback_server_path) {
Err(format!(
"installed package '{PACKAGE_NAME}' did not contain expected path '{fallback_server_path:?}'",
))?;
"installed package '{PACKAGE_NAME}' did not contain expected path '{fallback_server_path:?}'",
))?;
}
}
Err(error) => {
Expand Down