elias/strudel-docker
1
0
Fork 0
mirror of https://github.com/eliasstepanik/strudel-docker.git synced 2026-01-22 02:58:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #298 from tidalcycles/dont-highlight-whitespace

Browse Source 
remove whitespace from highlighted region
This commit is contained in:
Felix Roos 2022-12-11 23:17:48 +01:00 committed by GitHub
commit c5083b2aef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/mini/mini.mjs
View File

@ -6,7 +6,6 @@ This program is free software: you can redistribute it and/or modify it under th
import * as krill from './krill-parser.js'; import * as krill from './krill-parser.js';
import * as strudel from '@strudel.cycles/core'; import * as strudel from '@strudel.cycles/core';
// import { addMiniLocations } from '@strudel.cycles/eval/shapeshifter.mjs';
const { pure, Fraction, stack, slowcat, sequence, timeCat, silence, reify } = strudel; const { pure, Fraction, stack, slowcat, sequence, timeCat, silence, reify } = strudel;
@ -137,15 +136,17 @@ export function patternifyAST(ast) {
return silence; return silence;
} }
if (typeof ast.source_ !== 'object') { if (typeof ast.source_ !== 'object') {
/* if (!addMiniLocations) {
return ast.source_;
} */
if (!ast.location_) { if (!ast.location_) {
console.warn('no location for', ast); console.warn('no location for', ast);
return ast.source_; return ast.source_;
} }
const { start, end } = ast.location_; const { start, end } = ast.location_;
const value = !isNaN(Number(ast.source_)) ? Number(ast.source_) : ast.source_; const value = !isNaN(Number(ast.source_)) ? Number(ast.source_) : ast.source_;
// make sure whitespaces are not part of the highlight
const len = ast.source_.length;
// end.column = start.column + len;
end.offset = start.offset + len;
end.line = start.line; // codemirror does not understand multiline highlights
// the following line expects the shapeshifter append .withMiniLocation // the following line expects the shapeshifter append .withMiniLocation
// because location_ is only relative to the mini string, but we need it relative to whole code // because location_ is only relative to the mini string, but we need it relative to whole code
return pure(value).withLocation([start.line, start.column, start.offset], [end.line, end.column, end.offset]); return pure(value).withLocation([start.line, start.column, start.offset], [end.line, end.column, end.offset]);