Fixed FunctionTypeAlias with annotation.

eggnstone · Jul 19, 2024 · a134c44 · a134c44
1 parent ad2e414
commit a134c44
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 1 deletion.
diff --git a/lib/src/Formatters/FunctionTypeAliasFormatter.dart b/lib/src/Formatters/FunctionTypeAliasFormatter.dart
@@ -19,12 +19,13 @@ class FunctionTypeAliasFormatter extends IFormatter
     @override
     void format(AstNode node)
     {
-        const String methodName = 'ForPartsWithExpressionFormatter.format';
+        const String methodName = 'FunctionTypeAliasFormatter.format';
         if (Constants.DEBUG_I_FORMATTER) log('START $methodName(${StringTools.toDisplayString(node, Constants.MAX_DEBUG_LENGTH)})', formatState.logIndent++);
 
         if (node is! FunctionTypeAlias)
             throw FormatException('Not a FunctionTypeAlias: ${node.runtimeType}');
 
+        formatState.acceptList(node.sortedCommentAndAnnotations, astVisitor, '$methodName/node.sortedCommentAndAnnotations');
         formatState.copyEntity(node.typedefKeyword, astVisitor, '$methodName/node.typedefKeyword');
         formatState.copyEntity(node.returnType, astVisitor, '$methodName/node.returnType');
         formatState.copyEntity(node.name, astVisitor, '$methodName/node.name');

diff --git a/test/Formatters/FunctionTypeAliasFormatter_test.dart b/test/Formatters/FunctionTypeAliasFormatter_test.dart
@@ -0,0 +1,34 @@
+import 'package:analyzer/dart/ast/ast.dart';
+import 'package:dart_format/src/Formatters/FunctionTypeAliasFormatter.dart';
+
+import '../TestTools/AstCreator.dart';
+import '../TestTools/TestConfig.dart';
+import '../TestTools/TestGroupConfig.dart';
+import '../TestTools/TestTools.dart';
+import '../TestTools/Visitors/TestVisitor.dart';
+
+void main()
+{
+    TestTools.init();
+
+    final List<TestGroupConfig> testGroupConfigs = <TestGroupConfig>[
+        TestGroupConfig(
+            inputNodeCreator: AstCreator.createFunctionTypeAlias,
+            inputLeading: '',
+            inputMiddle: '@a typedef void f();',
+            inputTrailing: '',
+            name: 'FunctionTypeAliasFormatter @a typedef void f();',
+            astVisitors: <TestVisitor<void>>[
+                TestVisitor<Annotation>(0, '@a'),
+                TestVisitor<NamedType>(11, 'void'),
+                TestVisitor<FormalParameterList>(17, '()')
+            ],
+            testConfigs: <TestConfig>[
+                TestConfig.none(),
+                TestConfig('@a typedef void f();\n')
+            ]
+        )
+    ];
+
+    TestTools.runTestGroupsForFormatter(testGroupConfigs, 'FunctionTypeAliasFormatter', FunctionTypeAliasFormatter.new, StackTrace.current);
+}
diff --git a/test/TestTools/AstCreator.dart b/test/TestTools/AstCreator.dart
@@ -66,6 +66,9 @@ class AstCreator
     static FieldDeclaration createFieldDeclarationInClass(String s)
     => createClassMember(s) as FieldDeclaration;
 
+    static FunctionTypeAlias createFunctionTypeAlias(String s)
+    => createDeclaration(s) as FunctionTypeAlias;
+
     static Expression createInitializerInVariableDeclarationInClass(String s)
     => createVariableDeclarationInClass(s).initializer!;