.github/workflows/test-package.yml

@@ -5,7 +5,7 @@ on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ master ]
+    branches: [ master, bump-2.0.2 ]
   schedule:
     - cron: "0 0 * * 0"
 

CHANGELOG.md

@@ -1,3 +1,14 @@
+# 2.0.2
+
+* Don't unnecessarily split argument lists with `/* */` comments (#837).
+* Return correct exit code from `FormatCommand` when formatting stdin (#1035).
+* Always split cascades with multiple sections (#1006).
+* Don't indent cascades farther than their receiver method chains.
+* Optimize line splitting cascades (#811).
+* Split empty catch blocks with finally clauses (#1029).
+* Split empty catch blocks with catches after them.
+* Allow the latest version of `package:analyzer`.
+
 # 2.0.1
 
 * Support triple-shift `>>>` and `>>>=` operators (#992).

README.md

@@ -55,49 +55,31 @@ greet(String name, {String title = "Captain"}) {
 }
 ```
 
-## Getting dartfmt
+## Using the formatter
 
-Dartfmt is included in the Dart SDK, so most users get it directly from there.
-That has the latest version of dartfmt that was available when the SDK was
-released.
+The formatter is part of the unified [`dart`][] developer tool included in the
+Dart SDK, so most users get it directly from there. That has the latest version
+of the formatter that was available when the SDK was released.
 
-If you want to make sure you are running the latest version of dartfmt, you can
-[globally activate][] the package from the dart_style package on
-pub.dev:
-
-    $ pub global activate dart_style
-    $ dartfmt ...
-
-For this to work, you need to put pub's bin directory on your PATH before the
-Dart SDK directory. Otherwise, the SDK's dartfmt will shadow this one.
-
-[globally activate]: https://dart.dev/tools/pub/cmd/pub-global
-
-If you don't want pub to put `dartfmt` on your PATH, you can run it explicitly:
-
-    $ pub global activate dart_style --no-executables
-    $ pub global run dart_style:format ...
-
-## Using dartfmt
+[`dart`]: https://dart.dev/tools/dart-tool
 
 IDEs and editors that support Dart usually provide easy ways to run the
 formatter. For example, in WebStorm you can right-click a .dart file and then
 choose **Reformat with Dart Style**.
 
-Here's a simple example of using dartfmt on the command line:
+Here's a simple example of using the formatter on the command line:
 
-    $ dartfmt test.dart
+    $ dart format test.dart
 
-This command formats the `test.dart` file and writes the result to standard
-output.
+This command formats the `test.dart` file and writes the result to the
+file.
 
-Dartfmt takes a list of paths, which can point to directories or files. If the
-path is a directory, it processes every `.dart` file in that directory or any of
-its subdirectories. If no file or directory is specified, dartfmt reads from
-standard input.
+`dart format` takes a list of paths, which can point to directories or files. If
+the path is a directory, it processes every `.dart` file in that directory or
+any of its subdirectories.
 
-By default, it formats each file and just prints the resulting code to stdout.
-If you pass `-w`, it overwrites your existing files with the formatted results.
+By default, it formats each file and write the formatting changes to the files.
+If you pass `--output show`, it prints the formatted code to stdout.
 
 You may pass a `-l` option to control the width of the page that it wraps lines
 to fit within, but you're strongly encouraged to keep the default line length of
@@ -106,13 +88,29 @@ to fit within, but you're strongly encouraged to keep the default line length of
 ### Validating files
 
 If you want to use the formatter in something like a [presubmit script][] or
-[commit hook][], you can use the `-n` dry run option. If you specify `-n`, the
-formatter prints the paths of the files whose contents would change if the
-formatter were run normally. If it prints no output, then everything is already
-correctly formatted.
+[commit hook][], you can pass flags to omit writing formatting changes to disk
+and to update the exit code to indicate success/failure:
+
+    $ dart format --output=none --set-exit-if-changed .
 
-[presubmit script]: https://www.chromium.org/developers/how-tos/depottools/presubmit-scripts
-[commit hook]: https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks
+## Running other versions of the formatter CLI command
+
+If you need to run a different version of the formatter, you can
+[globally activate][] the package from the dart_style package on
+pub.dev:
+
+    $ pub global activate dart_style
+    $ dartfmt ...
+
+For this to work, you need to put pub's bin directory on your PATH before the
+Dart SDK directory. Otherwise, the SDK's dartfmt will shadow this one.
+
+[globally activate]: https://dart.dev/tools/pub/cmd/pub-global
+
+If you don't want pub to put `dartfmt` on your PATH, you can run it explicitly:
+
+    $ pub global activate dart_style --no-executables
+    $ pub global run dart_style:format ...
 
 ## Using the dart_style API
 

benchmark/after.dart.txt

@@ -22,6 +22,96 @@ import 'dependency_queue.dart';
 import 'version_queue.dart';
 import 'version_solver.dart';
 
+class HttpRequest extends $pb.GeneratedMessage {
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      const $core.bool.fromEnvironment('protobuf.omit_message_names')
+          ? ''
+          : 'HttpRequest',
+      package: const $pb.PackageName(
+          const $core.bool.fromEnvironment('protobuf.omit_message_names')
+              ? ''
+              : 'google.logging.type'),
+      createEmptyInstance: create)
+    ..aOS(
+        1,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'requestMethod')
+    ..aOS(
+        2,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'requestUrl')
+    ..aInt64(
+        3,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'requestSize')
+    ..a<$core.int>(
+        4,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'status',
+        $pb.PbFieldType.O3)
+    ..aInt64(
+        5,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'responseSize')
+    ..aOS(
+        6,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'userAgent')
+    ..aOS(
+        7,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'remoteIp')
+    ..aOS(
+        8,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'referer')
+    ..aOB(
+        9,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'cacheHit')
+    ..aOB(
+        10,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'cacheValidatedWithOriginServer')
+    ..aOB(
+        11,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'cacheLookup')
+    ..aInt64(
+        12,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'cacheFillBytes')
+    ..aOS(
+        13,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'serverIp')
+    ..aOM<$0.Duration>(
+        14,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'latency',
+        subBuilder: $0.Duration.create)
+    ..aOS(
+        15,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'protocol')
+    ..hasRequiredFields = false;
+}
+
 /// The top-level solver.
 ///
 /// Keeps track of the current potential solution, and the other possible

benchmark/before.dart.txt

@@ -22,6 +22,96 @@ import 'dependency_queue.dart';
 import 'version_queue.dart';
 import 'version_solver.dart';
 
+class HttpRequest extends $pb.GeneratedMessage {
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      const $core.bool.fromEnvironment('protobuf.omit_message_names')
+          ? ''
+          : 'HttpRequest',
+      package: const $pb.PackageName(
+          const $core.bool.fromEnvironment('protobuf.omit_message_names')
+              ? ''
+              : 'google.logging.type'),
+      createEmptyInstance: create)
+    ..aOS(
+        1,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'requestMethod')
+    ..aOS(
+        2,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'requestUrl')
+    ..aInt64(
+        3,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'requestSize')
+    ..a<$core.int>(
+        4,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'status',
+        $pb.PbFieldType.O3)
+    ..aInt64(
+        5,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'responseSize')
+    ..aOS(
+        6,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'userAgent')
+    ..aOS(
+        7,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'remoteIp')
+    ..aOS(
+        8,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'referer')
+    ..aOB(
+        9,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'cacheHit')
+    ..aOB(
+        10,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'cacheValidatedWithOriginServer')
+    ..aOB(
+        11,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'cacheLookup')
+    ..aInt64(
+        12,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'cacheFillBytes')
+    ..aOS(
+        13,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'serverIp')
+    ..aOM<$0.Duration>(
+        14,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'latency',
+        subBuilder: $0.Duration.create)
+    ..aOS(
+        15,
+        const $core.bool.fromEnvironment('protobuf.omit_field_names')
+            ? ''
+            : 'protocol')
+    ..hasRequiredFields = false;
+}
+
 /// The top-level solver.
 ///
 /// Keeps track of the current potential solution, and the other possible

bin/format.dart

@@ -12,7 +12,7 @@ import 'package:dart_style/src/cli/summary.dart';
 import 'package:dart_style/src/io.dart';
 import 'package:dart_style/src/style_fix.dart';
 
-void main(List<String> args) {
+void main(List<String> args) async {
   var parser = ArgParser(allowTrailingOptions: true);
 
   defineOptions(parser,
@@ -135,7 +135,7 @@ void main(List<String> args) {
       setExitIfChanged: setExitIfChanged);
 
   if (argResults.rest.isEmpty) {
-    formatStdin(options, selection, argResults['stdin-name'] as String);
+    await formatStdin(options, selection, argResults['stdin-name'] as String);
   } else {
     formatPaths(options, argResults.rest);
   }

lib/src/argument_list_visitor.dart

@@ -316,7 +316,7 @@ class ArgumentSublist {
   final int _trailingBlocks;
 
   /// The rule used to split the bodies of all block arguments.
-  Rule? get blockRule => _blockRule;
+  Rule get blockRule => _blockRule!;
   Rule? _blockRule;
 
   /// The most recent chunk that split before an argument.
@@ -446,7 +446,7 @@ class ArgumentSublist {
       rule.disableSplitOnInnerRules();
 
       // Tell it to use the rule we've already created.
-      visitor.beforeBlock(argumentBlock, blockRule!, previousSplit);
+      visitor.beforeBlock(argumentBlock, blockRule, previousSplit);
     } else if (_allArguments.length > 1) {
       // Edge case: Only bump the nesting if there are multiple arguments. This
       // lets us avoid spurious indentation in cases like:

lib/src/call_chain_visitor.dart

@@ -173,14 +173,7 @@ class CallChainVisitor {
       this._blockCalls, this._hangingCall);
 
   /// Builds chunks for the call chain.
-  ///
-  /// If [unnest] is `false` than this will not close the expression nesting
-  /// created for the call chain and the caller must end it. Used by cascades
-  /// to force a cascade after a method chain to be more deeply nested than
-  /// the methods.
-  void visit({bool? unnest}) {
-    unnest ??= true;
-
+  void visit() {
     _visitor.builder.nestExpression();
 
     // Try to keep the entire method invocation one line.
@@ -259,8 +252,7 @@ class CallChainVisitor {
 
     _disableRule();
     _endSpan();
-
-    if (unnest) _visitor.builder.unnest();
+    _visitor.builder.unnest();
   }
 
   /// Returns `true` if the method chain should split if a split occurs inside