assistant2: Small efficiency improvements + add a todo

zed-industries · Jan 10, 2025 · 663116a · 663116a
1 parent 767f44b
commit 663116a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/crates/assistant2/src/context_store.rs b/crates/assistant2/src/context_store.rs
@@ -191,27 +191,26 @@ impl ContextStore {
                 collect_files_in_path(worktree, &project_path.path)
             })?;
 
-            let open_buffer_tasks = project.update(&mut cx, |project, cx| {
-                files
-                    .iter()
-                    .map(|file_path| {
-                        project.open_buffer(
-                            ProjectPath {
-                                worktree_id,
-                                path: file_path.clone(),
-                            },
-                            cx,
-                        )
-                    })
-                    .collect::<Vec<_>>()
+            let open_buffers_task = project.update(&mut cx, |project, cx| {
+                let tasks = files.iter().map(|file_path| {
+                    project.open_buffer(
+                        ProjectPath {
+                            worktree_id,
+                            path: file_path.clone(),
+                        },
+                        cx,
+                    )
+                });
+                future::join_all(tasks)
             })?;
 
-            let buffers = future::join_all(open_buffer_tasks).await;
+            let buffers = open_buffers_task.await;
 
             let mut buffer_infos = Vec::new();
             let mut text_tasks = Vec::new();
             this.update(&mut cx, |_, cx| {
                 for (path, buffer_model) in files.into_iter().zip(buffers) {
+                    // TODO: Collect multiple errors?
                     let buffer_model = buffer_model?;
                     let buffer = buffer_model.read(cx);
                     let (buffer_info, text_task) =

diff --git a/crates/language_model/src/request.rs b/crates/language_model/src/request.rs
@@ -214,9 +214,9 @@ impl LanguageModelRequestMessage {
                 .content
                 .first()
                 .map(|content| match content {
-                    MessageContent::Text(text) => text.trim().is_empty(),
+                    MessageContent::Text(text) => text.chars().all(|c| c.is_whitespace()),
                     MessageContent::ToolResult(tool_result) => {
-                        tool_result.content.trim().is_empty()
+                        tool_result.content.chars().all(|c| c.is_whitespace())
                     }
                     MessageContent::ToolUse(_) | MessageContent::Image(_) => true,
                 })