hacklab/strudel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

variable declarations with active patterns now have highlighting

Browse source
This commit is contained in:
Dsm0 2026-01-15 19:27:54 -08:00
parent 160ef84b47
commit 2e7ec9ea27
1 changed files with 44 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

56
packages/core/repl.mjs
View file

@ -126,7 +126,23 @@ export function repl({
); );
} }
// Helper function to handle single label code block storage // helper
function cleanupConflictingRanges(codeBlocks, currentKey, newRange) {
for (const [existingKey, existingBlock] of Object.entries(codeBlocks)) {
if (existingKey === currentKey) continue;
if (!existingBlock.range) continue;
const [existingStart, existingEnd] = existingBlock.range;
const [newStart, newEnd] = newRange;
// If ranges overlap (not just touch), remove the stale block
if (!(newEnd <= existingStart || newStart >= existingEnd)) {
delete codeBlocks[existingKey];
}
}
}
// helper
function handleSingleLabelBlock(label, code, options, meta) { function handleSingleLabelBlock(label, code, options, meta) {
// Detect if this block contains a non-inline widget // Detect if this block contains a non-inline widget
// The activeVisualizer is now provided by the transpiler for all labels // The activeVisualizer is now provided by the transpiler for all labels
@ -147,18 +163,30 @@ export function repl({
activeVisualizer: activeVisualizer, // Store the widget type if present, null otherwise activeVisualizer: activeVisualizer, // Store the widget type if present, null otherwise
}; };
// Clean up any blocks with conflicting ranges // Clean up any blocks with conflicting ranges (including declaration blocks)
for (const [existingKey, existingBlock] of Object.entries(codeBlocks)) { cleanupConflictingRanges(codeBlocks, label.name, options.range);
if (existingKey !== label.name && existingBlock.range && options.range) { }
const [existingStart, existingEnd] = existingBlock.range;
const [newStart, newEnd] = options.range;
// If ranges overlap (not just touch), remove the stale block // helper
if (!(newEnd <= existingStart || newStart >= existingEnd)) { // These blocks return silence but may contain mini notation strings that need highlighting
delete codeBlocks[existingKey]; function handleDeclarationBlock(code, options, meta) {
} const range = options.range || [];
} if (range.length < 2) return;
}
const blockKey = `_decl:${range[0]}:${range[1]}`;
codeBlocks[blockKey] = {
code: code,
range: range,
labels: [],
miniLocations: meta?.miniLocations || [],
widgets: meta?.widgets || [],
sliders: meta?.sliders || [],
activeVisualizer: null,
};
// Clean up any overlapping declaration blocks
cleanupConflictingRanges(codeBlocks, blockKey, range);
} }
const hush = function () { const hush = function () {
@ -443,6 +471,10 @@ export function repl({
throw new Error( throw new Error(
'anonymous labels disabled for block based evaluation (see https://strudel.cc/blog/#label-notation)', 'anonymous labels disabled for block based evaluation (see https://strudel.cc/blog/#label-notation)',
); );
} else {
// Declaration block (variable/function that returns silence)
// Store it so its miniLocations are preserved for highlighting patterns stored in variables
handleDeclarationBlock(code, options, meta);
} }
meta.miniLocations = collectFromBlocks('miniLocations'); meta.miniLocations = collectFromBlocks('miniLocations');