Merge pull request #71 from primer/mkt/more-css-var-scan-fixes

Fix variable recognition when fallback values present
primer · Oct 29, 2020 · 17bb30d · 17bb30d
2 parents bf6099f + a74c4c9
commit 17bb30d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/__tests__/no-undefined-vars.js b/__tests__/no-undefined-vars.js
@@ -27,6 +27,12 @@ testRule({
       message: messages.rejected('--color-foo'),
       line: 1,
       column: 6
+    },
+    {
+      code: '.x { color: var(--color-bar, #000000); }',
+      message: messages.rejected('--color-bar'),
+      line: 1,
+      column: 6
     }
   ]
 })
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stylelint-config-primer",
-  "version": "9.2.3",
+  "version": "9.2.4",
   "description": "Sharable stylelint config used by GitHub's CSS",
   "homepage": "http://primer.style/css/tools/linting",
   "author": "GitHub, Inc.",

diff --git a/plugins/no-undefined-vars.js b/plugins/no-undefined-vars.js
@@ -14,7 +14,7 @@ const variableDefinitionRegex = /(--[\w|-]*):/g
 
 // Match CSS variable references (e.g var(--color-text-primary))
 // eslint-disable-next-line no-useless-escape
-const variableReferenceRegex = /var\(([^\),]*)\)/g
+const variableReferenceRegex = /var\(([^\),]+)(,.*)?\)/g
 
 module.exports = stylelint.createPlugin(ruleName, (enabled, options = {}) => {
   if (!enabled) {