Version 3.6.0-232.0.dev

Merge 5a4bcb2 into dev
dart-lang · Sep 10, 2024 · a60078a · a60078a
2 parents 4c4def6 + 5a4bcb2
commit a60078a
Show file tree

Hide file tree

Showing 33 changed files with 762 additions and 687 deletions.
diff --git a/build/gn_run_binary.py b/build/gn_run_binary.py
@@ -24,8 +24,8 @@ def run_command(command):
         subprocess.check_output(command, stderr=subprocess.STDOUT)
         return 0
     except subprocess.CalledProcessError as e:
-        return ("Command failed: " + ' '.join(command) + "\n" + "output: " +
-                _decode(e.output))
+        return ("Command failed: " + ' '.join(command) + "\n" + "exitCode: " +
+                str(e.returncode) + "\n" + "output: " + _decode(e.output))
     except OSError as e:
         return ("Command failed: " + ' '.join(command) + "\n" + "output: " +
                 _decode(e.strerror))

diff --git a/pkg/analyzer/lib/src/dart/resolver/extension_member_resolver.dart b/pkg/analyzer/lib/src/dart/resolver/extension_member_resolver.dart
@@ -84,7 +84,7 @@ class ExtensionMemberResolver {
   /// returns [ResolutionResult.ambiguous].
   ResolutionResult findExtension(
       DartType type, SyntacticEntity nameEntity, Name name) {
-    var extensions = _resolver.definingLibrary.accessibleExtensions
+    var extensions = _resolver.libraryFragment.scope.accessibleExtensions
         .havingMemberWithBaseName(name)
         .applicableTo(
           targetLibrary: _resolver.definingLibrary,

diff --git a/pkg/analyzer/test/src/dart/resolution/extension_method_test.dart b/pkg/analyzer/test/src/dart/resolution/extension_method_test.dart
@@ -1363,6 +1363,47 @@ MethodInvocation
 ''');
   }
 
+  test_instance_method_fromInstance_importInPart() async {
+    newFile('$testPackageLibPath/x.dart', r'''
+extension E on int {
+  void foo() {}
+}
+''');
+
+    newFile('$testPackageLibPath/a.dart', r'''
+part 'b.dart';
+''');
+
+    var b = newFile('$testPackageLibPath/b.dart', r'''
+part of 'a.dart';
+import 'x.dart';
+void f() {
+  0.foo();
+}
+''');
+
+    await resolveFile2(b);
+    assertErrorsInResult([]);
+
+    var node = findNode.singleMethodInvocation;
+    assertResolvedNodeText(node, r'''
+MethodInvocation
+  target: IntegerLiteral
+    literal: 0
+    staticType: int
+  operator: .
+  methodName: SimpleIdentifier
+    token: foo
+    staticElement: package:test/x.dart::<fragment>::@extension::E::@method::foo
+    staticType: void Function()
+  argumentList: ArgumentList
+    leftParenthesis: (
+    rightParenthesis: )
+  staticInvokeType: void Function()
+  staticType: void
+''');
+  }
+
   test_instance_method_fromInstance_Never() async {
     await assertErrorsInCode('''
 extension E on Never {