Version 3.6.0-289.0.dev

Merge 15540bc into dev
dart-lang · Sep 27, 2024 · 133a2f3 · 133a2f3
2 parents 3a37ef3 + 15540bc
commit 133a2f3
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 22 deletions.
diff --git a/pkg/analyzer/lib/dart/element/element2.dart b/pkg/analyzer/lib/dart/element/element2.dart
@@ -1300,6 +1300,11 @@ abstract class LibraryImport {
 abstract class LocalFunctionElement implements ExecutableElement2 {
   /// The function in which the variable is defined.
   ExecutableFragment get enclosingFunction;
+
+  /// The offset of the name of this element in the file that contains the
+  /// declaration of this element, or `-1` if this element is synthetic, does
+  /// not have a name, or otherwise does not have an offset.
+  int get nameOffset;
 }
 
 /// A local variable.

diff --git a/pkg/analyzer/lib/src/dart/ast/ast.dart b/pkg/analyzer/lib/src/dart/ast/ast.dart
@@ -9400,13 +9400,7 @@ sealed class IdentifierImpl extends CommentReferableExpressionImpl
   @experimental
   @override
   Element2? get element {
-    var element = staticElement;
-    if (element case Fragment fragment) {
-      return fragment.element;
-    } else if (element case Element2 element) {
-      return element;
-    }
-    return null;
+    return staticElement.asElement2;
   }
 
   @override

diff --git a/pkg/analyzer/lib/src/dart/element/element.dart b/pkg/analyzer/lib/src/dart/element/element.dart
@@ -6481,6 +6481,9 @@ class LocalFunctionElementImpl extends ExecutableElementImpl2
   @override
   List<ElementAnnotation> get metadata => _wrappedElement.metadata;
 
+  @override
+  int get nameOffset => _wrappedElement.nameOffset;
+
   @override
   DartType get returnType => _wrappedElement.returnType;
 

diff --git a/pkg/analyzer/lib/src/utilities/extensions/element.dart b/pkg/analyzer/lib/src/utilities/extensions/element.dart
@@ -8,6 +8,7 @@ import 'package:analyzer/dart/element/nullability_suffix.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/dart/ast/ast.dart';
 import 'package:analyzer/src/dart/element/element.dart';
+import 'package:analyzer/src/dart/element/member.dart';
 import 'package:meta/meta.dart';
 
 extension Element2OrNullExtension on Element2? {
@@ -126,6 +127,9 @@ extension ElementOrNullExtension on Element? {
       return self;
     } else if (self is NeverElementImpl) {
       return self;
+    } else if (self is ParameterMember) {
+      // TODO(scheglov): we lose types here
+      return self.declaration.asElement2;
     } else if (self is PrefixElementImpl) {
       return self;
     } else {

diff --git a/pkg/analyzer/test/src/dart/resolution/function_reference_test.dart b/pkg/analyzer/test/src/dart/resolution/function_reference_test.dart
@@ -2805,10 +2805,10 @@ ExpressionStatement
     identifier: SimpleIdentifier
       token: loadLibrary
       staticElement: loadLibrary@-1
-<exception>
+      element: loadLibrary@-1
       staticType: Future<dynamic> Function()
     staticElement: loadLibrary@-1
-<exception>
+    element: loadLibrary@-1
     staticType: Future<dynamic> Function()
   semicolon: ;
 ''');
@@ -2829,7 +2829,7 @@ FunctionReference
   function: SimpleIdentifier
     token: foo
     staticElement: foo@20
-<exception>
+    element: foo@20
     staticType: void Function<T>(T)
   typeArguments: TypeArgumentList
     leftBracket: <

diff --git a/pkg/analyzer/test/src/dart/resolution/local_variable_test.dart b/pkg/analyzer/test/src/dart/resolution/local_variable_test.dart
@@ -162,7 +162,7 @@ f() {
 SimpleIdentifier
   token: _
   staticElement: _@52
-<exception>
+  element: _@52
   staticType: Null Function()
 ''');
   }

diff --git a/pkg/analyzer/test/src/dart/resolution/method_invocation_test.dart b/pkg/analyzer/test/src/dart/resolution/method_invocation_test.dart
@@ -2286,7 +2286,7 @@ MethodInvocation
   methodName: SimpleIdentifier
     token: loadLibrary
     staticElement: loadLibrary@-1
-<exception>
+    element: loadLibrary@-1
     staticType: Future<dynamic> Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -3554,7 +3554,7 @@ MethodInvocation
   methodName: SimpleIdentifier
     token: loadLibrary
     staticElement: loadLibrary@-1
-<exception>
+    element: loadLibrary@-1
     staticType: Future<dynamic> Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -3588,7 +3588,7 @@ MethodInvocation
   methodName: SimpleIdentifier
     token: loadLibrary
     staticElement: loadLibrary@-1
-<exception>
+    element: loadLibrary@-1
     staticType: Future<dynamic> Function()
   argumentList: ArgumentList
     leftParenthesis: (
@@ -6604,7 +6604,7 @@ MethodInvocation
   methodName: SimpleIdentifier
     token: g
     staticElement: g@20
-<exception>
+    element: g@20
     staticType: double Function(int, String)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -6635,7 +6635,7 @@ MethodInvocation
   methodName: SimpleIdentifier
     token: g
     staticElement: g@15
-<exception>
+    element: g@15
     staticType: T Function<T, U>(T, U)
   argumentList: ArgumentList
     leftParenthesis: (
@@ -6671,7 +6671,7 @@ MethodInvocation
   methodName: SimpleIdentifier
     token: g
     staticElement: g@15
-<exception>
+    element: g@15
     staticType: T Function<T>([T?])
   argumentList: ArgumentList
     leftParenthesis: (
@@ -6704,7 +6704,7 @@ MethodInvocation
   methodName: SimpleIdentifier
     token: g
     staticElement: g@15
-<exception>
+    element: g@15
     staticType: T Function<T>({required T a})
   argumentList: ArgumentList
     leftParenthesis: (
@@ -6716,7 +6716,7 @@ MethodInvocation
             staticElement: ParameterMember
               base: g@15::@parameter::a
               substitution: {T: int}
-            element: <null>
+            element: g@15::@parameter::a#element
             staticType: null
           colon: :
         expression: IntegerLiteral
@@ -7129,7 +7129,7 @@ MethodInvocation
   methodName: SimpleIdentifier
     token: foo
     staticElement: foo@16
-<exception>
+    element: foo@16
     staticType: void Function(int)
   argumentList: ArgumentList
     leftParenthesis: (

diff --git a/pkg/analyzer/test/src/dart/resolution/type_inference/function_test.dart b/pkg/analyzer/test/src/dart/resolution/type_inference/function_test.dart
@@ -84,7 +84,7 @@ MethodInvocation
             staticElement: ParameterMember
               base: <testLibraryFragment>::@function::foo::@parameter::x
               substitution: {T: int}
-            element: <null>
+            element: <testLibraryFragment>::@function::foo::@parameter::x#element
             staticType: null
           colon: :
         expression: IntegerLiteral

diff --git a/pkg/analyzer/test/util/element_printer.dart b/pkg/analyzer/test/util/element_printer.dart
@@ -105,6 +105,8 @@ class ElementPrinter {
         _sink.write('${element.name}@${element.nameOffset}');
       case LibraryElementImpl e:
         writeReference(e.reference!);
+      case LocalFunctionElementImpl():
+        _sink.write('${element.name}@${element.nameOffset}');
       case LocalVariableElementImpl():
         _sink.write('${element.name}@${element.nameOffset}');
       case LocalVariableElementImpl2():

diff --git a/pkg/dev_compiler/test/hot_reload_suite.dart b/pkg/dev_compiler/test/hot_reload_suite.dart
@@ -29,6 +29,7 @@ final testTimeoutSeconds = 10;
 final testDiffSeparator = '/** DIFF **/';
 
 final argParser = ArgParser()
+  ..addFlag('help', abbr: 'h', help: 'Display this message.', negatable: false)
   ..addOption('runtime',
       abbr: 'r',
       defaultsTo: 'd8',
@@ -71,6 +72,10 @@ late final bool debug;
 
 Future<void> main(List<String> args) async {
   final argResults = argParser.parse(args);
+  if (argResults['help'] as bool) {
+    print(argParser.usage);
+    return;
+  }
   final runtimePlatform =
       RuntimePlatforms.values.byName(argResults['runtime'] as String);
   final testNameFilter = RegExp(argResults['filter'] as String);

diff --git a/tools/VERSION b/tools/VERSION
@@ -27,5 +27,5 @@ CHANNEL dev
 MAJOR 3
 MINOR 6
 PATCH 0
-PRERELEASE 288
+PRERELEASE 289
 PRERELEASE_PATCH 0