@git-diff-view/react 0.0.12 → 0.0.13
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.
|
@@ -733,10 +733,8 @@ function __classPrivateFieldGet(receiver, state, kind, f) {
|
|
|
733
733
|
}
|
|
734
734
|
|
|
735
735
|
function __classPrivateFieldSet(receiver, state, value, kind, f) {
|
|
736
|
-
if (kind === "m") throw new TypeError("Private method is not writable");
|
|
737
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
|
|
738
736
|
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
|
|
739
|
-
return (
|
|
737
|
+
return (state.set(receiver, value)), value;
|
|
740
738
|
}
|
|
741
739
|
|
|
742
740
|
typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
|
|
@@ -926,7 +924,7 @@ class Cache extends Map {
|
|
|
926
924
|
_Cache_maxLength.set(this, 30);
|
|
927
925
|
}
|
|
928
926
|
setMaxLength(length) {
|
|
929
|
-
__classPrivateFieldSet(this, _Cache_maxLength, length
|
|
927
|
+
__classPrivateFieldSet(this, _Cache_maxLength, length);
|
|
930
928
|
this._checkLength();
|
|
931
929
|
}
|
|
932
930
|
set(key, value) {
|
|
@@ -1047,7 +1045,7 @@ _File_instances = new WeakSet(), _File_doCheck = function _File_doCheck() {
|
|
|
1047
1045
|
}
|
|
1048
1046
|
};
|
|
1049
1047
|
const getFile = (raw, lang, fileName) => {
|
|
1050
|
-
const key = raw + "--" + "0.0.
|
|
1048
|
+
const key = raw + "--" + "0.0.13" + "--" + lang;
|
|
1051
1049
|
if (map.has(key))
|
|
1052
1050
|
return map.get(key);
|
|
1053
1051
|
const file = new File(raw, lang, fileName);
|
|
@@ -1105,7 +1103,7 @@ class DiffFile {
|
|
|
1105
1103
|
_DiffFile_composeByMerge.set(this, false);
|
|
1106
1104
|
_DiffFile_composeByFullMerge.set(this, false);
|
|
1107
1105
|
_DiffFile_highlighterName.set(this, void 0);
|
|
1108
|
-
this._version_ = "0.0.
|
|
1106
|
+
this._version_ = "0.0.13";
|
|
1109
1107
|
this._oldFileContent = "";
|
|
1110
1108
|
this._oldFileLang = "";
|
|
1111
1109
|
this._newFileContent = "";
|
|
@@ -1113,6 +1111,7 @@ class DiffFile {
|
|
|
1113
1111
|
this.diffLineLength = 0;
|
|
1114
1112
|
this.splitLineLength = 0;
|
|
1115
1113
|
this.unifiedLineLength = 0;
|
|
1114
|
+
this.fileLineLength = 0;
|
|
1116
1115
|
this.hasExpandSplitAll = false;
|
|
1117
1116
|
this.hasExpandUnifiedAll = false;
|
|
1118
1117
|
this.hasSomeLineCollapsed = false;
|
|
@@ -1334,7 +1333,7 @@ class DiffFile {
|
|
|
1334
1333
|
};
|
|
1335
1334
|
this.notifyAll = (skipSyncExternal) => {
|
|
1336
1335
|
var _a;
|
|
1337
|
-
__classPrivateFieldSet(this, _DiffFile_updateCount, (_a = __classPrivateFieldGet(this, _DiffFile_updateCount, "f"), _a++, _a)
|
|
1336
|
+
__classPrivateFieldSet(this, _DiffFile_updateCount, (_a = __classPrivateFieldGet(this, _DiffFile_updateCount, "f"), _a++, _a));
|
|
1338
1337
|
__classPrivateFieldGet(this, _DiffFile_listeners, "f").forEach((f) => {
|
|
1339
1338
|
if (skipSyncExternal && f.isSyncExternal) {
|
|
1340
1339
|
return;
|
|
@@ -1364,6 +1363,7 @@ class DiffFile {
|
|
|
1364
1363
|
const newFilePlaceholderLines = __classPrivateFieldGet(this, _DiffFile_newFilePlaceholderLines, "f");
|
|
1365
1364
|
const splitLineLength = this.splitLineLength;
|
|
1366
1365
|
const unifiedLineLength = this.unifiedLineLength;
|
|
1366
|
+
const fileLineLength = this.fileLineLength;
|
|
1367
1367
|
const composeByDiff = __classPrivateFieldGet(this, _DiffFile_composeByDiff, "f");
|
|
1368
1368
|
const highlighterName = __classPrivateFieldGet(this, _DiffFile_highlighterName, "f");
|
|
1369
1369
|
const hasSomeLineCollapsed = this.hasSomeLineCollapsed;
|
|
@@ -1390,6 +1390,7 @@ class DiffFile {
|
|
|
1390
1390
|
newFilePlaceholderLines,
|
|
1391
1391
|
splitLineLength,
|
|
1392
1392
|
unifiedLineLength,
|
|
1393
|
+
fileLineLength,
|
|
1393
1394
|
splitLeftLines,
|
|
1394
1395
|
splitRightLines,
|
|
1395
1396
|
splitHunkLines,
|
|
@@ -1403,30 +1404,31 @@ class DiffFile {
|
|
|
1403
1404
|
};
|
|
1404
1405
|
};
|
|
1405
1406
|
this.mergeBundle = (data) => {
|
|
1406
|
-
__classPrivateFieldSet(this, _DiffFile_hasInitRaw, data.hasInitRaw
|
|
1407
|
-
__classPrivateFieldSet(this, _DiffFile_hasInitSyntax, data.hasInitSyntax
|
|
1408
|
-
__classPrivateFieldSet(this, _DiffFile_hasBuildSplit, data.hasBuildSplit
|
|
1409
|
-
__classPrivateFieldSet(this, _DiffFile_hasBuildUnified, data.hasBuildUnified
|
|
1410
|
-
__classPrivateFieldSet(this, _DiffFile_composeByDiff, data.composeByDiff
|
|
1411
|
-
__classPrivateFieldSet(this, _DiffFile_highlighterName, data.highlighterName
|
|
1412
|
-
__classPrivateFieldSet(this, _DiffFile_oldFileLines, data.oldFileLines
|
|
1413
|
-
__classPrivateFieldSet(this, _DiffFile_oldFileDiffLines, data.oldFileDiffLines
|
|
1414
|
-
__classPrivateFieldSet(this, _DiffFile_oldFileSyntaxLines, data.oldFileSyntaxLines
|
|
1415
|
-
__classPrivateFieldSet(this, _DiffFile_oldFilePlaceholderLines, data.oldFilePlaceholderLines
|
|
1416
|
-
__classPrivateFieldSet(this, _DiffFile_newFileLines, data.newFileLines
|
|
1417
|
-
__classPrivateFieldSet(this, _DiffFile_newFileDiffLines, data.newFileDiffLines
|
|
1418
|
-
__classPrivateFieldSet(this, _DiffFile_newFileSyntaxLines, data.newFileSyntaxLines
|
|
1419
|
-
__classPrivateFieldSet(this, _DiffFile_newFilePlaceholderLines, data.newFilePlaceholderLines
|
|
1407
|
+
__classPrivateFieldSet(this, _DiffFile_hasInitRaw, data.hasInitRaw);
|
|
1408
|
+
__classPrivateFieldSet(this, _DiffFile_hasInitSyntax, data.hasInitSyntax);
|
|
1409
|
+
__classPrivateFieldSet(this, _DiffFile_hasBuildSplit, data.hasBuildSplit);
|
|
1410
|
+
__classPrivateFieldSet(this, _DiffFile_hasBuildUnified, data.hasBuildUnified);
|
|
1411
|
+
__classPrivateFieldSet(this, _DiffFile_composeByDiff, data.composeByDiff);
|
|
1412
|
+
__classPrivateFieldSet(this, _DiffFile_highlighterName, data.highlighterName);
|
|
1413
|
+
__classPrivateFieldSet(this, _DiffFile_oldFileLines, data.oldFileLines);
|
|
1414
|
+
__classPrivateFieldSet(this, _DiffFile_oldFileDiffLines, data.oldFileDiffLines);
|
|
1415
|
+
__classPrivateFieldSet(this, _DiffFile_oldFileSyntaxLines, data.oldFileSyntaxLines);
|
|
1416
|
+
__classPrivateFieldSet(this, _DiffFile_oldFilePlaceholderLines, data.oldFilePlaceholderLines);
|
|
1417
|
+
__classPrivateFieldSet(this, _DiffFile_newFileLines, data.newFileLines);
|
|
1418
|
+
__classPrivateFieldSet(this, _DiffFile_newFileDiffLines, data.newFileDiffLines);
|
|
1419
|
+
__classPrivateFieldSet(this, _DiffFile_newFileSyntaxLines, data.newFileSyntaxLines);
|
|
1420
|
+
__classPrivateFieldSet(this, _DiffFile_newFilePlaceholderLines, data.newFilePlaceholderLines);
|
|
1420
1421
|
this.splitLineLength = data.splitLineLength;
|
|
1421
1422
|
this.unifiedLineLength = data.unifiedLineLength;
|
|
1423
|
+
this.fileLineLength = data.fileLineLength;
|
|
1422
1424
|
this.hasSomeLineCollapsed = data.hasSomeLineCollapsed;
|
|
1423
|
-
__classPrivateFieldSet(this, _DiffFile_splitLeftLines, data.splitLeftLines
|
|
1424
|
-
__classPrivateFieldSet(this, _DiffFile_splitRightLines, data.splitRightLines
|
|
1425
|
-
__classPrivateFieldSet(this, _DiffFile_splitHunksLines, data.splitHunkLines
|
|
1426
|
-
__classPrivateFieldSet(this, _DiffFile_unifiedLines, data.unifiedLines
|
|
1427
|
-
__classPrivateFieldSet(this, _DiffFile_unifiedHunksLines, data.unifiedHunkLines
|
|
1425
|
+
__classPrivateFieldSet(this, _DiffFile_splitLeftLines, data.splitLeftLines);
|
|
1426
|
+
__classPrivateFieldSet(this, _DiffFile_splitRightLines, data.splitRightLines);
|
|
1427
|
+
__classPrivateFieldSet(this, _DiffFile_splitHunksLines, data.splitHunkLines);
|
|
1428
|
+
__classPrivateFieldSet(this, _DiffFile_unifiedLines, data.unifiedLines);
|
|
1429
|
+
__classPrivateFieldSet(this, _DiffFile_unifiedHunksLines, data.unifiedHunkLines);
|
|
1428
1430
|
// mark this instance as a merged instance
|
|
1429
|
-
__classPrivateFieldSet(this, _DiffFile_composeByMerge, true
|
|
1431
|
+
__classPrivateFieldSet(this, _DiffFile_composeByMerge, true);
|
|
1430
1432
|
if (this._version_ !== data.version) {
|
|
1431
1433
|
console.error("the version of the `diffInstance` is not match, some error may happen!");
|
|
1432
1434
|
}
|
|
@@ -1487,21 +1489,21 @@ class DiffFile {
|
|
|
1487
1489
|
};
|
|
1488
1490
|
this.clear = () => {
|
|
1489
1491
|
this._destroy();
|
|
1490
|
-
__classPrivateFieldSet(this, _DiffFile_oldFileResult, null
|
|
1491
|
-
__classPrivateFieldSet(this, _DiffFile_newFileResult, null
|
|
1492
|
-
__classPrivateFieldSet(this, _DiffFile_diffLines, null
|
|
1493
|
-
__classPrivateFieldSet(this, _DiffFile_diffListResults, null
|
|
1494
|
-
__classPrivateFieldSet(this, _DiffFile_newFileDiffLines, null
|
|
1495
|
-
__classPrivateFieldSet(this, _DiffFile_oldFileDiffLines, null
|
|
1496
|
-
__classPrivateFieldSet(this, _DiffFile_newFileLines, null
|
|
1497
|
-
__classPrivateFieldSet(this, _DiffFile_oldFileLines, null
|
|
1498
|
-
__classPrivateFieldSet(this, _DiffFile_newFileSyntaxLines, null
|
|
1499
|
-
__classPrivateFieldSet(this, _DiffFile_oldFileSyntaxLines, null
|
|
1500
|
-
__classPrivateFieldSet(this, _DiffFile_splitHunksLines, null
|
|
1501
|
-
__classPrivateFieldSet(this, _DiffFile_splitLeftLines, null
|
|
1502
|
-
__classPrivateFieldSet(this, _DiffFile_splitRightLines, null
|
|
1503
|
-
__classPrivateFieldSet(this, _DiffFile_unifiedHunksLines, null
|
|
1504
|
-
__classPrivateFieldSet(this, _DiffFile_unifiedLines, null
|
|
1492
|
+
__classPrivateFieldSet(this, _DiffFile_oldFileResult, null);
|
|
1493
|
+
__classPrivateFieldSet(this, _DiffFile_newFileResult, null);
|
|
1494
|
+
__classPrivateFieldSet(this, _DiffFile_diffLines, null);
|
|
1495
|
+
__classPrivateFieldSet(this, _DiffFile_diffListResults, null);
|
|
1496
|
+
__classPrivateFieldSet(this, _DiffFile_newFileDiffLines, null);
|
|
1497
|
+
__classPrivateFieldSet(this, _DiffFile_oldFileDiffLines, null);
|
|
1498
|
+
__classPrivateFieldSet(this, _DiffFile_newFileLines, null);
|
|
1499
|
+
__classPrivateFieldSet(this, _DiffFile_oldFileLines, null);
|
|
1500
|
+
__classPrivateFieldSet(this, _DiffFile_newFileSyntaxLines, null);
|
|
1501
|
+
__classPrivateFieldSet(this, _DiffFile_oldFileSyntaxLines, null);
|
|
1502
|
+
__classPrivateFieldSet(this, _DiffFile_splitHunksLines, null);
|
|
1503
|
+
__classPrivateFieldSet(this, _DiffFile_splitLeftLines, null);
|
|
1504
|
+
__classPrivateFieldSet(this, _DiffFile_splitRightLines, null);
|
|
1505
|
+
__classPrivateFieldSet(this, _DiffFile_unifiedHunksLines, null);
|
|
1506
|
+
__classPrivateFieldSet(this, _DiffFile_unifiedLines, null);
|
|
1505
1507
|
};
|
|
1506
1508
|
Object.defineProperty(this, "__v_skip", { value: true });
|
|
1507
1509
|
let oldContent = _oldFileContent;
|
|
@@ -1530,7 +1532,7 @@ class DiffFile {
|
|
|
1530
1532
|
id = "--" + Math.random().toString().slice(2);
|
|
1531
1533
|
}
|
|
1532
1534
|
idSet.add(id);
|
|
1533
|
-
__classPrivateFieldSet(this, _DiffFile_id, id
|
|
1535
|
+
__classPrivateFieldSet(this, _DiffFile_id, id);
|
|
1534
1536
|
}
|
|
1535
1537
|
getId() {
|
|
1536
1538
|
return __classPrivateFieldGet(this, _DiffFile_id, "f");
|
|
@@ -1546,7 +1548,7 @@ class DiffFile {
|
|
|
1546
1548
|
__classPrivateFieldGet(this, _DiffFile_instances, "m", _DiffFile_doFile).call(this);
|
|
1547
1549
|
__classPrivateFieldGet(this, _DiffFile_instances, "m", _DiffFile_composeRaw).call(this);
|
|
1548
1550
|
__classPrivateFieldGet(this, _DiffFile_instances, "m", _DiffFile_composeFile).call(this);
|
|
1549
|
-
__classPrivateFieldSet(this, _DiffFile_hasInitRaw, true
|
|
1551
|
+
__classPrivateFieldSet(this, _DiffFile_hasInitRaw, true);
|
|
1550
1552
|
}
|
|
1551
1553
|
initSyntax({ registerHighlighter } = {}) {
|
|
1552
1554
|
var _a, _b;
|
|
@@ -1557,8 +1559,8 @@ class DiffFile {
|
|
|
1557
1559
|
return;
|
|
1558
1560
|
}
|
|
1559
1561
|
__classPrivateFieldGet(this, _DiffFile_instances, "m", _DiffFile_composeSyntax).call(this, { registerHighlighter });
|
|
1560
|
-
__classPrivateFieldSet(this, _DiffFile_highlighterName, ((_a = __classPrivateFieldGet(this, _DiffFile_oldFileResult, "f")) === null || _a === void 0 ? void 0 : _a.highlighterName) || ((_b = __classPrivateFieldGet(this, _DiffFile_newFileResult, "f")) === null || _b === void 0 ? void 0 : _b.highlighterName) || __classPrivateFieldGet(this, _DiffFile_highlighterName, "f")
|
|
1561
|
-
__classPrivateFieldSet(this, _DiffFile_hasInitSyntax, true
|
|
1562
|
+
__classPrivateFieldSet(this, _DiffFile_highlighterName, ((_a = __classPrivateFieldGet(this, _DiffFile_oldFileResult, "f")) === null || _a === void 0 ? void 0 : _a.highlighterName) || ((_b = __classPrivateFieldGet(this, _DiffFile_newFileResult, "f")) === null || _b === void 0 ? void 0 : _b.highlighterName) || __classPrivateFieldGet(this, _DiffFile_highlighterName, "f"));
|
|
1563
|
+
__classPrivateFieldSet(this, _DiffFile_hasInitSyntax, true);
|
|
1562
1564
|
}
|
|
1563
1565
|
init() {
|
|
1564
1566
|
this.initRaw();
|
|
@@ -1670,7 +1672,7 @@ class DiffFile {
|
|
|
1670
1672
|
typedPrevious.splitInfo = Object.assign(Object.assign({}, typedPrevious.hunkInfo), { startHiddenIndex: hideStart, endHiddenIndex: len, plainText: typedPrevious.text, _startHiddenIndex: hideStart, _endHiddenIndex: len, _plainText: typedPrevious.text });
|
|
1671
1673
|
hideStart = Infinity;
|
|
1672
1674
|
}
|
|
1673
|
-
__classPrivateFieldSet(this, _DiffFile_splitHunksLines, Object.assign(Object.assign({}, __classPrivateFieldGet(this, _DiffFile_splitHunksLines, "f")), { [len]: typedPrevious })
|
|
1675
|
+
__classPrivateFieldSet(this, _DiffFile_splitHunksLines, Object.assign(Object.assign({}, __classPrivateFieldGet(this, _DiffFile_splitHunksLines, "f")), { [len]: typedPrevious }));
|
|
1674
1676
|
}
|
|
1675
1677
|
}
|
|
1676
1678
|
}
|
|
@@ -1696,11 +1698,11 @@ class DiffFile {
|
|
|
1696
1698
|
_oldLength: 0,
|
|
1697
1699
|
_newLength: 0,
|
|
1698
1700
|
};
|
|
1699
|
-
__classPrivateFieldSet(this, _DiffFile_splitHunksLines, Object.assign(Object.assign({}, __classPrivateFieldGet(this, _DiffFile_splitHunksLines, "f")), { [__classPrivateFieldGet(this, _DiffFile_splitRightLines, "f").length]: lastHunk })
|
|
1701
|
+
__classPrivateFieldSet(this, _DiffFile_splitHunksLines, Object.assign(Object.assign({}, __classPrivateFieldGet(this, _DiffFile_splitHunksLines, "f")), { [__classPrivateFieldGet(this, _DiffFile_splitRightLines, "f").length]: lastHunk }));
|
|
1700
1702
|
hideStart = Infinity;
|
|
1701
1703
|
}
|
|
1702
1704
|
this.splitLineLength = __classPrivateFieldGet(this, _DiffFile_splitRightLines, "f").length;
|
|
1703
|
-
__classPrivateFieldSet(this, _DiffFile_hasBuildSplit, true
|
|
1705
|
+
__classPrivateFieldSet(this, _DiffFile_hasBuildSplit, true);
|
|
1704
1706
|
this.notifyAll();
|
|
1705
1707
|
}
|
|
1706
1708
|
buildUnifiedDiffLines() {
|
|
@@ -1801,7 +1803,7 @@ class DiffFile {
|
|
|
1801
1803
|
typedPrevious.unifiedInfo = Object.assign(Object.assign({}, typedPrevious.hunkInfo), { startHiddenIndex: hideStart, endHiddenIndex: len, plainText: typedPrevious.text, _startHiddenIndex: hideStart, _endHiddenIndex: len, _plainText: typedPrevious.text });
|
|
1802
1804
|
hideStart = Infinity;
|
|
1803
1805
|
}
|
|
1804
|
-
__classPrivateFieldSet(this, _DiffFile_unifiedHunksLines, Object.assign(Object.assign({}, __classPrivateFieldGet(this, _DiffFile_unifiedHunksLines, "f")), { [len]: typedPrevious })
|
|
1806
|
+
__classPrivateFieldSet(this, _DiffFile_unifiedHunksLines, Object.assign(Object.assign({}, __classPrivateFieldGet(this, _DiffFile_unifiedHunksLines, "f")), { [len]: typedPrevious }));
|
|
1805
1807
|
}
|
|
1806
1808
|
}
|
|
1807
1809
|
}
|
|
@@ -1827,33 +1829,35 @@ class DiffFile {
|
|
|
1827
1829
|
_oldLength: 0,
|
|
1828
1830
|
_newLength: 0,
|
|
1829
1831
|
};
|
|
1830
|
-
__classPrivateFieldSet(this, _DiffFile_unifiedHunksLines, Object.assign(Object.assign({}, __classPrivateFieldGet(this, _DiffFile_unifiedHunksLines, "f")), { [__classPrivateFieldGet(this, _DiffFile_unifiedLines, "f").length]: lastHunk })
|
|
1832
|
+
__classPrivateFieldSet(this, _DiffFile_unifiedHunksLines, Object.assign(Object.assign({}, __classPrivateFieldGet(this, _DiffFile_unifiedHunksLines, "f")), { [__classPrivateFieldGet(this, _DiffFile_unifiedLines, "f").length]: lastHunk }));
|
|
1831
1833
|
hideStart = Infinity;
|
|
1832
1834
|
}
|
|
1833
1835
|
this.unifiedLineLength = __classPrivateFieldGet(this, _DiffFile_unifiedLines, "f").length;
|
|
1834
|
-
__classPrivateFieldSet(this, _DiffFile_hasBuildUnified, true
|
|
1836
|
+
__classPrivateFieldSet(this, _DiffFile_hasBuildUnified, true);
|
|
1835
1837
|
this.notifyAll();
|
|
1836
1838
|
}
|
|
1837
1839
|
}
|
|
1838
1840
|
_DiffFile_oldFileResult = new WeakMap(), _DiffFile_newFileResult = new WeakMap(), _DiffFile_diffListResults = new WeakMap(), _DiffFile_diffLines = new WeakMap(), _DiffFile_oldFileDiffLines = new WeakMap(), _DiffFile_newFileDiffLines = new WeakMap(), _DiffFile_oldFileLines = new WeakMap(), _DiffFile_newFileLines = new WeakMap(), _DiffFile_oldFileSyntaxLines = new WeakMap(), _DiffFile_newFileSyntaxLines = new WeakMap(), _DiffFile_oldFilePlaceholderLines = new WeakMap(), _DiffFile_newFilePlaceholderLines = new WeakMap(), _DiffFile_splitLeftLines = new WeakMap(), _DiffFile_splitRightLines = new WeakMap(), _DiffFile_splitHunksLines = new WeakMap(), _DiffFile_unifiedLines = new WeakMap(), _DiffFile_unifiedHunksLines = new WeakMap(), _DiffFile_listeners = new WeakMap(), _DiffFile_hasInitRaw = new WeakMap(), _DiffFile_hasInitSyntax = new WeakMap(), _DiffFile_hasBuildSplit = new WeakMap(), _DiffFile_hasBuildUnified = new WeakMap(), _DiffFile_updateCount = new WeakMap(), _DiffFile_composeByDiff = new WeakMap(), _DiffFile_composeByMerge = new WeakMap(), _DiffFile_composeByFullMerge = new WeakMap(), _DiffFile_highlighterName = new WeakMap(), _DiffFile_id = new WeakMap(), _DiffFile_clonedInstance = new WeakMap(), _DiffFile_instances = new WeakSet(), _DiffFile_doDiff = function _DiffFile_doDiff() {
|
|
1839
1841
|
if (!this._diffList)
|
|
1840
1842
|
return;
|
|
1841
|
-
__classPrivateFieldSet(this, _DiffFile_diffListResults, this._diffList.map((s) => parseInstance.parse(s))
|
|
1843
|
+
__classPrivateFieldSet(this, _DiffFile_diffListResults, this._diffList.map((s) => parseInstance.parse(s)));
|
|
1842
1844
|
}, _DiffFile_doFile = function _DiffFile_doFile() {
|
|
1843
1845
|
if (!this._oldFileContent && !this._newFileContent)
|
|
1844
1846
|
return;
|
|
1845
1847
|
if (this._oldFileContent) {
|
|
1846
|
-
__classPrivateFieldSet(this, _DiffFile_oldFileResult, getFile(this._oldFileContent, this._oldFileLang, this._oldFileName)
|
|
1848
|
+
__classPrivateFieldSet(this, _DiffFile_oldFileResult, getFile(this._oldFileContent, this._oldFileLang, this._oldFileName));
|
|
1849
|
+
this.fileLineLength = Math.max(this.fileLineLength, __classPrivateFieldGet(this, _DiffFile_oldFileResult, "f").maxLineNumber);
|
|
1847
1850
|
}
|
|
1848
1851
|
if (this._newFileContent) {
|
|
1849
|
-
__classPrivateFieldSet(this, _DiffFile_newFileResult, getFile(this._newFileContent, this._newFileLang, this._newFileName)
|
|
1852
|
+
__classPrivateFieldSet(this, _DiffFile_newFileResult, getFile(this._newFileContent, this._newFileLang, this._newFileName));
|
|
1853
|
+
this.fileLineLength = Math.max(this.fileLineLength, __classPrivateFieldGet(this, _DiffFile_newFileResult, "f").maxLineNumber);
|
|
1850
1854
|
}
|
|
1851
1855
|
}, _DiffFile_composeRaw = function _DiffFile_composeRaw() {
|
|
1852
1856
|
var _a, _b, _c, _d;
|
|
1853
1857
|
(_a = __classPrivateFieldGet(this, _DiffFile_oldFileResult, "f")) === null || _a === void 0 ? void 0 : _a.doRaw();
|
|
1854
|
-
__classPrivateFieldSet(this, _DiffFile_oldFileLines, (_b = __classPrivateFieldGet(this, _DiffFile_oldFileResult, "f")) === null || _b === void 0 ? void 0 : _b.rawFile
|
|
1858
|
+
__classPrivateFieldSet(this, _DiffFile_oldFileLines, (_b = __classPrivateFieldGet(this, _DiffFile_oldFileResult, "f")) === null || _b === void 0 ? void 0 : _b.rawFile);
|
|
1855
1859
|
(_c = __classPrivateFieldGet(this, _DiffFile_newFileResult, "f")) === null || _c === void 0 ? void 0 : _c.doRaw();
|
|
1856
|
-
__classPrivateFieldSet(this, _DiffFile_newFileLines, (_d = __classPrivateFieldGet(this, _DiffFile_newFileResult, "f")) === null || _d === void 0 ? void 0 : _d.rawFile
|
|
1860
|
+
__classPrivateFieldSet(this, _DiffFile_newFileLines, (_d = __classPrivateFieldGet(this, _DiffFile_newFileResult, "f")) === null || _d === void 0 ? void 0 : _d.rawFile);
|
|
1857
1861
|
}, _DiffFile_composeFile = function _DiffFile_composeFile() {
|
|
1858
1862
|
if (this._oldFileContent && this._newFileContent)
|
|
1859
1863
|
return;
|
|
@@ -1895,12 +1899,13 @@ _DiffFile_oldFileResult = new WeakMap(), _DiffFile_newFileResult = new WeakMap()
|
|
|
1895
1899
|
return;
|
|
1896
1900
|
this._oldFileContent = oldFileContent;
|
|
1897
1901
|
this._newFileContent = newFileContent;
|
|
1898
|
-
__classPrivateFieldSet(this, _DiffFile_oldFileResult, getFile(this._oldFileContent, this._oldFileLang, this._oldFileName)
|
|
1899
|
-
__classPrivateFieldSet(this, _DiffFile_newFileResult, getFile(this._newFileContent, this._newFileLang, this._newFileName)
|
|
1900
|
-
__classPrivateFieldSet(this, _DiffFile_oldFilePlaceholderLines, oldFilePlaceholderLines
|
|
1901
|
-
__classPrivateFieldSet(this, _DiffFile_newFilePlaceholderLines, newFilePlaceholderLines
|
|
1902
|
+
__classPrivateFieldSet(this, _DiffFile_oldFileResult, getFile(this._oldFileContent, this._oldFileLang, this._oldFileName));
|
|
1903
|
+
__classPrivateFieldSet(this, _DiffFile_newFileResult, getFile(this._newFileContent, this._newFileLang, this._newFileName));
|
|
1904
|
+
__classPrivateFieldSet(this, _DiffFile_oldFilePlaceholderLines, oldFilePlaceholderLines);
|
|
1905
|
+
__classPrivateFieldSet(this, _DiffFile_newFilePlaceholderLines, newFilePlaceholderLines);
|
|
1906
|
+
this.fileLineLength = Math.max(this.fileLineLength, __classPrivateFieldGet(this, _DiffFile_oldFileResult, "f").maxLineNumber, __classPrivateFieldGet(this, _DiffFile_newFileResult, "f").maxLineNumber);
|
|
1902
1907
|
// all of the file just compose by diff, so we can not do the expand action
|
|
1903
|
-
__classPrivateFieldSet(this, _DiffFile_composeByDiff, true
|
|
1908
|
+
__classPrivateFieldSet(this, _DiffFile_composeByDiff, true);
|
|
1904
1909
|
}
|
|
1905
1910
|
else if (__classPrivateFieldGet(this, _DiffFile_oldFileResult, "f")) {
|
|
1906
1911
|
let newLineNumber = 1;
|
|
@@ -1927,7 +1932,8 @@ _DiffFile_oldFileResult = new WeakMap(), _DiffFile_newFileResult = new WeakMap()
|
|
|
1927
1932
|
if (!hasSymbolChanged && newFileContent === this._oldFileContent)
|
|
1928
1933
|
return;
|
|
1929
1934
|
this._newFileContent = newFileContent;
|
|
1930
|
-
__classPrivateFieldSet(this, _DiffFile_newFileResult, getFile(this._newFileContent, this._newFileLang, this._newFileName)
|
|
1935
|
+
__classPrivateFieldSet(this, _DiffFile_newFileResult, getFile(this._newFileContent, this._newFileLang, this._newFileName));
|
|
1936
|
+
this.fileLineLength = Math.max(this.fileLineLength, __classPrivateFieldGet(this, _DiffFile_newFileResult, "f").maxLineNumber);
|
|
1931
1937
|
}
|
|
1932
1938
|
else if (__classPrivateFieldGet(this, _DiffFile_newFileResult, "f")) {
|
|
1933
1939
|
let oldLineNumber = 1;
|
|
@@ -1954,7 +1960,8 @@ _DiffFile_oldFileResult = new WeakMap(), _DiffFile_newFileResult = new WeakMap()
|
|
|
1954
1960
|
if (!hasSymbolChanged && oldFileContent === this._newFileContent)
|
|
1955
1961
|
return;
|
|
1956
1962
|
this._oldFileContent = oldFileContent;
|
|
1957
|
-
__classPrivateFieldSet(this, _DiffFile_oldFileResult, getFile(this._oldFileContent, this._oldFileLang, this._oldFileName)
|
|
1963
|
+
__classPrivateFieldSet(this, _DiffFile_oldFileResult, getFile(this._oldFileContent, this._oldFileLang, this._oldFileName));
|
|
1964
|
+
this.fileLineLength = Math.max(this.fileLineLength, __classPrivateFieldGet(this, _DiffFile_oldFileResult, "f").maxLineNumber);
|
|
1958
1965
|
}
|
|
1959
1966
|
__classPrivateFieldGet(this, _DiffFile_instances, "m", _DiffFile_composeRaw).call(this);
|
|
1960
1967
|
}, _DiffFile_composeDiff = function _DiffFile_composeDiff() {
|
|
@@ -1982,7 +1989,7 @@ _DiffFile_oldFileResult = new WeakMap(), _DiffFile_newFileResult = new WeakMap()
|
|
|
1982
1989
|
getDiffRange(additions, deletions);
|
|
1983
1990
|
});
|
|
1984
1991
|
});
|
|
1985
|
-
__classPrivateFieldSet(this, _DiffFile_diffLines, []
|
|
1992
|
+
__classPrivateFieldSet(this, _DiffFile_diffLines, []);
|
|
1986
1993
|
const tmp = [];
|
|
1987
1994
|
__classPrivateFieldGet(this, _DiffFile_diffListResults, "f").forEach((item) => {
|
|
1988
1995
|
item.hunks.forEach((_item) => {
|
|
@@ -2012,7 +2019,7 @@ _DiffFile_oldFileResult = new WeakMap(), _DiffFile_newFileResult = new WeakMap()
|
|
|
2012
2019
|
};
|
|
2013
2020
|
}
|
|
2014
2021
|
return typedI;
|
|
2015
|
-
})
|
|
2022
|
+
}));
|
|
2016
2023
|
// this.#diffLines = this.#diffListResults
|
|
2017
2024
|
// .reduce<DiffLine[]>((p, c) => p.concat(...c.hunks.reduce<DiffLine[]>((_p, _c) => _p.concat(..._c.lines), [])), [])
|
|
2018
2025
|
// .map<DiffLineItem>((i, index) => {
|
|
@@ -2034,14 +2041,14 @@ _DiffFile_oldFileResult = new WeakMap(), _DiffFile_newFileResult = new WeakMap()
|
|
|
2034
2041
|
// }
|
|
2035
2042
|
// return typedI;
|
|
2036
2043
|
// });
|
|
2037
|
-
__classPrivateFieldSet(this, _DiffFile_oldFileDiffLines, {}
|
|
2044
|
+
__classPrivateFieldSet(this, _DiffFile_oldFileDiffLines, {});
|
|
2038
2045
|
__classPrivateFieldGet(this, _DiffFile_diffLines, "f").forEach((item) => {
|
|
2039
2046
|
if (item.oldLineNumber) {
|
|
2040
2047
|
this.diffLineLength = Math.max(this.diffLineLength, item.oldLineNumber);
|
|
2041
2048
|
__classPrivateFieldGet(this, _DiffFile_oldFileDiffLines, "f")[item.oldLineNumber] = item;
|
|
2042
2049
|
}
|
|
2043
2050
|
});
|
|
2044
|
-
__classPrivateFieldSet(this, _DiffFile_newFileDiffLines, {}
|
|
2051
|
+
__classPrivateFieldSet(this, _DiffFile_newFileDiffLines, {});
|
|
2045
2052
|
__classPrivateFieldGet(this, _DiffFile_diffLines, "f").forEach((item) => {
|
|
2046
2053
|
if (item.newLineNumber) {
|
|
2047
2054
|
this.diffLineLength = Math.max(this.diffLineLength, item.newLineNumber);
|
|
@@ -2051,9 +2058,9 @@ _DiffFile_oldFileResult = new WeakMap(), _DiffFile_newFileResult = new WeakMap()
|
|
|
2051
2058
|
}, _DiffFile_composeSyntax = function _DiffFile_composeSyntax({ registerHighlighter }) {
|
|
2052
2059
|
var _a, _b, _c, _d;
|
|
2053
2060
|
(_a = __classPrivateFieldGet(this, _DiffFile_oldFileResult, "f")) === null || _a === void 0 ? void 0 : _a.doSyntax({ registerHighlighter });
|
|
2054
|
-
__classPrivateFieldSet(this, _DiffFile_oldFileSyntaxLines, (_b = __classPrivateFieldGet(this, _DiffFile_oldFileResult, "f")) === null || _b === void 0 ? void 0 : _b.syntaxFile
|
|
2061
|
+
__classPrivateFieldSet(this, _DiffFile_oldFileSyntaxLines, (_b = __classPrivateFieldGet(this, _DiffFile_oldFileResult, "f")) === null || _b === void 0 ? void 0 : _b.syntaxFile);
|
|
2055
2062
|
(_c = __classPrivateFieldGet(this, _DiffFile_newFileResult, "f")) === null || _c === void 0 ? void 0 : _c.doSyntax({ registerHighlighter });
|
|
2056
|
-
__classPrivateFieldSet(this, _DiffFile_newFileSyntaxLines, (_d = __classPrivateFieldGet(this, _DiffFile_newFileResult, "f")) === null || _d === void 0 ? void 0 : _d.syntaxFile
|
|
2063
|
+
__classPrivateFieldSet(this, _DiffFile_newFileSyntaxLines, (_d = __classPrivateFieldGet(this, _DiffFile_newFileResult, "f")) === null || _d === void 0 ? void 0 : _d.syntaxFile);
|
|
2057
2064
|
}, _DiffFile_getOldDiffLine = function _DiffFile_getOldDiffLine(lineNumber) {
|
|
2058
2065
|
var _a;
|
|
2059
2066
|
if (!lineNumber)
|
|
@@ -2149,7 +2156,7 @@ const getUnifiedContentLine = (diffFile) => {
|
|
|
2149
2156
|
return lines.filter((line) => line.type === exports.DiffFileLineType.content);
|
|
2150
2157
|
};
|
|
2151
2158
|
|
|
2152
|
-
const versions = "0.0.
|
|
2159
|
+
const versions = "0.0.13";
|
|
2153
2160
|
|
|
2154
2161
|
const useUnmount = (cb, deps) => {
|
|
2155
2162
|
const ref = React.useRef(cb);
|
|
@@ -2826,7 +2833,7 @@ const DiffSplitViewTable = ({ side, diffFile }) => {
|
|
|
2826
2833
|
const DiffSplitViewNormal = React.memo(({ diffFile }) => {
|
|
2827
2834
|
const ref1 = React.useRef(null);
|
|
2828
2835
|
const ref2 = React.useRef(null);
|
|
2829
|
-
const splitLineLength = diffFile.splitLineLength;
|
|
2836
|
+
const splitLineLength = Math.max(diffFile.splitLineLength, diffFile.fileLineLength);
|
|
2830
2837
|
const { useDiffContext } = useDiffViewContext();
|
|
2831
2838
|
const fontSize = useDiffContext(React.useCallback((s) => s.fontSize, []));
|
|
2832
2839
|
shim.useSyncExternalStore(diffFile.subscribe, diffFile.getUpdateCount);
|
|
@@ -3107,7 +3114,7 @@ const Style = ({ useSelector, id, }) => {
|
|
|
3107
3114
|
: ""));
|
|
3108
3115
|
};
|
|
3109
3116
|
const DiffSplitViewWrap = React.memo(({ diffFile }) => {
|
|
3110
|
-
const splitLineLength = diffFile.splitLineLength;
|
|
3117
|
+
const splitLineLength = Math.max(diffFile.splitLineLength, diffFile.fileLineLength);
|
|
3111
3118
|
const { useDiffContext } = useDiffViewContext();
|
|
3112
3119
|
const splitSideInfo = React.useMemo(() => reactivityStore.createStore(() => {
|
|
3113
3120
|
const splitRef = reactivityStore.ref(undefined);
|
|
@@ -3449,7 +3456,7 @@ const DiffUnifiedView = React.memo(({ diffFile }) => {
|
|
|
3449
3456
|
const { setWidget } = useWidget.getReadonlyState();
|
|
3450
3457
|
setWidget({});
|
|
3451
3458
|
}, [diffFile, useWidget]);
|
|
3452
|
-
const unifiedLineLength = diffFile.unifiedLineLength;
|
|
3459
|
+
const unifiedLineLength = Math.max(diffFile.unifiedLineLength, diffFile.fileLineLength);
|
|
3453
3460
|
const _width = useTextWidth({
|
|
3454
3461
|
text: unifiedLineLength.toString(),
|
|
3455
3462
|
font: { fontSize: fontSize + "px", fontFamily: "Menlo, Consolas, monospace" },
|
|
@@ -3592,7 +3599,7 @@ const _InternalDiffView = (props) => {
|
|
|
3592
3599
|
]);
|
|
3593
3600
|
const value = React.useMemo(() => ({ useDiffContext }), [useDiffContext]);
|
|
3594
3601
|
return (React__namespace.createElement(DiffViewContext.Provider, { value: value },
|
|
3595
|
-
React__namespace.createElement("div", { className: "diff-tailwindcss-wrapper", "data-component": "git-diff-view", "data-version": `${"0.0.
|
|
3602
|
+
React__namespace.createElement("div", { className: "diff-tailwindcss-wrapper", "data-component": "git-diff-view", "data-version": `${"0.0.13"}`, "data-highlighter": diffFile._getHighlighterName() },
|
|
3596
3603
|
React__namespace.createElement("div", { className: "diff-style-root", style: {
|
|
3597
3604
|
// @ts-ignore
|
|
3598
3605
|
[diffFontSizeName]: diffViewFontSize + "px",
|
|
@@ -3645,7 +3652,7 @@ const DiffViewWithRef = (props, ref) => {
|
|
|
3645
3652
|
};
|
|
3646
3653
|
const DiffView = React.forwardRef(DiffViewWithRef);
|
|
3647
3654
|
DiffView.displayName = "DiffView";
|
|
3648
|
-
const version = "0.0.
|
|
3655
|
+
const version = "0.0.13";
|
|
3649
3656
|
|
|
3650
3657
|
exports.DefaultDiffExpansionStep = DefaultDiffExpansionStep;
|
|
3651
3658
|
exports.DiffFile = DiffFile;
|