Skip to content

Add support for "surrogate pairs" in unmatched characters #3

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for "surrogate pairs" in unmatched characters #3

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
14 changes: 5 additions & 9 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ const getStringTruncatedWidth = ( input: string, truncationOptions: TruncationOp
let truncationEnabled = false;
let truncationIndex = length;
let truncationLimit = Math.max ( 0, LIMIT - ELLIPSIS_WIDTH );
let unmatchedStart = 0;
let unmatchedEnd = 0;
let width = 0;
let widthExtra = 0;

Expand All @@ -64,9 +62,9 @@ const getStringTruncatedWidth = ( input: string, truncationOptions: TruncationOp

/* UNMATCHED */

if ( ( unmatchedEnd > unmatchedStart ) || ( index >= length && index > indexPrev ) ) {
if ( index > indexPrev ) {

const unmatched = input.slice ( unmatchedStart, unmatchedEnd ) || input.slice ( indexPrev, index );
const unmatched = input.slice ( indexPrev, index );

lengthExtra = 0;

Expand All @@ -83,7 +81,7 @@ const getStringTruncatedWidth = ( input: string, truncationOptions: TruncationOp
}

if ( ( width + widthExtra ) > truncationLimit ) {
truncationIndex = Math.min ( truncationIndex, Math.max ( unmatchedStart, indexPrev ) + lengthExtra );
truncationIndex = Math.min ( truncationIndex, indexPrev + lengthExtra );
}

if ( ( width + widthExtra ) > LIMIT ) {
Expand All @@ -96,7 +94,7 @@ const getStringTruncatedWidth = ( input: string, truncationOptions: TruncationOp

}

unmatchedStart = unmatchedEnd = 0;
indexPrev = index;

}

Expand Down Expand Up @@ -129,8 +127,6 @@ const getStringTruncatedWidth = ( input: string, truncationOptions: TruncationOp
}

width += widthExtra;
unmatchedStart = indexPrev;
unmatchedEnd = index;
index = indexPrev = BLOCK_RE.lastIndex;

continue outer;
Expand All @@ -141,7 +137,7 @@ const getStringTruncatedWidth = ( input: string, truncationOptions: TruncationOp

/* UNMATCHED INDEX */

index += 1;
index += ( input.codePointAt(index) || 0 ) > 0xffff ? 2 : 1;

}

Expand Down
12 changes: 12 additions & 0 deletions test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,18 @@ describe ( 'Fast String Width', () => {

});

it( 'supports "surrogate pairs" in unmatched characters', (t) => {

t.is(getTruncated("██ █", { limit: 4 }), "██ █");
t.is(getTruncated("██ █", { limit: 3 }), "██ ");
t.is(getTruncated("██ █", { limit: 2 }), "██");

t.is(getTruncated("██ █", { limit: 4, ellipsis: "…" }), "██ █");
t.is(getTruncated("██ █", { limit: 3, ellipsis: "…" }), "██…");
t.is(getTruncated("██ █", { limit: 2, ellipsis: "…" }), "█…");

});

});

});