Skip to content

chore(deps): remove tui for ratatui #5700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Evalir merged 4 commits into from
Aug 23, 2023
Merged

chore(deps): remove tui for ratatui #5700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
df861fc
fix: remove tui from cargo
Evalir Aug 22, 2023
8bf0381
fix: switch to ratatui
Evalir Aug 22, 2023
dd40c8e
chore: clippy
Evalir Aug 22, 2023
8ffbf2b
Merge branch 'master' into evalir/replace-tui
Evalir Aug 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 24 additions & 32 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/ui/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ ethers.workspace = true
crossterm = "0.26"
eyre = "0.6"
revm = { version = "3", features = ["std", "serde"] }
tui = { version = "0.19", default-features = false, features = ["crossterm"] }
ratatui = { version = "0.22.0", default-features = false, features = ["crossterm"]}
52 changes: 26 additions & 26 deletions crates/ui/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,15 @@ use foundry_evm::{
utils::{build_pc_ic_map, PCICMap},
CallKind,
};
use ratatui::{
backend::{Backend, CrosstermBackend},
layout::{Alignment, Constraint, Direction, Layout, Rect},
style::{Color, Modifier, Style},
terminal::Frame,
text::{Line, Span, Text},
widgets::{Block, Borders, Paragraph, Wrap},
Terminal,
};
use revm::{interpreter::opcode, primitives::SpecId};
use std::{
cmp::{max, min},
Expand All @@ -25,15 +34,6 @@ use std::{
thread,
time::{Duration, Instant},
};
use tui::{
backend::{Backend, CrosstermBackend},
layout::{Alignment, Constraint, Direction, Layout, Rect},
style::{Color, Modifier, Style},
terminal::Frame,
text::{Span, Spans, Text},
widgets::{Block, Borders, Paragraph, Wrap},
Terminal,
};

/// Trait for starting the UI
pub trait Ui {
Expand Down Expand Up @@ -367,9 +367,9 @@ impl Tui {
fn draw_footer<B: Backend>(f: &mut Frame<B>, area: Rect) {
let block_controls = Block::default();

let text_output = vec![Spans::from(Span::styled(
let text_output = vec![Line::from(Span::styled(
"[q]: quit | [k/j]: prev/next op | [a/s]: prev/next jump | [c/C]: prev/next call | [g/G]: start/end", Style::default().add_modifier(Modifier::DIM))),
Spans::from(Span::styled("[t]: stack labels | [m]: memory decoding | [shift + j/k]: scroll stack | [ctrl + j/k]: scroll memory | ['<char>]: goto breakpoint | [h] toggle help", Style::default().add_modifier(Modifier::DIM)))];
Line::from(Span::styled("[t]: stack labels | [m]: memory decoding | [shift + j/k]: scroll stack | [ctrl + j/k]: scroll memory | ['<char>]: goto breakpoint | [h] toggle help", Style::default().add_modifier(Modifier::DIM)))];

let paragraph = Paragraph::new(text_output)
.block(block_controls)
Expand Down Expand Up @@ -486,7 +486,7 @@ Spans::from(Span::styled("[t]: stack labels | [m]: memory decoding | [shift + j/
if let Some(last) = before.pop() {
if !last.ends_with('\n') {
before.iter().skip(start_line).for_each(|line| {
text_output.lines.push(Spans::from(vec![
text_output.lines.push(Line::from(vec![
Span::styled(
format!(
"{: >max_line_num$}",
Expand All @@ -506,7 +506,7 @@ Spans::from(Span::styled("[t]: stack labels | [m]: memory decoding | [shift + j/
line_number += 1;
});

text_output.lines.push(Spans::from(vec![
text_output.lines.push(Line::from(vec![
Span::styled(
format!(
"{: >max_line_num$}",
Expand All @@ -530,7 +530,7 @@ Spans::from(Span::styled("[t]: stack labels | [m]: memory decoding | [shift + j/
line_number += 1;

actual.iter().skip(1).for_each(|s| {
text_output.lines.push(Spans::from(vec![
text_output.lines.push(Line::from(vec![
Span::styled(
format!(
"{: >max_line_num$}",
Expand Down Expand Up @@ -561,7 +561,7 @@ Spans::from(Span::styled("[t]: stack labels | [m]: memory decoding | [shift + j/
} else {
before.push(last);
before.iter().skip(start_line).for_each(|line| {
text_output.lines.push(Spans::from(vec![
text_output.lines.push(Line::from(vec![
Span::styled(
format!(
"{: >max_line_num$}",
Expand All @@ -582,7 +582,7 @@ Spans::from(Span::styled("[t]: stack labels | [m]: memory decoding | [shift + j/
line_number += 1;
});
actual.iter().for_each(|s| {
text_output.lines.push(Spans::from(vec![
text_output.lines.push(Line::from(vec![
Span::styled(
format!(
"{: >max_line_num$}",
Expand Down Expand Up @@ -611,7 +611,7 @@ Spans::from(Span::styled("[t]: stack labels | [m]: memory decoding | [shift + j/
}
} else {
actual.iter().for_each(|s| {
text_output.lines.push(Spans::from(vec![
text_output.lines.push(Line::from(vec![
Span::styled(
format!(
"{: >max_line_num$}",
Expand Down Expand Up @@ -644,7 +644,7 @@ Spans::from(Span::styled("[t]: stack labels | [m]: memory decoding | [shift + j/
if !last.ends_with('\n') {
if let Some(post) = after.pop_front() {
if let Some(last) = text_output.lines.last_mut() {
last.0.push(Span::raw(post));
last.spans.push(Span::raw(post));
}
}
}
Expand All @@ -655,7 +655,7 @@ Spans::from(Span::styled("[t]: stack labels | [m]: memory decoding | [shift + j/
after.pop_back();
}
after.iter().for_each(|line| {
text_output.lines.push(Spans::from(vec![
text_output.lines.push(Line::from(vec![
Span::styled(
format!(
"{: >max_line_num$}",
Expand Down Expand Up @@ -721,7 +721,7 @@ Spans::from(Span::styled("[t]: stack labels | [m]: memory decoding | [shift + j/
debug_steps[current_step].total_gas_used,
))
.borders(Borders::ALL);
let mut text_output: Vec<Spans> = Vec::new();
let mut text_output: Vec<Line> = Vec::new();

// Scroll:
// Focused line is line that should always be at the center of the screen.
Expand Down Expand Up @@ -776,12 +776,12 @@ Spans::from(Span::styled("[t]: stack labels | [m]: memory decoding | [shift + j/
};

if let Some(op) = opcode_list.get(line_number) {
text_output.push(Spans::from(Span::styled(
text_output.push(Line::from(Span::styled(
format!("{line_number_format}{op}"),
Style::default().fg(Color::White).bg(bg_color),
)));
} else {
text_output.push(Spans::from(Span::styled(
text_output.push(Line::from(Span::styled(
line_number_format,
Style::default().fg(Color::White).bg(bg_color),
)));
Expand Down Expand Up @@ -818,7 +818,7 @@ Spans::from(Span::styled("[t]: stack labels | [m]: memory decoding | [shift + j/
vec![]
};

let text: Vec<Spans> = stack
let text: Vec<Line> = stack
.iter()
.rev()
.enumerate()
Expand Down Expand Up @@ -861,7 +861,7 @@ Spans::from(Span::styled("[t]: stack labels | [m]: memory decoding | [shift + j/
spans.extend(words);
spans.push(Span::raw("\n"));

Spans::from(spans)
Line::from(spans)
})
.collect();

Expand Down Expand Up @@ -923,7 +923,7 @@ Spans::from(Span::styled("[t]: stack labels | [m]: memory decoding | [shift + j/
let height = area.height as usize;
let end_line = draw_mem.current_mem_startline + height;

let text: Vec<Spans> = memory
let text: Vec<Line> = memory
.chunks(32)
.enumerate()
.skip(draw_mem.current_mem_startline)
Expand Down Expand Up @@ -975,7 +975,7 @@ Spans::from(Span::styled("[t]: stack labels | [m]: memory decoding | [shift + j/

spans.push(Span::raw("\n"));

Spans::from(spans)
Line::from(spans)
})
.collect();
let paragraph = Paragraph::new(text).block(stack_space).wrap(Wrap { trim: true });
Expand Down