🎨 Format all (cfug#2210)

All works are done by `dart fix --apply` automatically.

analysis_options.yaml

@@ -2,13 +2,38 @@ include: package:lints/recommended.yaml
 
 analyzer:
   errors:
+    always_declare_return_types: error
+    always_put_control_body_on_new_line: warning
+    avoid_renaming_method_parameters: error
+    avoid_void_async: error
+    camel_case_types: error
+    constant_identifier_names: error
     deprecated_member_use_from_same_package: ignore
+    non_constant_identifier_names: error
+    prefer_single_quotes: warning
+    require_trailing_commas: warning
     todo: ignore
 
 linter:
   rules:
+    always_declare_return_types: true
+    always_put_control_body_on_new_line: true
+    avoid_renaming_method_parameters: true
+    avoid_unnecessary_containers: true
     avoid_void_async: true
-    prefer_final_locals: true
+    curly_braces_in_flow_control_structures: true
+    directives_ordering: true
+    library_annotations: false
+    prefer_const_constructors: true
+    prefer_const_constructors_in_immutables: false
+    prefer_final_fields: true
     prefer_final_in_for_each: true
+    prefer_final_locals: true
     prefer_single_quotes: true
+    require_trailing_commas: true
+    sort_constructors_first: true
+    sort_unnamed_constructors_first: true
+    unnecessary_await_in_return: true
+    unnecessary_breaks: true
+    unnecessary_late: true
     unnecessary_parenthesis: true

dio/lib/src/adapter.dart

@@ -3,13 +3,12 @@ import 'dart:typed_data';
 
 import 'package:meta/meta.dart';
 
+import 'adapters/io_adapter.dart'
+    if (dart.library.html) 'adapters/browser_adapter.dart' as adapter;
 import 'headers.dart';
 import 'options.dart';
 import 'redirect_record.dart';
 
-import 'adapters/io_adapter.dart'
-    if (dart.library.html) 'adapters/browser_adapter.dart' as adapter;
-
 /// {@template dio.HttpClientAdapter}
 /// [HttpAdapter] is a bridge between [Dio] and [HttpClient].
 ///

dio/lib/src/adapters/io_adapter.dart

@@ -70,11 +70,13 @@ class IOHttpClientAdapter implements HttpClientAdapter {
         "Can't establish connection after the adapter was closed.",
       );
     }
-    final operation = CancelableOperation.fromFuture(_fetch(
-      options,
-      requestStream,
-      cancelFuture,
-    ));
+    final operation = CancelableOperation.fromFuture(
+      _fetch(
+        options,
+        requestStream,
+        cancelFuture,
+      ),
+    );
     cancelFuture?.whenComplete(() => operation.cancel());
     return operation.value;
   }
@@ -234,7 +236,7 @@ class IOHttpClientAdapter implements HttpClientAdapter {
     if (createHttpClient != null) {
       return createHttpClient!();
     }
-    final client = HttpClient()..idleTimeout = Duration(seconds: 3);
+    final client = HttpClient()..idleTimeout = const Duration(seconds: 3);
     // ignore: deprecated_member_use, deprecated_member_use_from_same_package
     return onHttpClientCreate?.call(client) ?? client;
   }

dio/lib/src/dio.dart

@@ -1,15 +1,14 @@
 import 'dart:async';
 
 import 'adapter.dart';
-import 'dio_mixin.dart';
-import 'options.dart';
-import 'headers.dart';
 import 'cancel_token.dart';
-import 'transformer.dart';
-import 'response.dart';
-
 import 'dio/dio_for_native.dart'
     if (dart.library.html) 'dio/dio_for_browser.dart';
+import 'dio_mixin.dart';
+import 'headers.dart';
+import 'options.dart';
+import 'response.dart';
+import 'transformer.dart';
 
 /// Dio enables you to make HTTP requests easily.
 ///

dio/lib/src/dio/dio_for_native.dart

@@ -2,14 +2,14 @@ import 'dart:async';
 import 'dart:io';
 
 import '../adapter.dart';
+import '../adapters/io_adapter.dart';
 import '../cancel_token.dart';
+import '../dio.dart';
 import '../dio_exception.dart';
 import '../dio_mixin.dart';
-import '../response.dart';
-import '../dio.dart';
 import '../headers.dart';
 import '../options.dart';
-import '../adapters/io_adapter.dart';
+import '../response.dart';
 
 /// Create the [Dio] instance for native platforms.
 Dio createDio([BaseOptions? baseOptions]) => DioForNative(baseOptions);

dio/lib/src/dio_mixin.dart

@@ -14,14 +14,13 @@ import 'form_data.dart';
 import 'headers.dart';
 import 'interceptors/imply_content_type.dart';
 import 'options.dart';
+import 'progress_stream/io_progress_stream.dart'
+    if (dart.library.html) 'progress_stream/browser_progress_stream.dart';
 import 'response.dart';
 import 'response/response_stream_handler.dart';
 import 'transformer.dart';
 import 'transformers/background_transformer.dart';
 
-import 'progress_stream/io_progress_stream.dart'
-    if (dart.library.html) 'progress_stream/browser_progress_stream.dart';
-
 part 'interceptor.dart';
 
 // TODO(EVERYONE): Use `mixin class` when the lower bound of SDK is raised to 3.0.0.

dio/lib/src/headers.dart

@@ -53,8 +53,12 @@ class Headers {
   /// thrown.
   String? value(String name) {
     final arr = this[name];
-    if (arr == null) return null;
-    if (arr.length == 1) return arr.first;
+    if (arr == null) {
+      return null;
+    }
+    if (arr.length == 1) {
+      return arr.first;
+    }
     throw Exception(
       '"$name" header has more than one value, please use Headers[name]',
     );
@@ -64,14 +68,18 @@ class Headers {
   /// [value] added to its list of values.
   void add(String name, String value) {
     final arr = this[name];
-    if (arr == null) return set(name, value);
+    if (arr == null) {
+      return set(name, value);
+    }
     arr.add(value);
   }
 
   /// Sets a header. The header named [name] will have all its values
   /// cleared before the value [value] is added as its value.
   void set(String name, dynamic value) {
-    if (value == null) return;
+    if (value == null) {
+      return;
+    }
     name = name.trim();
     if (value is List) {
       _map[name] = value.map<String>((e) => '$e').toList();
@@ -83,7 +91,9 @@ class Headers {
   /// Removes a specific value for a header name.
   void remove(String name, String value) {
     final arr = this[name];
-    if (arr == null) return;
+    if (arr == null) {
+      return;
+    }
     arr.removeWhere((v) => v == value);
   }
 

dio/lib/src/multipart_file.dart

@@ -1,10 +1,11 @@
 import 'dart:async';
 import 'dart:convert';
+
 import 'package:http_parser/http_parser.dart';
-import 'utils.dart';
 
 import 'multipart_file/io_multipart_file.dart'
     if (dart.library.html) 'multipart_file/browser_multipart_file.dart';
+import 'utils.dart';
 
 /// A file to be uploaded as part of a [MultipartRequest]. This doesn't need to
 /// correspond to a physical file.

dio/lib/src/options.dart

@@ -304,7 +304,9 @@ class Options {
   }) {
     final query = <String, dynamic>{};
     query.addAll(baseOpt.queryParameters);
-    if (queryParameters != null) query.addAll(queryParameters);
+    if (queryParameters != null) {
+      query.addAll(queryParameters);
+    }
 
     final headers = caseInsensitiveKeyMap(baseOpt.headers);
     if (this.headers != null) {

dio/lib/src/transformer.dart

@@ -36,7 +36,9 @@ abstract class Transformer {
     return encodeMap(
       map,
       (key, value) {
-        if (value == null) return key;
+        if (value == null) {
+          return key;
+        }
         return '$key=${Uri.encodeQueryComponent(value.toString())}';
       },
       listFormat: listFormat,
@@ -51,7 +53,9 @@ abstract class Transformer {
     return encodeMap(
       map,
       (key, value) {
-        if (value == null) return key;
+        if (value == null) {
+          return key;
+        }
         return '$key=$value';
       },
       listFormat: listFormat,
@@ -61,7 +65,9 @@ abstract class Transformer {
 
   /// See https://mimesniff.spec.whatwg.org/#json-mime-type.
   static bool isJsonMimeType(String? contentType) {
-    if (contentType == null) return false;
+    if (contentType == null) {
+      return false;
+    }
     final mediaType = MediaType.parse(contentType);
     return mediaType.mimeType == 'application/json' ||
         mediaType.mimeType == 'text/json' ||

dio/lib/src/transformers/sync_transformer.dart

@@ -78,7 +78,7 @@ class SyncTransformer extends Transformer {
       final decodeResponse = options.responseDecoder!(
         responseBytes,
         options,
-        responseBody..stream = Stream.empty(),
+        responseBody..stream = const Stream.empty(),
       );
 
       if (decodeResponse is Future) {

dio/lib/src/utils.dart

@@ -35,7 +35,9 @@ Future writeStreamToSink(Stream stream, EventSink sink) {
 /// [charset] is null or if no [Encoding] was found that corresponds to
 /// [charset].
 Encoding encodingForCharset(String? charset, [Encoding fallback = latin1]) {
-  if (charset == null) return fallback;
+  if (charset == null) {
+    return fallback;
+  }
   final encoding = Encoding.getByName(charset);
   return encoding ?? fallback;
 }
@@ -145,7 +147,9 @@ Map<String, V> caseInsensitiveKeyMap<V>([Map<String, V>? value]) {
     equals: (key1, key2) => key1.toLowerCase() == key2.toLowerCase(),
     hashCode: (key) => key.toLowerCase().hashCode,
   );
-  if (value != null && value.isNotEmpty) map.addAll(value);
+  if (value != null && value.isNotEmpty) {
+    map.addAll(value);
+  }
   return map;
 }
 

dio/test/browser_test.dart

@@ -10,7 +10,7 @@ void main() {
     final browserAdapter = BrowserHttpClientAdapter(withCredentials: true);
     final opts = RequestOptions();
     final testStream = Stream<Uint8List>.periodic(
-      Duration(seconds: 1),
+      const Duration(seconds: 1),
       (x) => Uint8List(x),
     );
     final cancelFuture = opts.cancelToken?.whenCancel;

dio/test/dio_mixin_test.dart

@@ -25,7 +25,7 @@ void main() {
   test('throws UnimplementedError when calling download', () {
     expectLater(
       () => _TestDioMixin().download('a', 'b'),
-      throwsA(TypeMatcher<UnimplementedError>()),
+      throwsA(const TypeMatcher<UnimplementedError>()),
     );
   });
 }

dio/test/encoding_test.dart

@@ -10,9 +10,9 @@ void main() {
         'd': 8,
         'e': {
           'a': 5,
-          'b': [66, 8]
-        }
-      }
+          'b': [66, 8],
+        },
+      },
     };
     test('default ', () {
       // a=你好&b=5&b=6&c[d]=8&c[e][a]=5&c[e][b]=66&c[e][b]=8
@@ -76,18 +76,18 @@ void main() {
         Transformer.urlEncodeMap(
           {
             'a': '你好',
-            'b': ListParam<int>([5, 6], ListFormat.pipes),
+            'b': const ListParam<int>([5, 6], ListFormat.pipes),
             'c': {
               'd': 8,
               'e': {
                 'a': 5,
-                'b': ListParam<String>(['foo', 'bar'], ListFormat.csv),
-                'c': ListParam<String>(['foo', 'bar'], ListFormat.ssv),
-                'd': ListParam<String>(['foo', 'bar'], ListFormat.multi),
-                'e': ListParam<String>(['foo', 'bar'], ListFormat.tsv),
+                'b': const ListParam<String>(['foo', 'bar'], ListFormat.csv),
+                'c': const ListParam<String>(['foo', 'bar'], ListFormat.ssv),
+                'd': const ListParam<String>(['foo', 'bar'], ListFormat.multi),
+                'e': const ListParam<String>(['foo', 'bar'], ListFormat.tsv),
                 'f': [
                   'foo',
-                  'bar'
+                  'bar',
                 ], // this uses ListFormat.multiCompatible set below
               },
             },
@@ -103,7 +103,7 @@ void main() {
     test(ListFormat.csv, () {
       expect(
         Transformer.urlEncodeQueryMap({
-          'foo': ListParam(['1', '%', '\$'], ListFormat.csv)
+          'foo': const ListParam(['1', '%', '\$'], ListFormat.csv),
         }),
         'foo=1,%25,%24',
       );
@@ -114,32 +114,32 @@ void main() {
         Transformer.urlEncodeQueryMap(
           {
             'a': '你好',
-            'b': ListParam<int>([5, 6], ListFormat.pipes),
+            'b': const ListParam<int>([5, 6], ListFormat.pipes),
             'c': {
               'd': 8,
               'e': {
                 'a': 5,
-                'b': ListParam<Object>(
+                'b': const ListParam<Object>(
                   ['foo', 'bar', 1, 2.2],
                   ListFormat.csv,
                 ),
-                'c': ListParam<Object>(
+                'c': const ListParam<Object>(
                   ['foo', 'bar', 1, 2.2],
                   ListFormat.ssv,
                 ),
-                'd': ListParam<Object>(
+                'd': const ListParam<Object>(
                   ['foo', 'bar', 1, 2.2],
                   ListFormat.multi,
                 ),
-                'e': ListParam<Object>(
+                'e': const ListParam<Object>(
                   ['foo', 'bar', 1, 2.2],
                   ListFormat.tsv,
                 ),
                 'f': [
                   'foo',
                   'bar',
                   1,
-                  2.2
+                  2.2,
                 ], // this uses ListFormat.multiCompatible set below
               },
             },