fix: use preferred loc in error maker (#1073)

Rel1cx · web-flow · commit 8fd19f141d39 · 2025-04-16T04:43:59.000+08:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -31,8 +31,7 @@
     }
   ],
   "eslint.rules.customizations": [
-    { "rule": "@eslint-react/debug/*", "severity": "info" },
-    { "rule": "@eslint-react/hooks-extra/no-unnecessary-use-prefix", "severity": "info" }
+    { "rule": "@eslint-react/debug/*", "severity": "info" }
   ],
   "files.exclude": {
     "**/.zed": true,
diff --git a/apps/website/package.json b/apps/website/package.json
@@ -50,7 +50,7 @@
     "dedent": "^1.5.3",
     "eslint": "^9.24.0",
     "eslint-plugin-de-morgan": "^1.2.1",
-    "eslint-plugin-import-x": "^4.10.3",
+    "eslint-plugin-import-x": "^4.10.5",
     "eslint-plugin-perfectionist": "^4.11.0",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-react-refresh": "^0.4.19",
diff --git a/examples/next-app/.vscode/settings.json b/examples/next-app/.vscode/settings.json
@@ -1,6 +1,5 @@
 {
   "eslint.rules.customizations": [
-    { "rule": "@eslint-react/debug/*", "severity": "info" },
-    { "rule": "@eslint-react/hooks-extra/no-unnecessary-use-prefix", "severity": "info" }
+    { "rule": "@eslint-react/debug/*", "severity": "info" }
   ]
 }
diff --git a/examples/vite-react-dom-app/.vscode/settings.json b/examples/vite-react-dom-app/.vscode/settings.json
@@ -1,6 +1,5 @@
 {
   "eslint.rules.customizations": [
-    { "rule": "@eslint-react/debug/*", "severity": "info" },
-    { "rule": "@eslint-react/hooks-extra/no-unnecessary-use-prefix", "severity": "info" }
+    { "rule": "@eslint-react/debug/*", "severity": "info" }
   ]
 }
diff --git a/examples/vite-react-dom-app/package.json b/examples/vite-react-dom-app/package.json
@@ -23,7 +23,7 @@
     "@tsconfig/vite-react": "^3.4.0",
     "@types/react": "^19.1.2",
     "@types/react-dom": "^19.1.2",
-    "@vitejs/plugin-react": "^4.3.4",
+    "@vitejs/plugin-react": "^4.4.0",
     "eslint": "^9.24.0",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-react-refresh": "^0.4.19",
diff --git a/examples/vite-react-dom-js-app/.vscode/settings.json b/examples/vite-react-dom-js-app/.vscode/settings.json
@@ -1,6 +1,5 @@
 {
   "eslint.rules.customizations": [
-    { "rule": "@eslint-react/debug/*", "severity": "info" },
-    { "rule": "@eslint-react/hooks-extra/no-unnecessary-use-prefix", "severity": "info" }
+    { "rule": "@eslint-react/debug/*", "severity": "info" }
   ]
 }
diff --git a/examples/vite-react-dom-js-app/package.json b/examples/vite-react-dom-js-app/package.json
@@ -20,7 +20,7 @@
     "@eslint/js": "^9.24.0",
     "@types/react": "^19.1.2",
     "@types/react-dom": "^19.1.2",
-    "@vitejs/plugin-react": "^4.3.4",
+    "@vitejs/plugin-react": "^4.4.0",
     "eslint": "^9.24.0",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-react-refresh": "^0.4.19",
diff --git a/examples/vite-react-dom-js-with-babel-eslint-parser-app/.vscode/settings.json b/examples/vite-react-dom-js-with-babel-eslint-parser-app/.vscode/settings.json
@@ -1,6 +1,5 @@
 {
   "eslint.rules.customizations": [
-    { "rule": "@eslint-react/debug/*", "severity": "info" },
-    { "rule": "@eslint-react/hooks-extra/no-unnecessary-use-prefix", "severity": "info" }
+    { "rule": "@eslint-react/debug/*", "severity": "info" }
   ]
 }
diff --git a/examples/vite-react-dom-js-with-babel-eslint-parser-app/package.json b/examples/vite-react-dom-js-with-babel-eslint-parser-app/package.json
@@ -26,7 +26,7 @@
     "@types/babel__preset-env": "~7.10.0",
     "@types/react": "^19.1.2",
     "@types/react-dom": "^19.1.2",
-    "@vitejs/plugin-react": "^4.3.4",
+    "@vitejs/plugin-react": "^4.4.0",
     "eslint": "^9.24.0",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-react-refresh": "^0.4.19",
diff --git a/examples/vite-react-dom-with-ts-blank-eslint-parser-app/.vscode/settings.json b/examples/vite-react-dom-with-ts-blank-eslint-parser-app/.vscode/settings.json
@@ -1,6 +1,5 @@
 {
   "eslint.rules.customizations": [
-    { "rule": "@eslint-react/debug/*", "severity": "info" },
-    { "rule": "@eslint-react/hooks-extra/no-unnecessary-use-prefix", "severity": "info" }
+    { "rule": "@eslint-react/debug/*", "severity": "info" }
   ]
 }
diff --git a/examples/vite-react-dom-with-ts-blank-eslint-parser-app/package.json b/examples/vite-react-dom-with-ts-blank-eslint-parser-app/package.json
@@ -25,7 +25,7 @@
     "@tsconfig/vite-react": "^3.4.0",
     "@types/react": "^19.1.2",
     "@types/react-dom": "^19.1.2",
-    "@vitejs/plugin-react": "^4.3.4",
+    "@vitejs/plugin-react": "^4.4.0",
     "eslint": "^9.24.0",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-react-refresh": "^0.4.19",
diff --git a/package.json b/package.json
@@ -87,7 +87,7 @@
     "tslib": "^2.8.1",
     "tsup": "^8.4.0",
     "tsx": "^4.19.3",
-    "type-fest": "^4.39.1",
+    "type-fest": "^4.40.0",
     "typedoc": "^0.28.2",
     "typedoc-plugin-markdown": "^4.6.2",
     "typedoc-plugin-mdn-links": "^5.0.1",
diff --git a/packages/plugins/eslint-plugin-react-hooks-extra/src/rules/no-unnecessary-use-prefix.ts b/packages/plugins/eslint-plugin-react-hooks-extra/src/rules/no-unnecessary-use-prefix.ts
@@ -64,9 +64,19 @@ export function create(context: RuleContext<MessageID, []>): RuleListener {
         if (containsUseComments(context, node)) {
           continue;
         }
+        if (id != null) {
+          context.report({
+            messageId: "noUnnecessaryUsePrefix",
+            data: {
+              name,
+            },
+            loc: getPreferredLoc(context, id),
+          });
+          continue;
+        }
         context.report({
           messageId: "noUnnecessaryUsePrefix",
-          node: id ?? node,
+          node,
           data: {
             name,
           },
@@ -75,3 +85,18 @@ export function create(context: RuleContext<MessageID, []>): RuleListener {
     },
   };
 }
+
+function getPreferredLoc(context: RuleContext, id: TSESTree.Identifier) {
+  if (AST.isMultiLine(id)) return id.loc;
+  if (!context.sourceCode.getText(id).startsWith("use")) return id.loc;
+  return {
+    end: {
+      column: id.loc.start.column + 3,
+      line: id.loc.start.line,
+    },
+    start: {
+      column: id.loc.start.column,
+      line: id.loc.start.line,
+    },
+  };
+}
diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -55,7 +55,7 @@
     "@tsconfig/node22": "^22.0.1",
     "@types/picomatch": "^4.0.0",
     "tsup": "^8.4.0",
-    "type-fest": "^4.39.1"
+    "type-fest": "^4.40.0"
   },
   "engines": {
     "bun": ">=1.0.15",
diff --git a/packages/utilities/kit/package.json b/packages/utilities/kit/package.json
@@ -51,7 +51,7 @@
     "@local/configs": "workspace:*",
     "@tsconfig/node22": "^22.0.1",
     "tsup": "^8.4.0",
-    "type-fest": "^4.39.1"
+    "type-fest": "^4.40.0"
   },
   "engines": {
     "bun": ">=1.0.15",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"eslint.rules.customizations": [`
`3`		`- { "rule": "@eslint-react/debug/*", "severity": "info" },`
`4`		`- { "rule": "@eslint-react/hooks-extra/no-unnecessary-use-prefix", "severity": "info" }`
	`3`	`+ { "rule": "@eslint-react/debug/*", "severity": "info" }`
`5`	`4`	`]`
`6`	`5`	`}`