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

tidal highlighting (single line only for now)

Browse source
This commit is contained in:
Felix Roos 2024-05-18 00:44:47 +02:00
parent 5fb3aadad9
commit a94ddc7947
2 changed files with 76 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

30
packages/tidal/tidal.mjs
View file

@ -28,11 +28,6 @@ function getInfixOperators() {
ops['~>'] = (l, r) => reify(l).late(reify(r));
ops['<~'] = (l, r) => reify(l).early(reify(r));
ops['<$>'] = (l, r) => reify(r).fmap(l).outerJoin(); // is this right?
ops['string'] = (node) => {
const str = node.text.slice(1, -1);
console.log('string node', node);
return m(str, 1);
};
return ops;
}
const ops = getInfixOperators();
@ -51,9 +46,30 @@ export async function initTidal() {
return loadParser();
}
export function tidal(code) {
// offset is expected to be passed in from transpiler
/*
1. acorn parses JS to find location of tidal call
2. haskell-tree-sitter calls "string" function with node (including location)
3. m function sets locations for individual mini notation atom
so the location for a mini notation atom is:
js offset + hs offset + atom offset
*/
export function tidal(code, offset = 0) {
if (Array.isArray(code)) {
code = code.join('');
}
return evaluate(code, window, ops);
return evaluate(code, window, {
...ops,
string: (node) => {
// parses strings as mini notation and passes location
const str = node.text.slice(1, -1);
const col = node.startIndex + offset;
// problem: node.startIndex is wrong because hs2js parser removes newlines
// for some reason, the parser doesn't like newlines
// this means highlighting only works in the first line for now
return m(str, col);
},
});
}