Skip to content

word level diff #15

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

word level diff #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 12 additions & 3 deletions diffview.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,27 @@ table.diff .replace {
background-color:#FD8
}
table.diff .delete {
background-color:#E99;
background-color:#FDD;
}
table.diff .skip {
background-color:#EFEFEF;
border:1px solid #AAA;
border-right:1px solid #BBC;
}
table.diff .insert {
background-color:#9E9
background-color:#CFC
}
table.diff th.author {
text-align:right;
border-top:1px solid #BBC;
background:#EFEFEF
}
}
ins.diff {
background-color: #50FF50;
text-decoration: none;
}
del.diff {
background-color: #fff;
color: #999;
text-decoration: line-through;
}
56 changes: 54 additions & 2 deletions diffview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ var diffview = {
var baseTextName = params.baseTextName ? params.baseTextName : "Base Text";
var newTextName = params.newTextName ? params.newTextName : "New Text";
var contextSize = params.contextSize;
var inline = (params.viewType == 0 || params.viewType == 1) ? params.viewType : 0;
var inline = (params.viewType == 0 || params.viewType >= 1) ? params.viewType : 0;
Copy link

@Goodwine Goodwine Jun 12, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you should update params.viewType to use a 1 instead of params.viewType.
Also I think it would look better if it instead did this (depending on whether viewType is used in more places or not(?):

var inline = params.viewType ? 1 : 0;

var wordlevel = params.viewType > 1;

if (baseTextLines == null)
throw "Cannot build diff view; baseTextLines is not defined.";
Expand All @@ -78,6 +79,13 @@ var diffview = {
e.appendChild(document.createTextNode(text));
return e;
}

function ctel (name, clazz, node) {
var e = document.createElement(name);
e.className = clazz;
e.appendChild(node);
return e;
}

var tdata = document.createElement("thead");
var node = document.createElement("tr");
Expand Down Expand Up @@ -123,7 +131,13 @@ var diffview = {
row.appendChild(telt("th", tidx2 == null ? "" : (tidx2 + 1).toString()));
row.appendChild(ctelt("td", change, textLines[tidx != null ? tidx : tidx2].replace(/\t/g, "\u00a0\u00a0\u00a0\u00a0")));
}


function addCellsNode (row, tidx, tidx2, node, change) {
row.appendChild(telt("th", tidx == null ? "" : (tidx + 1).toString()));
row.appendChild(telt("th", tidx2 == null ? "" : (tidx2 + 1).toString()));
row.appendChild(ctel("td", change, node));
}

for (var idx = 0; idx < opcodes.length; idx++) {
code = opcodes[idx];
change = code[0];
Expand Down Expand Up @@ -164,8 +178,46 @@ var diffview = {
addCellsInline(node, null, n++, newTextLines, change);
} else if (change == "replace") {
botrows.push(node2 = document.createElement("tr"));
if (wordlevel) {
var baseTextLine = baseTextLines[b];
var newTextLine = newTextLines[n];
var wordrule = /([^\S]+|[a-zA-Z0-9_-]+|.)(?:(?!<)[^\S])?/;
var bw = baseTextLine.split(wordrule);
var nw = newTextLine.split(wordrule);
var wsm = new difflib.SequenceMatcher(bw, nw);
var wopcodes = wsm.get_opcodes();
var bnode = document.createElement('span');
var nnode = document.createElement('span');
for (var k = 0; k < wopcodes.length; k++) {
var wcode = wopcodes[k];
var wchange = wcode[0];
var wb = wcode[1];
var wbe = wcode[2];
var wn = wcode[3];
var wne = wcode[4];
var wcnt = Math.max(wbe - wb, wne - wn);

for (var m = 0; m < wcnt; m++) {
if (wchange == "insert") {
nnode.appendChild(ctelt("ins", "diff", nw[wn++]));
} else if (wchange == "replace") {
if (wb < wbe) bnode.appendChild(ctelt("del", "diff", bw[wb++]));
if (wn < wne) nnode.appendChild(ctelt("ins", "diff", nw[wn++]));
} else if (wchange == "delete") {
bnode.appendChild(ctelt("del", "diff", bw[wb++]));
} else {
// equal
bnode.appendChild(ctelt("span", wchange, bw[wb]));
nnode.appendChild(ctelt("span", wchange, bw[wb++]));
}
}
}
if (b < be) addCellsNode(node, b++, null, bnode, "delete");
if (n < ne) addCellsNode(node2, null, n++, nnode, "insert");
} else {
if (b < be) addCellsInline(node, b++, null, baseTextLines, "delete");
if (n < ne) addCellsInline(node2, null, n++, newTextLines, "insert");
}
} else if (change == "delete") {
addCellsInline(node, b++, null, baseTextLines, change);
} else {
Expand Down