Extract and reuse EnclosingExecutableContext.displayName

Change-Id: If411305b7484e59b234366b656d07d2235e6513d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/151305
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

pkg/analyzer/lib/src/error/return_type_verifier.dart

@@ -140,36 +140,29 @@ class ReturnTypeVerifier {
     var S = getStaticType(expression);
 
     void reportTypeError() {
-      String displayName = enclosingExecutable.element.displayName;
-      if (enclosingExecutable.isConstructor) {
-        var constructor = enclosingExecutable.element as ConstructorElement;
-        var className = constructor.enclosingElement.displayName;
-        var constructorBaseName = constructor.displayName;
-        var constructorName = constructorBaseName.isEmpty
-            ? className
-            : '$className.$constructorBaseName';
-        _errorReporter.reportErrorForNode(
-          StaticTypeWarningCode.RETURN_OF_INVALID_TYPE_FROM_CONSTRUCTOR,
-          expression,
-          [S, T, constructorName],
-        );
-      } else if (displayName.isEmpty) {
+      if (enclosingExecutable.isClosure) {
         _errorReporter.reportErrorForNode(
           StaticTypeWarningCode.RETURN_OF_INVALID_TYPE_FROM_CLOSURE,
           expression,
           [S, T],
         );
-      } else if (enclosingExecutable.isMethod) {
+      } else if (enclosingExecutable.isConstructor) {
         _errorReporter.reportErrorForNode(
-          StaticTypeWarningCode.RETURN_OF_INVALID_TYPE_FROM_METHOD,
+          StaticTypeWarningCode.RETURN_OF_INVALID_TYPE_FROM_CONSTRUCTOR,
           expression,
-          [S, T, displayName],
+          [S, T, enclosingExecutable.displayName],
         );
-      } else {
+      } else if (enclosingExecutable.isFunction) {
         _errorReporter.reportErrorForNode(
           StaticTypeWarningCode.RETURN_OF_INVALID_TYPE_FROM_FUNCTION,
           expression,
-          [S, T, displayName],
+          [S, T, enclosingExecutable.displayName],
+        );
+      } else if (enclosingExecutable.isMethod) {
+        _errorReporter.reportErrorForNode(
+          StaticTypeWarningCode.RETURN_OF_INVALID_TYPE_FROM_METHOD,
+          expression,
+          [S, T, enclosingExecutable.displayName],
         );
       }
     }
@@ -248,36 +241,29 @@ class ReturnTypeVerifier {
     var S = getStaticType(expression);
 
     void reportTypeError() {
-      String displayName = enclosingExecutable.element.displayName;
-      if (enclosingExecutable.isConstructor) {
-        var constructor = enclosingExecutable.element as ConstructorElement;
-        var className = constructor.enclosingElement.displayName;
-        var constructorBaseName = constructor.displayName;
-        var constructorName = constructorBaseName.isEmpty
-            ? className
-            : '$className.$constructorBaseName';
-        _errorReporter.reportErrorForNode(
-          StaticTypeWarningCode.RETURN_OF_INVALID_TYPE_FROM_CONSTRUCTOR,
-          expression,
-          [S, T, constructorName],
-        );
-      } else if (displayName.isEmpty) {
+      if (enclosingExecutable.isClosure) {
         _errorReporter.reportErrorForNode(
           StaticTypeWarningCode.RETURN_OF_INVALID_TYPE_FROM_CLOSURE,
           expression,
           [S, T],
         );
-      } else if (enclosingExecutable.isMethod) {
+      } else if (enclosingExecutable.isConstructor) {
         _errorReporter.reportErrorForNode(
-          StaticTypeWarningCode.RETURN_OF_INVALID_TYPE_FROM_METHOD,
+          StaticTypeWarningCode.RETURN_OF_INVALID_TYPE_FROM_CONSTRUCTOR,
           expression,
-          [S, T, displayName],
+          [S, T, enclosingExecutable.displayName],
         );
-      } else {
+      } else if (enclosingExecutable.isFunction) {
         _errorReporter.reportErrorForNode(
           StaticTypeWarningCode.RETURN_OF_INVALID_TYPE_FROM_FUNCTION,
           expression,
-          [S, T, displayName],
+          [S, T, enclosingExecutable.displayName],
+        );
+      } else if (enclosingExecutable.isMethod) {
+        _errorReporter.reportErrorForNode(
+          StaticTypeWarningCode.RETURN_OF_INVALID_TYPE_FROM_METHOD,
+          expression,
+          [S, T, enclosingExecutable.displayName],
         );
       }
     }

pkg/analyzer/lib/src/generated/error_verifier.dart

@@ -71,8 +71,32 @@ class EnclosingExecutableContext {
 
   EnclosingExecutableContext.empty() : this(null);
 
+  String get displayName {
+    var element = this.element;
+    if (element is ConstructorElement) {
+      var className = element.enclosingElement.displayName;
+      var constructorName = element.displayName;
+      return constructorName.isEmpty
+          ? className
+          : '$className.$constructorName';
+    } else {
+      return element.displayName;
+    }
+  }
+
+  bool get isClosure {
+    return element is FunctionElement && element.displayName.isEmpty;
+  }
+
   bool get isConstructor => element is ConstructorElement;
 
+  bool get isFunction {
+    if (element is FunctionElement) {
+      return element.displayName.isNotEmpty;
+    }
+    return element is PropertyAccessorElement;
+  }
+
   bool get isMethod => element is MethodElement;
 
   bool get isSynchronous => !isAsynchronous;