mirror of
https://github.com/coderaiser/cloudcmd.git
synced 2026-07-21 10:38:26 +00:00
feature(package) add daffy from npm
This commit is contained in:
coderaiser
parent
4a5ad589eb
commit
c4832161d4
22 changed files with 258 additions and 1158 deletions
|
|
@ -25,6 +25,7 @@
|
|||
"jquery": "~2.1.3",
|
||||
"menu": "~0.7.5",
|
||||
"pako": "~0.2.5",
|
||||
"google-diff-match-patch-js": "~1.0.0"
|
||||
"google-diff-match-patch": "~0.1.0",
|
||||
"daffy": "~1.0.1"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
var CloudCmd, Util, DOM, CloudFunc, io, ace, DiffProto, diff_match_patch, Zip, MenuIO, Format;
|
||||
var CloudCmd, Util, DOM, CloudFunc, io, ace, Zip, MenuIO, Format;
|
||||
(function(CloudCmd, Util, DOM, CloudFunc) {
|
||||
'use strict';
|
||||
|
||||
|
|
@ -8,7 +8,6 @@ var CloudCmd, Util, DOM, CloudFunc, io, ace, DiffProto, diff_match_patch, Zip, M
|
|||
var Name = 'Edit',
|
||||
Loading = true,
|
||||
DIR = '/modules/ace-builds/src-noconflict/',
|
||||
LIBDIR = CloudCmd.LIBDIR,
|
||||
Info = DOM.CurrentInfo,
|
||||
Files = DOM.Files,
|
||||
Storage = DOM.Storage,
|
||||
|
|
@ -441,13 +440,13 @@ var CloudCmd, Util, DOM, CloudFunc, io, ace, DiffProto, diff_match_patch, Zip, M
|
|||
|
||||
function loadDiff(callback) {
|
||||
var url = join([
|
||||
'/modules/google-diff-match-patch-js/diff_match_patch.js',
|
||||
LIBDIR + 'diff.js'
|
||||
'/modules/google-diff-match-patch/diff_match_patch.js',
|
||||
'/modules/daffy/lib/daffy.js'
|
||||
]);
|
||||
|
||||
DOM.load.js(url, function(error) {
|
||||
if (!error && !Diff)
|
||||
Diff = new DiffProto(diff_match_patch);
|
||||
Diff = window.daffy;
|
||||
|
||||
callback(error);
|
||||
});
|
||||
|
|
|
|||
|
|
@ -7,8 +7,7 @@
|
|||
|
||||
Util = require(DIR + 'util'),
|
||||
|
||||
diffPatch = require('diff-match-patch').diff_match_patch,
|
||||
diff = new (require(DIR + 'diff').DiffProto)(diffPatch),
|
||||
diff = require('daffy'),
|
||||
|
||||
flop = require('flop'),
|
||||
|
||||
|
|
|
|||
36
modules/daffy/.bower.json
Normal file
36
modules/daffy/.bower.json
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{
|
||||
"name": "daffy",
|
||||
"homepage": "https://github.com/coderaiser/daffy",
|
||||
"authors": [
|
||||
"coderaiser <mnemonic.enemy@gmail.com>"
|
||||
],
|
||||
"description": "create and apply patch",
|
||||
"main": "lib/daffy.js",
|
||||
"moduleType": [
|
||||
"globals",
|
||||
"node"
|
||||
],
|
||||
"keywords": [
|
||||
"diff",
|
||||
"patch"
|
||||
],
|
||||
"license": "MIT",
|
||||
"ignore": [
|
||||
"**/.*",
|
||||
"node_modules",
|
||||
"modules"
|
||||
],
|
||||
"dependencies": {
|
||||
"google-diff-match-patch": "~0.1.0"
|
||||
},
|
||||
"version": "1.0.3",
|
||||
"_release": "1.0.3",
|
||||
"_resolution": {
|
||||
"type": "version",
|
||||
"tag": "v1.0.3",
|
||||
"commit": "3809514bf10440fca74b34051d56958a2f08096a"
|
||||
},
|
||||
"_source": "git://github.com/coderaiser/daffy.git",
|
||||
"_target": "~1.0.1",
|
||||
"_originalSource": "daffy"
|
||||
}
|
||||
17
modules/daffy/ChangeLog
Normal file
17
modules/daffy/ChangeLog
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
2015.01.08, v1.0.3
|
||||
|
||||
fix:
|
||||
- (daffy) diff_match_patch
|
||||
|
||||
|
||||
2015.01.08, v1.0.2
|
||||
|
||||
fix:
|
||||
- (daffy) add "!"
|
||||
|
||||
|
||||
2015.01.08, v1.0.1
|
||||
|
||||
feature:
|
||||
- (bower) rm private
|
||||
|
||||
21
modules/daffy/LICENSE
Normal file
21
modules/daffy/LICENSE
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2015 coderaiser
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
22
modules/daffy/README.md
Normal file
22
modules/daffy/README.md
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
# Daffy
|
||||
|
||||
Create and apply patches.
|
||||
|
||||
## Install
|
||||
|
||||
```
|
||||
npm i daffy --save
|
||||
```
|
||||
|
||||
## How to use?
|
||||
|
||||
```js
|
||||
var daffy = require('daffy'),
|
||||
patch = daffy.createPatch('hello', 'hello world');
|
||||
|
||||
daffy.applyPatch('hello', patch);
|
||||
```
|
||||
|
||||
## License
|
||||
|
||||
MIT
|
||||
26
modules/daffy/bower.json
Normal file
26
modules/daffy/bower.json
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{
|
||||
"name": "daffy",
|
||||
"homepage": "https://github.com/coderaiser/daffy",
|
||||
"authors": [
|
||||
"coderaiser <mnemonic.enemy@gmail.com>"
|
||||
],
|
||||
"description": "create and apply patch",
|
||||
"main": "lib/daffy.js",
|
||||
"moduleType": [
|
||||
"globals",
|
||||
"node"
|
||||
],
|
||||
"keywords": [
|
||||
"diff",
|
||||
"patch"
|
||||
],
|
||||
"license": "MIT",
|
||||
"ignore": [
|
||||
"**/.*",
|
||||
"node_modules",
|
||||
"modules"
|
||||
],
|
||||
"dependencies": {
|
||||
"google-diff-match-patch": "~0.1.0"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,7 +1,12 @@
|
|||
!(function (obj) {
|
||||
!(function (global) {
|
||||
'use strict';
|
||||
|
||||
obj.DiffProto = function(DiffMatchPatch) {
|
||||
if (typeof module !== 'undefined' && module.exports)
|
||||
module.exports = new DiffProto(require('diff-match-patch'));
|
||||
else
|
||||
global.daffy = new DiffProto(global.diff_match_patch);
|
||||
|
||||
function DiffProto(DiffMatchPatch) {
|
||||
var dmp = new DiffMatchPatch();
|
||||
|
||||
this.createPatch = function(oldText, newText) {
|
||||
|
|
@ -19,5 +24,5 @@
|
|||
|
||||
return newText;
|
||||
};
|
||||
};
|
||||
}
|
||||
})(this);
|
||||
27
modules/daffy/package.json
Normal file
27
modules/daffy/package.json
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{
|
||||
"name": "daffy",
|
||||
"version": "1.0.3",
|
||||
"description": "create and apply patch",
|
||||
"main": "lib/daffy.js",
|
||||
"dependencies": {
|
||||
"diff-match-patch": "~1.0.0"
|
||||
},
|
||||
"devDependencies": {},
|
||||
"scripts": {
|
||||
"test": "echo \"Error: no test specified\" && exit 1"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git://github.com/coderaiser/daffy.git"
|
||||
},
|
||||
"keywords": [
|
||||
"patch",
|
||||
"diff"
|
||||
],
|
||||
"author": "coderaiser <mnemonic.enemy@gmail.com> (http://coderaiser.github.io/)",
|
||||
"license": "MIT",
|
||||
"bugs": {
|
||||
"url": "https://github.com/coderaiser/daffy/issues"
|
||||
},
|
||||
"homepage": "https://github.com/coderaiser/daffy"
|
||||
}
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
{
|
||||
"name": "google-diff-match-patch-js",
|
||||
"version": "1.0.0",
|
||||
"main": [
|
||||
"diff_match_patch.js",
|
||||
"diff_match_patch_uncompressed.js"
|
||||
],
|
||||
"ignore": [
|
||||
"**/.*",
|
||||
"node_modules",
|
||||
"components"
|
||||
],
|
||||
"homepage": "https://github.com/tanaka-de-silva/google-diff-match-patch-js",
|
||||
"_release": "1.0.0",
|
||||
"_resolution": {
|
||||
"type": "version",
|
||||
"tag": "v1.0.0",
|
||||
"commit": "7843d8804fc2553ddd9d2131b9fa68708ac69580"
|
||||
},
|
||||
"_source": "git://github.com/tanaka-de-silva/google-diff-match-patch-js.git",
|
||||
"_target": "~1.0.0",
|
||||
"_originalSource": "google-diff-match-patch-js",
|
||||
"_direct": true
|
||||
}
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
#google-diff-match-patch unofficial mirror
|
||||
|
||||
This is an unofficial mirror of the JavaScript version of the google-diff-match-patch library. The code included is unmodified.
|
||||
|
||||
The software is licenced under the Apache License Version 2.0.
|
||||
|
||||
To install the library please use [bower](https://github.com/bower/bower) or simply clone this repository.
|
||||
|
||||
bower install google-diff-match-patch-js
|
||||
|
||||
##Diff, Match and Patch Library
|
||||
http://code.google.com/p/google-diff-match-patch/
|
||||
Neil Fraser
|
||||
|
||||
This library is currently available in seven different ports, all using the same API.
|
||||
Every version includes a full set of unit tests.
|
||||
|
||||
JavaScript:
|
||||
* diff_match_patch_uncompressed.js is the human-readable version.
|
||||
Users of node.js should 'require' this uncompressed version since the
|
||||
compressed version is not guaranteed to work outside of a web browser.
|
||||
* diff_match_patch.js has been compressed using Google's internal JavaScript compressor.
|
||||
Non-Google hackers who wish to recompress the source can use:
|
||||
http://dean.edwards.name/packer/
|
||||
|
||||
Demos:
|
||||
* Separate demos for Diff, Match and Patch in JavaScript.
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
{
|
||||
"name": "google-diff-match-patch-js",
|
||||
"version": "1.0.0",
|
||||
"main": ["diff_match_patch.js", "diff_match_patch_uncompressed.js"],
|
||||
"ignore": [
|
||||
"**/.*",
|
||||
"node_modules",
|
||||
"components"
|
||||
]
|
||||
}
|
||||
|
|
@ -1,146 +0,0 @@
|
|||
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
|
||||
<!--
|
||||
Test Harness for diff_match_patch.js and diff_match_patch_uncompressed.js
|
||||
|
||||
Copyright 2006 Google Inc.
|
||||
http://code.google.com/p/google-diff-match-patch/
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
|
||||
<html>
|
||||
<head>
|
||||
<script type="text/javascript">
|
||||
// Depending on the URL argument, test the compressed or uncompressed version.
|
||||
var compressed = (document.location.search == '?compressed');
|
||||
if (compressed) {
|
||||
document.write('<TITLE>Test harness for diff_match_patch.js</TITLE>');
|
||||
document.write('<scr'+'ipt type="text/javascript" src="diff_match_patch.js"></scr'+'ipt>');
|
||||
} else {
|
||||
document.write('<TITLE>Test harness for diff_match_patch_uncompressed.js</TITLE>');
|
||||
document.write('<scr'+'ipt type="text/javascript" src="diff_match_patch_uncompressed.js"></scr'+'ipt>');
|
||||
}
|
||||
</script>
|
||||
|
||||
<script type="text/javascript" src="diff_match_patch_test.js"></script>
|
||||
|
||||
<script type="text/javascript">
|
||||
// Counters for unit test results.
|
||||
var test_good = 0;
|
||||
var test_bad = 0;
|
||||
|
||||
// If expected and actual are the identical, print 'Ok', otherwise 'Fail!'
|
||||
function assertEquals(msg, expected, actual) {
|
||||
if (typeof actual == 'undefined') {
|
||||
// msg is optional.
|
||||
actual = expected;
|
||||
expected = msg;
|
||||
msg = 'Expected: \'' + expected + '\' Actual: \'' + actual + '\'';
|
||||
}
|
||||
if (expected === actual) {
|
||||
document.write('<FONT COLOR="#009900">Ok</FONT><BR>');
|
||||
test_good++;
|
||||
} else {
|
||||
document.write('<FONT COLOR="#990000"><BIG>Fail!</BIG></FONT><BR>');
|
||||
msg = msg.replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>');
|
||||
document.write('<code>' + msg + '</code><BR>');
|
||||
test_bad++;
|
||||
}
|
||||
}
|
||||
|
||||
function assertTrue(msg, actual) {
|
||||
if (typeof actual == 'undefined') {
|
||||
// msg is optional.
|
||||
actual = msg;
|
||||
assertEquals(true, actual);
|
||||
} else {
|
||||
assertEquals(msg, true, actual);
|
||||
}
|
||||
}
|
||||
|
||||
function assertFalse(msg, actual) {
|
||||
if (typeof actual == 'undefined') {
|
||||
// msg is optional.
|
||||
actual = msg;
|
||||
assertEquals(false, actual);
|
||||
} else {
|
||||
assertEquals(msg, false, actual);
|
||||
}
|
||||
}
|
||||
|
||||
function runTests() {
|
||||
for (var x = 0; x < tests.length; x++) {
|
||||
document.write('<H3>' + tests[x] + ':</H3>');
|
||||
eval(tests[x] + '()');
|
||||
}
|
||||
}
|
||||
|
||||
var tests = [
|
||||
'testDiffCommonPrefix',
|
||||
'testDiffCommonSuffix',
|
||||
'testDiffCommonOverlap',
|
||||
'testDiffHalfMatch',
|
||||
'testDiffLinesToChars',
|
||||
'testDiffCharsToLines',
|
||||
'testDiffCleanupMerge',
|
||||
'testDiffCleanupSemanticLossless',
|
||||
'testDiffCleanupSemantic',
|
||||
'testDiffCleanupEfficiency',
|
||||
'testDiffPrettyHtml',
|
||||
'testDiffText',
|
||||
'testDiffDelta',
|
||||
'testDiffXIndex',
|
||||
'testDiffLevenshtein',
|
||||
'testDiffBisect',
|
||||
'testDiffMain',
|
||||
|
||||
'testMatchAlphabet',
|
||||
'testMatchBitap',
|
||||
'testMatchMain',
|
||||
|
||||
'testPatchObj',
|
||||
'testPatchFromText',
|
||||
'testPatchToText',
|
||||
'testPatchAddContext',
|
||||
'testPatchMake',
|
||||
'testPatchSplitMax',
|
||||
'testPatchAddPadding',
|
||||
'testPatchApply'];
|
||||
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<script type="text/javascript">
|
||||
if (compressed) {
|
||||
document.write('<H1>Test harness for diff_match_patch.js</H1>');
|
||||
document.write('[ Switch to <A HREF="?uncompressed">Uncompressed</A>. ]');
|
||||
} else {
|
||||
document.write('<H1>Test harness for diff_match_patch_uncompressed.js</H1>');
|
||||
document.write('[ Switch to <A HREF="?compressed">Compressed</A>. ]');
|
||||
}
|
||||
</script>
|
||||
|
||||
<P>If debugging errors, start with the first reported error,
|
||||
subsequent tests often rely on earlier ones.</P>
|
||||
|
||||
<script type="text/javascript">
|
||||
var startTime = (new Date()).getTime();
|
||||
runTests();
|
||||
var endTime = (new Date()).getTime();
|
||||
document.write('<H3>Done.</H3>');
|
||||
document.write('<P>Tests passed: ' + test_good + '<BR>Tests failed: ' + test_bad + '</P>');
|
||||
document.write('<P>Total time: ' + (endTime - startTime) + ' ms</P>');
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,938 +0,0 @@
|
|||
/**
|
||||
* Test Harness for Diff Match and Patch
|
||||
*
|
||||
* Copyright 2006 Google Inc.
|
||||
* http://code.google.com/p/google-diff-match-patch/
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
|
||||
// If expected and actual are the equivalent, pass the test.
|
||||
function assertEquivalent(msg, expected, actual) {
|
||||
if (typeof actual == 'undefined') {
|
||||
// msg is optional.
|
||||
actual = expected;
|
||||
expected = msg;
|
||||
msg = 'Expected: \'' + expected + '\' Actual: \'' + actual + '\'';
|
||||
}
|
||||
if (_equivalent(expected, actual)) {
|
||||
assertEquals(msg, String.toString(expected), String.toString(actual));
|
||||
} else {
|
||||
assertEquals(msg, expected, actual);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Are a and b the equivalent? -- Recursive.
|
||||
function _equivalent(a, b) {
|
||||
if (a == b) {
|
||||
return true;
|
||||
}
|
||||
if (typeof a == 'object' && typeof b == 'object' && a !== null && b !== null) {
|
||||
if (a.toString() != b.toString()) {
|
||||
return false;
|
||||
}
|
||||
for (var p in a) {
|
||||
if (!_equivalent(a[p], b[p])) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
for (var p in b) {
|
||||
if (!_equivalent(a[p], b[p])) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
function diff_rebuildtexts(diffs) {
|
||||
// Construct the two texts which made up the diff originally.
|
||||
var text1 = '';
|
||||
var text2 = '';
|
||||
for (var x = 0; x < diffs.length; x++) {
|
||||
if (diffs[x][0] != DIFF_INSERT) {
|
||||
text1 += diffs[x][1];
|
||||
}
|
||||
if (diffs[x][0] != DIFF_DELETE) {
|
||||
text2 += diffs[x][1];
|
||||
}
|
||||
}
|
||||
return [text1, text2];
|
||||
}
|
||||
|
||||
var dmp = new diff_match_patch();
|
||||
|
||||
|
||||
// DIFF TEST FUNCTIONS
|
||||
|
||||
|
||||
function testDiffCommonPrefix() {
|
||||
// Detect any common prefix.
|
||||
// Null case.
|
||||
assertEquals(0, dmp.diff_commonPrefix('abc', 'xyz'));
|
||||
|
||||
// Non-null case.
|
||||
assertEquals(4, dmp.diff_commonPrefix('1234abcdef', '1234xyz'));
|
||||
|
||||
// Whole case.
|
||||
assertEquals(4, dmp.diff_commonPrefix('1234', '1234xyz'));
|
||||
}
|
||||
|
||||
function testDiffCommonSuffix() {
|
||||
// Detect any common suffix.
|
||||
// Null case.
|
||||
assertEquals(0, dmp.diff_commonSuffix('abc', 'xyz'));
|
||||
|
||||
// Non-null case.
|
||||
assertEquals(4, dmp.diff_commonSuffix('abcdef1234', 'xyz1234'));
|
||||
|
||||
// Whole case.
|
||||
assertEquals(4, dmp.diff_commonSuffix('1234', 'xyz1234'));
|
||||
}
|
||||
|
||||
function testDiffCommonOverlap() {
|
||||
// Detect any suffix/prefix overlap.
|
||||
// Null case.
|
||||
assertEquals(0, dmp.diff_commonOverlap_('', 'abcd'));
|
||||
|
||||
// Whole case.
|
||||
assertEquals(3, dmp.diff_commonOverlap_('abc', 'abcd'));
|
||||
|
||||
// No overlap.
|
||||
assertEquals(0, dmp.diff_commonOverlap_('123456', 'abcd'));
|
||||
|
||||
// Overlap.
|
||||
assertEquals(3, dmp.diff_commonOverlap_('123456xxx', 'xxxabcd'));
|
||||
|
||||
// Unicode.
|
||||
// Some overly clever languages (C#) may treat ligatures as equal to their
|
||||
// component letters. E.g. U+FB01 == 'fi'
|
||||
assertEquals(0, dmp.diff_commonOverlap_('fi', '\ufb01i'));
|
||||
}
|
||||
|
||||
function testDiffHalfMatch() {
|
||||
// Detect a halfmatch.
|
||||
dmp.Diff_Timeout = 1;
|
||||
// No match.
|
||||
assertEquals(null, dmp.diff_halfMatch_('1234567890', 'abcdef'));
|
||||
|
||||
assertEquals(null, dmp.diff_halfMatch_('12345', '23'));
|
||||
|
||||
// Single Match.
|
||||
assertEquivalent(['12', '90', 'a', 'z', '345678'], dmp.diff_halfMatch_('1234567890', 'a345678z'));
|
||||
|
||||
assertEquivalent(['a', 'z', '12', '90', '345678'], dmp.diff_halfMatch_('a345678z', '1234567890'));
|
||||
|
||||
assertEquivalent(['abc', 'z', '1234', '0', '56789'], dmp.diff_halfMatch_('abc56789z', '1234567890'));
|
||||
|
||||
assertEquivalent(['a', 'xyz', '1', '7890', '23456'], dmp.diff_halfMatch_('a23456xyz', '1234567890'));
|
||||
|
||||
// Multiple Matches.
|
||||
assertEquivalent(['12123', '123121', 'a', 'z', '1234123451234'], dmp.diff_halfMatch_('121231234123451234123121', 'a1234123451234z'));
|
||||
|
||||
assertEquivalent(['', '-=-=-=-=-=', 'x', '', 'x-=-=-=-=-=-=-='], dmp.diff_halfMatch_('x-=-=-=-=-=-=-=-=-=-=-=-=', 'xx-=-=-=-=-=-=-='));
|
||||
|
||||
assertEquivalent(['-=-=-=-=-=', '', '', 'y', '-=-=-=-=-=-=-=y'], dmp.diff_halfMatch_('-=-=-=-=-=-=-=-=-=-=-=-=y', '-=-=-=-=-=-=-=yy'));
|
||||
|
||||
// Non-optimal halfmatch.
|
||||
// Optimal diff would be -q+x=H-i+e=lloHe+Hu=llo-Hew+y not -qHillo+x=HelloHe-w+Hulloy
|
||||
assertEquivalent(['qHillo', 'w', 'x', 'Hulloy', 'HelloHe'], dmp.diff_halfMatch_('qHilloHelloHew', 'xHelloHeHulloy'));
|
||||
|
||||
// Optimal no halfmatch.
|
||||
dmp.Diff_Timeout = 0;
|
||||
assertEquals(null, dmp.diff_halfMatch_('qHilloHelloHew', 'xHelloHeHulloy'));
|
||||
}
|
||||
|
||||
function testDiffLinesToChars() {
|
||||
function assertLinesToCharsResultEquals(a, b) {
|
||||
assertEquals(a.chars1, b.chars1);
|
||||
assertEquals(a.chars2, b.chars2);
|
||||
assertEquivalent(a.lineArray, b.lineArray);
|
||||
}
|
||||
|
||||
// Convert lines down to characters.
|
||||
assertLinesToCharsResultEquals({chars1: '\x01\x02\x01', chars2: '\x02\x01\x02', lineArray: ['', 'alpha\n', 'beta\n']}, dmp.diff_linesToChars_('alpha\nbeta\nalpha\n', 'beta\nalpha\nbeta\n'));
|
||||
|
||||
assertLinesToCharsResultEquals({chars1: '', chars2: '\x01\x02\x03\x03', lineArray: ['', 'alpha\r\n', 'beta\r\n', '\r\n']}, dmp.diff_linesToChars_('', 'alpha\r\nbeta\r\n\r\n\r\n'));
|
||||
|
||||
assertLinesToCharsResultEquals({chars1: '\x01', chars2: '\x02', lineArray: ['', 'a', 'b']}, dmp.diff_linesToChars_('a', 'b'));
|
||||
|
||||
// More than 256 to reveal any 8-bit limitations.
|
||||
var n = 300;
|
||||
var lineList = [];
|
||||
var charList = [];
|
||||
for (var x = 1; x < n + 1; x++) {
|
||||
lineList[x - 1] = x + '\n';
|
||||
charList[x - 1] = String.fromCharCode(x);
|
||||
}
|
||||
assertEquals(n, lineList.length);
|
||||
var lines = lineList.join('');
|
||||
var chars = charList.join('');
|
||||
assertEquals(n, chars.length);
|
||||
lineList.unshift('');
|
||||
assertLinesToCharsResultEquals({chars1: chars, chars2: '', lineArray: lineList}, dmp.diff_linesToChars_(lines, ''));
|
||||
}
|
||||
|
||||
function testDiffCharsToLines() {
|
||||
// Convert chars up to lines.
|
||||
var diffs = [[DIFF_EQUAL, '\x01\x02\x01'], [DIFF_INSERT, '\x02\x01\x02']];
|
||||
dmp.diff_charsToLines_(diffs, ['', 'alpha\n', 'beta\n']);
|
||||
assertEquivalent([[DIFF_EQUAL, 'alpha\nbeta\nalpha\n'], [DIFF_INSERT, 'beta\nalpha\nbeta\n']], diffs);
|
||||
|
||||
// More than 256 to reveal any 8-bit limitations.
|
||||
var n = 300;
|
||||
var lineList = [];
|
||||
var charList = [];
|
||||
for (var x = 1; x < n + 1; x++) {
|
||||
lineList[x - 1] = x + '\n';
|
||||
charList[x - 1] = String.fromCharCode(x);
|
||||
}
|
||||
assertEquals(n, lineList.length);
|
||||
var lines = lineList.join('');
|
||||
var chars = charList.join('');
|
||||
assertEquals(n, chars.length);
|
||||
lineList.unshift('');
|
||||
var diffs = [[DIFF_DELETE, chars]];
|
||||
dmp.diff_charsToLines_(diffs, lineList);
|
||||
assertEquivalent([[DIFF_DELETE, lines]], diffs);
|
||||
}
|
||||
|
||||
function testDiffCleanupMerge() {
|
||||
// Cleanup a messy diff.
|
||||
// Null case.
|
||||
var diffs = [];
|
||||
dmp.diff_cleanupMerge(diffs);
|
||||
assertEquivalent([], diffs);
|
||||
|
||||
// No change case.
|
||||
diffs = [[DIFF_EQUAL, 'a'], [DIFF_DELETE, 'b'], [DIFF_INSERT, 'c']];
|
||||
dmp.diff_cleanupMerge(diffs);
|
||||
assertEquivalent([[DIFF_EQUAL, 'a'], [DIFF_DELETE, 'b'], [DIFF_INSERT, 'c']], diffs);
|
||||
|
||||
// Merge equalities.
|
||||
diffs = [[DIFF_EQUAL, 'a'], [DIFF_EQUAL, 'b'], [DIFF_EQUAL, 'c']];
|
||||
dmp.diff_cleanupMerge(diffs);
|
||||
assertEquivalent([[DIFF_EQUAL, 'abc']], diffs);
|
||||
|
||||
// Merge deletions.
|
||||
diffs = [[DIFF_DELETE, 'a'], [DIFF_DELETE, 'b'], [DIFF_DELETE, 'c']];
|
||||
dmp.diff_cleanupMerge(diffs);
|
||||
assertEquivalent([[DIFF_DELETE, 'abc']], diffs);
|
||||
|
||||
// Merge insertions.
|
||||
diffs = [[DIFF_INSERT, 'a'], [DIFF_INSERT, 'b'], [DIFF_INSERT, 'c']];
|
||||
dmp.diff_cleanupMerge(diffs);
|
||||
assertEquivalent([[DIFF_INSERT, 'abc']], diffs);
|
||||
|
||||
// Merge interweave.
|
||||
diffs = [[DIFF_DELETE, 'a'], [DIFF_INSERT, 'b'], [DIFF_DELETE, 'c'], [DIFF_INSERT, 'd'], [DIFF_EQUAL, 'e'], [DIFF_EQUAL, 'f']];
|
||||
dmp.diff_cleanupMerge(diffs);
|
||||
assertEquivalent([[DIFF_DELETE, 'ac'], [DIFF_INSERT, 'bd'], [DIFF_EQUAL, 'ef']], diffs);
|
||||
|
||||
// Prefix and suffix detection.
|
||||
diffs = [[DIFF_DELETE, 'a'], [DIFF_INSERT, 'abc'], [DIFF_DELETE, 'dc']];
|
||||
dmp.diff_cleanupMerge(diffs);
|
||||
assertEquivalent([[DIFF_EQUAL, 'a'], [DIFF_DELETE, 'd'], [DIFF_INSERT, 'b'], [DIFF_EQUAL, 'c']], diffs);
|
||||
|
||||
// Prefix and suffix detection with equalities.
|
||||
diffs = [[DIFF_EQUAL, 'x'], [DIFF_DELETE, 'a'], [DIFF_INSERT, 'abc'], [DIFF_DELETE, 'dc'], [DIFF_EQUAL, 'y']];
|
||||
dmp.diff_cleanupMerge(diffs);
|
||||
assertEquivalent([[DIFF_EQUAL, 'xa'], [DIFF_DELETE, 'd'], [DIFF_INSERT, 'b'], [DIFF_EQUAL, 'cy']], diffs);
|
||||
|
||||
// Slide edit left.
|
||||
diffs = [[DIFF_EQUAL, 'a'], [DIFF_INSERT, 'ba'], [DIFF_EQUAL, 'c']];
|
||||
dmp.diff_cleanupMerge(diffs);
|
||||
assertEquivalent([[DIFF_INSERT, 'ab'], [DIFF_EQUAL, 'ac']], diffs);
|
||||
|
||||
// Slide edit right.
|
||||
diffs = [[DIFF_EQUAL, 'c'], [DIFF_INSERT, 'ab'], [DIFF_EQUAL, 'a']];
|
||||
dmp.diff_cleanupMerge(diffs);
|
||||
assertEquivalent([[DIFF_EQUAL, 'ca'], [DIFF_INSERT, 'ba']], diffs);
|
||||
|
||||
// Slide edit left recursive.
|
||||
diffs = [[DIFF_EQUAL, 'a'], [DIFF_DELETE, 'b'], [DIFF_EQUAL, 'c'], [DIFF_DELETE, 'ac'], [DIFF_EQUAL, 'x']];
|
||||
dmp.diff_cleanupMerge(diffs);
|
||||
assertEquivalent([[DIFF_DELETE, 'abc'], [DIFF_EQUAL, 'acx']], diffs);
|
||||
|
||||
// Slide edit right recursive.
|
||||
diffs = [[DIFF_EQUAL, 'x'], [DIFF_DELETE, 'ca'], [DIFF_EQUAL, 'c'], [DIFF_DELETE, 'b'], [DIFF_EQUAL, 'a']];
|
||||
dmp.diff_cleanupMerge(diffs);
|
||||
assertEquivalent([[DIFF_EQUAL, 'xca'], [DIFF_DELETE, 'cba']], diffs);
|
||||
}
|
||||
|
||||
function testDiffCleanupSemanticLossless() {
|
||||
// Slide diffs to match logical boundaries.
|
||||
// Null case.
|
||||
var diffs = [];
|
||||
dmp.diff_cleanupSemanticLossless(diffs);
|
||||
assertEquivalent([], diffs);
|
||||
|
||||
// Blank lines.
|
||||
diffs = [[DIFF_EQUAL, 'AAA\r\n\r\nBBB'], [DIFF_INSERT, '\r\nDDD\r\n\r\nBBB'], [DIFF_EQUAL, '\r\nEEE']];
|
||||
dmp.diff_cleanupSemanticLossless(diffs);
|
||||
assertEquivalent([[DIFF_EQUAL, 'AAA\r\n\r\n'], [DIFF_INSERT, 'BBB\r\nDDD\r\n\r\n'], [DIFF_EQUAL, 'BBB\r\nEEE']], diffs);
|
||||
|
||||
// Line boundaries.
|
||||
diffs = [[DIFF_EQUAL, 'AAA\r\nBBB'], [DIFF_INSERT, ' DDD\r\nBBB'], [DIFF_EQUAL, ' EEE']];
|
||||
dmp.diff_cleanupSemanticLossless(diffs);
|
||||
assertEquivalent([[DIFF_EQUAL, 'AAA\r\n'], [DIFF_INSERT, 'BBB DDD\r\n'], [DIFF_EQUAL, 'BBB EEE']], diffs);
|
||||
|
||||
// Word boundaries.
|
||||
diffs = [[DIFF_EQUAL, 'The c'], [DIFF_INSERT, 'ow and the c'], [DIFF_EQUAL, 'at.']];
|
||||
dmp.diff_cleanupSemanticLossless(diffs);
|
||||
assertEquivalent([[DIFF_EQUAL, 'The '], [DIFF_INSERT, 'cow and the '], [DIFF_EQUAL, 'cat.']], diffs);
|
||||
|
||||
// Alphanumeric boundaries.
|
||||
diffs = [[DIFF_EQUAL, 'The-c'], [DIFF_INSERT, 'ow-and-the-c'], [DIFF_EQUAL, 'at.']];
|
||||
dmp.diff_cleanupSemanticLossless(diffs);
|
||||
assertEquivalent([[DIFF_EQUAL, 'The-'], [DIFF_INSERT, 'cow-and-the-'], [DIFF_EQUAL, 'cat.']], diffs);
|
||||
|
||||
// Hitting the start.
|
||||
diffs = [[DIFF_EQUAL, 'a'], [DIFF_DELETE, 'a'], [DIFF_EQUAL, 'ax']];
|
||||
dmp.diff_cleanupSemanticLossless(diffs);
|
||||
assertEquivalent([[DIFF_DELETE, 'a'], [DIFF_EQUAL, 'aax']], diffs);
|
||||
|
||||
// Hitting the end.
|
||||
diffs = [[DIFF_EQUAL, 'xa'], [DIFF_DELETE, 'a'], [DIFF_EQUAL, 'a']];
|
||||
dmp.diff_cleanupSemanticLossless(diffs);
|
||||
assertEquivalent([[DIFF_EQUAL, 'xaa'], [DIFF_DELETE, 'a']], diffs);
|
||||
|
||||
// Sentence boundaries.
|
||||
diffs = [[DIFF_EQUAL, 'The xxx. The '], [DIFF_INSERT, 'zzz. The '], [DIFF_EQUAL, 'yyy.']];
|
||||
dmp.diff_cleanupSemanticLossless(diffs);
|
||||
assertEquivalent([[DIFF_EQUAL, 'The xxx.'], [DIFF_INSERT, ' The zzz.'], [DIFF_EQUAL, ' The yyy.']], diffs);
|
||||
}
|
||||
|
||||
function testDiffCleanupSemantic() {
|
||||
// Cleanup semantically trivial equalities.
|
||||
// Null case.
|
||||
var diffs = [];
|
||||
dmp.diff_cleanupSemantic(diffs);
|
||||
assertEquivalent([], diffs);
|
||||
|
||||
// No elimination #1.
|
||||
diffs = [[DIFF_DELETE, 'ab'], [DIFF_INSERT, 'cd'], [DIFF_EQUAL, '12'], [DIFF_DELETE, 'e']];
|
||||
dmp.diff_cleanupSemantic(diffs);
|
||||
assertEquivalent([[DIFF_DELETE, 'ab'], [DIFF_INSERT, 'cd'], [DIFF_EQUAL, '12'], [DIFF_DELETE, 'e']], diffs);
|
||||
|
||||
// No elimination #2.
|
||||
diffs = [[DIFF_DELETE, 'abc'], [DIFF_INSERT, 'ABC'], [DIFF_EQUAL, '1234'], [DIFF_DELETE, 'wxyz']];
|
||||
dmp.diff_cleanupSemantic(diffs);
|
||||
assertEquivalent([[DIFF_DELETE, 'abc'], [DIFF_INSERT, 'ABC'], [DIFF_EQUAL, '1234'], [DIFF_DELETE, 'wxyz']], diffs);
|
||||
|
||||
// Simple elimination.
|
||||
diffs = [[DIFF_DELETE, 'a'], [DIFF_EQUAL, 'b'], [DIFF_DELETE, 'c']];
|
||||
dmp.diff_cleanupSemantic(diffs);
|
||||
assertEquivalent([[DIFF_DELETE, 'abc'], [DIFF_INSERT, 'b']], diffs);
|
||||
|
||||
// Backpass elimination.
|
||||
diffs = [[DIFF_DELETE, 'ab'], [DIFF_EQUAL, 'cd'], [DIFF_DELETE, 'e'], [DIFF_EQUAL, 'f'], [DIFF_INSERT, 'g']];
|
||||
dmp.diff_cleanupSemantic(diffs);
|
||||
assertEquivalent([[DIFF_DELETE, 'abcdef'], [DIFF_INSERT, 'cdfg']], diffs);
|
||||
|
||||
// Multiple eliminations.
|
||||
diffs = [[DIFF_INSERT, '1'], [DIFF_EQUAL, 'A'], [DIFF_DELETE, 'B'], [DIFF_INSERT, '2'], [DIFF_EQUAL, '_'], [DIFF_INSERT, '1'], [DIFF_EQUAL, 'A'], [DIFF_DELETE, 'B'], [DIFF_INSERT, '2']];
|
||||
dmp.diff_cleanupSemantic(diffs);
|
||||
assertEquivalent([[DIFF_DELETE, 'AB_AB'], [DIFF_INSERT, '1A2_1A2']], diffs);
|
||||
|
||||
// Word boundaries.
|
||||
diffs = [[DIFF_EQUAL, 'The c'], [DIFF_DELETE, 'ow and the c'], [DIFF_EQUAL, 'at.']];
|
||||
dmp.diff_cleanupSemantic(diffs);
|
||||
assertEquivalent([[DIFF_EQUAL, 'The '], [DIFF_DELETE, 'cow and the '], [DIFF_EQUAL, 'cat.']], diffs);
|
||||
|
||||
// No overlap elimination.
|
||||
diffs = [[DIFF_DELETE, 'abcxx'], [DIFF_INSERT, 'xxdef']];
|
||||
dmp.diff_cleanupSemantic(diffs);
|
||||
assertEquivalent([[DIFF_DELETE, 'abcxx'], [DIFF_INSERT, 'xxdef']], diffs);
|
||||
|
||||
// Overlap elimination.
|
||||
diffs = [[DIFF_DELETE, 'abcxxx'], [DIFF_INSERT, 'xxxdef']];
|
||||
dmp.diff_cleanupSemantic(diffs);
|
||||
assertEquivalent([[DIFF_DELETE, 'abc'], [DIFF_EQUAL, 'xxx'], [DIFF_INSERT, 'def']], diffs);
|
||||
|
||||
// Reverse overlap elimination.
|
||||
diffs = [[DIFF_DELETE, 'xxxabc'], [DIFF_INSERT, 'defxxx']];
|
||||
dmp.diff_cleanupSemantic(diffs);
|
||||
assertEquivalent([[DIFF_INSERT, 'def'], [DIFF_EQUAL, 'xxx'], [DIFF_DELETE, 'abc']], diffs);
|
||||
|
||||
// Two overlap eliminations.
|
||||
diffs = [[DIFF_DELETE, 'abcd1212'], [DIFF_INSERT, '1212efghi'], [DIFF_EQUAL, '----'], [DIFF_DELETE, 'A3'], [DIFF_INSERT, '3BC']];
|
||||
dmp.diff_cleanupSemantic(diffs);
|
||||
assertEquivalent([[DIFF_DELETE, 'abcd'], [DIFF_EQUAL, '1212'], [DIFF_INSERT, 'efghi'], [DIFF_EQUAL, '----'], [DIFF_DELETE, 'A'], [DIFF_EQUAL, '3'], [DIFF_INSERT, 'BC']], diffs);
|
||||
}
|
||||
|
||||
function testDiffCleanupEfficiency() {
|
||||
// Cleanup operationally trivial equalities.
|
||||
dmp.Diff_EditCost = 4;
|
||||
// Null case.
|
||||
var diffs = [];
|
||||
dmp.diff_cleanupEfficiency(diffs);
|
||||
assertEquivalent([], diffs);
|
||||
|
||||
// No elimination.
|
||||
diffs = [[DIFF_DELETE, 'ab'], [DIFF_INSERT, '12'], [DIFF_EQUAL, 'wxyz'], [DIFF_DELETE, 'cd'], [DIFF_INSERT, '34']];
|
||||
dmp.diff_cleanupEfficiency(diffs);
|
||||
assertEquivalent([[DIFF_DELETE, 'ab'], [DIFF_INSERT, '12'], [DIFF_EQUAL, 'wxyz'], [DIFF_DELETE, 'cd'], [DIFF_INSERT, '34']], diffs);
|
||||
|
||||
// Four-edit elimination.
|
||||
diffs = [[DIFF_DELETE, 'ab'], [DIFF_INSERT, '12'], [DIFF_EQUAL, 'xyz'], [DIFF_DELETE, 'cd'], [DIFF_INSERT, '34']];
|
||||
dmp.diff_cleanupEfficiency(diffs);
|
||||
assertEquivalent([[DIFF_DELETE, 'abxyzcd'], [DIFF_INSERT, '12xyz34']], diffs);
|
||||
|
||||
// Three-edit elimination.
|
||||
diffs = [[DIFF_INSERT, '12'], [DIFF_EQUAL, 'x'], [DIFF_DELETE, 'cd'], [DIFF_INSERT, '34']];
|
||||
dmp.diff_cleanupEfficiency(diffs);
|
||||
assertEquivalent([[DIFF_DELETE, 'xcd'], [DIFF_INSERT, '12x34']], diffs);
|
||||
|
||||
// Backpass elimination.
|
||||
diffs = [[DIFF_DELETE, 'ab'], [DIFF_INSERT, '12'], [DIFF_EQUAL, 'xy'], [DIFF_INSERT, '34'], [DIFF_EQUAL, 'z'], [DIFF_DELETE, 'cd'], [DIFF_INSERT, '56']];
|
||||
dmp.diff_cleanupEfficiency(diffs);
|
||||
assertEquivalent([[DIFF_DELETE, 'abxyzcd'], [DIFF_INSERT, '12xy34z56']], diffs);
|
||||
|
||||
// High cost elimination.
|
||||
dmp.Diff_EditCost = 5;
|
||||
diffs = [[DIFF_DELETE, 'ab'], [DIFF_INSERT, '12'], [DIFF_EQUAL, 'wxyz'], [DIFF_DELETE, 'cd'], [DIFF_INSERT, '34']];
|
||||
dmp.diff_cleanupEfficiency(diffs);
|
||||
assertEquivalent([[DIFF_DELETE, 'abwxyzcd'], [DIFF_INSERT, '12wxyz34']], diffs);
|
||||
dmp.Diff_EditCost = 4;
|
||||
}
|
||||
|
||||
function testDiffPrettyHtml() {
|
||||
// Pretty print.
|
||||
var diffs = [[DIFF_EQUAL, 'a\n'], [DIFF_DELETE, '<B>b</B>'], [DIFF_INSERT, 'c&d']];
|
||||
assertEquals('<span>a¶<br></span><del style="background:#ffe6e6;"><B>b</B></del><ins style="background:#e6ffe6;">c&d</ins>', dmp.diff_prettyHtml(diffs));
|
||||
}
|
||||
|
||||
function testDiffText() {
|
||||
// Compute the source and destination texts.
|
||||
var diffs = [[DIFF_EQUAL, 'jump'], [DIFF_DELETE, 's'], [DIFF_INSERT, 'ed'], [DIFF_EQUAL, ' over '], [DIFF_DELETE, 'the'], [DIFF_INSERT, 'a'], [DIFF_EQUAL, ' lazy']];
|
||||
assertEquals('jumps over the lazy', dmp.diff_text1(diffs));
|
||||
|
||||
assertEquals('jumped over a lazy', dmp.diff_text2(diffs));
|
||||
}
|
||||
|
||||
function testDiffDelta() {
|
||||
// Convert a diff into delta string.
|
||||
var diffs = [[DIFF_EQUAL, 'jump'], [DIFF_DELETE, 's'], [DIFF_INSERT, 'ed'], [DIFF_EQUAL, ' over '], [DIFF_DELETE, 'the'], [DIFF_INSERT, 'a'], [DIFF_EQUAL, ' lazy'], [DIFF_INSERT, 'old dog']];
|
||||
var text1 = dmp.diff_text1(diffs);
|
||||
assertEquals('jumps over the lazy', text1);
|
||||
|
||||
var delta = dmp.diff_toDelta(diffs);
|
||||
assertEquals('=4\t-1\t+ed\t=6\t-3\t+a\t=5\t+old dog', delta);
|
||||
|
||||
// Convert delta string into a diff.
|
||||
assertEquivalent(diffs, dmp.diff_fromDelta(text1, delta));
|
||||
|
||||
// Generates error (19 != 20).
|
||||
try {
|
||||
dmp.diff_fromDelta(text1 + 'x', delta);
|
||||
assertEquals(Error, null);
|
||||
} catch (e) {
|
||||
// Exception expected.
|
||||
}
|
||||
|
||||
// Generates error (19 != 18).
|
||||
try {
|
||||
dmp.diff_fromDelta(text1.substring(1), delta);
|
||||
assertEquals(Error, null);
|
||||
} catch (e) {
|
||||
// Exception expected.
|
||||
}
|
||||
|
||||
// Generates error (%c3%xy invalid Unicode).
|
||||
try {
|
||||
dmp.diff_fromDelta('', '+%c3%xy');
|
||||
assertEquals(Error, null);
|
||||
} catch (e) {
|
||||
// Exception expected.
|
||||
}
|
||||
|
||||
// Test deltas with special characters.
|
||||
diffs = [[DIFF_EQUAL, '\u0680 \x00 \t %'], [DIFF_DELETE, '\u0681 \x01 \n ^'], [DIFF_INSERT, '\u0682 \x02 \\ |']];
|
||||
text1 = dmp.diff_text1(diffs);
|
||||
assertEquals('\u0680 \x00 \t %\u0681 \x01 \n ^', text1);
|
||||
|
||||
delta = dmp.diff_toDelta(diffs);
|
||||
assertEquals('=7\t-7\t+%DA%82 %02 %5C %7C', delta);
|
||||
|
||||
// Convert delta string into a diff.
|
||||
assertEquivalent(diffs, dmp.diff_fromDelta(text1, delta));
|
||||
|
||||
// Verify pool of unchanged characters.
|
||||
diffs = [[DIFF_INSERT, 'A-Z a-z 0-9 - _ . ! ~ * \' ( ) ; / ? : @ & = + $ , # ']];
|
||||
var text2 = dmp.diff_text2(diffs);
|
||||
assertEquals('A-Z a-z 0-9 - _ . ! ~ * \' ( ) ; / ? : @ & = + $ , # ', text2);
|
||||
|
||||
delta = dmp.diff_toDelta(diffs);
|
||||
assertEquals('+A-Z a-z 0-9 - _ . ! ~ * \' ( ) ; / ? : @ & = + $ , # ', delta);
|
||||
|
||||
// Convert delta string into a diff.
|
||||
assertEquivalent(diffs, dmp.diff_fromDelta('', delta));
|
||||
}
|
||||
|
||||
function testDiffXIndex() {
|
||||
// Translate a location in text1 to text2.
|
||||
// Translation on equality.
|
||||
assertEquals(5, dmp.diff_xIndex([[DIFF_DELETE, 'a'], [DIFF_INSERT, '1234'], [DIFF_EQUAL, 'xyz']], 2));
|
||||
|
||||
// Translation on deletion.
|
||||
assertEquals(1, dmp.diff_xIndex([[DIFF_EQUAL, 'a'], [DIFF_DELETE, '1234'], [DIFF_EQUAL, 'xyz']], 3));
|
||||
}
|
||||
|
||||
function testDiffLevenshtein() {
|
||||
// Levenshtein with trailing equality.
|
||||
assertEquals(4, dmp.diff_levenshtein([[DIFF_DELETE, 'abc'], [DIFF_INSERT, '1234'], [DIFF_EQUAL, 'xyz']]));
|
||||
// Levenshtein with leading equality.
|
||||
assertEquals(4, dmp.diff_levenshtein([[DIFF_EQUAL, 'xyz'], [DIFF_DELETE, 'abc'], [DIFF_INSERT, '1234']]));
|
||||
// Levenshtein with middle equality.
|
||||
assertEquals(7, dmp.diff_levenshtein([[DIFF_DELETE, 'abc'], [DIFF_EQUAL, 'xyz'], [DIFF_INSERT, '1234']]));
|
||||
}
|
||||
|
||||
function testDiffBisect() {
|
||||
// Normal.
|
||||
var a = 'cat';
|
||||
var b = 'map';
|
||||
// Since the resulting diff hasn't been normalized, it would be ok if
|
||||
// the insertion and deletion pairs are swapped.
|
||||
// If the order changes, tweak this test as required.
|
||||
assertEquivalent([[DIFF_DELETE, 'c'], [DIFF_INSERT, 'm'], [DIFF_EQUAL, 'a'], [DIFF_DELETE, 't'], [DIFF_INSERT, 'p']], dmp.diff_bisect_(a, b, Number.MAX_VALUE));
|
||||
|
||||
// Timeout.
|
||||
assertEquivalent([[DIFF_DELETE, 'cat'], [DIFF_INSERT, 'map']], dmp.diff_bisect_(a, b, 0));
|
||||
}
|
||||
|
||||
function testDiffMain() {
|
||||
// Perform a trivial diff.
|
||||
// Null case.
|
||||
assertEquivalent([], dmp.diff_main('', '', false));
|
||||
|
||||
// Equality.
|
||||
assertEquivalent([[DIFF_EQUAL, 'abc']], dmp.diff_main('abc', 'abc', false));
|
||||
|
||||
// Simple insertion.
|
||||
assertEquivalent([[DIFF_EQUAL, 'ab'], [DIFF_INSERT, '123'], [DIFF_EQUAL, 'c']], dmp.diff_main('abc', 'ab123c', false));
|
||||
|
||||
// Simple deletion.
|
||||
assertEquivalent([[DIFF_EQUAL, 'a'], [DIFF_DELETE, '123'], [DIFF_EQUAL, 'bc']], dmp.diff_main('a123bc', 'abc', false));
|
||||
|
||||
// Two insertions.
|
||||
assertEquivalent([[DIFF_EQUAL, 'a'], [DIFF_INSERT, '123'], [DIFF_EQUAL, 'b'], [DIFF_INSERT, '456'], [DIFF_EQUAL, 'c']], dmp.diff_main('abc', 'a123b456c', false));
|
||||
|
||||
// Two deletions.
|
||||
assertEquivalent([[DIFF_EQUAL, 'a'], [DIFF_DELETE, '123'], [DIFF_EQUAL, 'b'], [DIFF_DELETE, '456'], [DIFF_EQUAL, 'c']], dmp.diff_main('a123b456c', 'abc', false));
|
||||
|
||||
// Perform a real diff.
|
||||
// Switch off the timeout.
|
||||
dmp.Diff_Timeout = 0;
|
||||
// Simple cases.
|
||||
assertEquivalent([[DIFF_DELETE, 'a'], [DIFF_INSERT, 'b']], dmp.diff_main('a', 'b', false));
|
||||
|
||||
assertEquivalent([[DIFF_DELETE, 'Apple'], [DIFF_INSERT, 'Banana'], [DIFF_EQUAL, 's are a'], [DIFF_INSERT, 'lso'], [DIFF_EQUAL, ' fruit.']], dmp.diff_main('Apples are a fruit.', 'Bananas are also fruit.', false));
|
||||
|
||||
assertEquivalent([[DIFF_DELETE, 'a'], [DIFF_INSERT, '\u0680'], [DIFF_EQUAL, 'x'], [DIFF_DELETE, '\t'], [DIFF_INSERT, '\0']], dmp.diff_main('ax\t', '\u0680x\0', false));
|
||||
|
||||
// Overlaps.
|
||||
assertEquivalent([[DIFF_DELETE, '1'], [DIFF_EQUAL, 'a'], [DIFF_DELETE, 'y'], [DIFF_EQUAL, 'b'], [DIFF_DELETE, '2'], [DIFF_INSERT, 'xab']], dmp.diff_main('1ayb2', 'abxab', false));
|
||||
|
||||
assertEquivalent([[DIFF_INSERT, 'xaxcx'], [DIFF_EQUAL, 'abc'], [DIFF_DELETE, 'y']], dmp.diff_main('abcy', 'xaxcxabc', false));
|
||||
|
||||
assertEquivalent([[DIFF_DELETE, 'ABCD'], [DIFF_EQUAL, 'a'], [DIFF_DELETE, '='], [DIFF_INSERT, '-'], [DIFF_EQUAL, 'bcd'], [DIFF_DELETE, '='], [DIFF_INSERT, '-'], [DIFF_EQUAL, 'efghijklmnopqrs'], [DIFF_DELETE, 'EFGHIJKLMNOefg']], dmp.diff_main('ABCDa=bcd=efghijklmnopqrsEFGHIJKLMNOefg', 'a-bcd-efghijklmnopqrs', false));
|
||||
|
||||
// Large equality.
|
||||
assertEquivalent([[DIFF_INSERT, ' '], [DIFF_EQUAL, 'a'], [DIFF_INSERT, 'nd'], [DIFF_EQUAL, ' [[Pennsylvania]]'], [DIFF_DELETE, ' and [[New']], dmp.diff_main('a [[Pennsylvania]] and [[New', ' and [[Pennsylvania]]', false));
|
||||
|
||||
// Timeout.
|
||||
dmp.Diff_Timeout = 0.1; // 100ms
|
||||
var a = '`Twas brillig, and the slithy toves\nDid gyre and gimble in the wabe:\nAll mimsy were the borogoves,\nAnd the mome raths outgrabe.\n';
|
||||
var b = 'I am the very model of a modern major general,\nI\'ve information vegetable, animal, and mineral,\nI know the kings of England, and I quote the fights historical,\nFrom Marathon to Waterloo, in order categorical.\n';
|
||||
// Increase the text lengths by 1024 times to ensure a timeout.
|
||||
for (var x = 0; x < 10; x++) {
|
||||
a = a + a;
|
||||
b = b + b;
|
||||
}
|
||||
var startTime = (new Date()).getTime();
|
||||
dmp.diff_main(a, b);
|
||||
var endTime = (new Date()).getTime();
|
||||
// Test that we took at least the timeout period.
|
||||
assertTrue(dmp.Diff_Timeout * 1000 <= endTime - startTime);
|
||||
// Test that we didn't take forever (be forgiving).
|
||||
// Theoretically this test could fail very occasionally if the
|
||||
// OS task swaps or locks up for a second at the wrong moment.
|
||||
// ****
|
||||
// TODO(fraser): For unknown reasons this is taking 500 ms on Google's
|
||||
// internal test system. Whereas browsers take 140 ms.
|
||||
//assertTrue(dmp.Diff_Timeout * 1000 * 2 > endTime - startTime);
|
||||
// ****
|
||||
dmp.Diff_Timeout = 0;
|
||||
|
||||
// Test the linemode speedup.
|
||||
// Must be long to pass the 100 char cutoff.
|
||||
// Simple line-mode.
|
||||
a = '1234567890\n1234567890\n1234567890\n1234567890\n1234567890\n1234567890\n1234567890\n1234567890\n1234567890\n1234567890\n1234567890\n1234567890\n1234567890\n';
|
||||
b = 'abcdefghij\nabcdefghij\nabcdefghij\nabcdefghij\nabcdefghij\nabcdefghij\nabcdefghij\nabcdefghij\nabcdefghij\nabcdefghij\nabcdefghij\nabcdefghij\nabcdefghij\n';
|
||||
assertEquivalent(dmp.diff_main(a, b, false), dmp.diff_main(a, b, true));
|
||||
|
||||
// Single line-mode.
|
||||
a = '1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890';
|
||||
b = 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij';
|
||||
assertEquivalent(dmp.diff_main(a, b, false), dmp.diff_main(a, b, true));
|
||||
|
||||
// Overlap line-mode.
|
||||
a = '1234567890\n1234567890\n1234567890\n1234567890\n1234567890\n1234567890\n1234567890\n1234567890\n1234567890\n1234567890\n1234567890\n1234567890\n1234567890\n';
|
||||
b = 'abcdefghij\n1234567890\n1234567890\n1234567890\nabcdefghij\n1234567890\n1234567890\n1234567890\nabcdefghij\n1234567890\n1234567890\n1234567890\nabcdefghij\n';
|
||||
var texts_linemode = diff_rebuildtexts(dmp.diff_main(a, b, true));
|
||||
var texts_textmode = diff_rebuildtexts(dmp.diff_main(a, b, false));
|
||||
assertEquivalent(texts_textmode, texts_linemode);
|
||||
|
||||
// Test null inputs.
|
||||
try {
|
||||
dmp.diff_main(null, null);
|
||||
assertEquals(Error, null);
|
||||
} catch (e) {
|
||||
// Exception expected.
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// MATCH TEST FUNCTIONS
|
||||
|
||||
|
||||
function testMatchAlphabet() {
|
||||
// Initialise the bitmasks for Bitap.
|
||||
// Unique.
|
||||
assertEquivalent({'a':4, 'b':2, 'c':1}, dmp.match_alphabet_('abc'));
|
||||
|
||||
// Duplicates.
|
||||
assertEquivalent({'a':37, 'b':18, 'c':8}, dmp.match_alphabet_('abcaba'));
|
||||
}
|
||||
|
||||
function testMatchBitap() {
|
||||
// Bitap algorithm.
|
||||
dmp.Match_Distance = 100;
|
||||
dmp.Match_Threshold = 0.5;
|
||||
// Exact matches.
|
||||
assertEquals(5, dmp.match_bitap_('abcdefghijk', 'fgh', 5));
|
||||
|
||||
assertEquals(5, dmp.match_bitap_('abcdefghijk', 'fgh', 0));
|
||||
|
||||
// Fuzzy matches.
|
||||
assertEquals(4, dmp.match_bitap_('abcdefghijk', 'efxhi', 0));
|
||||
|
||||
assertEquals(2, dmp.match_bitap_('abcdefghijk', 'cdefxyhijk', 5));
|
||||
|
||||
assertEquals(-1, dmp.match_bitap_('abcdefghijk', 'bxy', 1));
|
||||
|
||||
// Overflow.
|
||||
assertEquals(2, dmp.match_bitap_('123456789xx0', '3456789x0', 2));
|
||||
|
||||
// Threshold test.
|
||||
dmp.Match_Threshold = 0.4;
|
||||
assertEquals(4, dmp.match_bitap_('abcdefghijk', 'efxyhi', 1));
|
||||
|
||||
dmp.Match_Threshold = 0.3;
|
||||
assertEquals(-1, dmp.match_bitap_('abcdefghijk', 'efxyhi', 1));
|
||||
|
||||
dmp.Match_Threshold = 0.0;
|
||||
assertEquals(1, dmp.match_bitap_('abcdefghijk', 'bcdef', 1));
|
||||
dmp.Match_Threshold = 0.5;
|
||||
|
||||
// Multiple select.
|
||||
assertEquals(0, dmp.match_bitap_('abcdexyzabcde', 'abccde', 3));
|
||||
|
||||
assertEquals(8, dmp.match_bitap_('abcdexyzabcde', 'abccde', 5));
|
||||
|
||||
// Distance test.
|
||||
dmp.Match_Distance = 10; // Strict location.
|
||||
assertEquals(-1, dmp.match_bitap_('abcdefghijklmnopqrstuvwxyz', 'abcdefg', 24));
|
||||
|
||||
assertEquals(0, dmp.match_bitap_('abcdefghijklmnopqrstuvwxyz', 'abcdxxefg', 1));
|
||||
|
||||
dmp.Match_Distance = 1000; // Loose location.
|
||||
assertEquals(0, dmp.match_bitap_('abcdefghijklmnopqrstuvwxyz', 'abcdefg', 24));
|
||||
}
|
||||
|
||||
function testMatchMain() {
|
||||
// Full match.
|
||||
// Shortcut matches.
|
||||
assertEquals(0, dmp.match_main('abcdef', 'abcdef', 1000));
|
||||
|
||||
assertEquals(-1, dmp.match_main('', 'abcdef', 1));
|
||||
|
||||
assertEquals(3, dmp.match_main('abcdef', '', 3));
|
||||
|
||||
assertEquals(3, dmp.match_main('abcdef', 'de', 3));
|
||||
|
||||
// Beyond end match.
|
||||
assertEquals(3, dmp.match_main("abcdef", "defy", 4));
|
||||
|
||||
// Oversized pattern.
|
||||
assertEquals(0, dmp.match_main("abcdef", "abcdefy", 0));
|
||||
|
||||
// Complex match.
|
||||
assertEquals(4, dmp.match_main('I am the very model of a modern major general.', ' that berry ', 5));
|
||||
|
||||
// Test null inputs.
|
||||
try {
|
||||
dmp.match_main(null, null, 0);
|
||||
assertEquals(Error, null);
|
||||
} catch (e) {
|
||||
// Exception expected.
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// PATCH TEST FUNCTIONS
|
||||
|
||||
|
||||
function testPatchObj() {
|
||||
// Patch Object.
|
||||
var p = new diff_match_patch.patch_obj();
|
||||
p.start1 = 20;
|
||||
p.start2 = 21;
|
||||
p.length1 = 18;
|
||||
p.length2 = 17;
|
||||
p.diffs = [[DIFF_EQUAL, 'jump'], [DIFF_DELETE, 's'], [DIFF_INSERT, 'ed'], [DIFF_EQUAL, ' over '], [DIFF_DELETE, 'the'], [DIFF_INSERT, 'a'], [DIFF_EQUAL, '\nlaz']];
|
||||
var strp = p.toString();
|
||||
assertEquals('@@ -21,18 +22,17 @@\n jump\n-s\n+ed\n over \n-the\n+a\n %0Alaz\n', strp);
|
||||
}
|
||||
|
||||
function testPatchFromText() {
|
||||
assertEquivalent([], dmp.patch_fromText(strp));
|
||||
|
||||
var strp = '@@ -21,18 +22,17 @@\n jump\n-s\n+ed\n over \n-the\n+a\n %0Alaz\n';
|
||||
assertEquals(strp, dmp.patch_fromText(strp)[0].toString());
|
||||
|
||||
assertEquals('@@ -1 +1 @@\n-a\n+b\n', dmp.patch_fromText('@@ -1 +1 @@\n-a\n+b\n')[0].toString());
|
||||
|
||||
assertEquals('@@ -1,3 +0,0 @@\n-abc\n', dmp.patch_fromText('@@ -1,3 +0,0 @@\n-abc\n')[0].toString());
|
||||
|
||||
assertEquals('@@ -0,0 +1,3 @@\n+abc\n', dmp.patch_fromText('@@ -0,0 +1,3 @@\n+abc\n')[0].toString());
|
||||
|
||||
// Generates error.
|
||||
try {
|
||||
dmp.patch_fromText('Bad\nPatch\n');
|
||||
assertEquals(Error, null);
|
||||
} catch (e) {
|
||||
// Exception expected.
|
||||
}
|
||||
}
|
||||
|
||||
function testPatchToText() {
|
||||
var strp = '@@ -21,18 +22,17 @@\n jump\n-s\n+ed\n over \n-the\n+a\n laz\n';
|
||||
var p = dmp.patch_fromText(strp);
|
||||
assertEquals(strp, dmp.patch_toText(p));
|
||||
|
||||
strp = '@@ -1,9 +1,9 @@\n-f\n+F\n oo+fooba\n@@ -7,9 +7,9 @@\n obar\n-,\n+.\n tes\n';
|
||||
p = dmp.patch_fromText(strp);
|
||||
assertEquals(strp, dmp.patch_toText(p));
|
||||
}
|
||||
|
||||
function testPatchAddContext() {
|
||||
dmp.Patch_Margin = 4;
|
||||
var p = dmp.patch_fromText('@@ -21,4 +21,10 @@\n-jump\n+somersault\n')[0];
|
||||
dmp.patch_addContext_(p, 'The quick brown fox jumps over the lazy dog.');
|
||||
assertEquals('@@ -17,12 +17,18 @@\n fox \n-jump\n+somersault\n s ov\n', p.toString());
|
||||
|
||||
// Same, but not enough trailing context.
|
||||
p = dmp.patch_fromText('@@ -21,4 +21,10 @@\n-jump\n+somersault\n')[0];
|
||||
dmp.patch_addContext_(p, 'The quick brown fox jumps.');
|
||||
assertEquals('@@ -17,10 +17,16 @@\n fox \n-jump\n+somersault\n s.\n', p.toString());
|
||||
|
||||
// Same, but not enough leading context.
|
||||
p = dmp.patch_fromText('@@ -3 +3,2 @@\n-e\n+at\n')[0];
|
||||
dmp.patch_addContext_(p, 'The quick brown fox jumps.');
|
||||
assertEquals('@@ -1,7 +1,8 @@\n Th\n-e\n+at\n qui\n', p.toString());
|
||||
|
||||
// Same, but with ambiguity.
|
||||
p = dmp.patch_fromText('@@ -3 +3,2 @@\n-e\n+at\n')[0];
|
||||
dmp.patch_addContext_(p, 'The quick brown fox jumps. The quick brown fox crashes.');
|
||||
assertEquals('@@ -1,27 +1,28 @@\n Th\n-e\n+at\n quick brown fox jumps. \n', p.toString());
|
||||
}
|
||||
|
||||
function testPatchMake() {
|
||||
// Null case.
|
||||
var patches = dmp.patch_make('', '');
|
||||
assertEquals('', dmp.patch_toText(patches));
|
||||
|
||||
var text1 = 'The quick brown fox jumps over the lazy dog.';
|
||||
var text2 = 'That quick brown fox jumped over a lazy dog.';
|
||||
// Text2+Text1 inputs.
|
||||
var expectedPatch = '@@ -1,8 +1,7 @@\n Th\n-at\n+e\n qui\n@@ -21,17 +21,18 @@\n jump\n-ed\n+s\n over \n-a\n+the\n laz\n';
|
||||
// The second patch must be "-21,17 +21,18", not "-22,17 +21,18" due to rolling context.
|
||||
patches = dmp.patch_make(text2, text1);
|
||||
assertEquals(expectedPatch, dmp.patch_toText(patches));
|
||||
|
||||
// Text1+Text2 inputs.
|
||||
expectedPatch = '@@ -1,11 +1,12 @@\n Th\n-e\n+at\n quick b\n@@ -22,18 +22,17 @@\n jump\n-s\n+ed\n over \n-the\n+a\n laz\n';
|
||||
patches = dmp.patch_make(text1, text2);
|
||||
assertEquals(expectedPatch, dmp.patch_toText(patches));
|
||||
|
||||
// Diff input.
|
||||
var diffs = dmp.diff_main(text1, text2, false);
|
||||
patches = dmp.patch_make(diffs);
|
||||
assertEquals(expectedPatch, dmp.patch_toText(patches));
|
||||
|
||||
// Text1+Diff inputs.
|
||||
patches = dmp.patch_make(text1, diffs);
|
||||
assertEquals(expectedPatch, dmp.patch_toText(patches));
|
||||
|
||||
// Text1+Text2+Diff inputs (deprecated).
|
||||
patches = dmp.patch_make(text1, text2, diffs);
|
||||
assertEquals(expectedPatch, dmp.patch_toText(patches));
|
||||
|
||||
// Character encoding.
|
||||
patches = dmp.patch_make('`1234567890-=[]\\;\',./', '~!@#$%^&*()_+{}|:"<>?');
|
||||
assertEquals('@@ -1,21 +1,21 @@\n-%601234567890-=%5B%5D%5C;\',./\n+~!@#$%25%5E&*()_+%7B%7D%7C:%22%3C%3E?\n', dmp.patch_toText(patches));
|
||||
|
||||
// Character decoding.
|
||||
diffs = [[DIFF_DELETE, '`1234567890-=[]\\;\',./'], [DIFF_INSERT, '~!@#$%^&*()_+{}|:"<>?']];
|
||||
assertEquivalent(diffs, dmp.patch_fromText('@@ -1,21 +1,21 @@\n-%601234567890-=%5B%5D%5C;\',./\n+~!@#$%25%5E&*()_+%7B%7D%7C:%22%3C%3E?\n')[0].diffs);
|
||||
|
||||
// Long string with repeats.
|
||||
text1 = '';
|
||||
for (var x = 0; x < 100; x++) {
|
||||
text1 += 'abcdef';
|
||||
}
|
||||
text2 = text1 + '123';
|
||||
expectedPatch = '@@ -573,28 +573,31 @@\n cdefabcdefabcdefabcdefabcdef\n+123\n';
|
||||
patches = dmp.patch_make(text1, text2);
|
||||
assertEquals(expectedPatch, dmp.patch_toText(patches));
|
||||
|
||||
// Test null inputs.
|
||||
try {
|
||||
dmp.patch_make(null);
|
||||
assertEquals(Error, null);
|
||||
} catch (e) {
|
||||
// Exception expected.
|
||||
}
|
||||
}
|
||||
|
||||
function testPatchSplitMax() {
|
||||
// Assumes that dmp.Match_MaxBits is 32.
|
||||
var patches = dmp.patch_make('abcdefghijklmnopqrstuvwxyz01234567890', 'XabXcdXefXghXijXklXmnXopXqrXstXuvXwxXyzX01X23X45X67X89X0');
|
||||
dmp.patch_splitMax(patches);
|
||||
assertEquals('@@ -1,32 +1,46 @@\n+X\n ab\n+X\n cd\n+X\n ef\n+X\n gh\n+X\n ij\n+X\n kl\n+X\n mn\n+X\n op\n+X\n qr\n+X\n st\n+X\n uv\n+X\n wx\n+X\n yz\n+X\n 012345\n@@ -25,13 +39,18 @@\n zX01\n+X\n 23\n+X\n 45\n+X\n 67\n+X\n 89\n+X\n 0\n', dmp.patch_toText(patches));
|
||||
|
||||
patches = dmp.patch_make('abcdef1234567890123456789012345678901234567890123456789012345678901234567890uvwxyz', 'abcdefuvwxyz');
|
||||
var oldToText = dmp.patch_toText(patches);
|
||||
dmp.patch_splitMax(patches);
|
||||
assertEquals(oldToText, dmp.patch_toText(patches));
|
||||
|
||||
patches = dmp.patch_make('1234567890123456789012345678901234567890123456789012345678901234567890', 'abc');
|
||||
dmp.patch_splitMax(patches);
|
||||
assertEquals('@@ -1,32 +1,4 @@\n-1234567890123456789012345678\n 9012\n@@ -29,32 +1,4 @@\n-9012345678901234567890123456\n 7890\n@@ -57,14 +1,3 @@\n-78901234567890\n+abc\n', dmp.patch_toText(patches));
|
||||
|
||||
patches = dmp.patch_make('abcdefghij , h : 0 , t : 1 abcdefghij , h : 0 , t : 1 abcdefghij , h : 0 , t : 1', 'abcdefghij , h : 1 , t : 1 abcdefghij , h : 1 , t : 1 abcdefghij , h : 0 , t : 1');
|
||||
dmp.patch_splitMax(patches);
|
||||
assertEquals('@@ -2,32 +2,32 @@\n bcdefghij , h : \n-0\n+1\n , t : 1 abcdef\n@@ -29,32 +29,32 @@\n bcdefghij , h : \n-0\n+1\n , t : 1 abcdef\n', dmp.patch_toText(patches));
|
||||
}
|
||||
|
||||
function testPatchAddPadding() {
|
||||
// Both edges full.
|
||||
var patches = dmp.patch_make('', 'test');
|
||||
assertEquals('@@ -0,0 +1,4 @@\n+test\n', dmp.patch_toText(patches));
|
||||
dmp.patch_addPadding(patches);
|
||||
assertEquals('@@ -1,8 +1,12 @@\n %01%02%03%04\n+test\n %01%02%03%04\n', dmp.patch_toText(patches));
|
||||
|
||||
// Both edges partial.
|
||||
patches = dmp.patch_make('XY', 'XtestY');
|
||||
assertEquals('@@ -1,2 +1,6 @@\n X\n+test\n Y\n', dmp.patch_toText(patches));
|
||||
dmp.patch_addPadding(patches);
|
||||
assertEquals('@@ -2,8 +2,12 @@\n %02%03%04X\n+test\n Y%01%02%03\n', dmp.patch_toText(patches));
|
||||
|
||||
// Both edges none.
|
||||
patches = dmp.patch_make('XXXXYYYY', 'XXXXtestYYYY');
|
||||
assertEquals('@@ -1,8 +1,12 @@\n XXXX\n+test\n YYYY\n', dmp.patch_toText(patches));
|
||||
dmp.patch_addPadding(patches);
|
||||
assertEquals('@@ -5,8 +5,12 @@\n XXXX\n+test\n YYYY\n', dmp.patch_toText(patches));
|
||||
}
|
||||
|
||||
function testPatchApply() {
|
||||
dmp.Match_Distance = 1000;
|
||||
dmp.Match_Threshold = 0.5;
|
||||
dmp.Patch_DeleteThreshold = 0.5;
|
||||
// Null case.
|
||||
var patches = dmp.patch_make('', '');
|
||||
var results = dmp.patch_apply(patches, 'Hello world.');
|
||||
assertEquivalent(['Hello world.', []], results);
|
||||
|
||||
// Exact match.
|
||||
patches = dmp.patch_make('The quick brown fox jumps over the lazy dog.', 'That quick brown fox jumped over a lazy dog.');
|
||||
results = dmp.patch_apply(patches, 'The quick brown fox jumps over the lazy dog.');
|
||||
assertEquivalent(['That quick brown fox jumped over a lazy dog.', [true, true]], results);
|
||||
|
||||
// Partial match.
|
||||
results = dmp.patch_apply(patches, 'The quick red rabbit jumps over the tired tiger.');
|
||||
assertEquivalent(['That quick red rabbit jumped over a tired tiger.', [true, true]], results);
|
||||
|
||||
// Failed match.
|
||||
results = dmp.patch_apply(patches, 'I am the very model of a modern major general.');
|
||||
assertEquivalent(['I am the very model of a modern major general.', [false, false]], results);
|
||||
|
||||
// Big delete, small change.
|
||||
patches = dmp.patch_make('x1234567890123456789012345678901234567890123456789012345678901234567890y', 'xabcy');
|
||||
results = dmp.patch_apply(patches, 'x123456789012345678901234567890-----++++++++++-----123456789012345678901234567890y');
|
||||
assertEquivalent(['xabcy', [true, true]], results);
|
||||
|
||||
// Big delete, big change 1.
|
||||
patches = dmp.patch_make('x1234567890123456789012345678901234567890123456789012345678901234567890y', 'xabcy');
|
||||
results = dmp.patch_apply(patches, 'x12345678901234567890---------------++++++++++---------------12345678901234567890y');
|
||||
assertEquivalent(['xabc12345678901234567890---------------++++++++++---------------12345678901234567890y', [false, true]], results);
|
||||
|
||||
// Big delete, big change 2.
|
||||
dmp.Patch_DeleteThreshold = 0.6;
|
||||
patches = dmp.patch_make('x1234567890123456789012345678901234567890123456789012345678901234567890y', 'xabcy');
|
||||
results = dmp.patch_apply(patches, 'x12345678901234567890---------------++++++++++---------------12345678901234567890y');
|
||||
assertEquivalent(['xabcy', [true, true]], results);
|
||||
dmp.Patch_DeleteThreshold = 0.5;
|
||||
|
||||
// Compensate for failed patch.
|
||||
dmp.Match_Threshold = 0.0;
|
||||
dmp.Match_Distance = 0;
|
||||
patches = dmp.patch_make('abcdefghijklmnopqrstuvwxyz--------------------1234567890', 'abcXXXXXXXXXXdefghijklmnopqrstuvwxyz--------------------1234567YYYYYYYYYY890');
|
||||
results = dmp.patch_apply(patches, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ--------------------1234567890');
|
||||
assertEquivalent(['ABCDEFGHIJKLMNOPQRSTUVWXYZ--------------------1234567YYYYYYYYYY890', [false, true]], results);
|
||||
dmp.Match_Threshold = 0.5;
|
||||
dmp.Match_Distance = 1000;
|
||||
|
||||
// No side effects.
|
||||
patches = dmp.patch_make('', 'test');
|
||||
var patchstr = dmp.patch_toText(patches);
|
||||
dmp.patch_apply(patches, '');
|
||||
assertEquals(patchstr, dmp.patch_toText(patches));
|
||||
|
||||
// No side effects with major delete.
|
||||
patches = dmp.patch_make('The quick brown fox jumps over the lazy dog.', 'Woof');
|
||||
patchstr = dmp.patch_toText(patches);
|
||||
dmp.patch_apply(patches, 'The quick brown fox jumps over the lazy dog.');
|
||||
assertEquals(patchstr, dmp.patch_toText(patches));
|
||||
|
||||
// Edge exact match.
|
||||
patches = dmp.patch_make('', 'test');
|
||||
results = dmp.patch_apply(patches, '');
|
||||
assertEquivalent(['test', [true]], results);
|
||||
|
||||
// Near edge exact match.
|
||||
patches = dmp.patch_make('XY', 'XtestY');
|
||||
results = dmp.patch_apply(patches, 'XY');
|
||||
assertEquivalent(['XtestY', [true]], results);
|
||||
|
||||
// Edge partial match.
|
||||
patches = dmp.patch_make('y', 'y123');
|
||||
results = dmp.patch_apply(patches, 'x');
|
||||
assertEquivalent(['x123', [true]], results);
|
||||
}
|
||||
35
modules/google-diff-match-patch/.bower.json
Normal file
35
modules/google-diff-match-patch/.bower.json
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{
|
||||
"name": "google-diff-match-patch",
|
||||
"version": "0.1.0",
|
||||
"homepage": "https://github.com/friedolinfoerder/google-diff-match-patch",
|
||||
"authors": [
|
||||
"Friedolin Förder"
|
||||
],
|
||||
"description": "A bower wrapper for the google-diff-match-patch Javascript library",
|
||||
"main": "diff_match_patch.js",
|
||||
"keywords": [
|
||||
"google",
|
||||
"diff",
|
||||
"match",
|
||||
"patch",
|
||||
"text",
|
||||
"content"
|
||||
],
|
||||
"license": "Apache License V2",
|
||||
"ignore": [
|
||||
"**/.*",
|
||||
"node_modules",
|
||||
"bower_components",
|
||||
"test",
|
||||
"tests"
|
||||
],
|
||||
"_release": "0.1.0",
|
||||
"_resolution": {
|
||||
"type": "version",
|
||||
"tag": "v0.1.0",
|
||||
"commit": "b825c615de87c8152d4e9d7804c344c4e1d862cd"
|
||||
},
|
||||
"_source": "git://github.com/friedolinfoerder/google-diff-match-patch.git",
|
||||
"_target": "~0.1.0",
|
||||
"_originalSource": "google-diff-match-patch"
|
||||
}
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
|
||||
Apache License
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
|
|
@ -175,3 +174,28 @@
|
|||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "{}"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright {yyyy} {name of copyright owner}
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
6
modules/google-diff-match-patch/README.md
Normal file
6
modules/google-diff-match-patch/README.md
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
google-diff-match-patch
|
||||
=======================
|
||||
|
||||
A bower package for the google-diff-match-patch Javascript library.
|
||||
|
||||
See http://code.google.com/p/google-diff-match-patch/ for more information about the library.
|
||||
26
modules/google-diff-match-patch/bower.json
Normal file
26
modules/google-diff-match-patch/bower.json
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{
|
||||
"name": "google-diff-match-patch",
|
||||
"version": "0.1.0",
|
||||
"homepage": "https://github.com/friedolinfoerder/google-diff-match-patch",
|
||||
"authors": [
|
||||
"Friedolin Förder"
|
||||
],
|
||||
"description": "A bower wrapper for the google-diff-match-patch Javascript library",
|
||||
"main": "diff_match_patch.js",
|
||||
"keywords": [
|
||||
"google",
|
||||
"diff",
|
||||
"match",
|
||||
"patch",
|
||||
"text",
|
||||
"content"
|
||||
],
|
||||
"license": "Apache License V2",
|
||||
"ignore": [
|
||||
"**/.*",
|
||||
"node_modules",
|
||||
"bower_components",
|
||||
"test",
|
||||
"tests"
|
||||
]
|
||||
}
|
||||
0
modules/google-diff-match-patch-js/diff_match_patch.js → modules/google-diff-match-patch/diff_match_patch.js
Normal file → Executable file
0
modules/google-diff-match-patch-js/diff_match_patch.js → modules/google-diff-match-patch/diff_match_patch.js
Normal file → Executable file
|
|
@ -28,6 +28,7 @@
|
|||
"ashify": "~1.0.0",
|
||||
"checkup": "~1.0.2",
|
||||
"console-io": "~1.11.0",
|
||||
"daffy": "~1.0.1",
|
||||
"diff-match-patch": "~1.0.0",
|
||||
"execon": "~1.0.1",
|
||||
"express": "~4.10.0",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue