mirror of
https://seed.radicle.dev/rad:z6cFWeWpnZNHh9rUW8phgA3b5yGt.git
synced 2026-11-16 08:10:41 +08:00
radicle-surf: fix EofNewLine
- added `NoneMissing` case. - moved `EofNewLine` into `DiffContent::Plain`. Signed-off-by: Han Xu <keepsimple@gmail.com>
This commit is contained in:
+19
-23
@@ -90,16 +90,8 @@ impl Diff {
|
||||
&self.stats
|
||||
}
|
||||
|
||||
fn insert_modified(
|
||||
&mut self,
|
||||
path: PathBuf,
|
||||
hunks: impl Into<Hunks<Modification>>,
|
||||
eof: Option<EofNewLine>,
|
||||
) {
|
||||
let diff = DiffContent::Plain {
|
||||
hunks: hunks.into(),
|
||||
};
|
||||
let diff = FileDiff::Modified(Modified { path, eof, diff });
|
||||
fn insert_modified(&mut self, path: PathBuf, diff: DiffContent) {
|
||||
let diff = FileDiff::Modified(Modified { path, diff });
|
||||
self.files.push(diff)
|
||||
}
|
||||
|
||||
@@ -121,15 +113,6 @@ impl Diff {
|
||||
self.files.push(diff);
|
||||
}
|
||||
|
||||
fn insert_modified_binary(&mut self, path: PathBuf) {
|
||||
let diff = FileDiff::Modified(Modified {
|
||||
path,
|
||||
eof: None,
|
||||
diff: DiffContent::Binary,
|
||||
});
|
||||
self.files.push(diff)
|
||||
}
|
||||
|
||||
fn insert_added(&mut self, path: PathBuf, diff: DiffContent) {
|
||||
let diff = FileDiff::Added(Added { path, diff });
|
||||
self.files.push(diff);
|
||||
@@ -201,17 +184,21 @@ pub enum EofNewLine {
|
||||
OldMissing,
|
||||
NewMissing,
|
||||
BothMissing,
|
||||
NoneMissing,
|
||||
}
|
||||
|
||||
impl Default for EofNewLine {
|
||||
fn default() -> Self {
|
||||
Self::NoneMissing
|
||||
}
|
||||
}
|
||||
|
||||
/// A file that was modified within a [`Diff`].
|
||||
#[cfg_attr(feature = "serde", derive(Serialize), serde(rename_all = "camelCase"))]
|
||||
#[derive(Clone, Debug, PartialEq, Eq)]
|
||||
pub struct Modified {
|
||||
/// The path to this file, relative to the repository root.
|
||||
pub path: PathBuf,
|
||||
pub diff: DiffContent,
|
||||
/// Was there an EOF newline present.
|
||||
pub eof: Option<EofNewLine>,
|
||||
}
|
||||
|
||||
/// The set of changes for a given file.
|
||||
@@ -228,10 +215,20 @@ pub enum DiffContent {
|
||||
#[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))]
|
||||
Plain {
|
||||
hunks: Hunks<Modification>,
|
||||
eof: EofNewLine,
|
||||
},
|
||||
Empty,
|
||||
}
|
||||
|
||||
impl DiffContent {
|
||||
pub fn eof(&self) -> Option<EofNewLine> {
|
||||
match self {
|
||||
Self::Plain { hunks: _, eof } => Some(eof.clone()),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, PartialEq, Eq)]
|
||||
pub enum FileDiff {
|
||||
Added(Added),
|
||||
@@ -260,7 +257,6 @@ impl Serialize for FileDiff {
|
||||
FileDiff::Modified(x) => {
|
||||
state.serialize_field("path", &x.path)?;
|
||||
state.serialize_field("diff", &x.diff)?;
|
||||
state.serialize_field("eof", &x.eof)?
|
||||
},
|
||||
FileDiff::Moved(x) => {
|
||||
state.serialize_field("oldPath", &x.old_path)?;
|
||||
|
||||
Reference in New Issue
Block a user