Rooba
/
lapce
mirror of https://github.com/lapce/lapce.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Run rustfmt. 

It really manages 'data.rs/save_as_success()'.
This commit is contained in:
Philip Daniels 2022-05-24 22:19:19 +01:00
parent d83cb5d0d2
commit 50e3623f24
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lapce-data/src/data.rs
View File

@ -1764,7 +1764,9 @@ pub fn content_doc(&self, content: &BufferContent) -> Arc<Document> {
BufferContent::File(path) => self.open_docs.get(path).unwrap().clone(), BufferContent::File(path) => self.open_docs.get(path).unwrap().clone(),
BufferContent::Local(kind) => self.local_docs.get(kind).unwrap().clone(), BufferContent::Local(kind) => self.local_docs.get(kind).unwrap().clone(),
BufferContent::Value(name) => self.value_docs.get(name).unwrap().clone(), BufferContent::Value(name) => self.value_docs.get(name).unwrap().clone(),
BufferContent::Scratch(id, _) => self.scratch_docs.get(id).unwrap().clone(), BufferContent::Scratch(id, _) => {
self.scratch_docs.get(id).unwrap().clone()
}
} }
} }
@ -2617,7 +2619,12 @@ pub fn save_as_success(
if doc.rev() == rev { if doc.rev() == rev {
let new_content = BufferContent::File(path.to_path_buf()); let new_content = BufferContent::File(path.to_path_buf());
for (_, editor) in self.editors.iter_mut() { for (_, editor) in self.editors.iter_mut() {
if editor.content== BufferContent::Scratch(*id, scratch_doc_name.to_string()) { if editor.content
== BufferContent::Scratch(
*id,
scratch_doc_name.to_string(),
)
{
Arc::make_mut(editor).content = new_content.clone(); Arc::make_mut(editor).content = new_content.clone();
} }
} }
@ -2709,8 +2716,7 @@ pub fn editor_close(
force: bool, force: bool,
) { ) {
let editor = self.editors.get(&view_id).unwrap(); let editor = self.editors.get(&view_id).unwrap();
if let BufferContent::File(_) | BufferContent::Scratch(..) = if let BufferContent::File(_) | BufferContent::Scratch(..) = &editor.content
&editor.content
{ {
let doc = self.editor_doc(view_id); let doc = self.editor_doc(view_id);
if !force && !doc.buffer().is_pristine() { if !force && !doc.buffer().is_pristine() {

4
lapce-ui/src/editor/header.rs
View File

@ -140,7 +140,9 @@ pub fn paint_buffer(
{ {
let mut path = match data.doc.content() { let mut path = match data.doc.content() {
BufferContent::File(path) => path.to_path_buf(), BufferContent::File(path) => path.to_path_buf(),
BufferContent::Scratch(_, scratch_doc_name) => scratch_doc_name.into(), BufferContent::Scratch(_, scratch_doc_name) => {
scratch_doc_name.into()
}
_ => PathBuf::from(""), _ => PathBuf::from(""),
}; };