Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Style fixes

Browse source
This commit is contained in:
Kirill Bulatov 2023-11-29 11:33:29 +02:00
parent f1314afe35
commit 6e44f53ea1
2 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/project/src/prettier_support.rs
View file

@ -25,7 +25,10 @@ use crate::{
Event, File, FormatOperation, PathChange, Project, ProjectEntryId, Worktree, WorktreeId,
};
pub fn prettier_plugins_for_language(language: &Language, language_settings: &LanguageSettings) -> Option<HashSet<&'static str>> {
pub fn prettier_plugins_for_language(
language: &Language,
language_settings: &LanguageSettings,
) -> Option<HashSet<&'static str>> {
match &language_settings.formatter {
Formatter::Prettier { .. } | Formatter::Auto => {}
Formatter::LanguageServer | Formatter::External { .. } => return None,
@ -603,6 +606,8 @@ impl Project {
) {
// suppress unused code warnings
let _ = &self.default_prettier.installed_plugins;
let _ = install_prettier_packages;
let _ = save_prettier_server_file;
}
#[cfg(not(any(test, feature = "test-support")))]
@ -633,14 +638,13 @@ impl Project {
}
None => Task::ready(Ok(ControlFlow::Continue(None))),
};
new_plugins
.retain(|plugin| !self.default_prettier.installed_plugins.contains(plugin));
new_plugins.retain(|plugin| !self.default_prettier.installed_plugins.contains(plugin));
let mut installation_attempt = 0;
let previous_installation_task = match &mut self.default_prettier.prettier {
PrettierInstallation::NotInstalled {
installation_task,
attempts,
not_installed_plugins
not_installed_plugins,
} => {
installation_attempt = *attempts;
if installation_attempt > prettier::FAIL_THRESHOLD {