Include linked hashes into the current file state.

pkg/analyzer/lib/src/dart/analysis/driver.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:convert';
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
@@ skipping 110 matching lines @@
   final _explicitFiles = new LinkedHashSet<String>();
 
   /**
    * The set of files that are currently scheduled for analysis.
    */
   final _filesToAnalyze = new LinkedHashSet<String>();
 
   /**
    * The current file state.
    *
-   * It maps file paths to MD5 hash of the file content.
+   * It maps file paths to the MD5 hash of the file content.
    */
   final _fileContentHashMap = <String, String>{};
 
   /**
+   * Mapping from library URIs to the linked hash of the library.
+   */
+  final _linkedHashMap = <Uri, String>{};

[Paul Berry, 2016/10/24 11:51:47]

My comments about nomenclature from the last patch apply here too.  Consider
renaming to something like "_dependencyHashMap".

[scheglov, 2016/10/24 17:44:37]

Acknowledged.
I renamed them together.

+
+  /**
    * TODO(scheglov) document and improve
    */
   final _hasWorkStreamController = new StreamController<String>();
 
   AnalysisDriver(this._logger, this._resourceProvider, this._byteStore,
       this._contentCache, this._sourceFactory, this._analysisOptions) {
     _sdkBundle = _sourceFactory.dartSdk.getLinkedBundle();
   }
 
   /**
@@ skipping 80 matching lines @@
    * transitions to "idle".
    *
    * Invocation of this method will not prevent a [Future] returned from
    * [getResult] from completing with a result, but the result is not
    * guaranteed to be consistent with the new current file state after this
    * [changeFile] invocation.
    */
   void changeFile(String path) {
     // TODO(scheglov) Don't clear, schedule API signature validation.
     _fileContentHashMap.clear();
+    _linkedHashMap.clear();
     _filesToAnalyze.add(path);
     _filesToAnalyze.addAll(_explicitFiles);
     // TODO(scheglov) name?!
     _hasWorkStreamController.add('do it!');
   }
 
   /**
    * Return the [Future] that completes with a [AnalysisResult] for the file
    * with the given [path].
    *
@@ skipping 24 matching lines @@
    */
   void removeFile(String path) {
     _explicitFiles.remove(path);
     _filesToAnalyze.remove(path);
   }
 
   /**
    * TODO(scheglov) replace with actual [AnalysisResult] computing.
    */
   List<String> _computeAndPrintErrors(_File file) {
+    // TODO(scheglov) Computing resolved unit fails for these units.
+    // pkg/analyzer/lib/plugin/embedded_resolver_provider.dart
+    // pkg/analyzer/lib/plugin/embedded_resolver_provider.dart
+    if (file.path.endsWith(
+            'pkg/analyzer/lib/plugin/embedded_resolver_provider.dart') ||
+        file.path.endsWith('pkg/analyzer/lib/source/embedder.dart') ||
+        file.path.endsWith('pkg/analyzer/lib/src/generated/ast.dart') ||
+        file.path.endsWith('pkg/analyzer/lib/src/generated/element.dart') ||
+        file.path
+            .endsWith('pkg/analyzer/lib/src/generated/element_handle.dart') ||
+        file.path.endsWith('pkg/analyzer/lib/src/generated/error.dart') ||
+        file.path.endsWith('pkg/analyzer/lib/src/generated/scanner.dart') ||
+        file.path.endsWith('pkg/analyzer/lib/src/generated/sdk_io.dart') ||
+        file.path.endsWith('pkg/analyzer/lib/src/generated/visitors.dart') ||
+        file.path.endsWith('pkg/analyzer/test/generated/constant_test.dart') ||
+        file.path.endsWith('pkg/analyzer/test/source/embedder_test.dart')) {
+      return [];
+    }
+
     List<String> errorStrings = _logger.run('Compute errors $file', () {
       LibraryContext libraryContext = _createLibraryContext(file);
 
       String errorsKey;
       {
         ApiSignature signature = new ApiSignature();
         signature.addString(libraryContext.node.linkedHash);
         signature.addString(file.contentHash);
         errorsKey = '${signature.toHex()}.errors';
       }
 
       {
         List<int> bytes = _byteStore.get(errorsKey);
         if (bytes != null) {
           fb.BufferContext bp = new fb.BufferContext.fromBytes(bytes);
           int table = bp.derefObject(0);
           return const fb.ListReader<String>(const fb.StringReader())
               .vTableGet(bp, table, 0);
         }
       }
 
       AnalysisContext analysisContext = _createAnalysisContext(libraryContext);
-      analysisContext.resolveCompilationUnit2(
-          libraryContext.file.source, libraryContext.file.source);
+      analysisContext.setContents(file.source, file.content);
       try {
+        // Compute resolved unit.
+//        _logger.runTimed('Computed resolved unit', () {

[Paul Berry, 2016/10/24 11:51:47]

Why is this code commented out?  Either remove or add a TODO comment.

[scheglov, 2016/10/24 17:44:37]

We don't actually compute full analysis results yet.
Will implement soon.

+//          analysisContext.resolveCompilationUnit2(
+//              libraryContext.file.source, libraryContext.file.source);
+//        });
+        // Compute errors.
         List<AnalysisError> errors;
         try {
           errors = _logger.runTimed('Computed errors', () {
             return analysisContext.computeErrors(file.source);
           });
         } catch (e, st) {
           // TODO(scheglov) why does it fail?
           // Caused by Bad state: Unmatched TypeParameterElementImpl T
           errors = [];
         }
@@ skipping 552 matching lines @@
     }
     return _dependencies;
   }
 
   @override
   int get hashCode => uri.hashCode;
 
   bool get isReady => linked != null;
 
   String get linkedHash {
-    if (_linkedHash == null) {
-      if (transitiveDependencies == null) {
-        computeTransitiveDependencies();
-      }
+    _linkedHash ??= driver._linkedHashMap.putIfAbsent(uri, () {
+      computeTransitiveDependencies();
 
       // Add all unlinked API signatures.
       List<String> signatures = <String>[];
       signatures.add(driver._sdkBundle.apiSignature);
       transitiveDependencies
           .map((node) => node.unlinkedBundles)
           .expand((bundles) => bundles)
           .map((bundle) => bundle.apiSignature)
           .forEach(signatures.add);
       signatures.sort();
 
       // Combine into a single hash.
       ApiSignature signature = new ApiSignature();
       signature.addString(uri.toString());
       signatures.forEach(signature.addString);
-      _linkedHash = signature.toHex();
-    }
+      return signature.toHex();
+    });
     return _linkedHash;
   }
 
   bool operator ==(other) {
     return other is _LibraryNode && other.uri == uri;
   }
 
   void computeTransitiveDependencies() {
     if (transitiveDependencies == null) {
       transitiveDependencies = new Set<_LibraryNode>();
 
       void appendDependencies(_LibraryNode node) {
         if (transitiveDependencies.add(node)) {
           node.dependencies.forEach(appendDependencies);
         }
       }
 
       appendDependencies(this);
     }
   }
 
   @override
   String toString() => uri.toString();
 }