Version 1.19.0-dev.1.0

Merge 'b78aeee6f20dcad020267443bae6b00017f1eae0' into dev

Author: whesse

DEPS

@@ -56,7 +56,7 @@ vars = {
   "dart_services_rev" : "@7aea2574e6f3924bf409a80afb8ad52aa2be4f97",
   "dart_style_tag": "@0.2.4",
   "dartdoc_tag" : "@v0.9.6+2",
-  "dev_compiler_rev": "@108f2a2a03b1926e640013f3244df625b42ec380",
+  "dev_compiler_rev": "@d39946fd7af11d02a8831dbd7a2b776c69099ff6",
   "fixnum_tag": "@0.10.5",
   "func_rev": "@8d4aea75c21be2179cb00dc2b94a71414653094e",
   "glob_rev": "@704cf75e4f26b417505c5c611bdaacd8808467dd",
@@ -71,7 +71,7 @@ vars = {
   "isolate_tag": "@0.2.2",
   "jinja2_rev": "@2222b31554f03e62600cd7e383376a7c187967a1",
   "json_rpc_2_tag": "@2.0.0",
-  "linter_rev": "@7ca3aab6ca45b988440e425c187993a533fbe27e",
+  "linter_rev": "@0abfb82a7d8c36946a2a9f00c699fa5a925abec3",
   "logging_rev": "@85d83e002670545e9039ad3985f0018ab640e597",
   "markdown_rev": "@4aaadf3d940bb172e1f6285af4d2b1710d309982",
   "matcher_tag": "@0.12.0",
@@ -81,7 +81,7 @@ vars = {
   "oauth2_tag": "@1.0.0",
   "observatory_pub_packages_rev": "@e5e1e543bea10d4bed95b22ad3e7aa2b20a23584",
   "observe_rev": "@eee2b8ec34236fa46982575fbccff84f61202ac6",
-  "package_config_rev": "@0.1.5",
+  "package_config_rev": "@1.0.0",
   "path_tag": "@1.3.6",
   "plugin_tag": "@0.2.0",
   "ply_rev": "@604b32590ffad5cbb82e4afef1d305512d06ae93",

pkg/analysis_server/pubspec.yaml

@@ -12,6 +12,7 @@ dependencies:
   isolate: ^0.2.2
   linter: ^0.1.16
   logging: any
+  package_config: '>=0.1.5 <2.0.0'
   path: any
   plugin: ^0.2.0
   watcher: any

pkg/analysis_server/test/context_manager_test.dart

@@ -9,7 +9,6 @@ import 'dart:collection';
 import 'package:analysis_server/src/context_manager.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/memory_file_system.dart';
-import 'package:analyzer/file_system/physical_file_system.dart';
 import 'package:analyzer/instrumentation/instrumentation.dart';
 import 'package:analyzer/source/embedder.dart';
 import 'package:analyzer/source/error_processor.dart';

pkg/analysis_server/test/services/completion/completion_target_test.dart

@@ -64,11 +64,7 @@ class CompletionTargetTest extends AbstractContextTest {
   test_ArgumentList_InstanceCreationExpression2() {
     // ArgumentList  InstanceCreationExpression  Block
     addTestSource('main() {new Foo(a,^)}');
-    if (context.analysisOptions.enableTrailingCommas) {
-      assertTarget(')', '(a)', argIndex: 1);
-    } else {
-      assertTarget('', '(a, )', argIndex: 1);
-    }
+    assertTarget(')', '(a)', argIndex: 1);
   }
 
   test_ArgumentList_InstanceCreationExpression_functionArg2() {
@@ -104,11 +100,7 @@ class CompletionTargetTest extends AbstractContextTest {
   test_ArgumentList_MethodInvocation4() {
     // ArgumentList  MethodInvocation  Block
     addTestSource('main() {foo(n,^)}');
-    if (context.analysisOptions.enableTrailingCommas) {
-      assertTarget(')', '(n)', argIndex: 1);
-    } else {
-      assertTarget('', '(n, )', argIndex: 1);
-    }
+    assertTarget(')', '(n)', argIndex: 1);
   }
 
   test_ArgumentList_MethodInvocation_functionArg() {

pkg/analyzer/lib/src/context/cache.dart

@@ -8,8 +8,6 @@ import 'dart:async';
 import 'dart:collection';
 
 import 'package:analyzer/file_system/file_system.dart';
-import 'package:analyzer/src/dart/element/element.dart'
-    show ElementImpl, Modifier;
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/java_engine.dart';
 import 'package:analyzer/src/generated/source.dart';
@@ -559,7 +557,7 @@ class CacheEntry {
 //      }
 //      valueStr = valueStr.replaceAll('\n', '\\n');
 //      print(
-//          'setValue $descriptor for $target value=$valueStr $dependedOn=$dependedOn');
+//          'setValue $descriptor for $target value=$valueStr dependedOn=$dependedOn');
 //    }
     _validateStateChange(descriptor, CacheState.VALID);
     TargetedResult thisResult = new TargetedResult(target, descriptor);
@@ -659,44 +657,51 @@ class CacheEntry {
         return;
       }
     }
-//    if (deltaResult != null && deltaResult != DeltaResult.KEEP_CONTINUE) {
+//    if (deltaResult != null) {
 //      String indent = '  ' * level;
 //      String deltaResultName = deltaResult.toString().split('.').last;
 //      print('[$id]$indent$deltaResultName $descriptor for $target');
 //    }
     if (deltaResult == DeltaResult.INVALIDATE_NO_DELTA) {
       delta = null;
     }
-    if (deltaResult == null ||
+    if (deltaResult == DeltaResult.INVALIDATE_KEEP_DEPENDENCIES) {
+      thisData.value = descriptor.defaultValue;
+      thisData.state = CacheState.INVALID;
+    } else if (deltaResult == null ||
         deltaResult == DeltaResult.INVALIDATE ||
         deltaResult == DeltaResult.INVALIDATE_NO_DELTA) {
       _resultMap.remove(descriptor);
-//      {
-//        String indent = '  ' * level;
-//        print('[$id]$indent invalidate $descriptor for $target');
-//      }
-    }
-    // Stop depending on other results.
-    if (deltaResult != DeltaResult.KEEP_CONTINUE) {
-      TargetedResult thisResult = new TargetedResult(target, descriptor);
-      List<AnalysisCache> caches = _partition.containingCaches;
-      int cacheLength = caches.length;
-      List<TargetedResult> results = thisData.dependedOnResults;
-      int resultLength = results.length;
-      for (int i = 0; i < resultLength; i++) {
-        TargetedResult dependedOnResult = results[i];
-        for (int j = 0; j < cacheLength; j++) {
-          AnalysisCache cache = caches[j];
-          CacheEntry entry = cache.get(dependedOnResult.target);
-          if (entry != null) {
-            ResultData data =
-                entry.getResultDataOrNull(dependedOnResult.result);
-            if (data != null) {
-              data.dependentResults.remove(thisResult);
+      // Stop depending on other results.
+      if (deltaResult != DeltaResult.KEEP_CONTINUE) {
+        TargetedResult thisResult = new TargetedResult(target, descriptor);
+        List<AnalysisCache> caches = _partition.containingCaches;
+        int cacheLength = caches.length;
+        List<TargetedResult> results = thisData.dependedOnResults;
+        int resultLength = results.length;
+        for (int i = 0; i < resultLength; i++) {
+          TargetedResult dependedOnResult = results[i];
+          for (int j = 0; j < cacheLength; j++) {
+            AnalysisCache cache = caches[j];
+            CacheEntry entry = cache.get(dependedOnResult.target);
+            if (entry != null) {
+              ResultData data =
+                  entry.getResultDataOrNull(dependedOnResult.result);
+              if (data != null) {
+                data.dependentResults.remove(thisResult);
+              }
             }
           }
         }
       }
+//      if (deltaResult == null) {
+//        String indent = '  ' * level;
+//        print('[$id]$indent invalidate $descriptor for $target');
+//        if ('$descriptor for $target' ==
+//            'READY_LIBRARY_ELEMENT2 for /Users/scheglov/tmp/limited-invalidation/async/lib/async.dart') {
+//          print('interesting');
+//        }
+//      }
     }
     // Invalidate results that depend on this result.
     _invalidateDependentResults(id, thisData, delta, level + 1);
@@ -1269,10 +1274,16 @@ class Delta {
 enum DeltaResult {
   /**
    * Invalidate this result and continue visiting dependent results
-   * with this [Delta].
+   * with this [Delta]. Remove the result and all its dependencies.
    */
   INVALIDATE,
 
+  /**
+   * Invalidate this result and continue visiting dependent results
+   * with this [Delta]. Keep the dependencies of this result.
+   */
+  INVALIDATE_KEEP_DEPENDENCIES,
+
   /**
    * Invalidate this result and stop using this [Delta], so unconditionally
    * invalidate all the dependent results.

pkg/analyzer/lib/src/context/context.dart

@@ -298,8 +298,7 @@ class AnalysisContextImpl implements InternalAnalysisContext {
             options.enableStrictCallChecks ||
         this._options.enableGenericMethods != options.enableGenericMethods ||
         this._options.enableAsync != options.enableAsync ||
-        this._options.enableSuperMixins != options.enableSuperMixins ||
-        this._options.enableTrailingCommas != options.enableTrailingCommas;
+        this._options.enableSuperMixins != options.enableSuperMixins;
     int cacheSize = options.cacheSize;
     if (this._options.cacheSize != cacheSize) {
       this._options.cacheSize = cacheSize;
@@ -315,7 +314,6 @@ class AnalysisContextImpl implements InternalAnalysisContext {
     this._options.enableAsync = options.enableAsync;
     this._options.enableSuperMixins = options.enableSuperMixins;
     this._options.enableTiming = options.enableTiming;
-    this._options.enableTrailingCommas = options.enableTrailingCommas;
     this._options.hint = options.hint;
     this._options.incremental = options.incremental;
     this._options.incrementalApi = options.incrementalApi;
@@ -1859,9 +1857,10 @@ class AnalysisContextImpl implements InternalAnalysisContext {
         // TODO(scheglov) Incorrect implementation in general.
         entry.setState(TOKEN_STREAM, CacheState.FLUSHED);
         entry.setState(PARSED_UNIT, CacheState.FLUSHED);
-        List<Source> librarySources = getLibrariesContaining(source);
-        if (librarySources.length == 1) {
-          Source librarySource = librarySources[0];
+        SourceKind sourceKind = getKindOf(source);
+        List<Source> partSources = getResult(source, INCLUDED_PARTS);
+        if (sourceKind == SourceKind.LIBRARY && partSources.isEmpty) {
+          Source librarySource = source;
           // Try to find an old unit which has element model.
           CacheEntry unitEntry =
               getCacheEntry(new LibrarySpecificUnit(librarySource, source));

pkg/analyzer/lib/src/dart/ast/ast.dart

@@ -398,7 +398,7 @@ class ArgumentListImpl extends AstNodeImpl implements ArgumentList {
   @override
   void set correspondingPropagatedParameters(
       List<ParameterElement> parameters) {
-    if (parameters.length != _arguments.length) {
+    if (parameters != null && parameters.length != _arguments.length) {
       throw new IllegalArgumentException(
           "Expected ${_arguments.length} parameters, not ${parameters.length}");
     }
@@ -410,7 +410,7 @@ class ArgumentListImpl extends AstNodeImpl implements ArgumentList {
 
   @override
   void set correspondingStaticParameters(List<ParameterElement> parameters) {
-    if (parameters.length != _arguments.length) {
+    if (parameters != null && parameters.length != _arguments.length) {
       throw new IllegalArgumentException(
           "Expected ${_arguments.length} parameters, not ${parameters.length}");
     }

pkg/analyzer/lib/src/generated/element_resolver.dart

@@ -698,16 +698,12 @@ class ElementResolver extends SimpleAstVisitor<Object> {
     if (staticInvokeType != null) {
       List<ParameterElement> parameters =
           _computeCorrespondingParameters(argumentList, staticInvokeType);
-      if (parameters != null) {
-        argumentList.correspondingStaticParameters = parameters;
-      }
+      argumentList.correspondingStaticParameters = parameters;
     }
     if (propagatedInvokeType != null) {
       List<ParameterElement> parameters =
           _computeCorrespondingParameters(argumentList, propagatedInvokeType);
-      if (parameters != null) {
-        argumentList.correspondingPropagatedParameters = parameters;
-      }
+      argumentList.correspondingPropagatedParameters = parameters;
     }
     //
     // Then check for error conditions.

pkg/analyzer/lib/src/generated/engine.dart

@@ -1086,12 +1086,6 @@ abstract class AnalysisOptions {
    */
   bool get enableTiming;
 
-  /**
-   * Return `true` to enable trailing commas in parameter and argument lists
-   * (sdk#26647).
-   */
-  bool get enableTrailingCommas;
-
   /**
    * A flag indicating whether finer grained dependencies should be used
    * instead of just source level dependencies.
@@ -1347,7 +1341,6 @@ class AnalysisOptionsImpl implements AnalysisOptions {
     enableGenericMethods = options.enableGenericMethods;
     enableSuperMixins = options.enableSuperMixins;
     enableTiming = options.enableTiming;
-    enableTrailingCommas = options.enableTrailingCommas;
     generateImplicitErrors = options.generateImplicitErrors;
     generateSdkErrors = options.generateSdkErrors;
     hint = options.hint;

pkg/analyzer/lib/src/generated/parser.dart

@@ -2188,12 +2188,6 @@ class Parser {
    */
   bool parseGenericMethodComments = false;
 
-  /**
-   * A flag indicating whether the parser is to parse trailing commas in
-   * parameter and argument lists (sdk#26647).
-   */
-  bool parseTrailingCommas = false;
-
   /**
    * Initialize a newly created parser to parse tokens in the given [_source]
    * and to report any errors that are found to the given [_errorListener].
@@ -2330,7 +2324,7 @@ class Parser {
       bool foundNamedArgument = argument is NamedExpression;
       bool generatedError = false;
       while (_optional(TokenType.COMMA)) {
-        if (parseTrailingCommas && _matches(TokenType.CLOSE_PAREN)) {
+        if (_matches(TokenType.CLOSE_PAREN)) {
           break;
         }
         argument = parseArgument();
@@ -6146,7 +6140,7 @@ class Parser {
       type = _currentToken.type;
 
       // Advance past trailing commas as appropriate.
-      if (parseTrailingCommas && type == TokenType.COMMA) {
+      if (type == TokenType.COMMA) {
         // Only parse commas trailing normal (non-positional/named) params.
         if (rightSquareBracket == null && rightCurlyBracket == null) {
           Token next = _peek();