review fix

typescript-eslint · Jun 26, 2022 · a58c221 · a58c221
1 parent bad56e1
commit a58c221
Showing 1 changed file with 15 additions and 16 deletions.
diff --git a/packages/eslint-plugin/src/rules/no-shadow.ts b/packages/eslint-plugin/src/rules/no-shadow.ts
@@ -620,25 +620,24 @@ export default util.createRule<Options, MessageIds>({
           !(options.hoist !== 'all' && isInTdz(variable, shadowed))
         ) {
           const location = getDeclaredLocation(shadowed);
-          const report = location.global
-            ? ({
-                messageId: 'noShadowGlobal',
-                data: {
-                  name: variable.name,
-                },
-              } as const)
-            : ({
-                messageId: 'noShadow',
-                data: {
-                  name: variable.name,
-                  shadowedLine: location.line,
-                  shadowedColumn: location.column,
-                },
-              } as const);
 
           context.report({
             node: variable.identifiers[0],
-            ...report,
+            ...(location.global
+              ? {
+                  messageId: 'noShadowGlobal',
+                  data: {
+                    name: variable.name,
+                  },
+                }
+              : {
+                  messageId: 'noShadow',
+                  data: {
+                    name: variable.name,
+                    shadowedLine: location.line,
+                    shadowedColumn: location.column,
+                  },
+                }),
           });
         }
       }