Skip to content

Commit 583e3b0

Browse files
committed
Create the update marker only after download
1 parent 7db1b42 commit 583e3b0

File tree

2 files changed

+20
-16
lines changed

2 files changed

+20
-16
lines changed

src/jdk.rs

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,12 @@ pub fn try_to_fetch_and_install_latest_jdk(
8080
return get_jdk_bin_path(&path);
8181
}
8282

83+
// Check for updates, if same version is already downloaded skip download
84+
set_language_server_installation_status(
85+
language_server_id,
86+
&LanguageServerInstallationStatus::CheckingForUpdate,
87+
);
88+
8389
let version = zed::latest_github_release(
8490
CORRETTO_REPO,
8591
zed_extension_api::GithubReleaseOptions {
@@ -91,13 +97,6 @@ pub fn try_to_fetch_and_install_latest_jdk(
9197

9298
let install_path = jdk_path.join(&version);
9399

94-
// Check for updates, if same version is already downloaded skip download
95-
96-
set_language_server_installation_status(
97-
language_server_id,
98-
&LanguageServerInstallationStatus::CheckingForUpdate,
99-
);
100-
101100
if !install_path.exists() {
102101
set_language_server_installation_status(
103102
language_server_id,
@@ -118,10 +117,10 @@ pub fn try_to_fetch_and_install_latest_jdk(
118117

119118
// Remove older versions
120119
let _ = remove_all_files_except(&jdk_path, version.as_str());
121-
}
122120

123-
// Always mark the downloaded version for "Once" mode tracking
124-
let _ = mark_checked_once(JDK_INSTALL_PATH, &version);
121+
// Mark the downloaded version for "Once" mode tracking
122+
let _ = mark_checked_once(JDK_INSTALL_PATH, &version);
123+
}
125124

126125
get_jdk_bin_path(&install_path)
127126
}

src/jdtls.rs

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,11 @@ pub fn try_to_fetch_and_install_latest_jdtls(
164164
}
165165

166166
// Download latest version
167+
set_language_server_installation_status(
168+
language_server_id,
169+
&LanguageServerInstallationStatus::CheckingForUpdate,
170+
);
171+
167172
let (last, second_last) = get_latest_versions_from_tag(JDTLS_REPO)?;
168173

169174
let (latest_version, latest_version_build) = download_jdtls_milestone(last.as_ref())
@@ -203,10 +208,10 @@ pub fn try_to_fetch_and_install_latest_jdtls(
203208

204209
// ...and delete other versions
205210
let _ = remove_all_files_except(prefix, build_directory.as_str());
206-
}
207211

208-
// Always mark the downloaded version for "Once" mode tracking
209-
let _ = mark_checked_once(JDTLS_INSTALL_PATH, &latest_version);
212+
// Mark the downloaded version for "Once" mode tracking
213+
let _ = mark_checked_once(JDTLS_INSTALL_PATH, &latest_version);
214+
}
210215

211216
// return jdtls base path
212217
Ok(build_path)
@@ -254,10 +259,10 @@ pub fn try_to_fetch_and_install_latest_lombok(
254259
// ...and delete other versions
255260

256261
let _ = remove_all_files_except(prefix, jar_name.as_str());
257-
}
258262

259-
// Always mark the downloaded version for "Once" mode tracking
260-
let _ = mark_checked_once(LOMBOK_INSTALL_PATH, &latest_version);
263+
// Mark the downloaded version for "Once" mode tracking
264+
let _ = mark_checked_once(LOMBOK_INSTALL_PATH, &latest_version);
265+
}
261266

262267
// else use it
263268
Ok(jar_path)

0 commit comments

Comments
 (0)