Merge branch 'main' into block-lang

Author: marekdedic

CHANGELOG.md

@@ -1,5 +1,11 @@
 # eslint-plugin-svelte
 
+## 2.19.2
+
+### Patch Changes
+
+- [#387](https://github.com/ota-meshi/eslint-plugin-svelte/pull/387) [`6422ee8`](https://github.com/ota-meshi/eslint-plugin-svelte/commit/6422ee89fcb5c8cefceda7dfa5b78e411c27f557) Thanks [@ota-meshi](https://github.com/ota-meshi)! - fix: false positive for element in `svelte/no-unused-svelte-ignore`
+
 ## 2.19.1
 
 ### Patch Changes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-svelte",
-  "version": "2.19.1",
+  "version": "2.19.2",
   "description": "ESLint plugin for Svelte using AST",
   "repository": "git+https://github.com/ota-meshi/eslint-plugin-svelte.git",
   "homepage": "https://ota-meshi.github.io/eslint-plugin-svelte",

src/shared/svelte-compile-warns/index.ts

@@ -511,10 +511,30 @@ function processIgnore(
 
   /** Get warning node */
   function getWarningNode(warning: Warning) {
-    const index = getWarningIndex(warning)
-    if (index == null) {
-      return null
+    const indexes = getWarningIndexes(warning)
+    if (indexes.start != null) {
+      const node = getWarningTargetNodeFromIndex(indexes.start)
+      if (node) {
+        return node
+      }
+      if (indexes.end != null) {
+        const center = Math.floor(
+          indexes.start + (indexes.end - indexes.start) / 2,
+        )
+        return getWarningTargetNodeFromIndex(center)
+      }
+    }
+    if (indexes.end != null) {
+      return getWarningTargetNodeFromIndex(indexes.end)
     }
+
+    return null
+  }
+
+  /**
+   * Get warning target node from the given index
+   */
+  function getWarningTargetNodeFromIndex(index: number) {
     let targetNode = sourceCode.getNodeByRangeIndex(index)
     while (targetNode) {
       if (
@@ -535,18 +555,14 @@ function processIgnore(
       }
       targetNode = targetNode.parent || null
     }
-
     return null
   }
 
   /** Get warning index */
-  function getWarningIndex(warning: Warning) {
+  function getWarningIndexes(warning: Warning) {
     const start = warning.start && sourceCode.getIndexFromLoc(warning.start)
     const end = warning.end && sourceCode.getIndexFromLoc(warning.end)
-    if (start != null && end != null) {
-      return Math.floor(start + (end - start) / 2)
-    }
-    return start ?? end
+    return { start, end }
   }
 }
 

tests/fixtures/rules/no-unused-svelte-ignore/valid/element-ignore01-input.svelte

@@ -0,0 +1,4 @@
+<!-- svelte-ignore a11y-no-noninteractive-tabindex -->
+<span tabindex="0">
+  <span class="element" />
+</span>

tests/fixtures/rules/valid-compile/valid/ignore-input.svelte renamed to tests/fixtures/rules/valid-compile/valid/ignore01-input.svelte

@@ -0,0 +1,4 @@
+<!-- svelte-ignore a11y-no-noninteractive-tabindex -->
+<span tabindex="0">
+  <span class="element" />
+</span>