Preserve all formatter options (dart-lang#1456)

Author: isoos

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.22.21
+
+- Preserve all `formatter` settings in `analysis_options.yaml` when doing `dart format`.
+
 ## 0.22.20
 
 - Reduced minimum description length to 50 characters.

lib/src/analysis_options.dart

@@ -110,12 +110,9 @@ String updatePassthroughOptions({
 
   final origFormatter = origMap['formatter'];
   if (origFormatter is Map) {
-    final pageWidth = origFormatter['page_width'];
-    if (pageWidth is int) {
-      final customFormatter =
-          customMap.putIfAbsent('formatter', () => <String, Object?>{}) as Map;
-      customFormatter['page_width'] = pageWidth;
-    }
+    final customFormatter =
+        customMap.putIfAbsent('formatter', () => <String, dynamic>{}) as Map;
+    customFormatter.addAll(origFormatter.cast<String, dynamic>());
   }
 
   return json.encode(customMap);

lib/src/version.dart

@@ -1,6 +1,6 @@
 name: pana
 description: PAckage aNAlyzer - produce a report summarizing the health and quality of a Dart package.
-version: 0.22.20
+version: 0.22.21
 repository: https://github.com/dart-lang/pana
 topics:
   - tool

pubspec.yaml

@@ -39,6 +39,7 @@ analyzer:
 formatter:
   unknown_key: true
   page_width: 123
+  trailing_commas: preserve
 ''', custom: '');
     expect(json.decode(content), {
       'analyzer': {
@@ -50,7 +51,9 @@ formatter:
         ],
       },
       'formatter': {
+        'unknown_key': true,
         'page_width': 123,
+        'trailing_commas': 'preserve',
       },
     });
   });