diff options
| author | Myles Borins <myles.borins@gmail.com> | 2017-10-26 22:35:25 -0400 |
|---|---|---|
| committer | Myles Borins <myles.borins@gmail.com> | 2017-10-29 21:32:15 -0400 |
| commit | ace4fe566fc3af4876c7458f983feeb5eae3df26 (patch) | |
| tree | 458d847e9bd56199cd0d8b34cec126c7410fb6ca /deps/npm/node_modules/libnpx/node_modules/yargs/node_modules/string-width/index.js | |
| parent | 64168eb9b43e30e4c0b986c9b29c41be63e85df6 (diff) | |
| download | android-node-v8-ace4fe566fc3af4876c7458f983feeb5eae3df26.tar.gz android-node-v8-ace4fe566fc3af4876c7458f983feeb5eae3df26.tar.bz2 android-node-v8-ace4fe566fc3af4876c7458f983feeb5eae3df26.zip | |
deps: update npm to 5.5.1
Closes: https://github.com/nodejs/node/pull/16280
PR-URL: https://github.com/nodejs/node/pull/16509
Fixes: https://github.com/nodejs/node/issues/14161
Reviewed-By: Daijiro Wachi <daijiro.wachi@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Diffstat (limited to 'deps/npm/node_modules/libnpx/node_modules/yargs/node_modules/string-width/index.js')
| -rw-r--r-- | deps/npm/node_modules/libnpx/node_modules/yargs/node_modules/string-width/index.js | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/deps/npm/node_modules/libnpx/node_modules/yargs/node_modules/string-width/index.js b/deps/npm/node_modules/libnpx/node_modules/yargs/node_modules/string-width/index.js index 1f8a1f1134..bbc49d29b1 100644 --- a/deps/npm/node_modules/libnpx/node_modules/yargs/node_modules/string-width/index.js +++ b/deps/npm/node_modules/libnpx/node_modules/yargs/node_modules/string-width/index.js @@ -7,10 +7,10 @@ module.exports = str => { return 0; } - let width = 0; - str = stripAnsi(str); + let width = 0; + for (let i = 0; i < str.length; i++) { const code = str.codePointAt(i); @@ -19,16 +19,17 @@ module.exports = str => { continue; } + // Ignore combining characters + if (code >= 0x300 && code <= 0x36F) { + continue; + } + // Surrogates - if (code >= 0x10000) { + if (code > 0xFFFF) { i++; } - if (isFullwidthCodePoint(code)) { - width += 2; - } else { - width++; - } + width += isFullwidthCodePoint(code) ? 2 : 1; } return width; |