diff options
author | Duncan Healy <duncan.healy@gmail.com> | 2019-11-13 17:59:45 +0000 |
---|---|---|
committer | Anna Henningsen <anna@addaleax.net> | 2019-11-28 00:53:55 +0100 |
commit | 80ac428996a98d3e5fa846d011cdc425d2d6a9ad (patch) | |
tree | b17e533ee9970e8e701539e0997be69ddb2353d5 /test/pseudo-tty | |
parent | 988034be6aece7bd103249e18ac7f0a5d3f92545 (diff) | |
download | android-node-v8-80ac428996a98d3e5fa846d011cdc425d2d6a9ad.tar.gz android-node-v8-80ac428996a98d3e5fa846d011cdc425d2d6a9ad.tar.bz2 android-node-v8-80ac428996a98d3e5fa846d011cdc425d2d6a9ad.zip |
tty: truecolor check moved before 256 check
256 color would be return instead of 16m if both env variables were set
* tty: improve color check order highest spec first
* tty: add test for TERM and COLORTERM set
* tty: move COLORTERM check outside TERM closure
* tty: remove extra if check for COLORTERM
Refs: https://github.com/nodejs/node/issues/27609
PR-URL: https://github.com/nodejs/node/pull/30474
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Diffstat (limited to 'test/pseudo-tty')
-rw-r--r-- | test/pseudo-tty/test-tty-color-support.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/pseudo-tty/test-tty-color-support.js b/test/pseudo-tty/test-tty-color-support.js index b2cfc804c3..57ed640d4d 100644 --- a/test/pseudo-tty/test-tty-color-support.js +++ b/test/pseudo-tty/test-tty-color-support.js @@ -71,6 +71,7 @@ const writeStream = new WriteStream(fd); [{ NO_COLOR: '', COLORTERM: '24bit' }, 1], [{ TMUX: '1', FORCE_COLOR: 0 }, 1], [{ NO_COLOR: 'true', FORCE_COLOR: 0, COLORTERM: 'truecolor' }, 1], + [{ TERM: 'xterm-256color', COLORTERM: 'truecolor' }, 24], ].forEach(([env, depth], i) => { const actual = writeStream.getColorDepth(env); assert.strictEqual( |