chore: Fix several style lints (#17488)

It's not comprehensive enough to start linting on `style` group, but
hey, it's a start.

Release Notes:

- N/A
This commit is contained in:
Piotr Osiewicz
2024-09-06 11:58:39 +02:00
committed by GitHub
parent 93249fc82b
commit e6c1c51b37
361 changed files with 3529 additions and 3586 deletions
@@ -58,7 +58,7 @@ impl Intelephense {
}
zed::set_language_server_installation_status(
&language_server_id,
language_server_id,
&zed::LanguageServerInstallationStatus::CheckingForUpdate,
);
let version = zed::npm_package_latest_version(PACKAGE_NAME)?;
@@ -67,7 +67,7 @@ impl Intelephense {
|| zed::npm_package_installed_version(PACKAGE_NAME)?.as_ref() != Some(&version)
{
zed::set_language_server_installation_status(
&language_server_id,
language_server_id,
&zed::LanguageServerInstallationStatus::Downloading,
);
let result = zed::npm_install_package(PACKAGE_NAME, &version);
@@ -31,7 +31,7 @@ impl Phpactor {
}
zed::set_language_server_installation_status(
&language_server_id,
language_server_id,
&zed::LanguageServerInstallationStatus::CheckingForUpdate,
);
let release = zed::latest_github_release(
@@ -56,7 +56,7 @@ impl Phpactor {
if !fs::metadata(&binary_path).map_or(false, |stat| stat.is_file()) {
zed::set_language_server_installation_status(
&language_server_id,
language_server_id,
&zed::LanguageServerInstallationStatus::Downloading,
);
@@ -74,7 +74,7 @@ impl Phpactor {
for entry in entries {
let entry = entry.map_err(|e| format!("failed to load directory entry {e}"))?;
if entry.file_name().to_str() != Some(&version_dir) {
fs::remove_dir_all(&entry.path()).ok();
fs::remove_dir_all(entry.path()).ok();
}
}
}
+5 -8
View File
@@ -24,11 +24,11 @@ impl zed::Extension for PhpExtension {
) -> Result<zed::Command> {
match language_server_id.as_ref() {
Intelephense::LANGUAGE_SERVER_ID => {
let intelephense = self.intelephense.get_or_insert_with(|| Intelephense::new());
let intelephense = self.intelephense.get_or_insert_with(Intelephense::new);
intelephense.language_server_command(language_server_id, worktree)
}
Phpactor::LANGUAGE_SERVER_ID => {
let phpactor = self.phpactor.get_or_insert_with(|| Phpactor::new());
let phpactor = self.phpactor.get_or_insert_with(Phpactor::new);
Ok(zed::Command {
command: phpactor.language_server_binary_path(language_server_id, worktree)?,
@@ -45,13 +45,10 @@ impl zed::Extension for PhpExtension {
language_server_id: &LanguageServerId,
worktree: &zed::Worktree,
) -> Result<Option<serde_json::Value>> {
match language_server_id.as_ref() {
Intelephense::LANGUAGE_SERVER_ID => {
if let Some(intelephense) = self.intelephense.as_mut() {
return intelephense.language_server_workspace_configuration(worktree);
}
if language_server_id.as_ref() == Intelephense::LANGUAGE_SERVER_ID {
if let Some(intelephense) = self.intelephense.as_mut() {
return intelephense.language_server_workspace_configuration(worktree);
}
_ => (),
}
Ok(None)