Merge branch 'master' into patterns

# Conflicts:
#	lib/src/dart_formatter.dart
#	lib/src/source_visitor.dart
#	test/comments/patterns.stmt
#	test/splitting/if_case.stmt
#	test/splitting/patterns.stmt
#	test/whitespace/patterns.stmt

Author: munificent

CHANGELOG.md

@@ -7,6 +7,7 @@
 * Fix bug where parameter metadata wouldn't always split when it should.
 * Don't split after `<` in collection literals.
 * Format record expressions and record type annotations.
+* Format class modifiers `base`, `final`, `interface`, `mixin`, and `sealed`
 * Better indentation of multiline function types inside type argument lists. 
 * Require `package:analyzer` `^5.1.0`.
 * Format unnamed libraries.

lib/src/cli/show.dart

@@ -71,7 +71,7 @@ enum Show {
   /// Describes the directory whose contents are about to be processed.
   void directory(String path) {
     if (this == Show.legacy || this == Show.overwrite) {
-      print('Formatting directory $directory:');
+      print('Formatting directory $path:');
     }
   }
 

lib/src/dart_formatter.dart

@@ -206,8 +206,10 @@ class DartFormatter {
     var featureSet = FeatureSet.fromEnableFlags2(
       sdkLanguageVersion: Version(2, 19, 0),
       flags: [
+        'class-modifiers',
         if (patterns) 'patterns',
         'records',
+        'sealed-class',
         'unnamed-libraries',
       ],
     );

lib/src/debug.dart

@@ -126,26 +126,31 @@ void dumpChunks(int start, List<Chunk> chunks) {
       var spanBars = '';
       for (var span in spans) {
         if (chunk.spans.contains(span)) {
-          if (index == 0 || !chunks[index - 1].spans.contains(span)) {
+          if (index == chunks.length - 1 ||
+              !chunks[index + 1].spans.contains(span)) {
+            // This is the last chunk with the span.
+            spanBars += '╙';
+          } else {
+            spanBars += '║';
+          }
+        } else {
+          // If the next chunk has this span, then show it bridging this chunk
+          // and the next because a split between them breaks the span.
+          if (index < chunks.length - 1 &&
+              chunks[index + 1].spans.contains(span)) {
             if (span.cost == 1) {
               spanBars += '╓';
             } else {
               spanBars += span.cost.toString();
             }
-          } else {
-            spanBars += '║';
-          }
-        } else {
-          if (index > 0 && chunks[index - 1].spans.contains(span)) {
-            spanBars += '╙';
-          } else {
-            spanBars += ' ';
           }
         }
       }
       row.add(spanBars);
     }
 
+    row.add(chunk.spans.map((span) => span.id).join(' '));
+
     if (chunk.text.length > 70) {
       row.add(chunk.text.substring(0, 70));
     } else {

lib/src/source_visitor.dart

@@ -583,6 +583,11 @@ class SourceVisitor extends ThrowingAstVisitor {
 
     builder.nestExpression();
     modifier(node.abstractKeyword);
+    modifier(node.baseKeyword);
+    modifier(node.interfaceKeyword);
+    modifier(node.finalKeyword);
+    modifier(node.sealedKeyword);
+    modifier(node.mixinKeyword);
     token(node.classKeyword);
     space();
     token(node.name);
@@ -602,6 +607,11 @@ class SourceVisitor extends ThrowingAstVisitor {
 
     _simpleStatement(node, () {
       modifier(node.abstractKeyword);
+      modifier(node.baseKeyword);
+      modifier(node.interfaceKeyword);
+      modifier(node.finalKeyword);
+      modifier(node.sealedKeyword);
+      modifier(node.mixinKeyword);
       token(node.typedefKeyword);
       space();
       token(node.name);
@@ -2203,6 +2213,10 @@ class SourceVisitor extends ThrowingAstVisitor {
     visitMetadata(node.metadata);
 
     builder.nestExpression();
+    modifier(node.baseKeyword);
+    modifier(node.interfaceKeyword);
+    modifier(node.finalKeyword);
+    modifier(node.sealedKeyword);
     token(node.mixinKeyword);
     space();
     token(node.name);

test/whitespace/classes.unit

@@ -169,4 +169,78 @@ class Foo {
 <<<
 class Foo {
   bar() {}
-}
+}
+>>> class modifiers
+class C1 {}
+base  class C2 {}
+interface  class C3 {}
+final  class C4 {}
+sealed  class C5 {}
+abstract  class C6 {}
+abstract  base  class C7 {}
+abstract  interface  class C8 {}
+abstract  final  class C9 {}
+mixin  class C10 {}
+base  mixin  class C11 {}
+abstract  mixin  class C12 {}
+abstract  base  mixin  class C13 {}
+<<<
+class C1 {}
+
+base class C2 {}
+
+interface class C3 {}
+
+final class C4 {}
+
+sealed class C5 {}
+
+abstract class C6 {}
+
+abstract base class C7 {}
+
+abstract interface class C8 {}
+
+abstract final class C9 {}
+
+mixin class C10 {}
+
+base mixin class C11 {}
+
+abstract mixin class C12 {}
+
+abstract base mixin class C13 {}
+>>> mixin application modifiers
+class C1 = Object with Mixin;
+base  class C2 = Object with Mixin;
+interface  class C3 = Object with Mixin;
+final  class C4 = Object with Mixin;
+sealed  class C5 = Object with Mixin;
+abstract  class C6 = Object with Mixin;
+abstract  base  class C7 = Object with Mixin;
+abstract interface  class C8 = Object with Mixin;
+abstract  final  class C9 = Object with Mixin;
+mixin  class C10 = Object with Mixin;
+base  mixin  class C11 = Object with Mixin;
+abstract  mixin  class C12 = Object with Mixin;
+abstract  base  mixin  class C13 = Object with Mixin;
+<<<
+class C1 = Object with Mixin;
+base class C2 = Object with Mixin;
+interface class C3 = Object with Mixin;
+final class C4 = Object with Mixin;
+sealed class C5 = Object with Mixin;
+abstract class C6 = Object with Mixin;
+abstract base class C7 = Object
+    with Mixin;
+abstract interface class C8 = Object
+    with Mixin;
+abstract final class C9 = Object
+    with Mixin;
+mixin class C10 = Object with Mixin;
+base mixin class C11 = Object
+    with Mixin;
+abstract mixin class C12 = Object
+    with Mixin;
+abstract base mixin class C13 = Object
+    with Mixin;

test/whitespace/mixins.unit

@@ -24,4 +24,16 @@ mixin M1 on UnaryNum {
 >>> generic
 mixin M<   A  ,B  >on   C  implements    D{ }
 <<<
-mixin M<A, B> on C implements D {}
+mixin M<A, B> on C implements D {}
+>>> mixin modifiers
+mixin  M1 {}
+base  mixin M2 {}
+interface  mixin M3 {}
+final  mixin M4 {}
+sealed  mixin M5 {}
+<<<
+mixin M1 {}
+base mixin M2 {}
+interface mixin M3 {}
+final mixin M4 {}
+sealed mixin M5 {}