php: Allow using intelephense
from PATH (#14643)
This PR updates the PHP extension to use `intelephense` from the PATH, if it exists. Tested using the following Nix shell: ```sh NIXPKGS_ALLOW_UNFREE=1 nix-shell -p php nodePackages_latest.intelephense ``` Resolves #11994. Release Notes: - N/A
This commit is contained in:
parent
bd02f4fe28
commit
40ed3b6977
2 changed files with 31 additions and 18 deletions
|
@ -1,7 +1,5 @@
|
|||
mod language_servers;
|
||||
|
||||
use std::env;
|
||||
|
||||
use zed_extension_api::{self as zed, LanguageServerId, Result};
|
||||
|
||||
use crate::language_servers::{Intelephense, Phpactor};
|
||||
|
@ -27,20 +25,7 @@ impl zed::Extension for PhpExtension {
|
|||
match language_server_id.as_ref() {
|
||||
Intelephense::LANGUAGE_SERVER_ID => {
|
||||
let intelephense = self.intelephense.get_or_insert_with(|| Intelephense::new());
|
||||
|
||||
let server_path = intelephense.server_script_path(language_server_id)?;
|
||||
Ok(zed::Command {
|
||||
command: zed::node_binary_path()?,
|
||||
args: vec![
|
||||
env::current_dir()
|
||||
.unwrap()
|
||||
.join(&server_path)
|
||||
.to_string_lossy()
|
||||
.to_string(),
|
||||
"--stdio".to_string(),
|
||||
],
|
||||
env: Default::default(),
|
||||
})
|
||||
intelephense.language_server_command(language_server_id, worktree)
|
||||
}
|
||||
Phpactor::LANGUAGE_SERVER_ID => {
|
||||
let phpactor = self.phpactor.get_or_insert_with(|| Phpactor::new());
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue