add missing undecoded diffs views

Dependencies

• [2] ZVI4AWER woot contents_diff
• [3] DCSUCH6R add undecoded diff view, improve decoded view style
• [4] MJDGPSHG WIP contents diff

Change contents

• edit in crates/inflorescence/src/diff.rs at line 370
  [2.27782]

  [2.27782]
  + }

  +

  + fn undecodable_contents_to_str(contents: &UndecodableContents) -> &str {

  + match contents {

  + UndecodableContents::ShortBase64(short) => short,

  + UndecodableContents::UnknownEncoding => "Unknown encoding",

  + }
• replacement in crates/inflorescence/src/diff.rs at line 585
  [3.5586]→[3.5586:6031](∅→∅)
  − DiffWithoutContents::Move => todo!(),

  − DiffWithoutContents::SolveNameConflict => todo!(),

  − DiffWithoutContents::UnsolveNameConflict => todo!(),

  − DiffWithoutContents::SolveOrderConflict => todo!(),

  − DiffWithoutContents::UnsolveOrderConflict => todo!(),

  − DiffWithoutContents::ResurrectZombines => todo!(),

  − DiffWithoutContents::AddRoot => todo!(),

  − DiffWithoutContents::DelRoot => todo!(),
  [3.5586]

  [3.6031]
  + DiffWithoutContents::Move => el(text("Move")),

  + DiffWithoutContents::SolveNameConflict => {

  + el(text("Solve name conflict"))

  + }

  + DiffWithoutContents::UnsolveNameConflict => {

  + el(text("Unsolve name conflict"))

  + }

  + DiffWithoutContents::SolveOrderConflict => {

  + el(text("Solve order conflict"))

  + }

  + DiffWithoutContents::UnsolveOrderConflict => {

  + el(text("Unsolve order conflict"))

  + }

  + DiffWithoutContents::ResurrectZombines => el(text("Resurrect zombies")),

  + DiffWithoutContents::AddRoot => el(text("Add root")),

  + DiffWithoutContents::DelRoot => el(text("Delete root")),
• replacement in crates/inflorescence/src/diff.rs at line 605
  [3.6128]→[3.6128:6150](∅→∅)
  − } => todo!(),
  [3.6128]

  [3.6150]
  + } => {

  + let line_num = *line;

  + let line = undecodable_contents_to_str(contents);

  +

  + el(row([

  + el(code_view(if *deleted { "- " } else { "+ " })),

  + el(line_num_view(line_num, 1)),

  + el(code_view(line).width(Length::Fill)),

  + ]))

  + }
• replacement in crates/inflorescence/src/diff.rs at line 619
  [3.6274]→[3.6274:6296](∅→∅)
  − } => todo!(),
  [3.6274]

  [3.6296]
  + } => {

  + let line_num = *line;

  + let change_line = undecodable_contents_to_str(change_contents);

  + let replacement_line =

  + undecodable_contents_to_str(replacement_contents);

  +

  + el(column([

  + el(row([

  + el(code_view("- ")),

  + el(line_num_view(line_num, 1)),

  + el(code_view(change_line).width(Length::Fill)),

  + ])),

  + el(row([

  + el(code_view("+ ")),

  + el(line_num_view(line_num, 1)),

  + el(code_view(replacement_line).width(Length::Fill)),

  + ])),

  + ]))

  + }