Skip to content

Commit 2ad27ad

Browse files
committed
refactor: fix lint errors
1 parent 2cc3e59 commit 2ad27ad

File tree

4 files changed

+21
-9
lines changed

4 files changed

+21
-9
lines changed

src/diff/apply.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ export function applyPatch<T>(a: T[], patch: Apply<T>): T[] {
1818

1919
for (let i = 0; i < patch.length; ++i) {
2020
const patchItem = patch[i];
21-
sameStart !== patchItem.oldPos && segments.push(a.slice(sameStart, patchItem.oldPos));
21+
if (sameStart !== patchItem.oldPos) {
22+
segments.push(a.slice(sameStart, patchItem.oldPos));
23+
}
2224
if (patchItem.type === 'add') {
2325
segments.push(patchItem.items);
2426
sameStart = patchItem.oldPos;
@@ -28,7 +30,9 @@ export function applyPatch<T>(a: T[], patch: Apply<T>): T[] {
2830
sameStart = patchItem.oldPos + (<{ length: number }>patchItem).length;
2931
}
3032
}
31-
sameStart !== a.length && segments.push(a.slice(sameStart));
33+
if (sameStart !== a.length) {
34+
segments.push(a.slice(sameStart));
35+
}
3236

3337
return ([] as T[]).concat(...segments);
3438
}

src/diff/lcs.ts

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,19 @@ function getSolution<T, U = T>(
6969
const addFirst =
7070
(startDirect & Direct.vertical ? 1 : 0) + (endDirect & Direct.horizontal ? 1 : 0);
7171
if (removeFirst >= addFirst) {
72-
aStart !== aEnd && elementsChanged('remove', a, aStart, aEnd, b, bStart, bStart);
73-
bStart !== bEnd && elementsChanged('add', a, aEnd, aEnd, b, bStart, bEnd);
72+
if (aStart !== aEnd) {
73+
elementsChanged('remove', a, aStart, aEnd, b, bStart, bStart);
74+
}
75+
if (bStart !== bEnd) {
76+
elementsChanged('add', a, aEnd, aEnd, b, bStart, bEnd);
77+
}
7478
} else {
75-
bStart !== bEnd && elementsChanged('add', a, aStart, aStart, b, bStart, bEnd);
76-
aStart !== aEnd && elementsChanged('remove', a, aStart, aEnd, b, bEnd, bEnd);
79+
if (bStart !== bEnd) {
80+
elementsChanged('add', a, aStart, aStart, b, bStart, bEnd);
81+
}
82+
if (aStart !== aEnd) {
83+
elementsChanged('remove', a, aStart, aEnd, b, bEnd, bEnd);
84+
}
7785
}
7886
return;
7987
}

src/test/apply.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ describe('Apply Patch', () => {
3737

3838
apply_str('', '', [], 'empty');
3939
apply_str('a', '', [remove(0, 0, 'a')], 'remove a');
40-
apply_str('', 'b', [add(0, 0, 'b')]), 'add b';
40+
apply_str('', 'b', [add(0, 0, 'b')], 'add b');
4141
apply_str('abcd', 'e', [remove(0, 0, 'abcd'), add(4, 0, 'e')], 'for abcd-e');
4242
apply_str('abc', 'abc', [], 'same abc');
4343
apply_str(
@@ -129,7 +129,7 @@ describe('Apply Patch', () => {
129129

130130
apply_str('', '', [], 'empty');
131131
apply_str('a', '', [remove(0, 0, 'a')], 'remove a');
132-
apply_str('', 'b', [add(0, 0, 'b')]), 'add b';
132+
apply_str('', 'b', [add(0, 0, 'b')], 'add b');
133133
apply_str('abcd', 'e', [remove(0, 0, 'abcd'), add(4, 0, 'e')], 'for abcd-e');
134134
apply_str('abc', 'abc', [], 'same abc');
135135
apply_str(

src/test/patch.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ describe('Get Patch', () => {
3636

3737
es_str('', '', [], 'empty');
3838
es_str('a', '', [remove(0, 0, 'a')], 'remove a');
39-
es_str('', 'b', [add(0, 0, 'b')]), 'add b';
39+
es_str('', 'b', [add(0, 0, 'b')], 'add b');
4040
es_str('abcd', 'e', [remove(0, 0, 'abcd'), add(4, 0, 'e')], 'for abcd-e');
4141
es_str('abc', 'abc', [], 'same abc');
4242
es_str(

0 commit comments

Comments
 (0)