From 100504c5858cd00ba345b3b41f71740a34d0187a Mon Sep 17 00:00:00 2001 From: Romain Vigier Date: Fri, 14 Feb 2020 01:18:33 +0100 Subject: [PATCH] Fix Matcha light variant support --- src/variants.js | 4 ++-- tests/Matcha.js | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/variants.js b/src/variants.js index 5780bda..e4e6410 100644 --- a/src/variants.js +++ b/src/variants.js @@ -32,8 +32,8 @@ var Variants = class { variants.night = variants.day.replace(/Layan(-light)?/g, 'Layan-dark'); } else if ( name.includes('Matcha') ) { - variants.day = name.replace(/-dark-/g, '-'); - variants.night = variants.day.replace('Matcha-', 'Matcha-dark-'); + variants.day = name.replace('-dark-', '-'); + variants.night = variants.day.replace(/Matcha(-light)?-/g, 'Matcha-dark-'); } else if ( name.includes('Mojave') ) { variants.day = name.replace('-dark', '-light'); diff --git a/tests/Matcha.js b/tests/Matcha.js index 6f08b84..db0dd85 100644 --- a/tests/Matcha.js +++ b/tests/Matcha.js @@ -15,8 +15,7 @@ const { Variants } = require('./_variants'); t.is(variants.night, `Matcha-dark-${color}`); }); - // TODO: Implement light variant - test.skip(`Matcha-light-${color}`, t => { + test(`Matcha-light-${color}`, t => { const variants = Variants.guess_from(`Matcha-light-${color}`); t.is(variants.day, `Matcha-light-${color}`); t.is(variants.night, `Matcha-dark-${color}`);