Simplify how patch files are specified to analyzer.

pkg/analyzer/lib/src/dart/sdk/patch.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.
 
 library analyzer.src.dart.sdk.patch;
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/error/listener.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/src/dart/scanner/reader.dart';
 import 'package:analyzer/src/dart/scanner/scanner.dart';
-import 'package:analyzer/src/dart/sdk/sdk.dart';
 import 'package:analyzer/src/generated/parser.dart';
-import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:meta/meta.dart';
-import 'package:path/src/context.dart';
 
 /**
  * [SdkPatcher] applies patches to SDK [CompilationUnit].
  */
 class SdkPatcher {
   bool _allowNewPublicNames;
   String _baseDesc;
   String _patchDesc;
   CompilationUnit _patchUnit;
 
   /**
    * Patch the given [unit] of a SDK [source] with the patches defined in
-   * the [sdk] for the given [platform].  Throw [ArgumentError] if a patch
+   * [allPatchPaths].  Throw [ArgumentError] if a patch
    * file cannot be read, or the contents violates rules for patch files.
    */
   void patch(
-      FolderBasedDartSdk sdk,
-      int platform,
+      ResourceProvider resourceProvider,
+      bool strongMode,
+      Map<String, List<String>> allPatchPaths,
       AnalysisErrorListener errorListener,
       Source source,
       CompilationUnit unit) {
     // Process URI.
     String libraryUriStr;
     bool isLibraryDefiningUnit;
     {
       Uri uri = source.uri;
       if (uri.scheme != 'dart') {
         throw new ArgumentError(
             'The URI of the unit to patch must have the "dart" scheme: $uri');
       }
       List<String> uriSegments = uri.pathSegments;
       String libraryName = uriSegments.first;
       libraryUriStr = 'dart:$libraryName';
       isLibraryDefiningUnit = uriSegments.length == 1;
       _allowNewPublicNames = libraryName == '_internal';
     }
     // Prepare the patch files to apply.
-    List<String> patchPaths;
-    {
-      SdkLibrary sdkLibrary = sdk.getSdkLibrary(libraryUriStr);
-      if (sdkLibrary == null) {
-        throw new ArgumentError(
-            'The library $libraryUriStr is not defined in the SDK.');
-      }
-      patchPaths = sdkLibrary.getPatches(platform);
-    }
+    List<String> patchPaths = allPatchPaths[libraryUriStr];
 
-    bool strongMode = sdk.context.analysisOptions.strongMode;
-    Context pathContext = sdk.resourceProvider.pathContext;
     for (String path in patchPaths) {
-      String pathInLib = pathContext.joinAll(path.split('/'));
-      File patchFile = sdk.libraryDirectory.getChildAssumingFile(pathInLib);
+      File patchFile = resourceProvider.getFile(path);
       if (!patchFile.exists) {
         throw new ArgumentError(
             'The patch file ${patchFile.path} for $source does not exist.');
       }
       Source patchSource = patchFile.createSource();
       CompilationUnit patchUnit = parse(patchSource, strongMode, errorListener);
 
       // Prepare for reporting errors.
       _baseDesc = source.toString();
       _patchDesc = patchFile.path;
@@ skipping 288 matching lines @@
   }
 
   /**
    * Replace tokens of the [oldNode] with tokens of the [newNode].
    */
   static void _replaceNodeTokens(AstNode oldNode, AstNode newNode) {
     oldNode.beginToken.previous.setNext(newNode.beginToken);
     newNode.endToken.setNext(oldNode.endToken.next);
   }
 }