Skip to content

Fix for #51 Wrong result of JsDiff.diffLines #52

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

Merged
merged 2 commits into from
Mar 13, 2015
Merged

Fix for #51 Wrong result of JsDiff.diffLines #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13b33ef
Fix for #51 Wrong result of JsDiff.diffLines
felicienfrancois Mar 13, 2015
824c365
Test case for #51 fix
felicienfrancois Mar 13, 2015
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
7 changes: 1 addition & 6 deletions diff.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,13 +270,8 @@
lastLineLastChar = lastLine ? lastLine[lastLine.length - 1] : '';

// Merge lines that may contain windows new lines
if (line === '\n' && (lastLineLastChar === '\r' || lastLineLastChar === '\n')) {
if (this.ignoreTrim || lastLineLastChar === '\n'){
//to avoid merging to \n\n, remove \n and add \r\n.
if (line === '\n' && lastLineLastChar === '\r') {
retLines[retLines.length - 1] = retLines[retLines.length - 1].slice(0,-1) + '\r\n';
} else {
retLines[retLines.length - 1] += '\n';
}
} else if (line) {
if (this.ignoreTrim) {
line = line.trim();
Expand Down
7 changes: 7 additions & 0 deletions test/diffTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,13 @@ describe('#diffLines', function() {
'line\r\nnew value\r\nline');
diff.convertChangesToXML(diffResult).should.equal('line\r\n<ins>new value\r\n</ins><del>old value \r\n</del>line');
});

it('should handle empty lines', function() {
var diffResult = diff.diffLines(
'line\n\nold value \n\nline',
'line\n\nnew value\n\nline');
diff.convertChangesToXML(diffResult).should.equal('line\n\n<ins>new value\n</ins><del>old value \n</del>\nline');
});
});

// Trimmed Line Diff
Expand Down