Re-add special case for FunctionDeclaration visitor to generator.

Bug: #61224

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

Author: fshcheglov

pkg/analyzer/lib/dart/ast/visitor.g.dart

@@ -289,8 +289,12 @@ class GeneralizingAstVisitor<R> implements AstVisitor<R> {
   R? visitFunctionBody(FunctionBody node) => visitNode(node);
 
   @override
-  R? visitFunctionDeclaration(FunctionDeclaration node) =>
-      visitNamedCompilationUnitMember(node);
+  R? visitFunctionDeclaration(FunctionDeclaration node) {
+    if (node.parent is FunctionDeclarationStatement) {
+      return visitNode(node);
+    }
+    return visitNamedCompilationUnitMember(node);
+  }
 
   @override
   R? visitFunctionDeclarationStatement(FunctionDeclarationStatement node) =>

pkg/analyzer/tool/ast/generate.dart

@@ -216,13 +216,27 @@ class GeneralizingAstVisitor<R> implements AstVisitor<R> {
       if (node.isConcrete) {
         out.writeln('@override');
       }
+
+      // TODO(fshcheglov): Remove special case after AST hierarchy is fixed.
+      // https://github.com/dart-lang/sdk/issues/61224
+      if (node.name == 'FunctionDeclaration') {
+        out.writeln(r'''
+R? visitFunctionDeclaration(FunctionDeclaration node) {
+  if (node.parent is FunctionDeclarationStatement) {
+    return visitNode(node);
+  }
+  return visitNamedCompilationUnitMember(node);
+}''');
+        continue;
+      }
+
       if (superNode.element.isAstNodeImplExactly) {
         out.writeln('''
-  R? visit$name($name node) => visitNode(node);
+R? visit$name($name node) => visitNode(node);
 ''');
       } else {
         out.writeln('''
-  R? visit$name($name node) => visit${superNode.name}(node);
+R? visit$name($name node) => visit${superNode.name}(node);
 ''');
       }
     }