Allow rgb and rgba colour definitions

Gruntfuggly · Oct 5, 2020 · 1e1edf1 · 1e1edf1
1 parent 07f3572
commit 1e1edf1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Add context menu options to toggle badges and item counts
 - Fix counts in tree when hideFromStatusBar is enabled
 - kill ripgrep on deactivate
+- Allow rgb and rgba colour definitions
 
 ## v0.0.182 - 2020-10-03
 

diff --git a/src/utils.js b/src/utils.js
@@ -9,6 +9,7 @@ var config;
 var commentPatterns = require( 'comment-patterns' );
 
 var envRegex = new RegExp( "\\$\\{(.*?)\\}", "g" );
+var rgbRegex = new RegExp( "^rgba?\\((\\d+),\\s*(\\d+),\\s*(\\d+)(?:,\\s*(\\d+(?:\\.\\d+)?))?\\)$", "gi" );
 
 function init( configuration )
 {
@@ -26,6 +27,11 @@ function isHexColour( colour )
     return ( typeof colour === "string" ) && hex.length === withoutHash.length && ( hex.length === 3 || hex.length === 4 || hex.length === 6 || hex.length === 8 ) && !isNaN( parseInt( hex, 16 ) );
 }
 
+function isRgbColour( colour )
+{
+    return colour.match( rgbRegex ) !== null;
+}
+
 function hexToRgba( hex, opacity )
 {
     function toComponent( digits )
@@ -322,6 +328,7 @@ function formatExportPath( template, dateTime )
 
 module.exports.init = init;
 module.exports.isHexColour = isHexColour;
+module.exports.isRgbColour = isRgbColour;
 module.exports.hexToRgba = hexToRgba;
 module.exports.removeBlockComments = removeBlockComments;
 module.exports.removeLineComments = removeLineComments;

diff --git a/test/tests.js b/test/tests.js
@@ -32,6 +32,19 @@ QUnit.test( "utils.isHexColour strips non RGB values", function( assert )
     assert.ok( utils.isHexColour( "ace" ) === true );
 } );
 
+QUnit.test( "utils.isRgbColour", function( assert )
+{
+    assert.ok( utils.isRgbColour( "" ) == false );
+    assert.ok( utils.isRgbColour( "rgb(0,0,0)" ) == true );
+    assert.ok( utils.isRgbColour( "rgba(0,0,0)" ) == true );
+    assert.ok( utils.isRgbColour( "rgb(255,255,255)" ) == true );
+    assert.ok( utils.isRgbColour( "rgb(x,0,0)" ) == false );
+    assert.ok( utils.isRgbColour( "rgba(0,0,0,0.5)" ) == true );
+    assert.ok( utils.isRgbColour( "rgba(0, 0, 0, 0.5)" ) == true );
+    assert.ok( utils.isRgbColour( "rgba(0,0.5,0,0.5)" ) == false );
+    assert.ok( utils.isRgbColour( "rgxba(0,0,0,0.5)" ) == false );
+} );
+
 QUnit.test( "utils.removeBlockComments strips block comments based on filename", function( assert )
 {
     assert.equal( utils.removeBlockComments( "/* a */", "x.cpp" ), " a " );