-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
6 changed files
with
85 additions
and
147 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,103 +1,70 @@ | ||
| use std::fs::File; | ||
| use std::io::BufReader; | ||
| use std::io::BufWriter; | ||
| use std::path::PathBuf; | ||
|
|
||
| #[cfg(unix)] | ||
| use std::os::unix::prelude::OsStrExt; | ||
|
|
||
| use anyhow::Context; | ||
| use anyhow::Result; | ||
| use helix_core::history::deserialize_history; | ||
| use helix_core::history::serialize_history; | ||
| use helix_core::parse::*; | ||
|
|
||
| use crate::Editor; | ||
|
|
||
| use super::Session; | ||
|
|
||
| // TODO: Check if serialized files already exist, and use them. | ||
| // TODO: Maybe have a way to verify that the histories match, and overwrite if they don't. | ||
| pub fn serialize(session: &mut Session, editor: &mut Editor) -> Result<()> { | ||
| // Handle existing index file to merge. | ||
| let mut index_file = session.get_mut("undo/index")?; | ||
| let mut index = deserialize_index(&index_file).context("failed to parse undo index")?; | ||
| for path in editor.documents().filter_map(|doc| doc.path().cloned()) { | ||
| if !index.iter().any(|(_, value)| *value == path) { | ||
| let key = index.last().map(|(key, _)| key + 1).unwrap_or(0); | ||
| index.push((key, path)); | ||
| } | ||
| } | ||
| serialize_index(&mut index_file, &index)?; | ||
|
|
||
| for (filename, doc_path) in index { | ||
| let doc = match editor | ||
| .documents_mut() | ||
| .find(|doc| doc.path() == Some(&doc_path)) | ||
| { | ||
| Some(doc) => doc, | ||
| None => continue, | ||
| }; | ||
| let filename = format!("undo/{filename}"); | ||
| let file = session.get_mut(&filename)?; | ||
| let history = doc.history.take(); | ||
| serialize_history(file, &history)?; | ||
| doc.history.set(history); | ||
| } | ||
|
|
||
| Ok(()) | ||
| } | ||
|
|
||
| pub fn deserialize(session: &mut Session, editor: &mut Editor) -> Result<()> { | ||
| let index = session | ||
| .get("undo/index") | ||
| .and_then(|file| deserialize_index(&file)) | ||
| .context("failed to parse index file")?; | ||
|
|
||
| for (filename, doc_path) in index { | ||
| let id = editor.open(&doc_path, crate::editor::Action::Load)?; | ||
| let doc = editor.document_mut(id).unwrap(); | ||
| let filename = format!("undo/{filename}"); | ||
| let file = session.get(&filename)?; | ||
| doc.history = std::cell::Cell::new(deserialize_history(file)?); | ||
| } | ||
|
|
||
| Ok(()) | ||
| } | ||
|
|
||
| fn serialize_index(file: &mut File, documents: &[(usize, PathBuf)]) -> Result<()> { | ||
| let mut writer = BufWriter::new(file); | ||
| write_vec(&mut writer, documents, |writer, (id, path)| { | ||
| write_usize(writer, *id)?; | ||
|
|
||
| #[cfg(windows)] | ||
| write_string(writer, path.to_str().unwrap())?; | ||
|
|
||
| #[cfg(unix)] | ||
| { | ||
| let bytes = path.as_os_str().as_bytes(); | ||
| write_vec(writer, bytes, |writer, byte| write_byte(writer, *byte))?; | ||
| } | ||
| Ok(()) | ||
| })?; | ||
|
|
||
| Ok(()) | ||
| } | ||
|
|
||
| fn deserialize_index(file: &File) -> Result<Vec<(usize, PathBuf)>> { | ||
| let mut reader = BufReader::new(file); | ||
| let res = read_vec(&mut reader, |reader| { | ||
| let id = read_usize(reader)?; | ||
|
|
||
| #[cfg(windows)] | ||
| let path = PathBuf::from(read_string(reader)?); | ||
|
|
||
| #[cfg(unix)] | ||
| let path = { | ||
| let bytes = read_vec(reader, read_byte)?; | ||
| PathBuf::from(std::ffi::OsStr::from_bytes(&bytes)) | ||
| }; | ||
| Ok((id, path)) | ||
| })?; | ||
| Ok(res) | ||
| } | ||
| // use std::fs::File; | ||
| // use std::io::BufReader; | ||
| // use std::io::BufWriter; | ||
| // use std::path::PathBuf; | ||
|
|
||
| // #[cfg(unix)] | ||
| // use std::os::unix::prelude::OsStrExt; | ||
|
|
||
| // use anyhow::Context; | ||
| // use anyhow::Result; | ||
| // use helix_core::history::deserialize_history; | ||
| // use helix_core::history::serialize_history; | ||
| // use helix_core::parse::*; | ||
|
|
||
| // use crate::Editor; | ||
|
|
||
| // use super::Session; | ||
|
|
||
| // // TODO: Check if serialized files already exist, and use them. | ||
| // // TODO: Maybe have a way to verify that the histories match, and overwrite if they don't. | ||
| // pub fn serialize(session: &mut Session, editor: &mut Editor) -> Result<()> { | ||
| // let cwd = std::env::current_dir()?; | ||
| // for doc in editor.documents_mut().filter(|doc| doc.path().is_some()) { | ||
|
|
||
| // } | ||
| // // Handle existing index file to merge. | ||
| // let mut index_file = session.get_mut("undo/index")?; | ||
| // let mut index = deserialize_index(&index_file).context("failed to parse undo index")?; | ||
| // for path in editor.documents().filter_map(|doc| doc.path().cloned()) { | ||
| // if !index.iter().any(|(_, value)| *value == path) { | ||
| // let key = index.last().map(|(key, _)| key + 1).unwrap_or(0); | ||
| // index.push((key, path)); | ||
| // } | ||
| // } | ||
| // serialize_index(&mut index_file, &index)?; | ||
|
|
||
| // for (filename, doc_path) in index { | ||
| // let doc = match editor | ||
| // .documents_mut() | ||
| // .find(|doc| doc.path() == Some(&doc_path)) | ||
| // { | ||
| // Some(doc) => doc, | ||
| // None => continue, | ||
| // }; | ||
| // let filename = format!("undo/{filename}"); | ||
| // let file = session.get_mut(&filename)?; | ||
| // let history = doc.history.take(); | ||
| // serialize_history(file, &history)?; | ||
| // doc.history.set(history); | ||
| // } | ||
|
|
||
| // Ok(()) | ||
| // } | ||
|
|
||
| // pub fn deserialize(session: &mut Session, editor: &mut Editor) -> Result<()> { | ||
| // let index = session | ||
| // .get("undo/index") | ||
| // .and_then(|file| deserialize_index(&file)) | ||
| // .context("failed to parse index file")?; | ||
|
|
||
| // for (filename, doc_path) in index { | ||
| // let id = editor.open(&doc_path, crate::editor::Action::Load)?; | ||
| // let doc = editor.document_mut(id).unwrap(); | ||
| // let filename = format!("undo/{filename}"); | ||
| // let file = session.get(&filename)?; | ||
| // doc.history = std::cell::Cell::new(deserialize_history(file)?); | ||
| // } | ||
|
|
||
| // Ok(()) | ||
| // } |