More analyzer updates, and handle negative_tests

lib/src/analysis_context.dart

 // Copyright (c) 2015, 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 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/java_io.dart' show JavaFile;
 import 'package:analyzer/src/generated/sdk_io.dart' show DirectoryBasedDartSdk;
 import 'package:analyzer/src/generated/source.dart' show DartUriResolver;
 import 'package:analyzer/src/generated/source_io.dart';
 
@@ skipping 22 matching lines @@
 
 /// Creates a SourceFactory configured by the [options].
 ///
 /// Use [options.useMockSdk] to specify the SDK mode, or use [sdkResolver]
 /// to entirely override the DartUriResolver.
 ///
 /// If supplied, [fileResolvers] will override the default `file:` and
 /// `package:` URI resolvers.
 SourceFactory createSourceFactory(SourceResolverOptions options,
     {DartUriResolver sdkResolver, List<UriResolver> fileResolvers}) {
-  var sdkResolver = options.useMockSdk

[vsm, 2016/03/29 22:10:54]

doh!

+  sdkResolver ??= options.useMockSdk
       ? createMockSdkResolver(mockSdkSources)
       : createSdkPathResolver(options.dartSdkPath);
 
   var resolvers = <UriResolver>[];
   if (options.customUrlMappings.isNotEmpty) {
     resolvers.add(new CustomUriResolver(options.customUrlMappings));
   }
   resolvers.add(sdkResolver);
   if (fileResolvers == null) fileResolvers = createFileResolvers(options);
   resolvers.addAll(fileResolvers);
@@ skipping 13 matching lines @@
 DartUriResolver createMockSdkResolver(Map<String, String> mockSources) =>
     new MockDartSdk(mockSources, reportMissing: true).resolver;
 
 /// Creates a [DartUriResolver] that uses the SDK at the given [sdkPath].
 DartUriResolver createSdkPathResolver(String sdkPath) {
   var sdk = new DirectoryBasedDartSdk(
       new JavaFile(sdkPath), /*useDart2jsPaths:*/ true);
   sdk.context.analysisOptions.strongMode = true;
   return new DartUriResolver(sdk);
 }