Style fixes

Kirill Bulatov created 2 years ago

Change summary

crates/project/src/prettier_support.rs | 12 ++++++++----
crates/project/src/project.rs          | 19 ++++++++++++-------
2 files changed, 20 insertions(+), 11 deletions(-)

Detailed changes

crates/project/src/prettier_support.rs

@@ -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 {

crates/project/src/project.rs

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