fix logic

eslint · Feb 18, 2024 · 7bb7e55 · 7bb7e55
1 parent b1cf05f
commit 7bb7e55
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 30 deletions.
diff --git a/lib/rules/no-misleading-character-class.js b/lib/rules/no-misleading-character-class.js
@@ -280,6 +280,9 @@ module.exports = {
              * @see https://github.com/eslint/eslint/pull/17515
              */
             function getNodeReportLocations(matches) {
+                if (!astUtils.isStaticTemplateLiteral(node) && node.type !== "Literal") {
+                    return matches.length ? [node.loc] : [];
+                }
                 return matches.map(chars => {
                     const firstIndex = chars[0].start;
                     const lastIndex = chars.at(-1).end - 1;
@@ -359,12 +362,19 @@ module.exports = {
                 for (const { node: refNode } of tracker.iterateGlobalReferences({
                     RegExp: { [CALL]: true, [CONSTRUCT]: true }
                 })) {
+                    let pattern, flags;
                     const [patternNode, flagsNode] = refNode.arguments;
-                    const pattern = getStringIfConstant(patternNode, scope);
-                    const flags = getStringIfConstant(flagsNode, scope);
 
-                    if (typeof pattern === "string") {
-                        verify(patternNode, pattern, flags || "", fixer => {
+                    if (patternNode.type === "Literal" && patternNode.regex) {
+                        pattern = patternNode.regex.pattern;
+                        flags = flagsNode ? getStringIfConstant(flagsNode, scope) : patternNode.regex.flags;
+                    } else {
+                        pattern = getStringIfConstant(patternNode, scope);
+                        flags = flagsNode ? getStringIfConstant(flagsNode, scope) : "";
+                    }
+
+                    if (typeof pattern === "string" && typeof flags === "string") {
+                        verify(patternNode, pattern, flags, fixer => {
 
                             if (!isValidWithUnicodeFlag(context.languageOptions.ecmaVersion, pattern)) {
                                 return null;

diff --git a/tests/lib/rules/no-misleading-character-class.js b/tests/lib/rules/no-misleading-character-class.js
@@ -40,6 +40,7 @@ ruleTester.run("no-misleading-character-class", rule, {
         "var r = /🇯🇵/",
         "var r = /[JP]/",
         "var r = /👨‍👩‍👦/",
+        "var r = RegExp(/[👍]/u)",
 
         // Ignore solo lead/tail surrogate.
         "var r = /[\\uD83D]/",
@@ -75,6 +76,10 @@ ruleTester.run("no-misleading-character-class", rule, {
         // don't report on templates with expressions
         "var r = RegExp(`${x}[👍]`)",
 
+        // don't report on unknown flags
+        "var r = new RegExp('[🇯🇵]', `${foo}`)",
+        String.raw`var r = new RegExp("[👍]", flags)`,
+
         // ES2024
         { code: "var r = /[👍]/v", languageOptions: { ecmaVersion: 2024 } },
         { code: String.raw`var r = /^[\q{👶🏻}]$/v`, languageOptions: { ecmaVersion: 2024 } },
@@ -636,15 +641,6 @@ ruleTester.run("no-misleading-character-class", rule, {
                 suggestions: null
             }]
         },
-        {
-            code: String.raw`var r = new RegExp("[👍]", flags)`,
-            errors: [{
-                column: 22,
-                endColumn: 24,
-                messageId: "surrogatePairWithoutUFlag",
-                suggestions: null
-            }]
-        },
         {
             code: String.raw`const flags = ""; var r = new RegExp("[👍]", flags)`,
             errors: [{
@@ -1004,23 +1000,6 @@ ruleTester.run("no-misleading-character-class", rule, {
                 }
             ]
         },
-        {
-            code: "var r = new RegExp('[🇯🇵]', `${foo}`)",
-            errors: [
-                {
-                    column: 22,
-                    endColumn: 24,
-                    messageId: "surrogatePairWithoutUFlag",
-                    suggestions: [{ messageId: "suggestUnicodeFlag", output: "var r = new RegExp('[🇯🇵]', `${foo}u`)" }]
-                },
-                {
-                    column: 24,
-                    endColumn: 26,
-                    messageId: "surrogatePairWithoutUFlag",
-                    suggestions: [{ messageId: "suggestUnicodeFlag", output: "var r = new RegExp('[🇯🇵]', `${foo}u`)" }]
-                }
-            ]
-        },
         {
             code: String.raw`var r = new RegExp("[🇯🇵]")`,
             errors: [
@@ -1343,6 +1322,46 @@ ruleTester.run("no-misleading-character-class", rule, {
                 suggestions: null
             }]
         },
+
+        // no granular reports on templates with expressions
+        {
+            code: 'new RegExp(`${"[👍🇯🇵]"}[😊]`);',
+            errors: [{
+                column: 12,
+                endColumn: 31,
+                messageId: "surrogatePairWithoutUFlag",
+                suggestions: [{
+                    messageId: "suggestUnicodeFlag",
+                    output: 'new RegExp(`${"[👍🇯🇵]"}[😊]`, "u");'
+                }]
+            }]
+        },
+
+        // no granular reports on identifiers
+        {
+            code: 'const pattern = "[👍]"; new RegExp(pattern);',
+            errors: [{
+                column: 36,
+                endColumn: 43,
+                messageId: "surrogatePairWithoutUFlag",
+                suggestions: [{
+                    messageId: "suggestUnicodeFlag",
+                    output: 'const pattern = "[👍]"; new RegExp(pattern, "u");'
+                }]
+            }]
+        },
+
+        // second argument in RegExp should override flags in regexp literal
+        {
+            code: "RegExp(/[a👍z]/u, '');",
+            errors: [{
+                column: 11,
+                endColumn: 13,
+                messageId: "surrogatePairWithoutUFlag",
+                suggestions: [{ messageId: "suggestUnicodeFlag", output: "RegExp(/[a👍z]/u, 'u');" }]
+            }]
+        },
+
         {
             code: String.raw`