Merge pull request #1144 from dart-lang/unnamed-libraries

Format unnamed libraries

Author: srawlins

CHANGELOG.md

@@ -1,6 +1,7 @@
 # 2.2.5-dev
 
 * Require `package:analyzer` `^5.1.0`.
+* Format unnamed libraries.
 
 # 2.2.4
 

lib/src/dart_formatter.dart

@@ -88,11 +88,9 @@ class DartFormatter {
     // TODO(paulberry): consider plumbing in experiment enable flags from the
     // command line.
     var featureSet = FeatureSet.fromEnableFlags2(
-      sdkLanguageVersion: Version(2, 17, 0),
+      sdkLanguageVersion: Version(2, 19, 0),
       flags: [
-        'enhanced-enums',
-        'named-arguments-anywhere',
-        'super-parameters',
+        'unnamed-libraries',
       ],
     );
 

lib/src/source_visitor.dart

@@ -2021,8 +2021,10 @@ class SourceVisitor extends ThrowingAstVisitor {
     _visitDirectiveMetadata(node);
     _simpleStatement(node, () {
       token(node.libraryKeyword);
-      space();
-      visit(node.name2);
+      if (node.name2 != null) {
+        space();
+        visit(node.name2);
+      }
     });
   }
 

test/comments/top_level.unit

@@ -185,6 +185,10 @@ b.c;
 <<<
 library a. //
     b.c;
+>>> comment within unnamed library
+library/* c */;
+<<<
+library /* c */;
 >>> inline block comment between different kinds of directives
 library a; /* comment */ import 'b.dart';
 <<<

test/whitespace/directives.unit

@@ -50,6 +50,10 @@ part of some_very_long_library_name_that_wraps;
 library    a .  b   . c;
 <<<
 library a.b.c;
+>>> no spaces after unnamed library
+library    ;
+<<<
+library;
 >>> configuration
 import'a'if(b  . c . d)'e';
 <<<