Skip to content

Commit

Permalink
Properly transmit Results from the backend to the frontend
Browse files Browse the repository at this point in the history 
This allows the frontend to act on the results, instead of 'waiting
indefinitely' on error.
Also compute column width on update for the line number columns in
resym.
  • Loading branch information
@ergrelet
ergrelet committed May 22, 2022
1 parent 3dc1138 commit 91ea1f7
Show file tree
Hide file tree
Showing 4 changed files with 205 additions and 143 deletions.
185 changes: 126 additions & 59 deletions resym/src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,16 @@ struct ResymApp {
backend: Backend,
}

#[derive(PartialEq)]
enum ResymAppMode {
/// Mode in which the application starts
Idle,
/// This mode means we're browsing a single PDB file
Browsing(String, usize, String),
/// This mode means we're comparing two PDB files for differences
Comparing(String, String, usize, Vec<DiffChange>, String),
}

// GUI-related trait
impl eframe::App for ResymApp {
fn save(&mut self, storage: &mut dyn eframe::Storage) {
Expand Down Expand Up @@ -199,7 +209,7 @@ impl<'p> ResymApp {
}

self.current_mode =
ResymAppMode::Browsing(String::default(), String::default());
ResymAppMode::Browsing(String::default(), 0, String::default());
// Request a type list update
if let Err(err) =
self.backend.send_command(BackendCommand::UpdateTypeFilter(
Expand All @@ -215,6 +225,7 @@ impl<'p> ResymApp {
self.current_mode = ResymAppMode::Comparing(
String::default(),
String::default(),
0,
vec![],
String::default(),
);
Expand All @@ -234,46 +245,70 @@ impl<'p> ResymApp {
}
},

FrontendCommand::UpdateReconstructedType(data) => {
let line_numbers =
(1..1 + data.lines().count()).fold(String::default(), |mut acc, e| {
let _r = writeln!(&mut acc, "{}", e);
acc
});
self.current_mode = ResymAppMode::Browsing(line_numbers, data);
FrontendCommand::ReconstructTypeResult(type_reconstruction_result) => {
match type_reconstruction_result {
Err(err) => {
log::error!("Failed to reconstruct type: {}", err);
}
Ok(reconstructed_type) => {
let last_line_number = 1 + reconstructed_type.lines().count();
let line_numbers =
(1..last_line_number).fold(String::default(), |mut acc, e| {
let _r = writeln!(&mut acc, "{}", e);
acc
});
self.current_mode = ResymAppMode::Browsing(
line_numbers,
last_line_number,
reconstructed_type,
);
}
}
}

FrontendCommand::UpdateReconstructedTypeDiff(type_diff) => {
let (line_numbers_old, line_numbers_new, line_changes) =
type_diff.metadata.iter().fold(
(String::default(), String::default(), vec![]),
|(mut acc_old, mut acc_new, mut acc_changes), metadata| {
let indices = metadata.0;

if let Some(indice) = indices.0 {
let _r = writeln!(&mut acc_old, "{}", 1 + indice);
} else {
let _r = writeln!(&mut acc_old);
}
FrontendCommand::DiffTypeResult(type_diff_result) => match type_diff_result {
Err(err) => {
log::error!("Failed to diff type: {}", err);
}
Ok(type_diff) => {
let mut last_line_number = 1;
let (line_numbers_old, line_numbers_new, line_changes) =
type_diff.metadata.iter().fold(
(String::default(), String::default(), vec![]),
|(mut acc_old, mut acc_new, mut acc_changes), metadata| {
let indices = metadata.0;

if let Some(indice) = indices.0 {
last_line_number =
std::cmp::max(last_line_number, 1 + indice);
let _r = writeln!(&mut acc_old, "{}", 1 + indice);
} else {
let _r = writeln!(&mut acc_old);
}

if let Some(indice) = indices.1 {
let _r = writeln!(&mut acc_new, "{}", 1 + indice);
} else {
let _r = writeln!(&mut acc_new);
}
if let Some(indice) = indices.1 {
last_line_number =
std::cmp::max(last_line_number, 1 + indice);
let _r = writeln!(&mut acc_new, "{}", 1 + indice);
} else {
let _r = writeln!(&mut acc_new);
}

acc_changes.push(metadata.1);
acc_changes.push(metadata.1);

(acc_old, acc_new, acc_changes)
},
(acc_old, acc_new, acc_changes)
},
);

self.current_mode = ResymAppMode::Comparing(
line_numbers_old,
line_numbers_new,
last_line_number,
line_changes,
type_diff.data,
);
self.current_mode = ResymAppMode::Comparing(
line_numbers_old,
line_numbers_new,
line_changes,
type_diff.data,
);
}
}
},

FrontendCommand::UpdateFilteredTypes(filtered_types) => {
self.filtered_type_list = filtered_types;
Expand Down Expand Up @@ -408,11 +443,12 @@ impl<'p> ResymApp {
CodeTheme::dark()
};

let line_desc = if let ResymAppMode::Comparing(_, _, line_changes, _) = &self.current_mode {
Some(line_changes)
} else {
None
};
let line_desc =
if let ResymAppMode::Comparing(_, _, _, line_changes, _) = &self.current_mode {
Some(line_changes)
} else {
None
};

// Layouter that'll disable wrapping and apply syntax highlighting if needed
let mut layouter = |ui: &egui::Ui, string: &str, _wrap_width: f32| {
Expand All @@ -431,41 +467,58 @@ impl<'p> ResymApp {
egui::ScrollArea::both()
.auto_shrink([false, false])
.show(ui, |ui| {
let num_colums = if self.settings.print_line_numbers {
if let ResymAppMode::Comparing(..) = self.current_mode {
// Old index + new index + code editor
3
} else {
// Line numbers + code editor
2
const LINE_NUMBER_DIGIT_WIDTH: usize = 10;
let (num_colums, min_column_width) = if self.settings.print_line_numbers {
match self.current_mode {
ResymAppMode::Comparing(_, _, last_line_number, ..) => {
// Compute the columns' sizes from the number of digits
let char_count = int_log10(last_line_number);
let line_number_width = (char_count * LINE_NUMBER_DIGIT_WIDTH) as f32;

// Old index + new index + code editor
(3, line_number_width)
}
ResymAppMode::Browsing(_, last_line_number, _) => {
// Compute the columns' sizes from the number of digits
let char_count = int_log10(last_line_number);
let line_number_width = (char_count * LINE_NUMBER_DIGIT_WIDTH) as f32;

// Line numbers + code editor
(2, line_number_width)
}
_ => {
// Code editor only
(1, 0.0)
}
}
} else {
// Code editor only
1
(1, 0.0)
};
const LINE_NUMBER_WIDTH: f32 = 40.0;

egui::Grid::new("code_editor_grid")
.num_columns(num_colums)
.min_col_width(LINE_NUMBER_WIDTH)
.min_col_width(min_column_width)
.show(ui, |ui| {
match &self.current_mode {
ResymAppMode::Comparing(
line_numbers_old,
line_numbers_new,
_,
_,
reconstructed_type_diff,
) => {
// Line numbers
if self.settings.print_line_numbers {
ui.add(
egui::TextEdit::multiline(&mut line_numbers_old.as_str())
.interactive(false)
.desired_width(LINE_NUMBER_WIDTH),
.desired_width(min_column_width),
);
ui.add(
egui::TextEdit::multiline(&mut line_numbers_new.as_str())
.interactive(false)
.desired_width(LINE_NUMBER_WIDTH),
.desired_width(min_column_width),
);
}
// Text content
Expand All @@ -477,13 +530,13 @@ impl<'p> ResymApp {
.layouter(&mut layouter),
);
}
ResymAppMode::Browsing(line_numbers, reconstructed_type_content) => {
ResymAppMode::Browsing(line_numbers, _, reconstructed_type_content) => {
// Line numbers
if self.settings.print_line_numbers {
ui.add(
egui::TextEdit::multiline(&mut line_numbers.as_str())
.interactive(false)
.desired_width(LINE_NUMBER_WIDTH),
.desired_width(min_column_width),
);
}
// Text content
Expand Down Expand Up @@ -582,9 +635,23 @@ impl Default for ResymAppSettings {
}
}

#[derive(PartialEq)]
enum ResymAppMode {
Idle,
Browsing(String, String),
Comparing(String, String, Vec<DiffChange>, String),
// FIXME: Replace with `checked_log10` once it's stabilized.
fn int_log10<T>(mut i: T) -> usize
where
T: std::ops::DivAssign + std::cmp::PartialOrd + From<u8> + Copy,
{
let zero = T::from(0);
if i == zero {
return 1;
}

let mut len = 0;
let ten = T::from(10);

while i > zero {
i /= ten;
len += 1;
}

len
}
67 changes: 26 additions & 41 deletions resym_core/src/backend.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,15 +119,15 @@ fn worker_thread_routine(
print_access_specifiers,
) => {
if let Some(pdb_file) = pdb_files.get(&pdb_slot) {
let reconstructed_type = reconstruct_type_by_index_command(
let reconstructed_type_result = reconstruct_type_by_index_command(
pdb_file,
type_index,
print_header,
reconstruct_dependencies,
print_access_specifiers,
);
frontend_controller.send_command(FrontendCommand::UpdateReconstructedType(
reconstructed_type,
frontend_controller.send_command(FrontendCommand::ReconstructTypeResult(
reconstructed_type_result,
))?;
}
}
Expand All @@ -140,15 +140,15 @@ fn worker_thread_routine(
print_access_specifiers,
) => {
if let Some(pdb_file) = pdb_files.get(&pdb_slot) {
let reconstructed_type = reconstruct_type_by_name_command(
let reconstructed_type_result = reconstruct_type_by_name_command(
pdb_file,
&type_name,
print_header,
reconstruct_dependencies,
print_access_specifiers,
);
frontend_controller.send_command(FrontendCommand::UpdateReconstructedType(
reconstructed_type,
frontend_controller.send_command(FrontendCommand::ReconstructTypeResult(
reconstructed_type_result,
))?;
}
}
Expand Down Expand Up @@ -211,17 +211,16 @@ fn worker_thread_routine(
) => {
if let Some(pdb_file_from) = pdb_files.get(&pdb_from_slot) {
if let Some(pdb_file_to) = pdb_files.get(&pdb_to_slot) {
let type_diff = diff_type_by_name(
let type_diff_result = diff_type_by_name(
pdb_file_from,
pdb_file_to,
&type_name,
print_header,
reconstruct_dependencies,
print_access_specifiers,
)?;
frontend_controller.send_command(
FrontendCommand::UpdateReconstructedTypeDiff(type_diff),
)?;
);
frontend_controller
.send_command(FrontendCommand::DiffTypeResult(type_diff_result))?;
}
}
}
Expand All @@ -237,24 +236,17 @@ fn reconstruct_type_by_index_command(
print_header: bool,
reconstruct_dependencies: bool,
print_access_specifiers: bool,
) -> String {
match pdb_file.reconstruct_type_by_type_index(
) -> Result<String> {
let data = pdb_file.reconstruct_type_by_type_index(
type_index,
reconstruct_dependencies,
print_access_specifiers,
) {
Err(err) => {
// Make it obvious an error occured
format!("Error: {}", err)
}
Ok(data) => {
if print_header {
let file_header = generate_file_header(pdb_file, true);
format!("{}{}", file_header, data)
} else {
data
}
}
)?;
if print_header {
let file_header = generate_file_header(pdb_file, true);
Ok(format!("{}{}", file_header, data))
} else {
Ok(data)
}
}

Expand All @@ -264,24 +256,17 @@ fn reconstruct_type_by_name_command(
print_header: bool,
reconstruct_dependencies: bool,
print_access_specifiers: bool,
) -> String {
match pdb_file.reconstruct_type_by_name(
) -> Result<String> {
let data = pdb_file.reconstruct_type_by_name(
type_name,
reconstruct_dependencies,
print_access_specifiers,
) {
Err(err) => {
// Make it obvious an error occured
format!("Error: {}", err)
}
Ok(data) => {
if print_header {
let file_header = generate_file_header(pdb_file, true);
format!("{}{}", file_header, data)
} else {
data
}
}
)?;
if print_header {
let file_header = generate_file_header(pdb_file, true);
Ok(format!("{}{}", file_header, data))
} else {
Ok(data)
}
}

Expand Down
Loading

0 comments on commit 91ea1f7

Please sign in to comment.