BuboBubo/Cagire
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feat: cleanup
Some checks failed
Deploy Website / deploy (push) Failing after 4m50s
Details

Browse Source
This commit is contained in:
Raphaël Forment
2026-02-22 13:28:03 +01:00
parent 789dbb186b
commit 1ce5b8597a
26 changed files with 213 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/highlight.rs
View File

@@ -9,7 +9,7 @@ use crate::theme;
static EMPTY_SET: LazyLock<HashSet<String>> = LazyLock::new(HashSet::new);
#[derive(Clone, Copy, PartialEq, Eq)]
pub enum TokenKind {
enum TokenKind {
Number,
String,
Comment,
@@ -65,11 +65,11 @@ impl TokenKind {
}
}
pub struct Token {
pub start: usize,
pub end: usize,
pub kind: TokenKind,
pub varargs: bool,
struct Token {
start: usize,
end: usize,
kind: TokenKind,
varargs: bool,
}
fn lookup_word_kind(word: &str) -> Option<(TokenKind, bool)> {
@@ -121,7 +121,7 @@ const INTERVALS: &[&str] = &[
"M14", "P15",
];
pub fn tokenize_line(line: &str, user_words: &HashSet<String>) -> Vec<Token> {
fn tokenize_line(line: &str, user_words: &HashSet<String>) -> Vec<Token> {
let mut tokens = Vec::new();
let mut chars = line.char_indices().peekable();

83
src/views/main_view.rs
View File

@@ -1,18 +1,17 @@
//! Main page view — sequencer grid, visualizations (scope/spectrum), script previews.
use std::collections::HashSet;
use ratatui::layout::{Alignment, Constraint, Layout, Rect};
use ratatui::style::{Color, Modifier, Style};
use ratatui::text::{Line, Span};
use ratatui::widgets::{Block, Borders, Paragraph};
use ratatui::Frame;
use crate::app::App;
use crate::engine::SequencerSnapshot;
use crate::model::SourceSpan;
use crate::state::MainLayout;
use crate::theme;
use crate::views::highlight::highlight_line_with_runtime;
use crate::views::render::{adjust_resolved_for_line, adjust_spans_for_line};
use crate::views::render::highlight_script_lines;
use crate::widgets::{Orientation, Scope, Spectrum, VuMeter};
pub fn layout(area: Rect) -> [Rect; 3] {
@@ -70,14 +69,15 @@ fn render_top_layout(
idx += 1;
}
if has_preview {
let user_words: HashSet<String> = app.dict.lock().keys().cloned().collect();
let has_prelude = !app.project_state.project.prelude.trim().is_empty();
if has_prelude {
let [script_area, prelude_area] =
Layout::horizontal([Constraint::Fill(1), Constraint::Fill(1)]).areas(areas[idx]);
render_script_preview(frame, app, snapshot, script_area);
render_prelude_preview(frame, app, prelude_area);
render_script_preview(frame, app, snapshot, &user_words, script_area);
render_prelude_preview(frame, app, &user_words, prelude_area);
} else {
render_script_preview(frame, app, snapshot, areas[idx]);
render_script_preview(frame, app, snapshot, &user_words, areas[idx]);
}
idx += 1;
}
@@ -163,11 +163,18 @@ fn render_viz_area(
Orientation::Horizontal
};
let user_words_once: Option<HashSet<String>> = if panels.iter().any(|p| matches!(p, VizPanel::Preview)) {
Some(app.dict.lock().keys().cloned().collect())
} else {
None
};
for (panel, panel_area) in panels.iter().zip(areas.iter()) {
match panel {
VizPanel::Scope => render_scope(frame, app, *panel_area, orientation),
VizPanel::Spectrum => render_spectrum(frame, app, *panel_area),
VizPanel::Preview => {
let user_words = user_words_once.as_ref().unwrap();
let has_prelude = !app.project_state.project.prelude.trim().is_empty();
if has_prelude {
let [script_area, prelude_area] = if is_vertical_layout {
@@ -177,10 +184,10 @@ fn render_viz_area(
Layout::horizontal([Constraint::Fill(1), Constraint::Fill(1)])
.areas(*panel_area)
};
render_script_preview(frame, app, snapshot, script_area);
render_prelude_preview(frame, app, prelude_area);
render_script_preview(frame, app, snapshot, user_words, script_area);
render_prelude_preview(frame, app, user_words, prelude_area);
} else {
render_script_preview(frame, app, snapshot, *panel_area);
render_script_preview(frame, app, snapshot, user_words, *panel_area);
}
}
}
@@ -488,10 +495,10 @@ fn render_script_preview(
frame: &mut Frame,
app: &App,
snapshot: &SequencerSnapshot,
user_words: &HashSet<String>,
area: Rect,
) {
let theme = theme::get();
let user_words: HashSet<String> = app.dict.lock().keys().cloned().collect();
let pattern = app.current_edit_pattern();
let step_idx = app.editor_ctx.step;
@@ -534,43 +541,17 @@ fn render_script_preview(
None
};
let resolved_display: Vec<(SourceSpan, String)> = trace
.map(|t| {
t.resolved
.iter()
.map(|(s, v)| (*s, v.display()))
.collect()
})
.unwrap_or_default();
let mut line_start = 0usize;
let lines: Vec<Line> = script
.lines()
.take(inner.height as usize)
.map(|line_str| {
let tokens = if let Some(t) = trace {
let exec = adjust_spans_for_line(&t.executed_spans, line_start, line_str.len());
let sel = adjust_spans_for_line(&t.selected_spans, line_start, line_str.len());
let res = adjust_resolved_for_line(&resolved_display, line_start, line_str.len());
highlight_line_with_runtime(line_str, &exec, &sel, &res, &user_words)
} else {
highlight_line_with_runtime(line_str, &[], &[], &[], &user_words)
};
line_start += line_str.len() + 1;
let spans: Vec<Span> = tokens
.into_iter()
.map(|(style, text, _)| Span::styled(text, style))
.collect();
Line::from(spans)
})
.collect();
let lines = highlight_script_lines(script, trace, user_words, inner.height as usize);
frame.render_widget(Paragraph::new(lines), inner);
}
fn render_prelude_preview(frame: &mut Frame, app: &App, area: Rect) {
fn render_prelude_preview(
frame: &mut Frame,
app: &App,
user_words: &HashSet<String>,
area: Rect,
) {
let theme = theme::get();
let user_words: HashSet<String> = app.dict.lock().keys().cloned().collect();
let prelude = &app.project_state.project.prelude;
let block = Block::default()
@@ -580,19 +561,7 @@ fn render_prelude_preview(frame: &mut Frame, app: &App, area: Rect) {
let inner = block.inner(area);
frame.render_widget(block, area);
let lines: Vec<Line> = prelude
.lines()
.take(inner.height as usize)
.map(|line_str| {
let tokens = highlight_line_with_runtime(line_str, &[], &[], &[], &user_words);
let spans: Vec<Span> = tokens
.into_iter()
.map(|(style, text, _)| Span::styled(text, style))
.collect();
Line::from(spans)
})
.collect();
let lines = highlight_script_lines(prelude, None, user_words, inner.height as usize);
frame.render_widget(Paragraph::new(lines), inner);
}

83
src/views/render.rs
View File

@@ -1,3 +1,5 @@
//! Top-level render dispatch — composes header, page views, modals, and effects each frame.
use std::collections::HashSet;
use std::time::Duration;
@@ -9,7 +11,7 @@ use ratatui::Frame;
use crate::app::App;
use crate::engine::{LinkState, SequencerSnapshot};
use crate::model::SourceSpan;
use crate::model::{ExecutionTrace, SourceSpan};
use crate::page::Page;
use crate::state::{
EditorTarget, EuclideanField, FlashKind, Modal, PanelFocus, PatternField, RenameTarget,
@@ -62,6 +64,44 @@ pub fn adjust_resolved_for_line(
.collect()
}
pub fn highlight_script_lines(
script: &str,
trace: Option<&ExecutionTrace>,
user_words: &HashSet<String>,
max_lines: usize,
) -> Vec<Line<'static>> {
let resolved_display: Vec<(SourceSpan, String)> = trace
.map(|t| {
t.resolved
.iter()
.map(|(s, v)| (*s, v.display()))
.collect()
})
.unwrap_or_default();
let mut line_start = 0usize;
script
.lines()
.take(max_lines)
.map(|line_str| {
let tokens = if let Some(t) = trace {
let exec = adjust_spans_for_line(&t.executed_spans, line_start, line_str.len());
let sel = adjust_spans_for_line(&t.selected_spans, line_start, line_str.len());
let res = adjust_resolved_for_line(&resolved_display, line_start, line_str.len());
highlight_line_with_runtime(line_str, &exec, &sel, &res, user_words)
} else {
highlight_line_with_runtime(line_str, &[], &[], &[], user_words)
};
line_start += line_str.len() + 1;
let spans: Vec<Span> = tokens
.into_iter()
.map(|(style, text, _)| Span::styled(text, style))
.collect();
Line::from(spans)
})
.collect()
}
pub fn horizontal_padding(width: u16) -> u16 {
if width >= 120 {
4
@@ -522,7 +562,6 @@ fn render_modal(
term: Rect,
) -> Option<Rect> {
let theme = theme::get();
let user_words: HashSet<String> = app.dict.lock().keys().cloned().collect();
let inner = match &app.ui.modal {
Modal::None => return None,
Modal::Confirm { action, selected } => {
@@ -598,8 +637,14 @@ fn render_modal(
.height(18)
.render_centered(frame, term)
}
Modal::Preview => render_modal_preview(frame, app, snapshot, &user_words, term),
Modal::Editor => render_modal_editor(frame, app, snapshot, &user_words, term),
Modal::Preview => {
let user_words: HashSet<String> = app.dict.lock().keys().cloned().collect();
render_modal_preview(frame, app, snapshot, &user_words, term)
}
Modal::Editor => {
let user_words: HashSet<String> = app.dict.lock().keys().cloned().collect();
render_modal_editor(frame, app, snapshot, &user_words, term)
}
Modal::PatternProps {
bank,
pattern,
@@ -859,34 +904,8 @@ fn render_modal_preview(
None
};
let resolved_display: Vec<(SourceSpan, String)> = trace
.map(|t| t.resolved.iter().map(|(s, v)| (*s, v.display())).collect())
.unwrap_or_default();
let mut line_start = 0usize;
let lines: Vec<Line> = script
.lines()
.map(|line_str| {
let tokens = if let Some(t) = trace {
let exec = adjust_spans_for_line(&t.executed_spans, line_start, line_str.len());
let sel = adjust_spans_for_line(&t.selected_spans, line_start, line_str.len());
let res =
adjust_resolved_for_line(&resolved_display, line_start, line_str.len());
highlight_line_with_runtime(line_str, &exec, &sel, &res, user_words)
} else {
highlight_line_with_runtime(line_str, &[], &[], &[], user_words)
};
line_start += line_str.len() + 1;
let spans: Vec<Span> = tokens
.into_iter()
.map(|(style, text, _)| Span::styled(text, style))
.collect();
Line::from(spans)
})
.collect();
let paragraph = Paragraph::new(lines);
frame.render_widget(paragraph, inner);
let lines = highlight_script_lines(script, trace, user_words, usize::MAX);
frame.render_widget(Paragraph::new(lines), inner);
}
inner