Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Detect buffer newline style and honor it when saving

Browse source
This commit is contained in:
Antonio Scandurra 2022-07-04 17:25:19 +02:00
parent f9bad2d81d
commit 3480b50920
8 changed files with 136 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/project/src/worktree.rs
View file

@ -24,7 +24,7 @@ use gpui::{
};
use language::{
proto::{deserialize_version, serialize_version},
Buffer, DiagnosticEntry, PointUtf16, Rope,
Buffer, DiagnosticEntry, NewlineStyle, PointUtf16, Rope,
};
use lazy_static::lazy_static;
use parking_lot::Mutex;
@ -595,7 +595,7 @@ impl LocalWorktree {
let text = buffer.as_rope().clone();
let fingerprint = text.fingerprint();
let version = buffer.version();
let save = self.write_file(path, text, cx);
let save = self.write_file(path, text, buffer.newline_style(), cx);
let handle = cx.handle();
cx.as_mut().spawn(|mut cx| async move {
let entry = save.await?;
@ -636,9 +636,10 @@ impl LocalWorktree {
&self,
path: impl Into<Arc<Path>>,
text: Rope,
newline_style: NewlineStyle,
cx: &mut ModelContext<Worktree>,
) -> Task<Result<Entry>> {
self.write_entry_internal(path, Some(text), cx)
self.write_entry_internal(path, Some((text, newline_style)), cx)
}
pub fn delete_entry(
@ -754,7 +755,7 @@ impl LocalWorktree {
fn write_entry_internal(
&self,
path: impl Into<Arc<Path>>,
text_if_file: Option<Rope>,
text_if_file: Option<(Rope, NewlineStyle)>,
cx: &mut ModelContext<Worktree>,
) -> Task<Result<Entry>> {
let path = path.into();
@ -763,8 +764,8 @@ impl LocalWorktree {
let fs = self.fs.clone();
let abs_path = abs_path.clone();
async move {
if let Some(text) = text_if_file {
fs.save(&abs_path, &text).await
if let Some((text, newline_style)) = text_if_file {
fs.save(&abs_path, &text, newline_style).await
} else {
fs.create_dir(&abs_path).await
}
@ -1653,6 +1654,7 @@ impl language::File for File {
buffer_id: u64,
text: Rope,
version: clock::Global,
newline_style: NewlineStyle,
cx: &mut MutableAppContext,
) -> Task<Result<(clock::Global, String, SystemTime)>> {
self.worktree.update(cx, |worktree, cx| match worktree {
@ -1660,7 +1662,7 @@ impl language::File for File {
let rpc = worktree.client.clone();
let project_id = worktree.share.as_ref().map(|share| share.project_id);
let fingerprint = text.fingerprint();
let save = worktree.write_file(self.path.clone(), text, cx);
let save = worktree.write_file(self.path.clone(), text, newline_style, cx);
cx.background().spawn(async move {
let entry = save.await?;
if let Some(project_id) = project_id {
@ -2841,6 +2843,7 @@ mod tests {
tree.as_local().unwrap().write_file(
Path::new("tracked-dir/file.txt"),
"hello".into(),
Default::default(),
cx,
)
})
@ -2850,6 +2853,7 @@ mod tests {
tree.as_local().unwrap().write_file(
Path::new("ignored-dir/file.txt"),
"world".into(),
Default::default(),
cx,
)
})