Merge pull request #4697 from pq/analyzer_0.27.4-alpha.14

Update to latest analyzer (0.27.4-alpha.14) and misc. analysis fixes.

packages/flutter/lib/src/widgets/framework.dart

@@ -326,6 +326,9 @@ abstract class StatelessWidget extends Widget {
   /// provides the set of inherited widgets for this location in the tree.
   @protected
   Widget build(BuildContext context);
+
+  /// Trampoline to make the [build] closure library-accessible.
+  WidgetBuilder get _build => build;
 }
 
 /// StatefulWidgets provide the configuration for
@@ -484,6 +487,9 @@ abstract class State<T extends StatefulWidget> {
   @protected
   Widget build(BuildContext context);
 
+  /// Trampoline to make the [build] closure library-accessible.
+  WidgetBuilder get _build => build;
+
   /// Called when an Inherited widget in the ancestor chain has changed. Usually
   /// there is nothing to do here; whenever this is called, build() is also
   /// called.
@@ -1606,7 +1612,7 @@ abstract class ComponentElement extends BuildableElement {
 /// Instantiation of [StatelessWidget]s.
 class StatelessElement extends ComponentElement {
   StatelessElement(StatelessWidget widget) : super(widget) {
-    _builder = widget.build;
+    _builder = widget._build;
   }
 
   @override
@@ -1616,14 +1622,14 @@ class StatelessElement extends ComponentElement {
   void update(StatelessWidget newWidget) {
     super.update(newWidget);
     assert(widget == newWidget);
-    _builder = widget.build;
+    _builder = widget._build;
     _dirty = true;
     rebuild();
   }
 
   @override
   void _reassemble() {
-    _builder = widget.build;
+    _builder = widget._build;
     super._reassemble();
   }
 }
@@ -1636,7 +1642,7 @@ class StatefulElement extends ComponentElement {
     assert(_state._element == null);
     _state._element = this;
     assert(_builder == _buildNothing);
-    _builder = _state.build;
+    _builder = _state._build;
     assert(_state._config == null);
     _state._config = widget;
     assert(_state._debugLifecycleState == _StateLifecycle.created);
@@ -1647,7 +1653,7 @@ class StatefulElement extends ComponentElement {
 
   @override
   void _reassemble() {
-    _builder = state.build;
+    _builder = state._build;
     super._reassemble();
   }
 

packages/flutter_test/pubspec.yaml

@@ -10,7 +10,7 @@ dependencies:
   # We don't actually depend on 'analyzer', but 'test' and 'flutter_tools' do.
   # We pin the version of analyzer we depend on to avoid version skew across our
   # packages.
-  analyzer: 0.27.4-alpha.9
+  analyzer: 0.27.4-alpha.14
 
   flutter:
     path: ../flutter

packages/flutter_tools/lib/src/dart/analysis.dart

@@ -90,22 +90,30 @@ class AnalysisDriver {
 
   List<UriResolver> _getResolvers(InternalAnalysisContext context,
       Map<String, List<file_system.Folder>> packageMap) {
-    DirectoryBasedDartSdk sdk = new DirectoryBasedDartSdk(new JavaFile(sdkDir));
+
-    sdk.analysisOptions = context.analysisOptions;
+
-    // TODO(pq): re-enable once we have a proper story for SDK summaries
+    // Create our list of resolvers.
-    // in the presence of embedders (https://github.com/dart-lang/sdk/issues/26467).
-    sdk.useSummary = false;
     List<UriResolver> resolvers = <UriResolver>[];
+    
+    // Look for an embedder.
+    EmbedderYamlLocator locator = new EmbedderYamlLocator(packageMap);
+    if (locator.embedderYamls.isNotEmpty) {
+      // Create and configure an embedded SDK.
+      EmbedderSdk sdk = new EmbedderSdk(locator.embedderYamls);
+      // Fail fast if no URI mappings are found.
+      assert(sdk.libraryMap.size() > 0);
+      sdk.analysisOptions = context.analysisOptions;
+      // TODO(pq): re-enable once we have a proper story for SDK summaries
+      // in the presence of embedders (https://github.com/dart-lang/sdk/issues/26467).
+      sdk.useSummary = false;
 
-    EmbedderYamlLocator yamlLocator = context.embedderYamlLocator;
-    yamlLocator.refresh(packageMap);
-
-    EmbedderUriResolver embedderUriResolver =
-        new EmbedderUriResolver(yamlLocator.embedderYamls);
-    if (embedderUriResolver.length == 0) {
       resolvers.add(new DartUriResolver(sdk));
     } else {
-      resolvers.add(embedderUriResolver);
+      // Fall back to a standard SDK if no embedder is found.
+      DirectoryBasedDartSdk sdk = new DirectoryBasedDartSdk(new JavaFile(sdkDir));
+      sdk.analysisOptions = context.analysisOptions;
+
+      resolvers.add(new DartUriResolver(sdk));
     }
 
     if (options.packageRootPath != null) {
@@ -113,7 +121,7 @@ class AnalysisDriver {
       resolvers.add(new PackageUriResolver(<JavaFile>[packageDirectory]));
     }
 
-    resolvers.add(new FileUriResolver());
+    resolvers.add(new file_system.ResourceUriResolver(PhysicalResourceProvider.INSTANCE));
     return resolvers;
   }
 
@@ -202,6 +210,7 @@ class DriverOptions extends AnalysisOptionsImpl {
     cacheSize = 512;
     lint = true;
     generateSdkErrors = false;
+    trackCacheDependencies = false;
   }
 
   /// The path to the dart SDK.

packages/flutter_tools/pubspec.yaml

@@ -33,7 +33,7 @@ dependencies:
   test: 0.12.13+5
 
   # Pinned in flutter_test as well.
-  analyzer: 0.27.4-alpha.9
+  analyzer: 0.27.4-alpha.14
 
 dev_dependencies:
   mockito: ^0.11.0