From b9e3c063f601aef239edfc0eea423c85a9dcb4ff Mon Sep 17 00:00:00 2001
From: Gilbert Gilb's <gilbsgilbert@gmail.com>
Date: Sat, 23 Feb 2019 17:01:07 +0100
Subject: [PATCH] refactor(eslint-plugin): better namings in
 explicit-function-return-type

---
 .../rules/explicit-function-return-type.ts    | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/packages/eslint-plugin/src/rules/explicit-function-return-type.ts b/packages/eslint-plugin/src/rules/explicit-function-return-type.ts
index 1f080edf340..d767959c29f 100644
--- a/packages/eslint-plugin/src/rules/explicit-function-return-type.ts
+++ b/packages/eslint-plugin/src/rules/explicit-function-return-type.ts
@@ -45,34 +45,36 @@ export default util.createRule<Options, MessageIds>({
   ],
   create(context, [options]) {
     /**
-     * Checks if the parent of a function expression is a constructor.
-     * @param parent The parent of a function expression node
+     * Checks if a node is a constructor.
+     * @param node The node to check
      */
-    function isConstructor(parent: TSESTree.Node): boolean {
+    function isConstructor(node: TSESTree.Node): boolean {
       return (
-        parent.type === AST_NODE_TYPES.MethodDefinition &&
-        parent.kind === 'constructor'
+        node.type === AST_NODE_TYPES.MethodDefinition &&
+        node.kind === 'constructor'
       );
     }
 
     /**
-     * Checks if the parent of a function expression is a setter.
-     * @param parent The parent of a function expression node
+     * Checks if a node is a setter.
+     * @param parent The node to check
      */
-    function isSetter(parent: TSESTree.Node): boolean {
+    function isSetter(node: TSESTree.Node): boolean {
       return (
-        parent.type === AST_NODE_TYPES.MethodDefinition && parent.kind === 'set'
+        node.type === AST_NODE_TYPES.MethodDefinition && node.kind === 'set'
       );
     }
 
     /**
-     * Checks if the parent of a function expression has a type annotation.
-     * @param parent The parent of a function expression node
+     * Checks if a node is a variable declarator with a type annotation.
+     * @param node The node to check
      */
-    function hasTypeAnnotation(parent: TSESTree.Node): boolean {
+    function isVariableDeclaratorWithTypeAnnotation(
+      node: TSESTree.Node,
+    ): boolean {
       return (
-        parent.type === AST_NODE_TYPES.VariableDeclarator &&
-        !!parent.id.typeAnnotation
+        node.type === AST_NODE_TYPES.VariableDeclarator &&
+        !!node.id.typeAnnotation
       );
     }
 
@@ -122,7 +124,7 @@ export default util.createRule<Options, MessageIds>({
       if (
         options.allowTypedFunctionExpressions &&
         node.parent &&
-        hasTypeAnnotation(node.parent)
+        isVariableDeclaratorWithTypeAnnotation(node.parent)
       ) {
         return;
       }