rowan/multi-account-containers
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enclose implementations under a namespace

Browse source
This commit is contained in:
YUKI "Piro" Hiroshi 2019-04-18 13:42:47 +09:00
parent c72146a554
commit 5d152e3599
1 changed files with 57 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

114
src/js/background/diff.js
View file

@ -98,7 +98,7 @@ Diff.prototype = {
// path whose position in the new string is the farthest from the origin // path whose position in the new string is the farthest from the origin
// and does not pass the bounds of the diff graph // and does not pass the bounds of the diff graph
if (!canAdd || (canRemove && addPath.newPos < removePath.newPos)) { if (!canAdd || (canRemove && addPath.newPos < removePath.newPos)) {
basePath = clonePath(removePath); basePath = this._clonePath(removePath);
self.pushComponent(basePath.components, undefined, true); self.pushComponent(basePath.components, undefined, true);
} else { } else {
basePath = addPath; // No need to clone, we've pulled it from the list basePath = addPath; // No need to clone, we've pulled it from the list
@ -110,7 +110,7 @@ Diff.prototype = {
// If we have hit the end of both strings, then we are done // If we have hit the end of both strings, then we are done
if (basePath.newPos + 1 >= newLen && oldPos + 1 >= oldLen) { if (basePath.newPos + 1 >= newLen && oldPos + 1 >= oldLen) {
return done(buildValues(self, basePath.components, newString, oldString, self.useLongestToken)); return done(this._buildValues(self, basePath.components, newString, oldString, self.useLongestToken));
} else { } else {
// Otherwise track this path as a potential candidate and continue. // Otherwise track this path as a potential candidate and continue.
bestPath[diagonalPath] = basePath; bestPath[diagonalPath] = basePath;
@ -132,14 +132,14 @@ Diff.prototype = {
return callback(); return callback();
} }
if (!execEditLength()) { if (!execEditLength.call(this)) {
exec(); exec();
} }
}, 0); }, 0);
}()); }());
} else { } else {
while (editLength <= maxEditLength) { while (editLength <= maxEditLength) {
let ret = execEditLength(); let ret = execEditLength.call(this);
if (ret) { if (ret) {
return ret; return ret;
} }
@ -197,65 +197,65 @@ Diff.prototype = {
}, },
join(value) { join(value) {
return value; return value;
} },
};
function buildValues(diff, components, newString, oldString, useLongestToken) { _buildValues(diff, components, newString, oldString, useLongestToken) {
let componentPos = 0, let componentPos = 0,
componentLen = components.length, componentLen = components.length,
newPos = 0, newPos = 0,
oldPos = 0; oldPos = 0;
for (; componentPos < componentLen; componentPos++) { for (; componentPos < componentLen; componentPos++) {
let component = components[componentPos]; let component = components[componentPos];
if (!component.removed) { if (!component.removed) {
if (!component.added && useLongestToken) { if (!component.added && useLongestToken) {
let value = newString.slice(newPos, newPos + component.count); let value = newString.slice(newPos, newPos + component.count);
value = value.map(function(value, i) { value = value.map(function(value, i) {
let oldValue = oldString[oldPos + i]; let oldValue = oldString[oldPos + i];
return oldValue.length > value.length ? oldValue : value; return oldValue.length > value.length ? oldValue : value;
}); });
component.value = diff.join(value); component.value = diff.join(value);
} else {
component.value = diff.join(newString.slice(newPos, newPos + component.count));
}
newPos += component.count;
// Common case
if (!component.added) {
oldPos += component.count;
}
} else { } else {
component.value = diff.join(newString.slice(newPos, newPos + component.count)); component.value = diff.join(oldString.slice(oldPos, oldPos + component.count));
}
newPos += component.count;
// Common case
if (!component.added) {
oldPos += component.count; oldPos += component.count;
}
} else {
component.value = diff.join(oldString.slice(oldPos, oldPos + component.count));
oldPos += component.count;
// Reverse add and remove so removes are output first to match common convention // Reverse add and remove so removes are output first to match common convention
// The diffing algorithm is tied to add then remove output and this is the simplest // The diffing algorithm is tied to add then remove output and this is the simplest
// route to get the desired output with minimal overhead. // route to get the desired output with minimal overhead.
if (componentPos && components[componentPos - 1].added) { if (componentPos && components[componentPos - 1].added) {
let tmp = components[componentPos - 1]; let tmp = components[componentPos - 1];
components[componentPos - 1] = components[componentPos]; components[componentPos - 1] = components[componentPos];
components[componentPos] = tmp; components[componentPos] = tmp;
}
} }
} }
// Special case handle for when one terminal is ignored (i.e. whitespace).
// For this case we merge the terminal into the prior string and drop the change.
// This is only available for string mode.
let lastComponent = components[componentLen - 1];
if (componentLen > 1
&& typeof lastComponent.value === 'string'
&& (lastComponent.added || lastComponent.removed)
&& diff.equals('', lastComponent.value)) {
components[componentLen - 2].value += lastComponent.value;
components.pop();
}
return components;
},
_clonePath(path) {
return { newPos: path.newPos, components: path.components.slice(0) };
} }
};
// Special case handle for when one terminal is ignored (i.e. whitespace).
// For this case we merge the terminal into the prior string and drop the change.
// This is only available for string mode.
let lastComponent = components[componentLen - 1];
if (componentLen > 1
&& typeof lastComponent.value === 'string'
&& (lastComponent.added || lastComponent.removed)
&& diff.equals('', lastComponent.value)) {
components[componentLen - 2].value += lastComponent.value;
components.pop();
}
return components;
}
function clonePath(path) {
return { newPos: path.newPos, components: path.components.slice(0) };
}