Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix text lines mutator #2911

Closed
wants to merge 3 commits into from
Closed

Fix text lines mutator #2911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
927a3e7
tests: Add regression tests for #2836
webzwo0i Jan 23, 2016
77e4cde
Add another regression test that deletes all lines and inserts two
webzwo0i Jan 23, 2016
a8f09ab
- fix handling of insertions when there is nothing left in the lines
webzwo0i Jan 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 23 additions & 5 deletions src/static/js/Changeset.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,9 +711,14 @@ exports.textLinesMutator = (lines) => {
curSplice[1] += L - 1;
const sline = curSplice.length - 1;
removed = curSplice[sline].substring(curCol) + removed;
curSplice[sline] = curSplice[sline].substring(0, curCol) +
linesGet(curSplice[0] + curSplice[1]);
curSplice[1] += 1;
const line = linesGet(curSplice[0] + curSplice[1]);
// if no line follows the splice
if (!line) {
curSplice[sline] = curSplice[sline].substring(0, curCol);
} else {
curSplice[sline] = curSplice[sline].substring(0, curCol) + line;
curSplice[1] += 1;
}
}
} else {
removed = nextKLinesText(L);
Expand Down Expand Up @@ -775,14 +780,27 @@ exports.textLinesMutator = (lines) => {
curLine += newLines.length;
// insert the remaining chars from the "old" line (e.g. the line we were in
// when we started to insert new lines)
curSplice.push(theLine.substring(lineCol));
// if nothing is left we don't push an empty string
if (theLine.substring(lineCol)) {
curSplice.push(theLine.substring(lineCol));
}
curCol = 0; // TODO(doc) why is this not set to the length of last line?
} else {
Array.prototype.push.apply(curSplice, newLines);
curLine += newLines.length;
}
} else if (lines_get(curSplice[0] + curSplice[1]) === undefined) {
// find out if there is a line in splice that is not finished processing
if (isCurLineInSplice()) { // if yes, we can add our text to it
const sline = curSplice.length - 1;
curSplice[sline] =
curSplice[sline].substring(0, curCol) + text + curSplice[sline].substring(curCol);
curCol += text.length;
} else { // if no, we need to add the text in a new line
Array.prototype.push.apply(curSplice, [text]);
curCol += text.length;
}
} else {
// there are no additional lines
// although the line is put into splice, curLine is not increased, because
// there may be more chars in the line (newline is not reached)
const sline = putCurLineInSplice();
Expand Down
28 changes: 28 additions & 0 deletions src/tests/frontend/specs/easysync.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,34 @@ describe('easysync', function () {
['skip', 1, 1, true],
], ['banana\n', 'cabbage\n', 'duffle\n']);

// #2836 regressions
runMutationTest(8, ['\n', 'foo\n', '\n'], [
['remove', 1, 1, '\n'],
['skip', 4, 1, false],
['remove', 1, 1, '\n'],
['insert', 'c'],
], ['foo\n', 'c']);
runMutationTest(9, ['\n', 'foo\n', '\n'], [
['remove', 1, 1, '\n'],
['skip', 3, 0, false],
['remove', 2, 2, '\n\n'],
['insert', 'c'],
], ['fooc']);
runMutationTest(10, ['\n'], [
['remove', 1, 1, '\n'],
['insert', 'c', 0],
], ['c']); // TODO find out if c must have a newline because of unknown constraints
runMutationTest(11, ['\n'], [
['remove', 1, 1, '\n'],
['insert', 'a'],
['insert', 'c\n', 1],
], ['ac\n']);
runMutationTest(12, ['\n'], [
['remove', 1, 1, '\n'],
['insert', 'a\n', 1],
['insert', 'c'],
], ['a\n', 'c']); // TODO find out if c must have a newline because of unknown constraints

const poolOrArray = (attribs) => {
if (attribs.getAttrib) {
return attribs; // it's already an attrib pool
Expand Down