diff2html 3.4.36 → 3.4.38
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -3
- package/bundles/css/diff2html.min.css +1 -1
- package/bundles/js/diff2html-ui-base.min.js +1 -1
- package/bundles/js/diff2html-ui-slim.min.js +1 -1
- package/bundles/js/diff2html-ui.min.js +1 -1
- package/bundles/js/diff2html.min.js +1 -1
- package/lib/diff-parser.js +55 -65
- package/lib/diff-parser.js.map +1 -1
- package/lib/diff2html-templates.d.ts +1 -1
- package/lib/diff2html-templates.d.ts.map +1 -1
- package/lib/diff2html-templates.js +2 -24
- package/lib/diff2html-templates.js.map +1 -1
- package/lib/diff2html.js +16 -54
- package/lib/diff2html.js.map +1 -1
- package/lib/file-list-renderer.js +15 -39
- package/lib/file-list-renderer.js.map +1 -1
- package/lib/hoganjs-utils.js +22 -59
- package/lib/hoganjs-utils.js.map +1 -1
- package/lib/line-by-line-renderer.d.ts +3 -3
- package/lib/line-by-line-renderer.d.ts.map +1 -1
- package/lib/line-by-line-renderer.js +75 -114
- package/lib/line-by-line-renderer.js.map +1 -1
- package/lib/rematch.d.ts +3 -3
- package/lib/rematch.d.ts.map +1 -1
- package/lib/rematch.js +28 -31
- package/lib/rematch.js.map +1 -1
- package/lib/render-utils.d.ts +2 -2
- package/lib/render-utils.d.ts.map +1 -1
- package/lib/render-utils.js +44 -79
- package/lib/render-utils.js.map +1 -1
- package/lib/side-by-side-renderer.d.ts +3 -3
- package/lib/side-by-side-renderer.d.ts.map +1 -1
- package/lib/side-by-side-renderer.js +83 -122
- package/lib/side-by-side-renderer.js.map +1 -1
- package/lib/types.d.ts +6 -6
- package/lib/types.d.ts.map +1 -1
- package/lib/types.js +1 -1
- package/lib/types.js.map +1 -1
- package/lib/ui/js/diff2html-ui-base.js +61 -75
- package/lib/ui/js/diff2html-ui-base.js.map +1 -1
- package/lib/ui/js/diff2html-ui-slim.d.ts +2 -1
- package/lib/ui/js/diff2html-ui-slim.d.ts.map +1 -1
- package/lib/ui/js/diff2html-ui-slim.js +6 -24
- package/lib/ui/js/diff2html-ui-slim.js.map +1 -1
- package/lib/ui/js/diff2html-ui.d.ts +2 -1
- package/lib/ui/js/diff2html-ui.d.ts.map +1 -1
- package/lib/ui/js/diff2html-ui.js +7 -27
- package/lib/ui/js/diff2html-ui.js.map +1 -1
- package/lib/ui/js/highlight.js-helpers.d.ts +1 -1
- package/lib/ui/js/highlight.js-helpers.d.ts.map +1 -1
- package/lib/ui/js/highlight.js-helpers.js +17 -17
- package/lib/ui/js/highlight.js-helpers.js.map +1 -1
- package/lib/ui/js/highlight.js-slim.js +53 -55
- package/lib/ui/js/highlight.js-slim.js.map +1 -1
- package/lib/utils.js +4 -4
- package/lib/utils.js.map +1 -1
- package/lib-esm/diff-parser.js +53 -63
- package/lib-esm/diff-parser.js.map +1 -1
- package/lib-esm/diff2html-templates.d.ts +1 -1
- package/lib-esm/diff2html-templates.d.ts.map +1 -1
- package/lib-esm/diff2html-templates.js +1 -1
- package/lib-esm/diff2html-templates.js.map +1 -1
- package/lib-esm/diff2html.js +9 -22
- package/lib-esm/diff2html.js.map +1 -1
- package/lib-esm/file-list-renderer.js +13 -15
- package/lib-esm/file-list-renderer.js.map +1 -1
- package/lib-esm/hoganjs-utils.js +19 -35
- package/lib-esm/hoganjs-utils.js.map +1 -1
- package/lib-esm/line-by-line-renderer.d.ts +3 -3
- package/lib-esm/line-by-line-renderer.d.ts.map +1 -1
- package/lib-esm/line-by-line-renderer.js +71 -89
- package/lib-esm/line-by-line-renderer.js.map +1 -1
- package/lib-esm/rematch.d.ts +3 -3
- package/lib-esm/rematch.d.ts.map +1 -1
- package/lib-esm/rematch.js +28 -31
- package/lib-esm/rematch.js.map +1 -1
- package/lib-esm/render-utils.d.ts +2 -2
- package/lib-esm/render-utils.d.ts.map +1 -1
- package/lib-esm/render-utils.js +41 -54
- package/lib-esm/render-utils.js.map +1 -1
- package/lib-esm/side-by-side-renderer.d.ts +3 -3
- package/lib-esm/side-by-side-renderer.d.ts.map +1 -1
- package/lib-esm/side-by-side-renderer.js +79 -97
- package/lib-esm/side-by-side-renderer.js.map +1 -1
- package/lib-esm/types.d.ts +6 -6
- package/lib-esm/types.d.ts.map +1 -1
- package/lib-esm/types.js +3 -3
- package/lib-esm/types.js.map +1 -1
- package/lib-esm/ui/js/diff2html-ui-base.js +59 -74
- package/lib-esm/ui/js/diff2html-ui-base.js.map +1 -1
- package/lib-esm/ui/js/diff2html-ui-slim.d.ts +2 -1
- package/lib-esm/ui/js/diff2html-ui-slim.d.ts.map +1 -1
- package/lib-esm/ui/js/diff2html-ui-slim.js +4 -23
- package/lib-esm/ui/js/diff2html-ui-slim.js.map +1 -1
- package/lib-esm/ui/js/diff2html-ui.d.ts +2 -1
- package/lib-esm/ui/js/diff2html-ui.d.ts.map +1 -1
- package/lib-esm/ui/js/diff2html-ui.js +4 -23
- package/lib-esm/ui/js/diff2html-ui.js.map +1 -1
- package/lib-esm/ui/js/highlight.js-helpers.d.ts +1 -1
- package/lib-esm/ui/js/highlight.js-helpers.d.ts.map +1 -1
- package/lib-esm/ui/js/highlight.js-helpers.js +17 -17
- package/lib-esm/ui/js/highlight.js-helpers.js.map +1 -1
- package/lib-esm/ui/js/highlight.js-slim.js +1 -1
- package/lib-esm/ui/js/highlight.js-slim.js.map +1 -1
- package/lib-esm/utils.js +4 -4
- package/lib-esm/utils.js.map +1 -1
- package/package.json +35 -36
package/lib-esm/rematch.js
CHANGED
|
@@ -5,12 +5,12 @@ export function levenshtein(a, b) {
|
|
|
5
5
|
if (b.length === 0) {
|
|
6
6
|
return a.length;
|
|
7
7
|
}
|
|
8
|
-
|
|
9
|
-
|
|
8
|
+
const matrix = [];
|
|
9
|
+
let i;
|
|
10
10
|
for (i = 0; i <= b.length; i++) {
|
|
11
11
|
matrix[i] = [i];
|
|
12
12
|
}
|
|
13
|
-
|
|
13
|
+
let j;
|
|
14
14
|
for (j = 0; j <= a.length; j++) {
|
|
15
15
|
matrix[0][j] = j;
|
|
16
16
|
}
|
|
@@ -27,22 +27,21 @@ export function levenshtein(a, b) {
|
|
|
27
27
|
return matrix[b.length][a.length];
|
|
28
28
|
}
|
|
29
29
|
export function newDistanceFn(str) {
|
|
30
|
-
return
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
30
|
+
return (x, y) => {
|
|
31
|
+
const xValue = str(x).trim();
|
|
32
|
+
const yValue = str(y).trim();
|
|
33
|
+
const lev = levenshtein(xValue, yValue);
|
|
34
34
|
return lev / (xValue.length + yValue.length);
|
|
35
35
|
};
|
|
36
36
|
}
|
|
37
37
|
export function newMatcherFn(distance) {
|
|
38
|
-
function findBestMatch(a, b, cache) {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
var md = void 0;
|
|
38
|
+
function findBestMatch(a, b, cache = new Map()) {
|
|
39
|
+
let bestMatchDist = Infinity;
|
|
40
|
+
let bestMatch;
|
|
41
|
+
for (let i = 0; i < a.length; ++i) {
|
|
42
|
+
for (let j = 0; j < b.length; ++j) {
|
|
43
|
+
const cacheKey = JSON.stringify([a[i], b[j]]);
|
|
44
|
+
let md;
|
|
46
45
|
if (!(cache.has(cacheKey) && (md = cache.get(cacheKey)))) {
|
|
47
46
|
md = distance(a[i], b[j]);
|
|
48
47
|
cache.set(cacheKey, md);
|
|
@@ -55,25 +54,23 @@ export function newMatcherFn(distance) {
|
|
|
55
54
|
}
|
|
56
55
|
return bestMatch;
|
|
57
56
|
}
|
|
58
|
-
function group(a, b, level, cache) {
|
|
59
|
-
|
|
60
|
-
if (cache === void 0) { cache = new Map(); }
|
|
61
|
-
var bm = findBestMatch(a, b, cache);
|
|
57
|
+
function group(a, b, level = 0, cache = new Map()) {
|
|
58
|
+
const bm = findBestMatch(a, b, cache);
|
|
62
59
|
if (!bm || a.length + b.length < 3) {
|
|
63
60
|
return [[a, b]];
|
|
64
61
|
}
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
62
|
+
const a1 = a.slice(0, bm.indexA);
|
|
63
|
+
const b1 = b.slice(0, bm.indexB);
|
|
64
|
+
const aMatch = [a[bm.indexA]];
|
|
65
|
+
const bMatch = [b[bm.indexB]];
|
|
66
|
+
const tailA = bm.indexA + 1;
|
|
67
|
+
const tailB = bm.indexB + 1;
|
|
68
|
+
const a2 = a.slice(tailA);
|
|
69
|
+
const b2 = b.slice(tailB);
|
|
70
|
+
const group1 = group(a1, b1, level + 1, cache);
|
|
71
|
+
const groupMatch = group(aMatch, bMatch, level + 1, cache);
|
|
72
|
+
const group2 = group(a2, b2, level + 1, cache);
|
|
73
|
+
let result = groupMatch;
|
|
77
74
|
if (bm.indexA > 0 || bm.indexB > 0) {
|
|
78
75
|
result = group1.concat(result);
|
|
79
76
|
}
|
package/lib-esm/rematch.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rematch.js","sourceRoot":"","sources":["../src/rematch.ts"],"names":[],"mappings":"AAuBA,MAAM,UAAU,WAAW,CAAC,CAAS,EAAE,CAAS;IAC9C,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QAClB,OAAO,CAAC,CAAC,MAAM,CAAC;KACjB;IACD,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QAClB,OAAO,CAAC,CAAC,MAAM,CAAC;KACjB;IAED,
|
|
1
|
+
{"version":3,"file":"rematch.js","sourceRoot":"","sources":["../src/rematch.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { LineMatchingType, DiffStyleType, LineType, DiffLineParts, DiffFile, DiffFileName } from './types';
|
|
2
|
-
export
|
|
2
|
+
export type CSSLineClass = 'd2h-ins' | 'd2h-del' | 'd2h-cntx' | 'd2h-info' | 'd2h-ins d2h-change' | 'd2h-del d2h-change';
|
|
3
3
|
export declare const CSSLineClass: {
|
|
4
4
|
[_: string]: CSSLineClass;
|
|
5
5
|
};
|
|
6
|
-
export
|
|
6
|
+
export type HighlightedLines = {
|
|
7
7
|
oldLine: {
|
|
8
8
|
prefix: string;
|
|
9
9
|
content: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-utils.d.ts","sourceRoot":"","sources":["../src/render-utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE3G,
|
|
1
|
+
{"version":3,"file":"render-utils.d.ts","sourceRoot":"","sources":["../src/render-utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE3G,MAAM,MAAM,YAAY,GACpB,SAAS,GACT,SAAS,GACT,UAAU,GACV,UAAU,GACV,oBAAoB,GACpB,oBAAoB,CAAC;AAEzB,eAAO,MAAM,YAAY,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,YAAY,CAAA;CAOrD,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,OAAO,EAAE;QACP,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,OAAO,EAAE;QACP,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;CACH,CAAC;AAEF,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,SAAS,CAAC,EAAE,aAAa,CAAC;CAC3B;AAED,eAAO,MAAM,mBAAmB;;;;;CAK/B,CAAC;AAqBF,wBAAgB,UAAU,CAAC,QAAQ,EAAE,QAAQ,GAAG,YAAY,CAS3D;AAaD,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CASjD;AAKD,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,UAAO,GAAG,aAAa,CAM/F;AAaD,wBAAgB,YAAY,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,CA4DvD;AAKD,wBAAgB,SAAS,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,CAEpD;AAKD,wBAAgB,WAAW,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,CAiBlD;AAKD,wBAAgB,aAAa,CAC3B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,OAAO,EACnB,MAAM,GAAE,YAAiB,GACxB,gBAAgB,CA4DlB"}
|
package/lib-esm/render-utils.js
CHANGED
|
@@ -1,19 +1,8 @@
|
|
|
1
|
-
var __assign = (this && this.__assign) || function () {
|
|
2
|
-
__assign = Object.assign || function(t) {
|
|
3
|
-
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
4
|
-
s = arguments[i];
|
|
5
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
6
|
-
t[p] = s[p];
|
|
7
|
-
}
|
|
8
|
-
return t;
|
|
9
|
-
};
|
|
10
|
-
return __assign.apply(this, arguments);
|
|
11
|
-
};
|
|
12
1
|
import * as jsDiff from 'diff';
|
|
13
2
|
import { unifyPath, hashCode } from './utils';
|
|
14
3
|
import * as rematch from './rematch';
|
|
15
4
|
import { LineMatchingType, DiffStyleType, LineType } from './types';
|
|
16
|
-
export
|
|
5
|
+
export const CSSLineClass = {
|
|
17
6
|
INSERTS: 'd2h-ins',
|
|
18
7
|
DELETES: 'd2h-del',
|
|
19
8
|
CONTEXT: 'd2h-cntx',
|
|
@@ -21,15 +10,15 @@ export var CSSLineClass = {
|
|
|
21
10
|
INSERT_CHANGES: 'd2h-ins d2h-change',
|
|
22
11
|
DELETE_CHANGES: 'd2h-del d2h-change',
|
|
23
12
|
};
|
|
24
|
-
export
|
|
13
|
+
export const defaultRenderConfig = {
|
|
25
14
|
matching: LineMatchingType.NONE,
|
|
26
15
|
matchWordsThreshold: 0.25,
|
|
27
16
|
maxLineLengthHighlight: 10000,
|
|
28
17
|
diffStyle: DiffStyleType.WORD,
|
|
29
18
|
};
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
19
|
+
const separator = '/';
|
|
20
|
+
const distance = rematch.newDistanceFn((change) => change.value);
|
|
21
|
+
const matcher = rematch.newMatcherFn(distance);
|
|
33
22
|
function isDevNullName(name) {
|
|
34
23
|
return name.indexOf('dev/null') !== -1;
|
|
35
24
|
}
|
|
@@ -62,27 +51,26 @@ export function escapeForHtml(str) {
|
|
|
62
51
|
.replace(/'/g, ''')
|
|
63
52
|
.replace(/\//g, '/');
|
|
64
53
|
}
|
|
65
|
-
export function deconstructLine(line, isCombined, escape) {
|
|
66
|
-
|
|
67
|
-
var indexToSplit = prefixLength(isCombined);
|
|
54
|
+
export function deconstructLine(line, isCombined, escape = true) {
|
|
55
|
+
const indexToSplit = prefixLength(isCombined);
|
|
68
56
|
return {
|
|
69
57
|
prefix: line.substring(0, indexToSplit),
|
|
70
58
|
content: escape ? escapeForHtml(line.substring(indexToSplit)) : line.substring(indexToSplit),
|
|
71
59
|
};
|
|
72
60
|
}
|
|
73
61
|
export function filenameDiff(file) {
|
|
74
|
-
|
|
75
|
-
|
|
62
|
+
const oldFilename = unifyPath(file.oldName);
|
|
63
|
+
const newFilename = unifyPath(file.newName);
|
|
76
64
|
if (oldFilename !== newFilename && !isDevNullName(oldFilename) && !isDevNullName(newFilename)) {
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
65
|
+
const prefixPaths = [];
|
|
66
|
+
const suffixPaths = [];
|
|
67
|
+
const oldFilenameParts = oldFilename.split(separator);
|
|
68
|
+
const newFilenameParts = newFilename.split(separator);
|
|
69
|
+
const oldFilenamePartsSize = oldFilenameParts.length;
|
|
70
|
+
const newFilenamePartsSize = newFilenameParts.length;
|
|
71
|
+
let i = 0;
|
|
72
|
+
let j = oldFilenamePartsSize - 1;
|
|
73
|
+
let k = newFilenamePartsSize - 1;
|
|
86
74
|
while (i < j && i < k) {
|
|
87
75
|
if (oldFilenameParts[i] === newFilenameParts[i]) {
|
|
88
76
|
prefixPaths.push(newFilenameParts[i]);
|
|
@@ -102,10 +90,10 @@ export function filenameDiff(file) {
|
|
|
102
90
|
break;
|
|
103
91
|
}
|
|
104
92
|
}
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
93
|
+
const finalPrefix = prefixPaths.join(separator);
|
|
94
|
+
const finalSuffix = suffixPaths.join(separator);
|
|
95
|
+
const oldRemainingPath = oldFilenameParts.slice(i, j + 1).join(separator);
|
|
96
|
+
const newRemainingPath = newFilenameParts.slice(i, k + 1).join(separator);
|
|
109
97
|
if (finalPrefix.length && finalSuffix.length) {
|
|
110
98
|
return (finalPrefix + separator + '{' + oldRemainingPath + ' → ' + newRemainingPath + '}' + separator + finalSuffix);
|
|
111
99
|
}
|
|
@@ -125,10 +113,10 @@ export function filenameDiff(file) {
|
|
|
125
113
|
}
|
|
126
114
|
}
|
|
127
115
|
export function getHtmlId(file) {
|
|
128
|
-
return
|
|
116
|
+
return `d2h-${hashCode(filenameDiff(file)).toString().slice(-6)}`;
|
|
129
117
|
}
|
|
130
118
|
export function getFileIcon(file) {
|
|
131
|
-
|
|
119
|
+
let templateName = 'file-changed';
|
|
132
120
|
if (file.isRename) {
|
|
133
121
|
templateName = 'file-renamed';
|
|
134
122
|
}
|
|
@@ -146,11 +134,10 @@ export function getFileIcon(file) {
|
|
|
146
134
|
}
|
|
147
135
|
return templateName;
|
|
148
136
|
}
|
|
149
|
-
export function diffHighlight(diffLine1, diffLine2, isCombined, config) {
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
var line2 = deconstructLine(diffLine2, isCombined, false);
|
|
137
|
+
export function diffHighlight(diffLine1, diffLine2, isCombined, config = {}) {
|
|
138
|
+
const { matching, maxLineLengthHighlight, matchWordsThreshold, diffStyle } = Object.assign(Object.assign({}, defaultRenderConfig), config);
|
|
139
|
+
const line1 = deconstructLine(diffLine1, isCombined, false);
|
|
140
|
+
const line2 = deconstructLine(diffLine2, isCombined, false);
|
|
154
141
|
if (line1.content.length > maxLineLengthHighlight || line2.content.length > maxLineLengthHighlight) {
|
|
155
142
|
return {
|
|
156
143
|
oldLine: {
|
|
@@ -163,17 +150,17 @@ export function diffHighlight(diffLine1, diffLine2, isCombined, config) {
|
|
|
163
150
|
},
|
|
164
151
|
};
|
|
165
152
|
}
|
|
166
|
-
|
|
153
|
+
const diff = diffStyle === 'char'
|
|
167
154
|
? jsDiff.diffChars(line1.content, line2.content)
|
|
168
155
|
: jsDiff.diffWordsWithSpace(line1.content, line2.content);
|
|
169
|
-
|
|
156
|
+
const changedWords = [];
|
|
170
157
|
if (diffStyle === 'word' && matching === 'words') {
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
chunks.forEach(
|
|
158
|
+
const removed = diff.filter(element => element.removed);
|
|
159
|
+
const added = diff.filter(element => element.added);
|
|
160
|
+
const chunks = matcher(added, removed);
|
|
161
|
+
chunks.forEach(chunk => {
|
|
175
162
|
if (chunk[0].length === 1 && chunk[1].length === 1) {
|
|
176
|
-
|
|
163
|
+
const dist = distance(chunk[0][0], chunk[1][0]);
|
|
177
164
|
if (dist < matchWordsThreshold) {
|
|
178
165
|
changedWords.push(chunk[0][0]);
|
|
179
166
|
changedWords.push(chunk[1][0]);
|
|
@@ -181,13 +168,13 @@ export function diffHighlight(diffLine1, diffLine2, isCombined, config) {
|
|
|
181
168
|
}
|
|
182
169
|
});
|
|
183
170
|
}
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
171
|
+
const highlightedLine = diff.reduce((highlightedLine, part) => {
|
|
172
|
+
const elemType = part.added ? 'ins' : part.removed ? 'del' : null;
|
|
173
|
+
const addClass = changedWords.indexOf(part) > -1 ? ' class="d2h-change"' : '';
|
|
174
|
+
const escapedValue = escapeForHtml(part.value);
|
|
188
175
|
return elemType !== null
|
|
189
|
-
?
|
|
190
|
-
:
|
|
176
|
+
? `${highlightedLine}<${elemType}${addClass}>${escapedValue}</${elemType}>`
|
|
177
|
+
: `${highlightedLine}${escapedValue}`;
|
|
191
178
|
}, '');
|
|
192
179
|
return {
|
|
193
180
|
oldLine: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-utils.js","sourceRoot":"","sources":["../src/render-utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"render-utils.js","sourceRoot":"","sources":["../src/render-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,18 +31,18 @@ export default class SideBySideRenderer {
|
|
|
31
31
|
generateLineHtml(oldLine?: DiffPreparedLine, newLine?: DiffPreparedLine): FileHtml;
|
|
32
32
|
generateSingleHtml(line?: DiffPreparedLine): string;
|
|
33
33
|
}
|
|
34
|
-
|
|
34
|
+
type DiffLineGroups = [
|
|
35
35
|
(DiffLineContext & DiffLineContent)[],
|
|
36
36
|
(DiffLineDeleted & DiffLineContent)[],
|
|
37
37
|
(DiffLineInserted & DiffLineContent)[]
|
|
38
38
|
][];
|
|
39
|
-
|
|
39
|
+
type DiffPreparedLine = {
|
|
40
40
|
type: renderUtils.CSSLineClass;
|
|
41
41
|
prefix: string;
|
|
42
42
|
content: string;
|
|
43
43
|
number: number;
|
|
44
44
|
};
|
|
45
|
-
|
|
45
|
+
type FileHtml = {
|
|
46
46
|
left: string;
|
|
47
47
|
right: string;
|
|
48
48
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"side-by-side-renderer.d.ts","sourceRoot":"","sources":["../src/side-by-side-renderer.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,iBAAiB,CAAC;AAC3C,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,WAAW,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EACL,QAAQ,EAER,QAAQ,EACR,SAAS,EACT,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,eAAe,EAChB,MAAM,SAAS,CAAC;AAEjB,MAAM,WAAW,wBAAyB,SAAQ,WAAW,CAAC,YAAY;IACxE,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,+BAA+B,CAAC,EAAE,MAAM,CAAC;CAC1C;AAED,eAAO,MAAM,+BAA+B;;;;;;;;CAK3C,CAAC;AAOF,MAAM,CAAC,OAAO,OAAO,kBAAkB;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAe;IAC1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyC;gBAEpD,UAAU,EAAE,YAAY,EAAE,MAAM,GAAE,wBAA6B;IAK3E,MAAM,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,MAAM;IAgBrC,gBAAgB,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,GAAG,MAAM;IAwBzD,iBAAiB,IAAI,QAAQ;IAU7B,gBAAgB,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ;IA0D1C,kBAAkB,CAAC,KAAK,EAAE,SAAS,GAAG,cAAc;IAsCpD,oBAAoB,CAClB,QAAQ,EAAE,QAAQ,EAAE,EACpB,QAAQ,EAAE,QAAQ,EAAE,EACpB,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,GACnC,QAAQ,EAAE,EAAE,EAAE;IAcjB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,QAAQ,GAAG,MAAM;IAS5D,mBAAmB,CAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,QAAQ;IA0D9F,gBAAgB,CAAC,OAAO,CAAC,EAAE,gBAAgB,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,QAAQ;IAOlF,kBAAkB,CAAC,IAAI,CAAC,EAAE,gBAAgB,GAAG,MAAM;CAapD;AAED,
|
|
1
|
+
{"version":3,"file":"side-by-side-renderer.d.ts","sourceRoot":"","sources":["../src/side-by-side-renderer.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,iBAAiB,CAAC;AAC3C,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,WAAW,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EACL,QAAQ,EAER,QAAQ,EACR,SAAS,EACT,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,eAAe,EAChB,MAAM,SAAS,CAAC;AAEjB,MAAM,WAAW,wBAAyB,SAAQ,WAAW,CAAC,YAAY;IACxE,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,+BAA+B,CAAC,EAAE,MAAM,CAAC;CAC1C;AAED,eAAO,MAAM,+BAA+B;;;;;;;;CAK3C,CAAC;AAOF,MAAM,CAAC,OAAO,OAAO,kBAAkB;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAe;IAC1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyC;gBAEpD,UAAU,EAAE,YAAY,EAAE,MAAM,GAAE,wBAA6B;IAK3E,MAAM,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,MAAM;IAgBrC,gBAAgB,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,GAAG,MAAM;IAwBzD,iBAAiB,IAAI,QAAQ;IAU7B,gBAAgB,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ;IA0D1C,kBAAkB,CAAC,KAAK,EAAE,SAAS,GAAG,cAAc;IAsCpD,oBAAoB,CAClB,QAAQ,EAAE,QAAQ,EAAE,EACpB,QAAQ,EAAE,QAAQ,EAAE,EACpB,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,GACnC,QAAQ,EAAE,EAAE,EAAE;IAcjB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,QAAQ,GAAG,MAAM;IAS5D,mBAAmB,CAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,QAAQ;IA0D9F,gBAAgB,CAAC,OAAO,CAAC,EAAE,gBAAgB,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,QAAQ;IAOlF,kBAAkB,CAAC,IAAI,CAAC,EAAE,gBAAgB,GAAG,MAAM;CAapD;AAED,KAAK,cAAc,GAAG;IACpB,CAAC,eAAe,GAAG,eAAe,CAAC,EAAE;IACrC,CAAC,eAAe,GAAG,eAAe,CAAC,EAAE;IACrC,CAAC,gBAAgB,GAAG,eAAe,CAAC,EAAE;CACvC,EAAE,CAAC;AAEJ,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,WAAW,CAAC,YAAY,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,KAAK,QAAQ,GAAG;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf,CAAC"}
|