commit 775dd08ae91ad3e946a59202d79daa852a5add79
author Jacob MacDonald <jakemac@google.com> Mon Mar 25 14:33:26 2019 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org> Mon Mar 25 14:33:26 2019 +0000
tree f29d17dcc235e4a818c15c277e76623be800049d
parent 51da94da76f284a129519139338a1a88d6244411

add some fixes to the widget transformer so it can find the flutter libs and assume the location arg exists on widget constructors

Change-Id: I4dc119f559be2cdbeb6a673c90662a856b24e44f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/97682
Commit-Queue: Jake Macdonald <jakemac@google.com>
Reviewed-by: Jacob Richman <jacobr@google.com>
Reviewed-by: Jenny Messerly <jmesserly@google.com>

pkg/dev_compiler/lib/src/flutter/track_widget_constructor_locations.dart

diff --git a/pkg/dev_compiler/lib/src/flutter/track_widget_constructor_locations.dart b/pkg/dev_compiler/lib/src/flutter/track_widget_constructor_locations.dart
index e44eb59..02d12f2 100644
--- a/pkg/dev_compiler/lib/src/flutter/track_widget_constructor_locations.dart
+++ b/pkg/dev_compiler/lib/src/flutter/track_widget_constructor_locations.dart
@@ -80,7 +80,15 @@
     return;
   }
   if (!_hasNamedParameter(function, _creationLocationParameterName)) {
-    return;
+    // TODO(jakemac): We don't apply the transformation to dependencies kernel
+    // outlines, so instead we just assume the named parameter exists.
+    //
+    // The only case in which it shouldn't exist is if the function has optional
+    // positional parameters so it cannot have optional named parameters.
+    if (function.requiredParameterCount !=
+        function.positionalParameters.length) {
+      return;
+    }
   }
 
   final NamedExpression namedArgument =
@@ -315,17 +323,18 @@
     // the latest version
     for (Library library in libraries) {
       final Uri importUri = library.importUri;
-      if (!library.isExternal &&
-          importUri != null &&
-          importUri.scheme == 'package') {
-        if (importUri.path == 'flutter/src/widgets/framework.dart') {
+      if (importUri != null && importUri.scheme == 'package') {
+        if (importUri.path == 'flutter/src/widgets/framework.dart' ||
+            importUri.path == 'flutter_web/src/widgets/framework.dart') {
           for (Class class_ in library.classes) {
             if (class_.name == 'Widget') {
               _widgetClass = class_;
             }
           }
         } else {
-          if (importUri.path == 'flutter/src/widgets/widget_inspector.dart') {
+          if (importUri.path == 'flutter/src/widgets/widget_inspector.dart' ||
+              importUri.path ==
+                  'flutter_web/src/widgets/widget_inspector.dart') {
             for (Class class_ in library.classes) {
               if (class_.name == '_HasCreationLocation') {
                 _hasCreationLocationClass = class_;