Skip to content

fix: exclude wide characters that would exceed endColumn #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
RyogaK wants to merge 1 commit into from
Closed

fix: exclude wide characters that would exceed endColumn #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,10 @@ export default function sliceAnsi(string, start, end) {
let include = false;

for (const [tokenIndex, token] of tokens.entries()) {
let isPastEnd = end !== undefined && position >= end;
let isPastEnd = end !== undefined && (
position >= end
|| (token.type === 'character' && !token.isGraphemeContinuation && position + token.visibleWidth > end)
);
if (
isPastEnd
&& token.type !== 'character'
Expand Down
23 changes: 20 additions & 3 deletions test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,8 @@ test('supports fullwidth characters', t => {
});

test('supports unicode surrogate pairs', t => {
t.is(sliceAnsi('a\uD83C\uDE00BC', 0, 2), 'a\uD83C\uDE00');
t.is(sliceAnsi('a\uD83C\uDE00BC', 0, 2), 'a');
t.is(sliceAnsi('a\uD83C\uDE00BC', 0, 3), 'a\uD83C\uDE00');
});

test('does not split grapheme clusters with combining marks', t => {
Expand Down Expand Up @@ -308,15 +309,31 @@ test('does not lose fullwidth characters', t => {
t.is(sliceAnsi('古古test', 0), '古古test');
});

// See https://github.com/chalk/slice-ansi/issues/43
test('does not exceed endColumn for wide characters', t => {
const input = 'あいう';
t.is(sliceAnsi(input, 0, 0), '');
t.is(sliceAnsi(input, 0, 1), '');
t.is(sliceAnsi(input, 0, 2), 'あ');
t.is(sliceAnsi(input, 0, 3), 'あ');
t.is(sliceAnsi(input, 0, 4), 'あい');
t.is(sliceAnsi(input, 0, 5), 'あい');
t.is(sliceAnsi(input, 0, 6), 'あいう');
});

test('does not split regional-indicator flag graphemes', t => {
const input = 'A🇮🇱B';
t.is(sliceAnsi(input, 1, 2), '🇮🇱');
t.is(sliceAnsi(input, 0, 1), 'A');
t.is(sliceAnsi(input, 1, 2), '');
t.is(sliceAnsi(input, 1, 3), '🇮🇱');
t.is(sliceAnsi(input, 2, 3), '');
t.is(sliceAnsi(input, 3, 4), 'B');
});

test('does not split styled regional-indicator flag graphemes', t => {
const input = '\u001B[31m🇮🇱\u001B[39m';
t.is(sliceAnsi(input, 0, 1), input);
t.is(sliceAnsi(input, 0, 1), '');
t.is(sliceAnsi(input, 0, 2), input);
t.is(sliceAnsi(input, 1, 2), '');
});

Expand Down