Do not clear cache for default prettiers

Kirill Bulatov created 2 years ago

Change summary

crates/prettier/src/prettier_server.js |  3 +
crates/project/src/project.rs          | 70 ++++++++++++++--------------
2 files changed, 38 insertions(+), 35 deletions(-)

Detailed changes

crates/prettier/src/prettier_server.js

@@ -155,6 +155,9 @@ async function handleMessage(message, prettier) {
             parser: params.options.parser,
             path: params.options.path
         };
+        // TODO kb always resolve prettier config for each file.
+        // need to understand if default prettier can be affected by other configs in the project
+        // (restart default prettiers on config changes too then)
         const formattedText = await prettier.prettier.format(params.text, options);
         sendResponse({ id, result: { text: formattedText } });
     } else if (method === 'prettier/clear_cache') {

crates/project/src/project.rs

@@ -6391,43 +6391,42 @@ impl Project {
             log::info!(
                 "Prettier config file {config_path:?} changed, reloading prettier instances for worktree {current_worktree_id}"
             );
-        }
-
-        let prettiers_to_reload = self
-            .prettier_instances
-            .iter()
-            .filter_map(|((worktree_id, prettier_path), prettier_task)| {
-                if worktree_id.is_none() || worktree_id == &Some(current_worktree_id) {
-                    Some((*worktree_id, prettier_path.clone(), prettier_task.clone()))
-                } else {
-                    None
-                }
-            })
-            .collect::<Vec<_>>();
-
-        cx.background()
-            .spawn(async move {
-                for task_result in future::join_all(prettiers_to_reload.into_iter().map(|(worktree_id, prettier_path, prettier_task)| {
-                    async move {
-                        prettier_task.await?
-                            .clear_cache()
-                            .await
-                            .with_context(|| {
-                                format!(
-                                    "clearing prettier {prettier_path:?} cache for worktree {worktree_id:?}"
-                                )
-                            })
-                            .map_err(Arc::new)
+            let prettiers_to_reload = self
+                .prettier_instances
+                .iter()
+                .filter_map(|((worktree_id, prettier_path), prettier_task)| {
+                    if worktree_id == &Some(current_worktree_id) {
+                        Some((*worktree_id, prettier_path.clone(), prettier_task.clone()))
+                    } else {
+                        None
                     }
-                }))
-                .await
-                {
-                    if let Err(e) = task_result {
-                        log::error!("Failed to clear cache for prettier: {e:#}");
+                })
+                .collect::<Vec<_>>();
+
+            cx.background()
+                .spawn(async move {
+                    for task_result in future::join_all(prettiers_to_reload.into_iter().map(|(worktree_id, prettier_path, prettier_task)| {
+                        async move {
+                            prettier_task.await?
+                                .clear_cache()
+                                .await
+                                .with_context(|| {
+                                    format!(
+                                        "clearing prettier {prettier_path:?} cache for worktree {worktree_id:?}"
+                                    )
+                                })
+                                .map_err(Arc::new)
+                        }
+                    }))
+                    .await
+                    {
+                        if let Err(e) = task_result {
+                            log::error!("Failed to clear cache for prettier: {e:#}");
+                        }
                     }
-                }
-            })
-            .detach();
+                })
+                .detach();
+        }
     }
 
     pub fn set_active_path(&mut self, entry: Option<ProjectPath>, cx: &mut ModelContext<Self>) {
@@ -8410,6 +8409,7 @@ impl Project {
                             project
                                 .supplementary_language_servers
                                 .insert(new_server_id, (name, Arc::clone(prettier.server())));
+                            // TODO kb could there be a race with multiple default prettier instances added?
                             cx.emit(Event::LanguageServerAdded(new_server_id));
                         });
                     }