Run the sorter to reduce code churn

pkg/analyzer/lib/src/dart/analysis/file_state.dart

 // Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:async';
 import 'dart:convert';
 import 'dart:typed_data';
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
@@ skipping 27 matching lines @@
 import 'package:front_end/src/incremental/byte_store.dart';
 import 'package:meta/meta.dart';
 
 /**
  * [FileContentOverlay] is used to temporary override content of files.
  */
 class FileContentOverlay {
   final _map = <String, String>{};
 
   /**
+   * Return the paths currently being overridden.
+   */
+  Iterable<String> get paths => _map.keys;
+
+  /**
    * Return the content of the file with the given [path], or `null` the
    * overlay does not override the content of the file.
    *
    * The [path] must be absolute and normalized.
    */
   String operator [](String path) => _map[path];
 
   /**
    * Return the new [content] of the file with the given [path].
    *
    * The [path] must be absolute and normalized.
    */
   void operator []=(String path, String content) {
     if (content == null) {
       _map.remove(path);
     } else {
       _map[path] = content;
     }
   }
-
-  /**
-   * Return the paths currently being overridden.
-   */
-  Iterable<String> get paths => _map.keys;
 }
 
 /**
  * Information about a file being analyzed, explicitly or implicitly.
  *
  * It provides a consistent view on its properties.
  *
  * The properties are not guaranteed to represent the most recent state
  * of the file system. To update the file to the most recent state, [refresh]
  * should be called.
@@ skipping 297 matching lines @@
 
   /**
    * Return a new parsed unresolved [CompilationUnit].
    */
   CompilationUnit parse(AnalysisErrorListener errorListener) {
     return PerformanceStatistics.parse.makeCurrentWhile(() {
       return _parse(errorListener);
     });
   }
 
-  CompilationUnit _parse(AnalysisErrorListener errorListener) {
-    AnalysisOptions analysisOptions = _fsState._analysisOptions;
-
-    if (USE_FASTA_PARSER) {
-      try {
-        fasta.ScannerResult scanResult =
-            PerformanceStatistics.scan.makeCurrentWhile(() {
-          return fasta.scan(
-            _contentBytes,
-            includeComments: true,
-            scanGenericMethodComments: analysisOptions.strongMode,
-          );
-        });
-
-        var astBuilder = new fasta.AstBuilder(
-            new ErrorReporter(errorListener, source),
-            null,
-            null,
-            new _FastaElementStoreProxy(),
-            new fasta.Scope.top(isModifiable: true),
-            true,
-            uri);
-        astBuilder.parseGenericMethodComments = analysisOptions.strongMode;
-
-        var parser = new fasta.Parser(astBuilder);
-        astBuilder.parser = parser;
-        parser.parseUnit(scanResult.tokens);
-        var unit = astBuilder.pop() as CompilationUnit;
-
-        LineInfo lineInfo = new LineInfo(scanResult.lineStarts);
-        unit.lineInfo = lineInfo;
-        return unit;
-      } catch (e, st) {
-        print(e);
-        print(st);
-        rethrow;
-      }
-    } else {
-      CharSequenceReader reader = new CharSequenceReader(content);
-      Scanner scanner = new Scanner(source, reader, errorListener);
-      scanner.scanGenericMethodComments = analysisOptions.strongMode;
-      Token token = PerformanceStatistics.scan.makeCurrentWhile(() {
-        return scanner.tokenize();
-      });
-      LineInfo lineInfo = new LineInfo(scanner.lineStarts);
-
-      Parser parser = new Parser(source, errorListener);
-      parser.enableAssertInitializer = analysisOptions.enableAssertInitializer;
-      parser.parseGenericMethodComments = analysisOptions.strongMode;
-      CompilationUnit unit = parser.parseCompilationUnit(token);
-      unit.lineInfo = lineInfo;
-      return unit;
-    }
-  }
-
   /**
    * Read the file content and ensure that all of the file properties are
    * consistent with the read content, including API signature.
    *
    * Return `true` if the API signature changed since the last refresh.
    */
   bool refresh() {
     // Read the content.
     try {
       _content = _fsState._contentOverlay[path];
@@ skipping 151 matching lines @@
     Uri absoluteUri;
     try {
       absoluteUri = resolveRelativeUri(uri, Uri.parse(relativeUri));
     } on FormatException {
       return _fsState.unresolvedFile;
     }
 
     return _fsState.getFileForUri(absoluteUri);
   }
 
+  CompilationUnit _parse(AnalysisErrorListener errorListener) {
+    AnalysisOptions analysisOptions = _fsState._analysisOptions;
+
+    if (USE_FASTA_PARSER) {
+      try {
+        fasta.ScannerResult scanResult =
+            PerformanceStatistics.scan.makeCurrentWhile(() {
+          return fasta.scan(
+            _contentBytes,
+            includeComments: true,
+            scanGenericMethodComments: analysisOptions.strongMode,
+          );
+        });
+
+        var astBuilder = new fasta.AstBuilder(
+            new ErrorReporter(errorListener, source),
+            null,
+            null,
+            new _FastaElementStoreProxy(),
+            new fasta.Scope.top(isModifiable: true),
+            true,
+            uri);
+        astBuilder.parseGenericMethodComments = analysisOptions.strongMode;
+
+        var parser = new fasta.Parser(astBuilder);
+        astBuilder.parser = parser;
+        parser.parseUnit(scanResult.tokens);
+        var unit = astBuilder.pop() as CompilationUnit;
+
+        LineInfo lineInfo = new LineInfo(scanResult.lineStarts);
+        unit.lineInfo = lineInfo;
+        return unit;
+      } catch (e, st) {
+        print(e);
+        print(st);
+        rethrow;
+      }
+    } else {
+      CharSequenceReader reader = new CharSequenceReader(content);
+      Scanner scanner = new Scanner(source, reader, errorListener);
+      scanner.scanGenericMethodComments = analysisOptions.strongMode;
+      Token token = PerformanceStatistics.scan.makeCurrentWhile(() {
+        return scanner.tokenize();
+      });
+      LineInfo lineInfo = new LineInfo(scanner.lineStarts);
+
+      Parser parser = new Parser(source, errorListener);
+      parser.enableAssertInitializer = analysisOptions.enableAssertInitializer;
+      parser.parseGenericMethodComments = analysisOptions.strongMode;
+      CompilationUnit unit = parser.parseCompilationUnit(token);
+      unit.lineInfo = lineInfo;
+      return unit;
+    }
+  }
+
   /**
    * Return `true` if the given byte lists are equal.
    */
   static bool _equalByteLists(List<int> a, List<int> b) {
     if (a == null) {
       return b == null;
     } else if (b == null) {
       return false;
     }
     if (a.length != b.length) {
@@ skipping 320 matching lines @@
   _FastaElementProxy operator [](fasta.Builder builder) =>
       _elements.putIfAbsent(builder, () => new _FastaElementProxy());
 
   @override
   noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
 }
 
 class _FastaInterfaceTypeProxy implements fasta.KernelInterfaceType {
   noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
 }