Version 2.11.0-168.0.dev

Merge commit 'febb1929cd4dccd08232657890f935bd752866d4' into 'dev'

Author: Dart CI

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

@@ -5669,6 +5669,17 @@ const MessageCode messageJsInteropNonExternalConstructor = const MessageCode(
         r"""JS interop classes do not support non-external constructors.""",
     tip: r"""Try annotating with `external`.""");
 
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const Code<Null> codeJsInteropNonExternalMember =
+    messageJsInteropNonExternalMember;
+
+// DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
+const MessageCode messageJsInteropNonExternalMember = const MessageCode(
+    "JsInteropNonExternalMember",
+    message:
+        r"""This JS interop member must be annotated with `external`. Only factories and static methods can be non-external.""",
+    tip: r"""Try annotating the member with `external`.""");
+
 // DO NOT EDIT. THIS FILE IS GENERATED. SEE TOP OF FILE.
 const Template<
     Message Function(String name)> templateLabelNotFound = const Template<

pkg/_js_interop_checks/lib/js_interop_checks.dart

@@ -13,26 +13,57 @@ import 'package:_fe_analyzer_shared/src/messages/codes.dart'
         messageJsInteropEnclosingClassJSAnnotationContext,
         messageJsInteropIndexNotSupported,
         messageJsInteropNamedParameters,
-        messageJsInteropNonExternalConstructor;
+        messageJsInteropNonExternalConstructor,
+        messageJsInteropNonExternalMember;
 
 import 'src/js_interop.dart';
 
 class JsInteropChecks extends RecursiveVisitor<void> {
   final DiagnosticReporter<Message, LocatedMessage> _diagnosticsReporter;
+  bool _classHasJSAnnotation = false;
+  bool _libraryHasJSAnnotation = false;
 
   JsInteropChecks(this._diagnosticsReporter);
 
   @override
   void defaultMember(Member member) {
-    _checkMemberJSInteropAnnotation(member);
+    _checkJSInteropAnnotation(member);
+    // TODO(43530): Disallow having JS interop annotations on non-external
+    // members (class members or otherwise). Currently, they're being ignored.
     super.defaultMember(member);
   }
 
   @override
-  void visitProcedure(Procedure procedure) {
-    _checkMemberJSInteropAnnotation(procedure);
+  void visitClass(Class cls) {
+    _classHasJSAnnotation = hasJSInteropAnnotation(cls);
+    super.visitClass(cls);
+    _classHasJSAnnotation = false;
+  }
 
-    if (!procedure.isExternal || !isJSInteropMember(procedure)) return;
+  @override
+  void visitLibrary(Library lib) {
+    _libraryHasJSAnnotation = hasJSInteropAnnotation(lib);
+    super.visitLibrary(lib);
+    _libraryHasJSAnnotation = false;
+  }
+
+  @override
+  void visitProcedure(Procedure procedure) {
+    _checkJSInteropAnnotation(procedure);
+    if (_classHasJSAnnotation && !procedure.isExternal) {
+      // If not one of few exceptions, member is not allowed to exclude
+      // `external` inside of a JS interop class.
+      if (!(procedure.isAbstract ||
+          procedure.isFactory ||
+          procedure.isStatic)) {
+        _diagnosticsReporter.report(
+            messageJsInteropNonExternalMember,
+            procedure.fileOffset,
+            procedure.name.text.length,
+            procedure.location.file);
+      }
+    }
+    if (!_isJSInteropMember(procedure)) return;
 
     if (!procedure.isStatic &&
         (procedure.name.text == '[]=' || procedure.name.text == '[]')) {
@@ -65,17 +96,18 @@ class JsInteropChecks extends RecursiveVisitor<void> {
 
   @override
   void visitConstructor(Constructor constructor) {
-    _checkMemberJSInteropAnnotation(constructor);
-
-    if (!isJSInteropMember(constructor)) return;
-
-    if (!constructor.isExternal && !constructor.isSynthetic) {
+    _checkJSInteropAnnotation(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.location.file);
     }
+    if (!_isJSInteropMember(constructor)) return;
 
     _checkNoNamedParameters(constructor.function);
   }
@@ -92,14 +124,18 @@ class JsInteropChecks extends RecursiveVisitor<void> {
     }
   }
 
-  /// Reports an error if [m] has a JS interop annotation and is part of a class
-  /// that does not.
-  void _checkMemberJSInteropAnnotation(Member m) {
-    if (!hasJSInteropAnnotation(m)) return;
-    var enclosingClass = m.enclosingClass;
-    if (enclosingClass != null && !hasJSInteropAnnotation(enclosingClass)) {
+  /// Reports an error if [member] does not correctly use the JS interop
+  /// annotation or the keyword `external`.
+  void _checkJSInteropAnnotation(Member member) {
+    var enclosingClass = member.enclosingClass;
+
+    if (!_classHasJSAnnotation &&
+        enclosingClass != null &&
+        hasJSInteropAnnotation(member)) {
+      // If in a class that is not JS interop, this member is not allowed to be
+      // JS interop.
       _diagnosticsReporter.report(messageJsInteropEnclosingClassJSAnnotation,
-          m.fileOffset, m.name.text.length, m.location.file,
+          member.fileOffset, member.name.text.length, member.location.file,
           context: <LocatedMessage>[
             messageJsInteropEnclosingClassJSAnnotationContext.withLocation(
                 enclosingClass.location.file,
@@ -108,4 +144,15 @@ class JsInteropChecks extends RecursiveVisitor<void> {
           ]);
     }
   }
+
+  /// Returns whether [member] is considered to be a JS interop member.
+  bool _isJSInteropMember(Member member) {
+    if (!member.isExternal) return false;
+    if (_classHasJSAnnotation) return true;
+    if (!_classHasJSAnnotation && member.enclosingClass != null) return false;
+    // In the case where the member does not belong to any class, a JS
+    // annotation is not needed on the library to be considered JS interop as
+    // long as the member has an annotation.
+    return hasJSInteropAnnotation(member) || _libraryHasJSAnnotation;
+  }
 }

pkg/_js_interop_checks/lib/src/js_interop.dart

@@ -9,17 +9,6 @@ import 'package:kernel/kernel.dart';
 bool hasJSInteropAnnotation(Annotatable a) =>
     a.annotations.any(_isPublicJSAnnotation);
 
-/// Returns true if [m] belongs to a JS interop context. Checks if either the
-/// member or the surrounding context has a JS interop annotation.
-bool isJSInteropMember(Member m) {
-  if (hasJSInteropAnnotation(m)) return true;
-  var enclosingClass = m.enclosingClass;
-  if (enclosingClass != null) return hasJSInteropAnnotation(enclosingClass);
-  var enclosingLibrary = m.enclosingLibrary;
-  if (enclosingLibrary != null) return hasJSInteropAnnotation(enclosingLibrary);
-  return false;
-}
-
 /// Returns true if [m] belongs to an anonymous class.
 bool isAnonymousClassMember(Member m) {
   var enclosingClass = m.enclosingClass;

pkg/analysis_server/lib/src/services/correction/bulk_fix_processor.dart

@@ -63,6 +63,7 @@ import 'package:analysis_server/src/services/linter/lint_names.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/src/error/codes.dart';
+import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 
 /// A fix producer that produces changes to fix multiple diagnostics.
@@ -257,8 +258,11 @@ class BulkFixProcessor {
   Future<ChangeBuilder> fixErrorsInLibraries(List<String> libraryPaths) async {
     for (var path in libraryPaths) {
       var session = workspace.getSession(path);
-      var libraryResult = await session.getResolvedLibrary(path);
-      await _fixErrorsInLibrary(libraryResult);
+      var kind = await session.getSourceKind(path);
+      if (kind == SourceKind.LIBRARY) {
+        var libraryResult = await session.getResolvedLibrary(path);
+        await _fixErrorsInLibrary(libraryResult);
+      }
     }
     return builder;
   }

pkg/analyzer/lib/src/dart/element/display_string_builder.dart

@@ -8,6 +8,7 @@ import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/dart/element/type.dart';
 import 'package:analyzer/src/dart/element/type_algebra.dart';
+import 'package:analyzer/src/dart/resolver/variance.dart';
 import 'package:analyzer/src/generated/element_type_provider.dart';
 import 'package:meta/meta.dart';
 
@@ -171,8 +172,9 @@ class ElementDisplayStringBuilder {
 
   void writeTypeParameter(TypeParameterElement element) {
     if (element is TypeParameterElementImpl) {
-      if (!element.isLegacyCovariant) {
-        _write(element.variance.toKeywordString());
+      var variance = element.variance;
+      if (!element.isLegacyCovariant && variance != Variance.unrelated) {
+        _write(variance.toKeywordString());
         _write(' ');
       }
     }

pkg/analyzer/lib/src/dart/element/element.dart

@@ -7426,10 +7426,7 @@ class TypeParameterElementImpl extends ElementImpl
     if (_variance != null) return _variance;
 
     if (linkedNode != null) {
-      var varianceKeyword = linkedContext.getTypeParameterVariance(linkedNode);
-      if (varianceKeyword != null) {
-        _variance = Variance.fromKeywordString(varianceKeyword.lexeme);
-      }
+      _variance = linkedContext.getTypeParameterVariance(linkedNode);
     }
 
     return _variance ?? Variance.covariant;

pkg/analyzer/lib/src/dart/resolver/variance.dart

@@ -204,4 +204,20 @@ class Variance {
             'Missing keyword lexeme representation for variance: $this');
     }
   }
+
+  @override
+  String toString() {
+    switch (this) {
+      case contravariant:
+        return 'contravariant';
+      case invariant:
+        return 'invariant';
+      case covariant:
+        return 'covariant';
+      case unrelated:
+        return 'unrelated';
+      default:
+        throw UnimplementedError('encoding: $_encoding');
+    }
+  }
 }

pkg/analyzer/lib/src/summary/format.dart

@@ -6702,6 +6702,12 @@ class LinkedNodeBuilder extends Object
     return _variantField_15 ??= 0;
   }
 
+  @override
+  int get typeParameter_variance {
+    assert(kind == idl.LinkedNodeKind.typeParameter);
+    return _variantField_15 ??= 0;
+  }
+
   set assignmentExpression_element(int value) {
     assert(kind == idl.LinkedNodeKind.assignmentExpression);
     assert(value == null || value >= 0);
@@ -6774,6 +6780,12 @@ class LinkedNodeBuilder extends Object
     _variantField_15 = value;
   }
 
+  set typeParameter_variance(int value) {
+    assert(kind == idl.LinkedNodeKind.typeParameter);
+    assert(value == null || value >= 0);
+    _variantField_15 = value;
+  }
+
   @override
   idl.UnlinkedTokenType get assignmentExpression_operator {
     assert(kind == idl.LinkedNodeKind.assignmentExpression);
@@ -6804,12 +6816,6 @@ class LinkedNodeBuilder extends Object
     return _variantField_28 ??= idl.UnlinkedTokenType.NOTHING;
   }
 
-  @override
-  idl.UnlinkedTokenType get typeParameter_variance {
-    assert(kind == idl.LinkedNodeKind.typeParameter);
-    return _variantField_28 ??= idl.UnlinkedTokenType.NOTHING;
-  }
-
   set assignmentExpression_operator(idl.UnlinkedTokenType value) {
     assert(kind == idl.LinkedNodeKind.assignmentExpression);
     _variantField_28 = value;
@@ -6835,11 +6841,6 @@ class LinkedNodeBuilder extends Object
     _variantField_28 = value;
   }
 
-  set typeParameter_variance(idl.UnlinkedTokenType value) {
-    assert(kind == idl.LinkedNodeKind.typeParameter);
-    _variantField_28 = value;
-  }
-
   @override
   bool get booleanLiteral_value {
     assert(kind == idl.LinkedNodeKind.booleanLiteral);
@@ -8619,13 +8620,13 @@ class LinkedNodeBuilder extends Object
   LinkedNodeBuilder.typeParameter({
     List<LinkedNodeBuilder> annotatedNode_metadata,
     LinkedNodeBuilder typeParameter_bound,
-    idl.UnlinkedTokenType typeParameter_variance,
+    int typeParameter_variance,
     int informativeId,
     LinkedNodeTypeBuilder typeParameter_defaultType,
   })  : _kind = idl.LinkedNodeKind.typeParameter,
         _variantField_4 = annotatedNode_metadata,
         _variantField_6 = typeParameter_bound,
-        _variantField_28 = typeParameter_variance,
+        _variantField_15 = typeParameter_variance,
         _variantField_36 = informativeId,
         _variantField_23 = typeParameter_defaultType;
 
@@ -10668,12 +10669,10 @@ class LinkedNodeBuilder extends Object
       }
       signature.addBool(this.typeParameter_bound != null);
       this.typeParameter_bound?.collectApiSignature(signature);
+      signature.addInt(this.typeParameter_variance ?? 0);
       signature.addInt(this.flags ?? 0);
       signature.addBool(this.typeParameter_defaultType != null);
       this.typeParameter_defaultType?.collectApiSignature(signature);
-      signature.addInt(this.typeParameter_variance == null
-          ? 0
-          : this.typeParameter_variance.index);
       signature.addString(this.name ?? '');
     } else if (kind == idl.LinkedNodeKind.typeParameterList) {
       signature.addInt(this.kind == null ? 0 : this.kind.index);
@@ -12711,6 +12710,14 @@ class _LinkedNodeImpl extends Object
     return _variantField_15;
   }
 
+  @override
+  int get typeParameter_variance {
+    assert(kind == idl.LinkedNodeKind.typeParameter);
+    _variantField_15 ??=
+        const fb.Uint32Reader().vTableGet(_bc, _bcOffset, 15, 0);
+    return _variantField_15;
+  }
+
   @override
   idl.UnlinkedTokenType get assignmentExpression_operator {
     assert(kind == idl.LinkedNodeKind.assignmentExpression);
@@ -12751,14 +12758,6 @@ class _LinkedNodeImpl extends Object
     return _variantField_28;
   }
 
-  @override
-  idl.UnlinkedTokenType get typeParameter_variance {
-    assert(kind == idl.LinkedNodeKind.typeParameter);
-    _variantField_28 ??= const _UnlinkedTokenTypeReader()
-        .vTableGet(_bc, _bcOffset, 28, idl.UnlinkedTokenType.NOTHING);
-    return _variantField_28;
-  }
-
   @override
   bool get booleanLiteral_value {
     assert(kind == idl.LinkedNodeKind.booleanLiteral);
@@ -14797,9 +14796,8 @@ abstract class _LinkedNodeMixin implements idl.LinkedNode {
       if (typeParameter_bound != null) {
         _result["typeParameter_bound"] = typeParameter_bound.toJson();
       }
-      if (typeParameter_variance != idl.UnlinkedTokenType.NOTHING) {
-        _result["typeParameter_variance"] =
-            typeParameter_variance.toString().split('.')[1];
+      if (typeParameter_variance != 0) {
+        _result["typeParameter_variance"] = typeParameter_variance;
       }
       if (informativeId != 0) {
         _result["informativeId"] = informativeId;

pkg/analyzer/lib/src/summary/idl.dart

@@ -1557,8 +1557,8 @@ abstract class LinkedNode extends base.SummaryClass {
   @VariantId(23, variant: LinkedNodeKind.typeParameter)
   LinkedNodeType get typeParameter_defaultType;
 
-  @VariantId(28, variant: LinkedNodeKind.typeParameter)
-  UnlinkedTokenType get typeParameter_variance;
+  @VariantId(15, variant: LinkedNodeKind.typeParameter)
+  int get typeParameter_variance;
 
   @VariantId(2, variant: LinkedNodeKind.typeParameterList)
   List<LinkedNode> get typeParameterList_typeParameters;