Version 1.19.0-dev.6.0

Merge 1196cf5 into dev

Author: whesse

CHANGELOG.md

@@ -30,7 +30,7 @@
 
 *   Breaking change - infer generic type arguments from the
     constructor invocation arguments
-    (SDK issue [25220](https://github.com/dart-lang/sdk/issues/25220))
+    (SDK issue [25220](https://github.com/dart-lang/sdk/issues/25220)).
 
     ```dart
     var map = new Map<String, String>();
@@ -40,7 +40,7 @@
     ```
 
 *   Breaking change - infer local function return type
-    (SDK issue [26414](https://github.com/dart-lang/sdk/issues/26414))
+    (SDK issue [26414](https://github.com/dart-lang/sdk/issues/26414)).
 
     ```dart
     void main() {
@@ -52,7 +52,7 @@
     ```
 
 *   Breaking change - allow type promotion from a generic type parameter
-    (SDK issue [26414](https://github.com/dart-lang/sdk/issues/26965))
+    (SDK issue [26414](https://github.com/dart-lang/sdk/issues/26965)).
 
     ```dart
     void fn/*<T>*/(/*=T*/ object) {
@@ -64,6 +64,31 @@
     }
     ```
 
+* Breaking change - smarter inference for Future.then
+    (SDK issue [25944](https://github.com/dart-lang/sdk/issues/25944)).
+    Previous workarounds that use async/await or `.then/*<Future<SomeType>>*/`
+    should no longer be necessary.
+
+    ```dart
+    // This will now infer correctly.
+    Future<List<int>> t2 = f.then((_) => [3]);
+    // This infers too.
+    Future<int> t2 = f.then((_) => new Future.value(42));
+    ```
+
+* Breaking change - smarter inference for async functions
+    (SDK issue [25322](https://github.com/dart-lang/sdk/issues/25322)).
+
+    ```dart
+    void test() async {
+      List<int> x = await [4]; // was previously inferred
+      List<int> y = await new Future.value([4]); // now inferred too
+    }
+    ```
+
+* Breaking change - sideways casts are no longer allowed
+    (SDK issue [26120](https://github.com/dart-lang/sdk/issues/26120)).
+
 ### Dart VM
 
 *   The dependency on BoringSSL has been rolled forward. Going forward, builds

pkg/analysis_server/lib/src/analysis_server.dart

@@ -40,6 +40,7 @@ import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/generated/source_io.dart';
 import 'package:analyzer/src/generated/utilities_general.dart';
+import 'package:analyzer/src/summary/package_bundle_reader.dart';
 import 'package:analyzer/src/summary/pub_summary.dart';
 import 'package:analyzer/src/task/dart.dart';
 import 'package:analyzer/src/util/glob.dart';
@@ -1544,6 +1545,7 @@ class AnalysisServer {
 class AnalysisServerOptions {
   bool enableIncrementalResolutionApi = false;
   bool enableIncrementalResolutionValidation = false;
+  bool enablePubSummaryManager = false;
   bool finerGrainedInvalidation = false;
   bool noErrorNotification = false;
   bool noIndex = false;
@@ -1603,8 +1605,19 @@ class ServerContextManagerCallbacks extends ContextManagerCallbacks {
         _createSourceFactory(context, options, disposition, folder);
     context.analysisOptions = options;
 
-    // TODO(scheglov) use linked bundles
-//    analysisServer.pubSummaryManager.getLinkedBundles(context);
+    if (analysisServer.options.enablePubSummaryManager) {
+      List<LinkedPubPackage> linkedBundles =
+          analysisServer.pubSummaryManager.getLinkedBundles(context);
+      if (linkedBundles.isNotEmpty) {
+        SummaryDataStore store = new SummaryDataStore([]);
+        for (LinkedPubPackage package in linkedBundles) {
+          store.addBundle(null, package.unlinked);
+          store.addBundle(null, package.linked);
+        }
+        context.resultProvider =
+            new InputPackagesResultProvider(context, store);
+      }
+    }
 
     analysisServer._onContextsChangedController
         .add(new ContextsChangedEvent(added: [context]));

pkg/analysis_server/lib/src/search/type_hierarchy.dart

@@ -76,42 +76,41 @@ class TypeHierarchyComputer {
   }
 
   Future _createSubclasses(
-      TypeHierarchyItem item, int itemId, InterfaceType type) {
-    var future = getDirectSubClasses(_searchEngine, type.element);
-    return future.then((Set<ClassElement> subElements) {
-      List<int> subItemIds = <int>[];
-      for (ClassElement subElement in subElements) {
-        // check for recursion
-        TypeHierarchyItem subItem = _elementItemMap[subElement];
-        if (subItem != null) {
-          int id = _items.indexOf(subItem);
-          item.subclasses.add(id);
-          continue;
-        }
-        // create a subclass item
-        ExecutableElement subMemberElement = _findMemberElement(subElement);
-        subItem = new TypeHierarchyItem(convertElement(subElement),
-            memberElement: subMemberElement != null
-                ? convertElement(subMemberElement)
-                : null,
-            superclass: itemId);
-        int subItemId = _items.length;
-        // remember
-        _elementItemMap[subElement] = subItem;
-        _items.add(subItem);
-        _itemClassElements.add(subElement);
-        // add to hierarchy
-        item.subclasses.add(subItemId);
-        subItemIds.add(subItemId);
+      TypeHierarchyItem item, int itemId, InterfaceType type) async {
+    Set<ClassElement> subElements =
+        await getDirectSubClasses(_searchEngine, type.element);
+    List<int> subItemIds = <int>[];
+    for (ClassElement subElement in subElements) {
+      // check for recursion
+      TypeHierarchyItem subItem = _elementItemMap[subElement];
+      if (subItem != null) {
+        int id = _items.indexOf(subItem);
+        item.subclasses.add(id);
+        continue;
       }
-      // compute subclasses of subclasses
-      return Future.forEach(subItemIds, (int subItemId) {
-        TypeHierarchyItem subItem = _items[subItemId];
-        ClassElement subItemElement = _itemClassElements[subItemId];
-        InterfaceType subType = subItemElement.type;
-        return _createSubclasses(subItem, subItemId, subType);
-      });
-    });
+      // create a subclass item
+      ExecutableElement subMemberElement = _findMemberElement(subElement);
+      subItem = new TypeHierarchyItem(convertElement(subElement),
+          memberElement: subMemberElement != null
+              ? convertElement(subMemberElement)
+              : null,
+          superclass: itemId);
+      int subItemId = _items.length;
+      // remember
+      _elementItemMap[subElement] = subItem;
+      _items.add(subItem);
+      _itemClassElements.add(subElement);
+      // add to hierarchy
+      item.subclasses.add(subItemId);
+      subItemIds.add(subItemId);
+    }
+    // compute subclasses of subclasses
+    for (int subItemId in subItemIds) {
+      TypeHierarchyItem subItem = _items[subItemId];
+      ClassElement subItemElement = _itemClassElements[subItemId];
+      InterfaceType subType = subItemElement.type;
+      await _createSubclasses(subItem, subItemId, subType);
+    }
   }
 
   int _createSuperItem(InterfaceType type) {

pkg/analysis_server/lib/src/server/driver.dart

@@ -20,11 +20,10 @@ import 'package:analyzer/file_system/physical_file_system.dart';
 import 'package:analyzer/instrumentation/file_instrumentation.dart';
 import 'package:analyzer/instrumentation/instrumentation.dart';
 import 'package:analyzer/plugin/resolver_provider.dart';
+import 'package:analyzer/src/dart/sdk/sdk.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/incremental_logger.dart';
-import 'package:analyzer/src/generated/java_io.dart';
 import 'package:analyzer/src/generated/sdk.dart';
-import 'package:analyzer/src/generated/sdk_io.dart';
 import 'package:args/args.dart';
 import 'package:linter/src/plugin/linter_plugin.dart';
 import 'package:plugin/manager.dart';
@@ -243,6 +242,11 @@ class Driver implements ServerStarter {
   static const String INCREMENTAL_RESOLUTION_VALIDATION =
       "incremental-resolution-validation";
 
+  /**
+   * The name of the option used to enable using pub summary manager.
+   */
+  static const String ENABLE_PUB_SUMMARY_MANAGER = 'enable-pub-summary-manager';
+
   /**
    * The name of the option used to enable fined grained invalidation.
    */
@@ -379,6 +383,8 @@ class Driver implements ServerStarter {
         results[ENABLE_INCREMENTAL_RESOLUTION_API];
     analysisServerOptions.enableIncrementalResolutionValidation =
         results[INCREMENTAL_RESOLUTION_VALIDATION];
+    analysisServerOptions.enablePubSummaryManager =
+        results[ENABLE_PUB_SUMMARY_MANAGER];
     analysisServerOptions.finerGrainedInvalidation =
         results[FINER_GRAINED_INVALIDATION];
     analysisServerOptions.noErrorNotification = results[NO_ERROR_NOTIFICATION];
@@ -405,26 +411,30 @@ class Driver implements ServerStarter {
     ExtensionManager manager = new ExtensionManager();
     manager.processPlugins(plugins);
 
-    JavaFile defaultSdkDirectory;
+    String defaultSdkPath;
     if (results[SDK_OPTION] != null) {
-      defaultSdkDirectory = new JavaFile(results[SDK_OPTION]);
+      defaultSdkPath = results[SDK_OPTION];
     } else {
       // No path to the SDK was provided.
       // Use DirectoryBasedDartSdk.defaultSdkDirectory, which will make a guess.
-      defaultSdkDirectory = DirectoryBasedDartSdk.defaultSdkDirectory;
+      defaultSdkPath = FolderBasedDartSdk
+          .defaultSdkDirectory(PhysicalResourceProvider.INSTANCE)
+          .path;
     }
     bool useSummaries = analysisServerOptions.fileReadMode == 'as-is';
     SdkCreator defaultSdkCreator = (AnalysisOptions options) {
-      DirectoryBasedDartSdk sdk =
-          new DirectoryBasedDartSdk(defaultSdkDirectory);
+      PhysicalResourceProvider resourceProvider =
+          PhysicalResourceProvider.INSTANCE;
+      FolderBasedDartSdk sdk = new FolderBasedDartSdk(resourceProvider,
+          FolderBasedDartSdk.defaultSdkDirectory(resourceProvider));
       sdk.analysisOptions = options;
       sdk.useSummary = useSummaries;
       return sdk;
     };
     // TODO(brianwilkerson) It would be nice to avoid creating an SDK that
     // cannot be re-used, but the SDK is needed to create a package map provider
     // in the case where we need to run `pub` in order to get the package map.
-    DirectoryBasedDartSdk defaultSdk = defaultSdkCreator(null);
+    DartSdk defaultSdk = defaultSdkCreator(null);
     //
     // Initialize the instrumentation service.
     //
@@ -448,8 +458,7 @@ class Driver implements ServerStarter {
     //
     socketServer = new SocketServer(
         analysisServerOptions,
-        new DartSdkManager(defaultSdkDirectory.getAbsolutePath(), useSummaries,
-            defaultSdkCreator),
+        new DartSdkManager(defaultSdkPath, useSummaries, defaultSdkCreator),
         defaultSdk,
         service,
         serverPlugin,
@@ -532,6 +541,10 @@ class Driver implements ServerStarter {
         help: "enable validation of incremental resolution results (slow)",
         defaultsTo: false,
         negatable: false);
+    parser.addFlag(ENABLE_PUB_SUMMARY_MANAGER,
+        help: "enable using summaries for pub cache packages",
+        defaultsTo: false,
+        negatable: false);
     parser.addFlag(FINER_GRAINED_INVALIDATION,
         help: "enable finer grained invalidation",
         defaultsTo: false,

pkg/analysis_server/lib/src/services/correction/fix.dart

@@ -80,6 +80,7 @@ bool hasFix(ErrorCode errorCode) =>
     errorCode ==
         CompileTimeErrorCode.UNDEFINED_CONSTRUCTOR_IN_INITIALIZER_DEFAULT ||
     errorCode == CompileTimeErrorCode.URI_DOES_NOT_EXIST ||
+    errorCode == CompileTimeErrorCode.URI_HAS_NOT_BEEN_GENERATED ||
     errorCode == HintCode.CAN_BE_NULL_AFTER_NULL_AWARE ||
     errorCode == HintCode.DEAD_CODE ||
     errorCode == HintCode.DIVISION_OPTIMIZATION ||

pkg/analysis_server/lib/src/services/correction/fix_internal.dart

@@ -190,6 +190,9 @@ class FixProcessor {
       _addFix_createPartUri();
       _addFix_replaceImportUri();
     }
+    if (errorCode == CompileTimeErrorCode.URI_HAS_NOT_BEEN_GENERATED) {
+      _addFix_replaceImportUri();
+    }
     if (errorCode == HintCode.CAN_BE_NULL_AFTER_NULL_AWARE) {
       _addFix_canBeNullAfterNullAware();
     }

pkg/analysis_server/lib/src/services/correction/organize_directives.dart

@@ -47,7 +47,9 @@ class DirectiveOrganizer {
 
   bool _isUnresolvedUri(UriBasedDirective directive) {
     for (AnalysisError error in errors) {
-      if (error.errorCode == CompileTimeErrorCode.URI_DOES_NOT_EXIST &&
+      ErrorCode errorCode = error.errorCode;
+      if ((errorCode == CompileTimeErrorCode.URI_DOES_NOT_EXIST ||
+              errorCode == CompileTimeErrorCode.URI_HAS_NOT_BEEN_GENERATED) &&
           directive.uri.offset == error.offset) {
         return true;
       }

pkg/analysis_server/lib/src/services/refactoring/extract_method.dart

@@ -70,7 +70,7 @@ class ExtractMethodRefactoringImpl extends RefactoringImpl
     implements ExtractMethodRefactoring {
   static const ERROR_EXITS =
       'Selected statements contain a return statement, but not all possible '
-      'execuion flows exit. Semantics may not be preserved.';
+      'execution flows exit. Semantics may not be preserved.';
 
   final SearchEngine searchEngine;
   final CompilationUnit unit;