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, 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 { match &language_settings.formatter {
Formatter::Prettier { .. } | Formatter::Auto => {} Formatter::Prettier { .. } | Formatter::Auto => {}
Formatter::LanguageServer | Formatter::External { .. } => return None, Formatter::LanguageServer | Formatter::External { .. } => return None,
@ -603,6 +606,8 @@ impl Project {
) { ) {
// suppress unused code warnings // suppress unused code warnings
let _ = &self.default_prettier.installed_plugins; let _ = &self.default_prettier.installed_plugins;
let _ = install_prettier_packages;
let _ = save_prettier_server_file;
} }
#[cfg(not(any(test, feature = "test-support")))] #[cfg(not(any(test, feature = "test-support")))]
@ -633,14 +638,13 @@ impl Project {
} }
None => Task::ready(Ok(ControlFlow::Continue(None))), None => Task::ready(Ok(ControlFlow::Continue(None))),
}; };
new_plugins new_plugins.retain(|plugin| !self.default_prettier.installed_plugins.contains(plugin));
.retain(|plugin| !self.default_prettier.installed_plugins.contains(plugin));
let mut installation_attempt = 0; let mut installation_attempt = 0;
let previous_installation_task = match &mut self.default_prettier.prettier { let previous_installation_task = match &mut self.default_prettier.prettier {
PrettierInstallation::NotInstalled { PrettierInstallation::NotInstalled {
installation_task, installation_task,
attempts, attempts,
not_installed_plugins not_installed_plugins,
} => { } => {
installation_attempt = *attempts; installation_attempt = *attempts;
if installation_attempt > prettier::FAIL_THRESHOLD { if installation_attempt > prettier::FAIL_THRESHOLD {

19
crates/project/src/project.rs
View file

@ -927,8 +927,13 @@ impl Project {
let mut prettier_plugins_by_worktree = HashMap::default(); let mut prettier_plugins_by_worktree = HashMap::default();
for (worktree, language, settings) in language_formatters_to_check { for (worktree, language, settings) in language_formatters_to_check {
if let Some(plugins) = prettier_support::prettier_plugins_for_language(&language, &settings) { if let Some(plugins) =
prettier_plugins_by_worktree.entry(worktree).or_insert_with(|| HashSet::default()).extend(plugins); prettier_support::prettier_plugins_for_language(&language, &settings)
{
prettier_plugins_by_worktree
.entry(worktree)
.or_insert_with(|| HashSet::default())
.extend(plugins);
} }
} }
for (worktree, prettier_plugins) in prettier_plugins_by_worktree { for (worktree, prettier_plugins) in prettier_plugins_by_worktree {
@ -2688,7 +2693,9 @@ impl Project {
let settings = language_settings(Some(&new_language), buffer_file.as_ref(), cx).clone(); let settings = language_settings(Some(&new_language), buffer_file.as_ref(), cx).clone();
let buffer_file = File::from_dyn(buffer_file.as_ref()); let buffer_file = File::from_dyn(buffer_file.as_ref());
let worktree = buffer_file.as_ref().map(|f| f.worktree_id(cx)); let worktree = buffer_file.as_ref().map(|f| f.worktree_id(cx));
if let Some(prettier_plugins) = prettier_support::prettier_plugins_for_language(&new_language, &settings) { if let Some(prettier_plugins) =
prettier_support::prettier_plugins_for_language(&new_language, &settings)
{
self.install_default_prettier(worktree, prettier_plugins, cx); self.install_default_prettier(worktree, prettier_plugins, cx);
}; };
if let Some(file) = buffer_file { if let Some(file) = buffer_file {
@ -4077,8 +4084,6 @@ impl Project {
let remove_trailing_whitespace = settings.remove_trailing_whitespace_on_save; let remove_trailing_whitespace = settings.remove_trailing_whitespace_on_save;
let ensure_final_newline = settings.ensure_final_newline_on_save; let ensure_final_newline = settings.ensure_final_newline_on_save;
let format_on_save = settings.format_on_save.clone();
let formatter = settings.formatter.clone();
let tab_size = settings.tab_size; let tab_size = settings.tab_size;
// First, format buffer's whitespace according to the settings. // First, format buffer's whitespace according to the settings.
@ -4106,7 +4111,7 @@ impl Project {
// Apply language-specific formatting using either a language server // Apply language-specific formatting using either a language server
// or external command. // or external command.
let mut format_operation = None; let mut format_operation = None;
match (formatter, format_on_save) { match (&settings.formatter, &settings.format_on_save) {
(_, FormatOnSave::Off) if trigger == FormatTrigger::Save => {} (_, FormatOnSave::Off) if trigger == FormatTrigger::Save => {}
(Formatter::LanguageServer, FormatOnSave::On | FormatOnSave::Off) (Formatter::LanguageServer, FormatOnSave::On | FormatOnSave::Off)
@ -4173,7 +4178,7 @@ impl Project {
)); ));
} }
} }
(Formatter::Prettier { .. }, FormatOnSave::On | FormatOnSave::Off) => { (Formatter::Prettier, FormatOnSave::On | FormatOnSave::Off) => {
if let Some(new_operation) = if let Some(new_operation) =
prettier_support::format_with_prettier(&project, buffer, &mut cx) prettier_support::format_with_prettier(&project, buffer, &mut cx)
.await .await