Skip to content

Commit

Permalink
fix: removed excess logic for when a or b are empty strings
Browse files Browse the repository at this point in the history
  • Loading branch information
joebobmiles committed Nov 10, 2022
1 parent baa3c01 commit 31d93d0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
8 changes: 5 additions & 3 deletions src/diff.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ describe("diff", () =>
});
});

describe.only("diffText", () =>
describe("diffText", () =>
{
it.each([
[ "", "" ],
Expand All @@ -292,13 +292,15 @@ describe.only("diffText", () =>
[ "a", "ab", [ [ "add", 1, "b" ] ] ],
[ "ab", "a", [ [ "delete", 1, undefined ] ] ],
[ "ab", "ac", [ [ "delete", 1, undefined ], [ "add", 1, "c" ] ] ],
[ "ac", "bc", [ [ "delete", 0, undefined ], [ "add", 0, "b" ] ] ]
[ "ac", "bc", [ [ "delete", 0, undefined ], [ "add", 0, "b" ] ] ],
[ "ab", "", [ [ "delete", 0, undefined ], [ "delete", 0, undefined ] ] ],
[ "", "ab", [ [ "add", 0, "a" ], [ "add", 1, "b" ] ] ]
])("Returns a change tuple for sequences that are different", (a, b, diff) =>
{
expect(diffText(a, b)).toStrictEqual(diff);
});

it.only.each([
it.each([
[
"hello",
"goodbye",
Expand Down
10 changes: 4 additions & 6 deletions src/diff.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,15 +133,13 @@ export const diffText = (a: string, b: string): any =>
return undefined;
else if (a.length === 0)
{
return [
[ "add", 0, b ]
];
return b.split("").map((character, index) =>
[ "add", index, character ]);
}
else if (b.length === 0)
{
return [
[ "delete", 0, undefined ]
];
return a.split("").map(() =>
[ "delete", 0, undefined ]);
}
else
{
Expand Down

0 comments on commit 31d93d0

Please sign in to comment.