Version 2.19.0-319.0.dev

Merge c42ab25 into dev

Author: Dart CI

CHANGELOG.md

@@ -108,6 +108,22 @@
 [`MirrorsUsed`]: https://api.dart.dev/stable/dart-mirrors/MirrorsUsed-class.html
 [`Comment`]: https://api.dart.dev/stable/dart-mirrors/Comment-class.html
 
+### Other libraries
+
+#### `package:js`
+
+- **Breaking changes to the preview feature `@staticInterop`**:
+  - Classes with this annotation are now disallowed from using `external`
+  generative constructors. Use `external factory`s for these classes instead,
+  and the behavior should be identical. See [#48730][] for more details.
+  - Classes with this annotation's external extension members are now disallowed
+  from using type parameters e.g. `external void method<T>(T t)`. Use a
+  non-`external` extension method for type parameters instead. See [#49350][]
+  for more details.
+
+[#48730]: https://github.com/dart-lang/sdk/issues/48730
+[#49350]: https://github.com/dart-lang/sdk/issues/49350
+
 ### Tools
 
 #### Analyzer

DEPS

@@ -149,7 +149,7 @@ vars = {
   "path_rev": "9955b27b9bb98d87591208e19eb01c51d29fd467",
   "ply_rev": "604b32590ffad5cbb82e4afef1d305512d06ae93",
   "pool_rev": "fa84ddd0e39f45bf3f09dcc5d6b9fbdda7820fef",
-  "protobuf_rev": "1d175bef6043bc4bdef5970f6dbd6d3001124373",
+  "protobuf_rev": "ba29983968de5b54196c6c2a5cff1afbdda24ae2",
   "pub_rev": "b9afe9270c24d040b8ae465b4b37ba4f7f4b4cc5", # manually rev'd
   "pub_semver_rev": "7671359982b4be9bdf87e621dd1bcdeac242b4b9",
   "root_certificates_rev": "692f6d6488af68e0121317a9c2c9eb393eb0ee50",

pkg/_fe_analyzer_shared/lib/src/messages/codes_generated.dart

@@ -7121,6 +7121,32 @@ const MessageCode messageJsInteropOperatorsNotSupported = const MessageCode(
     problemMessage: r"""JS interop classes do not support operator methods.""",
     correctionMessage: r"""Try replacing this with a normal method.""");
 
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Code<Null>
+    codeJsInteropStaticInteropExternalExtensionMembersWithTypeParameters =
+    messageJsInteropStaticInteropExternalExtensionMembersWithTypeParameters;
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const MessageCode
+    messageJsInteropStaticInteropExternalExtensionMembersWithTypeParameters =
+    const MessageCode(
+        "JsInteropStaticInteropExternalExtensionMembersWithTypeParameters",
+        problemMessage:
+            r"""`@staticInterop` classes cannot have external extension members with type parameters.""",
+        correctionMessage:
+            r"""Try using a Dart extension member if you need type parameters instead.""");
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Code<Null> codeJsInteropStaticInteropGenerativeConstructor =
+    messageJsInteropStaticInteropGenerativeConstructor;
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const MessageCode messageJsInteropStaticInteropGenerativeConstructor =
+    const MessageCode("JsInteropStaticInteropGenerativeConstructor",
+        problemMessage:
+            r"""`@staticInterop` classes should not contain any generative constructors.""",
+        correctionMessage: r"""Use factory constructors instead.""");
+
 // DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
 const Template<Message Function(String name, String string)>
     templateJsInteropStaticInteropMockExternalExtensionMemberConflict =

pkg/_js_interop_checks/lib/js_interop_checks.dart

@@ -19,6 +19,8 @@ import 'package:_fe_analyzer_shared/src/messages/codes.dart'
         messageJsInteropNonExternalConstructor,
         messageJsInteropNonExternalMember,
         messageJsInteropOperatorsNotSupported,
+        messageJsInteropStaticInteropExternalExtensionMembersWithTypeParameters,
+        messageJsInteropStaticInteropGenerativeConstructor,
         templateJsInteropDartClassExtendsJSClass,
         templateJsInteropStaticInteropWithInstanceMembers,
         templateJsInteropStaticInteropWithNonStaticSupertype,
@@ -33,6 +35,7 @@ class JsInteropChecks extends RecursiveVisitor {
   final CoreTypes _coreTypes;
   final DiagnosticReporter<Message, LocatedMessage> _diagnosticsReporter;
   final Map<String, Class> _nativeClasses;
+  final _TypeParameterVisitor _typeParameterVisitor = _TypeParameterVisitor();
   bool _classHasJSAnnotation = false;
   bool _classHasAnonymousAnnotation = false;
   bool _classHasStaticInteropAnnotation = false;
@@ -300,6 +303,26 @@ class JsInteropChecks extends RecursiveVisitor {
           procedure.name.text.length,
           procedure.fileUri);
     }
+
+    if (procedure.isExternal &&
+        procedure.isExtensionMember &&
+        _isStaticInteropExtensionMember(procedure)) {
+      // If the extension has type parameters of its own, it copies those type
+      // parameters to the procedure's type parameters (in the front) as well.
+      // Ignore these for the analysis.
+      var extensionTypeParams =
+          _libraryExtensionsIndex![procedure.reference]!.typeParameters;
+      var procedureTypeParams = List.from(procedure.function.typeParameters);
+      procedureTypeParams.removeRange(0, extensionTypeParams.length);
+      if (procedureTypeParams.isNotEmpty ||
+          _typeParameterVisitor.usesTypeParameters(procedure)) {
+        _diagnosticsReporter.report(
+            messageJsInteropStaticInteropExternalExtensionMembersWithTypeParameters,
+            procedure.fileOffset,
+            procedure.name.text.length,
+            procedure.fileUri);
+      }
+    }
   }
 
   @override
@@ -318,15 +341,22 @@ class JsInteropChecks extends RecursiveVisitor {
   @override
   void visitConstructor(Constructor constructor) {
     _checkInstanceMemberJSAnnotation(constructor);
-    if (_classHasJSAnnotation &&
-        !constructor.isExternal &&
-        !constructor.isSynthetic) {
-      // Non-synthetic constructors must be annotated with `external`.
-      _diagnosticsReporter.report(
-          messageJsInteropNonExternalConstructor,
-          constructor.fileOffset,
-          constructor.name.text.length,
-          constructor.fileUri);
+    if (!constructor.isSynthetic) {
+      if (_classHasJSAnnotation && !constructor.isExternal) {
+        // Non-synthetic constructors must be annotated with `external`.
+        _diagnosticsReporter.report(
+            messageJsInteropNonExternalConstructor,
+            constructor.fileOffset,
+            constructor.name.text.length,
+            constructor.fileUri);
+      }
+      if (_classHasStaticInteropAnnotation) {
+        _diagnosticsReporter.report(
+            messageJsInteropStaticInteropGenerativeConstructor,
+            constructor.fileOffset,
+            constructor.name.text.length,
+            constructor.fileUri);
+      }
     }
 
     if (!_isJSInteropMember(constructor)) {
@@ -442,6 +472,12 @@ class JsInteropChecks extends RecursiveVisitor {
     return _checkExtensionMember(member, hasJSInteropAnnotation);
   }
 
+  /// Returns whether given extension [member] is in an extension that is on a
+  /// `@staticInterop` class.
+  bool _isStaticInteropExtensionMember(Member member) {
+    return _checkExtensionMember(member, hasStaticInteropAnnotation);
+  }
+
   /// Returns whether given extension [member] is in an extension on a Native
   /// class.
   bool _isNativeExtensionMember(Member member) {
@@ -463,3 +499,18 @@ class JsInteropChecks extends RecursiveVisitor {
     return onType is InterfaceType && validateExtensionClass(onType.classNode);
   }
 }
+
+class _TypeParameterVisitor extends RecursiveVisitor {
+  bool _visitedTypeParameterType = false;
+
+  bool usesTypeParameters(Node node) {
+    _visitedTypeParameterType = false;
+    node.accept(this);
+    return _visitedTypeParameterType;
+  }
+
+  @override
+  void visitTypeParameterType(TypeParameterType node) {
+    _visitedTypeParameterType = true;
+  }
+}

pkg/analysis_server/lib/src/handler/legacy/edit_get_available_refactorings.dart

@@ -59,16 +59,16 @@ class EditGetAvailableRefactoringsHandler extends LegacyHandler {
       var node = NodeLocator(offset).searchWithin(resolvedUnit.unit);
       var element = server.getElementOfNode(node);
       if (element != null) {
+        final refactoringWorkspace = server.refactoringWorkspace;
         // try CONVERT_METHOD_TO_GETTER
         if (element is ExecutableElement) {
           if (ConvertMethodToGetterRefactoring(
-                  searchEngine, resolvedUnit.session, element)
+                  refactoringWorkspace, resolvedUnit.session, element)
               .isAvailable()) {
             kinds.add(RefactoringKind.CONVERT_METHOD_TO_GETTER);
           }
         }
         // try RENAME
-        final refactoringWorkspace = server.refactoringWorkspace;
         var renameRefactoring = RenameRefactoring.create(
             refactoringWorkspace, resolvedUnit, element);
         if (renameRefactoring != null) {

pkg/analysis_server/lib/src/lsp/handlers/commands/abstract_refactor.dart

@@ -112,7 +112,7 @@ abstract class AbstractRefactorCommandHandler extends SimpleEditCommandHandler
         if (element != null) {
           if (element is PropertyAccessorElement) {
             final refactor = ConvertGetterToMethodRefactoring(
-                server.searchEngine, result.session, element);
+                server.refactoringWorkspace, result.session, element);
             return success(refactor);
           }
         }
@@ -125,7 +125,7 @@ abstract class AbstractRefactorCommandHandler extends SimpleEditCommandHandler
         if (element != null) {
           if (element is ExecutableElement) {
             final refactor = ConvertMethodToGetterRefactoring(
-                server.searchEngine, result.session, element);
+                server.refactoringWorkspace, result.session, element);
             return success(refactor);
           }
         }

pkg/analysis_server/lib/src/lsp/handlers/handler_code_actions.dart

@@ -629,7 +629,7 @@ class CodeActionHandler
         // Getter to Method
         if (element is PropertyAccessorElement &&
             ConvertGetterToMethodRefactoring(
-                    server.searchEngine, unit.session, element)
+                    server.refactoringWorkspace, unit.session, element)
                 .isAvailable()) {
           refactorActions.add(createRefactor(
               CodeActionKind.RefactorRewrite,
@@ -640,7 +640,7 @@ class CodeActionHandler
         // Method to Getter
         if (element is ExecutableElement &&
             ConvertMethodToGetterRefactoring(
-                    server.searchEngine, unit.session, element)
+                    server.refactoringWorkspace, unit.session, element)
                 .isAvailable()) {
           refactorActions.add(createRefactor(
               CodeActionKind.RefactorRewrite,

pkg/analysis_server/lib/src/services/refactoring/legacy/convert_getter_to_method.dart

@@ -18,14 +18,16 @@ import 'package:analyzer_plugin/utilities/range_factory.dart';
 /// [ConvertMethodToGetterRefactoring] implementation.
 class ConvertGetterToMethodRefactoringImpl extends RefactoringImpl
     implements ConvertGetterToMethodRefactoring {
+  final RefactoringWorkspace workspace;
   final SearchEngine searchEngine;
   final AnalysisSession session;
   final PropertyAccessorElement element;
 
   late SourceChange change;
 
   ConvertGetterToMethodRefactoringImpl(
-      this.searchEngine, this.session, this.element);
+      this.workspace, this.session, this.element)
+      : searchEngine = workspace.searchEngine;
 
   @override
   String get refactoringName => 'Convert Getter To Method';
@@ -77,6 +79,11 @@ class ConvertGetterToMethodRefactoringImpl extends RefactoringImpl
 
   /// Checks if [element] is valid to perform this refactor.
   RefactoringStatus _checkElement() {
+    if (!workspace.containsElement(element)) {
+      return RefactoringStatus.fatal(
+          'Only getters in your workspace can be converted.');
+    }
+
     if (!element.isGetter || element.isSynthetic) {
       return RefactoringStatus.fatal(
           'Only explicit getters can be converted to methods.');

pkg/analysis_server/lib/src/services/refactoring/legacy/convert_method_to_getter.dart

@@ -18,15 +18,17 @@ import 'package:analyzer_plugin/utilities/range_factory.dart';
 /// [ConvertMethodToGetterRefactoring] implementation.
 class ConvertMethodToGetterRefactoringImpl extends RefactoringImpl
     implements ConvertMethodToGetterRefactoring {
+  final RefactoringWorkspace workspace;
   final SearchEngine searchEngine;
   final AnalysisSessionHelper sessionHelper;
   final ExecutableElement element;
 
   late SourceChange change;
 
   ConvertMethodToGetterRefactoringImpl(
-      this.searchEngine, AnalysisSession session, this.element)
-      : sessionHelper = AnalysisSessionHelper(session);
+      this.workspace, AnalysisSession session, this.element)
+      : sessionHelper = AnalysisSessionHelper(session),
+        searchEngine = workspace.searchEngine;
 
   @override
   String get refactoringName => 'Convert Method To Getter';
@@ -70,6 +72,11 @@ class ConvertMethodToGetterRefactoringImpl extends RefactoringImpl
 
   /// Checks if [element] is valid to perform this refactor.
   RefactoringStatus _checkElement() {
+    if (!workspace.containsElement(element)) {
+      return RefactoringStatus.fatal(
+          'Only methods in your workspace can be converted.');
+    }
+
     // check Element type
     if (element is FunctionElement) {
       if (element.enclosingElement is! CompilationUnitElement) {

pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring.dart

@@ -38,9 +38,9 @@ import 'package:analyzer_plugin/protocol/protocol_common.dart'
 abstract class ConvertGetterToMethodRefactoring implements Refactoring {
   /// Returns a new [ConvertMethodToGetterRefactoring] instance for converting
   /// [element] and all the corresponding hierarchy elements.
-  factory ConvertGetterToMethodRefactoring(SearchEngine searchEngine,
+  factory ConvertGetterToMethodRefactoring(RefactoringWorkspace workspace,
       AnalysisSession session, PropertyAccessorElement element) {
-    return ConvertGetterToMethodRefactoringImpl(searchEngine, session, element);
+    return ConvertGetterToMethodRefactoringImpl(workspace, session, element);
   }
 
   /// Return `true` if refactoring is available, possibly without checking all
@@ -58,9 +58,9 @@ abstract class ConvertGetterToMethodRefactoring implements Refactoring {
 abstract class ConvertMethodToGetterRefactoring implements Refactoring {
   /// Returns a new [ConvertMethodToGetterRefactoring] instance for converting
   /// [element] and all the corresponding hierarchy elements.
-  factory ConvertMethodToGetterRefactoring(SearchEngine searchEngine,
+  factory ConvertMethodToGetterRefactoring(RefactoringWorkspace workspace,
       AnalysisSession session, ExecutableElement element) {
-    return ConvertMethodToGetterRefactoringImpl(searchEngine, session, element);
+    return ConvertMethodToGetterRefactoringImpl(workspace, session, element);
   }
 
   /// Return `true` if refactoring is available, possibly without checking all