Finish file rename operation (TBR)

pkg/analysis_server/lib/src/plugin/result_merger.dart

 // Copyright (c) 2017, 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:collection';
 
 import 'package:analysis_server/plugin/protocol/protocol.dart'
     hide AnalysisErrorFixes;
-import 'package:analyzer_plugin/protocol/generated_protocol.dart' as plugin;
+import 'package:analyzer_plugin/protocol/protocol_generated.dart' as plugin;
 import 'package:meta/meta.dart';
 
 /**
  * An object used to merge partial lists of results that were contributed by
  * plugins.
  *
  * All of the methods in this class assume that the contributions from the
  * analysis server are the first partial result in the list of partial results
  * to be merged.
  */
@@ skipping 484 matching lines @@
       return outline;
     }
 
     for (int i = 0; i < mergedOutlines.length; i++) {
       mergedOutlines[i] = traverse(mergedOutlines[i]);
     }
     return mergedOutlines;
   }
 
   /**
+   * Return a list of source changes composed by merging the lists of source
+   * changes in the [partialResultList].
+   *
+   * The resulting list will contain all of the source changes from all of the
+   * plugins. If two or more plugins contribute the same source change the
+   * resulting list will contain duplications.
+   */
+  List<plugin.PrioritizedSourceChange> mergePrioritizedSourceChanges(
+      List<List<plugin.PrioritizedSourceChange>> partialResultList) {
+    int count = partialResultList.length;
+    if (count == 0) {
+      return <plugin.PrioritizedSourceChange>[];
+    } else if (count == 1) {
+      return partialResultList[0];
+    }
+    List<plugin.PrioritizedSourceChange> mergedChanges =
+        <plugin.PrioritizedSourceChange>[];
+    for (List<plugin.PrioritizedSourceChange> partialResults
+        in partialResultList) {
+      mergedChanges.addAll(partialResults);
+    }
+    mergedChanges.sort((first, second) => first.priority - second.priority);
+    return mergedChanges;
+  }
+
+  /**
    * Return a refactoring feedback composed by merging the refactoring feedbacks
    * in the [partialResultList].
    *
    * The content of the resulting feedback depends on the kind of feedbacks
    * being merged.
    *
    * Throw an exception if the refactoring feedbacks are of an unhandled type.
    *
    * The feedbacks in the [partialResultList] are expected to all be of the same
    * type. If that expectation is violated, and exception might be thrown.
@@ skipping 233 matching lines @@
   }
 
   /**
    * Return a list of source changes composed by merging the lists of source
    * changes in the [partialResultList].
    *
    * The resulting list will contain all of the source changes from all of the
    * plugins. If two or more plugins contribute the same source change the
    * resulting list will contain duplications.
    */
-  List<plugin.PrioritizedSourceChange> mergePrioritizedSourceChanges(
-      List<List<plugin.PrioritizedSourceChange>> partialResultList) {
-    int count = partialResultList.length;
-    if (count == 0) {
-      return <plugin.PrioritizedSourceChange>[];
-    } else if (count == 1) {
-      return partialResultList[0];
-    }
-    List<plugin.PrioritizedSourceChange> mergedChanges = <plugin.PrioritizedSourceChange>[];
-    for (List<plugin.PrioritizedSourceChange> partialResults in partialResultList) {
-      mergedChanges.addAll(partialResults);
-    }
-    mergedChanges.sort((first, second) => first.priority - second.priority);
-    return mergedChanges;
-  }
-
-  /**
-   * Return a list of source changes composed by merging the lists of source
-   * changes in the [partialResultList].
-   *
-   * The resulting list will contain all of the source changes from all of the
-   * plugins. If two or more plugins contribute the same source change the
-   * resulting list will contain duplications.
-   */
   List<SourceChange> mergeSourceChanges(
       List<List<SourceChange>> partialResultList) {
     int count = partialResultList.length;
     if (count == 0) {
       return <SourceChange>[];
     } else if (count == 1) {
       return partialResultList[0];
     }
     List<SourceChange> mergedChanges = <SourceChange>[];
     for (List<SourceChange> partialResults in partialResultList) {
@@ skipping 15 matching lines @@
     if (leftEnd < rightStart || leftStart > rightEnd) {
       return false;
     }
     if (!allowNesting) {
       return true;
     }
     return !((leftStart <= rightStart && rightEnd <= leftEnd) ||
         (rightStart <= leftStart && leftEnd <= rightEnd));
   }
 }