Fix conflicts

Author: EuclidDivisionLemma

crates/fs/src/fs.rs

@@ -7,8 +7,8 @@ pub mod fs_watcher;
 use anyhow::{Context as _, Result, anyhow};
 #[cfg(any(target_os = "linux", target_os = "freebsd"))]
 use ashpd::desktop::trash;
-use futures::stream::iter;
 use encodings::Encoding;
+use futures::stream::iter;
 use gpui::App;
 use gpui::BackgroundExecutor;
 use gpui::Global;

crates/project/src/buffer_store.rs

@@ -8,6 +8,8 @@ use anyhow::{Context as _, Result, anyhow};
 use client::Client;
 use collections::{HashMap, HashSet, hash_map};
 use encodings::Encoding;
+use fs::Fs;
+use futures::StreamExt;
 use futures::{Future, FutureExt as _, channel::oneshot, future::Shared};
 use gpui::{
     App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, Subscription, Task, WeakEntity,
@@ -1177,7 +1179,7 @@ impl BufferStore {
                 let buffers = this.update(cx, |this, cx| {
                     project_paths
                         .into_iter()
-                        .map(|project_path| this.open_buffer(project_path, None, cx))
+                        .map(|project_path| this.open_buffer(project_path, None, false, true, cx))
                         .collect::<Vec<_>>()
                 })?;
                 for buffer_task in buffers {

crates/project/src/lsp_store.rs

@@ -8234,7 +8234,7 @@ impl LspStore {
             lsp_store
                 .update(cx, |lsp_store, cx| {
                     lsp_store.buffer_store().update(cx, |buffer_store, cx| {
-                        buffer_store.open_buffer(project_path, None, false, true,cx)
+                        buffer_store.open_buffer(project_path, None, false, true, cx)
                     })
                 })?
                 .await