Compute both strong and spec mode unlinked bundles.

pkg/analyzer/lib/src/summary/pub_summary.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:collection';
 import 'dart:core' hide Resource;
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
@@ skipping 10 matching lines @@
 import 'package:analyzer/src/summary/package_bundle_reader.dart'
     show ResynthesizerResultProvider, SummaryDataStore;
 import 'package:analyzer/src/summary/summarize_ast.dart'
     show serializeAstUnlinked;
 import 'package:analyzer/src/summary/summarize_elements.dart'
     show PackageBundleAssembler;
 import 'package:analyzer/src/util/fast_uri.dart';
 import 'package:path/path.dart' as pathos;
 
 /**
+ * Unlinked and linked information about a [PubPackage].
+ */
+class LinkedPubPackage {
+  final PubPackage package;
+  final PackageBundle unlinked;
+  final PackageBundle linked;
+  LinkedPubPackage(this.package, this.unlinked, this.linked);
+}
+
+/**
  * A package in the pub cache.
  */
 class PubPackage {
   final String name;
   final Folder libFolder;
 
   PubPackage(this.name, this.libFolder);
 
   Folder get folder => libFolder.parent;
 
   @override
   int get hashCode => libFolder.hashCode;
 
   @override
   bool operator ==(other) {
     return other is PubPackage && other.libFolder == libFolder;
   }
 
   @override
   String toString() => '($name in $folder)';
 }
 
 /**
- * Unlinked and linked information about a [PubPackage].
- */
-class LinkedPubPackage {
-  final PubPackage package;
-  final PackageBundle unlinked;
-  final PackageBundle linked;
-  LinkedPubPackage(this.package, this.unlinked, this.linked);
-}
-
-/**
  * Class that manages summaries for pub packages.
  *
  * The client should call [getLinkedBundles] after creating a new
  * [AnalysisContext] and configuring its source factory, but before computing
  * any analysis results.  The returned linked bundles can be used to create and
  * configure [ResynthesizerResultProvider] for the context.
  */
 class PubSummaryManager {
-  static const UNLINKED_BUNDLE_FILE_NAME = 'unlinked.ds';
+  static const UNLINKED_NAME = 'unlinked.ds';
+  static const UNLINKED_SPEC_NAME = 'unlinked_spec.ds';
 
   final ResourceProvider resourceProvider;
 
   /**
    * The name of the temporary file that is used for atomic writes.
    */
   final String tempFileName;
 
   /**
    * The map from [PubPackage]s to their unlinked [PackageBundle]s in the pub
@@ skipping 95 matching lines @@
 
     // Done.
     return linkedPackages;
   }
 
   /**
    * Return all available unlinked [PackageBundle]s for the given [context],
    * maybe an empty map, but not `null`.
    */
   Map<PubPackage, PackageBundle> getUnlinkedBundles(AnalysisContext context) {
+    bool strongMode = context.analysisOptions.strongMode;
     Map<PubPackage, PackageBundle> unlinkedBundles =
         new HashMap<PubPackage, PackageBundle>();
     Map<String, List<Folder>> packageMap = context.sourceFactory.packageMap;
     if (packageMap != null) {
       packageMap.forEach((String packageName, List<Folder> libFolders) {
         if (libFolders.length == 1) {
           Folder libFolder = libFolders.first;
           if (isPathInPubCache(pathContext, libFolder.path)) {
             PubPackage package = new PubPackage(packageName, libFolder);
-            PackageBundle unlinkedBundle = _getUnlinkedOrSchedule(package);
+            PackageBundle unlinkedBundle =
+                _getUnlinkedOrSchedule(package, strongMode);
             if (unlinkedBundle != null) {
               unlinkedBundles[package] = unlinkedBundle;
             }
           }
         }
       });
     }
     return unlinkedBundles;
   }
 
   /**
    * Compute unlinked bundle for a package from [packagesToComputeUnlinked],
    * and schedule delayed computation for the next package, if any.
    */
   void _computeNextUnlinked() {
     if (packagesToComputeUnlinked.isNotEmpty) {
       PubPackage package = packagesToComputeUnlinked.first;
-      _computeUnlinked(package);
+      _computeUnlinked(package, false);
+      _computeUnlinked(package, true);
       packagesToComputeUnlinked.remove(package);
       _scheduleNextUnlinked();
     } else {
       if (_onUnlinkedCompleteCompleter != null) {
         _onUnlinkedCompleteCompleter.complete(true);
         _onUnlinkedCompleteCompleter = null;
       }
     }
   }
 
   /**
    * Compute the unlinked bundle for the package with the given path, put
    * it in the [unlinkedBundleMap] and store into the [resourceProvider].
    *
    * TODO(scheglov) Consider moving into separate isolate(s).
    */
-  void _computeUnlinked(PubPackage package) {
+  void _computeUnlinked(PubPackage package, bool strongMode) {
     Folder libFolder = package.libFolder;
     String libPath = libFolder.path + pathContext.separator;
     PackageBundleAssembler assembler = new PackageBundleAssembler();
 
     /**
      * Return the `package` [Uri] for the given [path] in the `lib` folder
      * of the current package.
      */
     Uri getUri(String path) {
       String pathInLib = path.substring(libPath.length);
       String uriPath = pathos.posix.joinAll(pathContext.split(pathInLib));
       String uriStr = 'package:${package.name}/$uriPath';
       return FastUri.parse(uriStr);
     }
 
     /**
      * If the given [file] is a Dart file, add its unlinked unit.
      */
     void addDartFile(File file) {
       String path = file.path;
       if (AnalysisEngine.isDartFileName(path)) {
         Uri uri = getUri(path);
         Source source = file.createSource(uri);
-        CompilationUnit unit = _parse(source);
+        CompilationUnit unit = _parse(source, strongMode);
         UnlinkedUnitBuilder unlinkedUnit = serializeAstUnlinked(unit);
         assembler.addUnlinkedUnit(source, unlinkedUnit);
       }
     }
 
     /**
      * Visit the [folder] recursively.
      */
     void addDartFiles(Folder folder) {
       List<Resource> children = folder.getChildren();
       for (Resource child in children) {
         if (child is File) {
           addDartFile(child);
         }
       }
       for (Resource child in children) {
         if (child is Folder) {
           addDartFiles(child);
         }
       }
     }
 
     try {
       addDartFiles(libFolder);
       List<int> bytes = assembler.assemble().toBuffer();
-      _writeAtomic(package.folder, UNLINKED_BUNDLE_FILE_NAME, bytes);
+      String fileName = _getUnlinkedName(strongMode);
+      _writeAtomic(package.folder, fileName, bytes);
     } on FileSystemException {
       // Ignore file system exceptions.
     }
   }
 
   /**
+   * Return the name of the file for an unlinked bundle, in strong or spec mode.
+   */
+  String _getUnlinkedName(bool strongMode) {
+    if (strongMode) {
+      return UNLINKED_NAME;
+    } else {
+      return UNLINKED_SPEC_NAME;
+    }
+  }
+
+  /**
    * Return the unlinked [PackageBundle] for the given [package]. If the bundle
    * has not been compute yet, return `null` and schedule its computation.
    */
-  PackageBundle _getUnlinkedOrSchedule(PubPackage package) {
+  PackageBundle _getUnlinkedOrSchedule(PubPackage package, bool strongMode) {
     // Try to find in the cache.
     PackageBundle bundle = unlinkedBundleMap[package];
     if (bundle != null) {
       return bundle;
     }
     // Try to read from the file system.
-    File unlinkedFile =
-        package.folder.getChildAssumingFile(UNLINKED_BUNDLE_FILE_NAME);
+    String fileName = _getUnlinkedName(strongMode);
+    File unlinkedFile = package.folder.getChildAssumingFile(fileName);
     if (unlinkedFile.exists) {
       try {
         List<int> bytes = unlinkedFile.readAsBytesSync();
         bundle = new PackageBundle.fromBuffer(bytes);
         unlinkedBundleMap[package] = bundle;
         return bundle;
       } on FileSystemException {
         // Ignore file system exceptions.
       }
     }
     // Schedule computation in the background.
     if (package != null && seenPackages.add(package)) {
       if (packagesToComputeUnlinked.isEmpty) {
         _scheduleNextUnlinked();
       }
       packagesToComputeUnlinked.add(package);
     }
     // The bundle is for available.
     return null;
   }
 
   /**
    * Parse the given [source] into AST.
    */
-  CompilationUnit _parse(Source source) {
+  CompilationUnit _parse(Source source, bool strongMode) {
     String code = source.contents.data;
     AnalysisErrorListener errorListener = AnalysisErrorListener.NULL_LISTENER;
     CharSequenceReader reader = new CharSequenceReader(code);
     Scanner scanner = new Scanner(source, reader, errorListener);
+    scanner.scanGenericMethodComments = strongMode;
     Token token = scanner.tokenize();
     LineInfo lineInfo = new LineInfo(scanner.lineStarts);
     Parser parser = new Parser(source, errorListener);
+    parser.parseGenericMethodComments = strongMode;
     CompilationUnit unit = parser.parseCompilationUnit(token);
     unit.lineInfo = lineInfo;
     return unit;
   }
 
   /**
    * Schedule delayed computation of the next package unlinked bundle from the
    * set of [packagesToComputeUnlinked].  We delay each computation because we
    * want operations in analysis server to proceed, and computing bundles of
    * packages is a background task.
@@ skipping 87 matching lines @@
         v.failed = true;
       }
       return dependencyLibrary;
     }, (String absUri) {
       UnlinkedUnit unlinkedUnit = store.unlinkedMap[absUri];
       if (unlinkedUnit == null) {
         // TODO(scheglov) add test
         v.failed = true;
       }
       return unlinkedUnit;
     }, false);

[Paul Berry, 2016/08/10 21:34:42]

Need to pass true when linking in strong mode.

[scheglov, 2016/08/10 21:41:37]

Done.

     if (!v.failed) {
       PackageBundleAssembler assembler = new PackageBundleAssembler();
       map.forEach((uri, linkedLibrary) {
         assembler.addLinkedLibrary(uri, linkedLibrary);
       });
       v.linkedBuilder = assembler.assemble();
       store.addBundle(null, v.linkedBuilder);
     }
   }
 
   @override
   void evaluateScc(List<_LinkedNode> scc) {
     print('evaluateScc: $scc');
     // TODO(scheglov): implement evaluateScc
   }
 }