open.source/stylus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix infinite loop in colorizeInvisible (#889)

Browse Source
This commit is contained in:
tophf 2020-04-17 14:34:52 +03:00 committed by GitHub
parent 7ae0798364
commit fea0d08f50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
vendor-overwrites/colorpicker/colorview.js
View File

@ -182,12 +182,13 @@
if (viewFrom > 0 || viewTo < cm.doc.size) { if (viewFrom > 0 || viewTo < cm.doc.size) {
clearTimeout(state.colorizeTimer); clearTimeout(state.colorizeTimer);
state.colorizeTimer = setTimeout(colorizeInvisible, 100, state, viewFrom, viewTo, 0); state.line = 0;
state.colorizeTimer = setTimeout(colorizeInvisible, 100, state, viewFrom, viewTo);
} }
} }
function colorizeInvisible(state, viewFrom, viewTo, line) { function colorizeInvisible(state, viewFrom, viewTo) {
const {cm} = state; const {cm} = state;
const {curOp} = cm; const {curOp} = cm;
if (!curOp) cm.startOperation(); if (!curOp) cm.startOperation();
@ -197,22 +198,19 @@
state.stopped = null; state.stopped = null;
// before the visible range // before the visible range
if (viewFrom) { cm.eachLine(state.line, viewFrom, lineHandle => colorizeLine(state, lineHandle));
state.line = line;
cm.doc.iter(line, viewFrom, lineHandle => colorizeLine(state, lineHandle));
}
// after the visible range // after the visible range
if (!state.stopped && viewTo < cm.doc.size) { if (!state.stopped && viewTo < cm.doc.size) {
state.line = viewTo; state.line = Math.max(viewTo, state.line);
cm.doc.iter(viewTo, cm.doc.size, lineHandle => colorizeLine(state, lineHandle)); cm.eachLine(state.line, cm.doc.size, lineHandle => colorizeLine(state, lineHandle));
} }
updateMarkers(state); updateMarkers(state);
if (!curOp) cm.endOperation(); if (!curOp) cm.endOperation();
if (state.stopped) { if (state.stopped) {
state.colorizeTimer = setTimeout(colorizeInvisible, 0, state, viewFrom, viewFrom, state.line); state.colorizeTimer = setTimeout(colorizeInvisible, 0, state, viewFrom, viewTo);
} }
} }