fix: false positive in quoted-expressions (43081j#209)

jpradelle · Jul 23, 2024 · bdad361 · bdad361
1 parent 406b902
commit bdad361
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/src/rules/quoted-expressions.ts b/src/rules/quoted-expressions.ts
@@ -64,13 +64,16 @@ const rule: Rule.RuleModule = {
               continue;
             }
 
-            const isQuoted =
+            const isQuotedForAlwaysQuote =
+              previousQuasi.value.raw.endsWith('="') ||
+              previousQuasi.value.raw.endsWith("='");
+            const isQuotedForNeverQuote =
               (previousQuasi.value.raw.endsWith('="') &&
                 nextQuasi.value.raw.startsWith('"')) ||
               (previousQuasi.value.raw.endsWith("='") &&
                 nextQuasi.value.raw.startsWith("'"));
 
-            if (alwaysQuote && !isQuoted) {
+            if (alwaysQuote && !isQuotedForAlwaysQuote) {
               context.report({
                 node: expression,
                 messageId: 'alwaysQuote',
@@ -93,7 +96,7 @@ const rule: Rule.RuleModule = {
               });
             }
 
-            if (!alwaysQuote && isQuoted) {
+            if (!alwaysQuote && isQuotedForNeverQuote) {
               context.report({
                 node: expression,
                 messageId: 'neverQuote',

diff --git a/src/test/rules/quoted-expressions_test.ts b/src/test/rules/quoted-expressions_test.ts
@@ -43,6 +43,30 @@ ruleTester.run('quoted-expressions', rule, {
     {
       code: "html`<x-foo attr='${v}'></x-foo>`",
       options: ['always']
+    },
+    {
+      code: 'html`<x-foo attr="${v} bar"></x-foo>`',
+      options: ['always']
+    },
+    {
+      code: 'html`<x-foo attr="foo ${v} bar"></x-foo>`',
+      options: ['always']
+    },
+    {
+      code: 'html`<x-foo attr="foo ${v}${w} bar"></x-foo>`',
+      options: ['always']
+    },
+    {
+      code: 'html`<x-foo attr="foo ${v} bar ${w} baz"></x-foo>`',
+      options: ['always']
+    },
+    {
+      code: 'html`<x-foo attr="${v ? "foo" : "bar"} baz"></x-foo>`',
+      options: ['always']
+    },
+    {
+      code: 'html`<x-foo attr="foo ${v}"></x-foo>`',
+      options: ['always']
     }
   ],