fix: francoismassart#152

acewf · Aug 12, 2022 · 47396be · 47396be
1 parent 7fdbbdb
commit 47396be
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 3,549 deletions.
diff --git a/lib/rules/no-contradicting-classname.js b/lib/rules/no-contradicting-classname.js
@@ -89,13 +89,18 @@ module.exports = {
       classNames = sorted.filter((slot) => slot.length > 1);
 
       // Sorts each groups' classnames
+      const arbitraryValues = String.raw`(\[(.*${mergedConfig.separator}))`
+      const arbitraryValuesOr = String.raw`(\[(.*${mergedConfig.separator}))|(^((?!:).)*$)`
+      const arbitraryRegex = new RegExp(arbitraryValues);
+
       classNames.forEach((slot) => {
         const variants = [];
         slot.forEach((cls) => {
-          const start = cls.lastIndexOf(mergedConfig.separator) + 1;
+          const arbiratySeparator = arbitraryRegex.test(cls);
+          const start = arbiratySeparator? 0 : cls.lastIndexOf(mergedConfig.separator) + 1;
           const prefix = cls.substr(0, start);
           const name = cls.substr(start);
-          const rePrefix = prefix === '' ? '((?!:).)*$' : prefix;
+          const rePrefix = prefix === '' ? arbitraryValuesOr : '^' + prefix;
           const idx = variants.findIndex((v) => v.prefix === rePrefix);
           if (idx === -1) {
             variants.push({
@@ -109,7 +114,7 @@ module.exports = {
         const troubles = variants.filter((v) => v.name.length > 1);
         if (troubles.length) {
           troubles.forEach((issue) => {
-            const re = new RegExp('^' + issue.prefix);
+            const re = new RegExp(issue.prefix);
             const conflicting = slot.filter((c) => re.test(c));
             context.report({
               node: node,