Version 3.4.0-160.0.dev

Merge 249895f into dev
dart-lang · Feb 21, 2024 · 0a77450 · 0a77450
2 parents a30222a + 249895f
commit 0a77450
Show file tree

Hide file tree

Showing 70 changed files with 576 additions and 698 deletions.
diff --git a/pkg/analysis_server/lib/src/computer/computer_lazy_type_hierarchy.dart b/pkg/analysis_server/lib/src/computer/computer_lazy_type_hierarchy.dart
@@ -130,7 +130,10 @@ class DartLazyTypeHierarchyComputer {
 
     var matches =
         await searchEngine.searchSubtypes(target, SearchEngineCache());
-    return matches.map(toHierarchyItem).toList();
+    return matches
+        .where((match) => !(match.element as InterfaceElement).isAugmentation)
+        .map(toHierarchyItem)
+        .toList();
   }
 
   /// Gets immediate super types for the class/mixin [element].

diff --git a/pkg/analysis_server/test/lsp/type_hierarchy_test.dart b/pkg/analysis_server/test/lsp/type_hierarchy_test.dart
@@ -176,6 +176,31 @@ import 'main.dart';
         ]));
   }
 
+  Future<void> test_augment_extends() async {
+    final content = '''
+import augment 'other.dart';
+
+class MyCl^ass1 {}
+[!class /*[1*/C/*1]*/ {}!]
+''';
+    final augmentation = '''
+library augment 'main.dart';
+
+augment class C extends MyClass1 {}
+''';
+    await _fetchSubtypes(content, otherContent: augmentation);
+    expect(
+        subtypes,
+        equals([
+          _isItem(
+            'C',
+            mainFileUri,
+            range: code.ranges[0].range,
+            selectionRange: code.ranges[1].range,
+          ),
+        ]));
+  }
+
   Future<void> test_extends() async {
     final content = '''
 class MyCla^ss1 {}
@@ -309,6 +334,31 @@ class MyCla^ss2 extends MyClass1 {}
         ]));
   }
 
+  Future<void> test_augment_extends() async {
+    final content = '''
+import augment 'other.dart';
+
+[!class /*[1*/MyClass1/*1]*/ {}!]
+class C^s {}
+''';
+    final augmentation = '''
+library augment 'main.dart';
+
+augment class Cs extends MyClass1 {}
+''';
+    await _fetchSupertypes(content, otherContent: augmentation);
+    expect(
+        supertypes,
+        equals([
+          _isItem(
+            'MyClass1',
+            mainFileUri,
+            range: code.ranges[0].range,
+            selectionRange: code.ranges[1].range,
+          ),
+        ]));
+  }
+
   Future<void> test_extends() async {
     final content = '''
 /*[0*/class /*[1*/MyClass1/*1]*/ {}/*0]*/

diff --git a/pkg/compiler/lib/src/constants/constant_system.dart b/pkg/compiler/lib/src/constants/constant_system.dart
@@ -229,8 +229,6 @@ ConstructedConstantValue createSymbol(
   InterfaceType type = commonElements.symbolImplementationType;
   FieldEntity field = commonElements.symbolField;
   ConstantValue argument = createString(text);
-  // TODO(johnniwinther): Use type arguments when all uses no longer expect
-  // a [FieldElement].
   var fields = <FieldEntity, ConstantValue>{field: argument};
   return ConstructedConstantValue(type, fields);
 }

diff --git a/pkg/compiler/lib/src/elements/entities.dart b/pkg/compiler/lib/src/elements/entities.dart
@@ -174,21 +174,19 @@ abstract class FunctionEntity extends MemberEntity {
 }
 
 /// Enum for the synchronous/asynchronous function body modifiers.
-class AsyncMarker {
+enum AsyncMarker {
   /// The default function body marker.
-  static const AsyncMarker SYNC = AsyncMarker._(AsyncModifier.Sync);
+  SYNC._(AsyncModifier.Sync),
 
   /// The `sync*` function body marker.
-  static const AsyncMarker SYNC_STAR =
-      AsyncMarker._(AsyncModifier.SyncStar, isYielding: true);
+  SYNC_STAR._(AsyncModifier.SyncStar, isYielding: true),
 
   /// The `async` function body marker.
-  static const AsyncMarker ASYNC =
-      AsyncMarker._(AsyncModifier.Async, isAsync: true);
+  ASYNC._(AsyncModifier.Async, isAsync: true),
 
   /// The `async*` function body marker.
-  static const AsyncMarker ASYNC_STAR =
-      AsyncMarker._(AsyncModifier.AsyncStar, isAsync: true, isYielding: true);
+  ASYNC_STAR._(AsyncModifier.AsyncStar, isAsync: true, isYielding: true),
+  ;
 
   /// Is `true` if this marker defines the function body to have an
   /// asynchronous result, that is, either a [Future] or a [Stream].
@@ -207,21 +205,6 @@ class AsyncMarker {
   String toString() {
     return '${isAsync ? 'async' : 'sync'}${isYielding ? '*' : ''}';
   }
-
-  /// Canonical list of marker values.
-  ///
-  /// Added to make [AsyncMarker] enum-like.
-  static const List<AsyncMarker> values = <AsyncMarker>[
-    SYNC,
-    SYNC_STAR,
-    ASYNC,
-    ASYNC_STAR
-  ];
-
-  /// Index to this marker within [values].
-  ///
-  /// Added to make [AsyncMarker] enum-like.
-  int get index => values.indexOf(this);
 }
 
 /// Stripped down super interface for constructor like entities.

diff --git a/pkg/compiler/lib/src/elements/types.dart b/pkg/compiler/lib/src/elements/types.dart
@@ -1624,7 +1624,7 @@ class _DartTypeToStringVisitor extends DartTypeVisitor<void, void> {
     // internal notion. The language specification does not define a '*' token
     // in the type language, and no such token should be surfaced to users.
     // For debugging, pass `--debug-print-legacy-stars` to emit the '*'.
-    if (_options == null || _options!.printLegacyStars) {
+    if (_options == null || _options.printLegacyStars) {
       _token('*');
     }
   }
@@ -1712,7 +1712,7 @@ class _DartTypeToStringVisitor extends DartTypeVisitor<void, void> {
         needsComma = _comma(needsComma);
         _visit(typeVariable);
         DartType bound = typeVariable.bound;
-        if (_dartTypes == null || !_dartTypes!.isTopType(bound)) {
+        if (_dartTypes == null || !_dartTypes.isTopType(bound)) {
           _token(' extends ');
           _visit(bound);
         }

diff --git a/pkg/compiler/lib/src/inferrer/abstract_value_domain.dart b/pkg/compiler/lib/src/inferrer/abstract_value_domain.dart
@@ -73,7 +73,7 @@ class AbstractBool {
 
   @override
   String toString() =>
-      'AbstractBool.${_value == null ? 'Maybe' : (_value! ? 'True' : 'False')}';
+      'AbstractBool.${_value == null ? 'Maybe' : (_value ? 'True' : 'False')}';
 }
 
 /// A value in an abstraction of runtime values.
@@ -296,12 +296,6 @@ mixin AbstractValueDomain {
   /// subtypes of [cls] or `null` at runtime.
   AbstractBool containsOnlyType(covariant AbstractValue value, ClassEntity cls);
 
-  /// Returns an [AbstractBool] that describes whether [value] is an instance of
-  /// [cls] or `null` at runtime.
-  // TODO(johnniwinther): Merge this with [isInstanceOf].
-  AbstractBool isInstanceOfOrNull(
-      covariant AbstractValue value, ClassEntity cls);
-
   /// Returns an [AbstractBool] that describes whether [value] is known to be an
   /// instance of [cls] at runtime.
   AbstractBool isInstanceOf(AbstractValue value, ClassEntity cls);

diff --git a/pkg/compiler/lib/src/inferrer/builder.dart b/pkg/compiler/lib/src/inferrer/builder.dart
@@ -1598,8 +1598,7 @@ class KernelTypeGraphBuilder extends ir.VisitorDefault<TypeInformation?>
 
   @override
   TypeInformation visitLoadLibrary(ir.LoadLibrary node) {
-    // TODO(johnniwinther): Improve this by returning a Future type instead.
-    return _types.dynamicType;
+    return _types.asyncFutureType;
   }
 
   @override

diff --git a/pkg/compiler/lib/src/inferrer/computable.dart b/pkg/compiler/lib/src/inferrer/computable.dart
@@ -238,11 +238,6 @@ class ComputableAbstractValueDomain with AbstractValueDomain {
           covariant ComputableAbstractValue value, ClassEntity cls) =>
       _wrappedDomain.containsOnlyType(_unwrap(value), cls);
 
-  @override
-  AbstractBool isInstanceOfOrNull(
-          covariant ComputableAbstractValue value, ClassEntity cls) =>
-      _wrappedDomain.isInstanceOfOrNull(_unwrap(value), cls);
-
   @override
   AbstractBool isInstanceOf(
           covariant ComputableAbstractValue value, ClassEntity cls) =>

diff --git a/pkg/compiler/lib/src/inferrer/engine.dart b/pkg/compiler/lib/src/inferrer/engine.dart
@@ -114,8 +114,6 @@ class InferrerEngine {
       closedWorld.abstractValueDomain;
   CommonElements get commonElements => closedWorld.commonElements;
 
-  // TODO(johnniwinther): This should be part of [ClosedWorld] or
-  // [ClosureWorldRefiner].
   NoSuchMethodData get noSuchMethodData => closedWorld.noSuchMethodData;
 
   final MemberHierarchyBuilder memberHierarchyBuilder;

diff --git a/pkg/compiler/lib/src/inferrer/powersets/powersets.dart b/pkg/compiler/lib/src/inferrer/powersets/powersets.dart
@@ -606,13 +606,6 @@ class PowersetDomain with AbstractValueDomain {
           _powersetBitsDomain.isInstanceOf(value._powersetBits, cls),
           _abstractValueDomain.isInstanceOf(value._abstractValue, cls));
 
-  @override
-  AbstractBool isInstanceOfOrNull(
-          covariant PowersetValue value, ClassEntity cls) =>
-      AbstractBool.strengthen(
-          _powersetBitsDomain.isInstanceOfOrNull(value._powersetBits, cls),
-          _abstractValueDomain.isInstanceOfOrNull(value._abstractValue, cls));
-
   @override
   AbstractBool containsOnlyType(
           covariant PowersetValue value, ClassEntity cls) =>

diff --git a/pkg/compiler/lib/src/inferrer/trivial.dart b/pkg/compiler/lib/src/inferrer/trivial.dart
@@ -323,10 +323,6 @@ class TrivialAbstractValueDomain with AbstractValueDomain {
   AbstractBool isInstanceOf(AbstractValue value, ClassEntity cls) =>
       AbstractBool.Maybe;
 
-  @override
-  AbstractBool isInstanceOfOrNull(AbstractValue value, ClassEntity cls) =>
-      AbstractBool.Maybe;
-
   @override
   AbstractBool containsOnlyType(AbstractValue value, ClassEntity cls) =>
       AbstractBool.Maybe;

diff --git a/pkg/compiler/lib/src/inferrer/type_system.dart b/pkg/compiler/lib/src/inferrer/type_system.dart
@@ -413,7 +413,7 @@ class TypeSystem {
     bool isTypedArray =
         _closedWorld.classHierarchy.isInstantiated(typedDataClass) &&
             _abstractValueDomain
-                .isInstanceOfOrNull(type.type, typedDataClass)
+                .isInstanceOf(type.type, typedDataClass)
                 .isDefinitelyTrue;
     bool isConst = (type.type == _abstractValueDomain.constListType);
     bool isFixed = (type.type == _abstractValueDomain.fixedListType) ||

diff --git a/pkg/compiler/lib/src/inferrer/typemasks/masks.dart b/pkg/compiler/lib/src/inferrer/typemasks/masks.dart
@@ -176,7 +176,6 @@ class CommonMasks with AbstractValueDomain {
   late final TypeMask asyncStarStreamType =
       TypeMask.nonNullExact(commonElements.controllerStream, _closedWorld);
 
-  // TODO(johnniwinther): Assert that the null type has been resolved.
   @override
   late final TypeMask nullType = TypeMask.empty();
 
@@ -409,10 +408,6 @@ class CommonMasks with AbstractValueDomain {
         typeMask.containsOnly(cls);
   }
 
-  @override
-  AbstractBool isInstanceOfOrNull(TypeMask typeMask, ClassEntity cls) =>
-      AbstractBool.trueOrMaybe(_isInstanceOfOrNull(typeMask, cls));
-
   bool _isInstanceOfOrNull(TypeMask typeMask, ClassEntity cls) {
     return _closedWorld.isImplemented(cls) &&
         typeMask.satisfies(cls, _closedWorld);

diff --git a/pkg/compiler/lib/src/inferrer/wrapped.dart b/pkg/compiler/lib/src/inferrer/wrapped.dart
@@ -450,11 +450,6 @@ class WrappedAbstractValueDomain with AbstractValueDomain {
           covariant WrappedAbstractValue value, ClassEntity cls) =>
       _abstractValueDomain.isInstanceOf(value._abstractValue, cls);
 
-  @override
-  AbstractBool isInstanceOfOrNull(
-          covariant WrappedAbstractValue value, ClassEntity cls) =>
-      _abstractValueDomain.isInstanceOfOrNull(value._abstractValue, cls);
-
   @override
   AbstractBool containsOnlyType(
           covariant WrappedAbstractValue value, ClassEntity cls) =>

diff --git a/pkg/compiler/lib/src/js_backend/custom_elements_analysis.dart b/pkg/compiler/lib/src/js_backend/custom_elements_analysis.dart
@@ -191,7 +191,7 @@ class CustomElementsAnalysisJoin {
         }
         if (_backendUsageBuilder != null) {
           escapingConstructors
-              .forEach(_backendUsageBuilder!.registerGlobalFunctionDependency);
+              .forEach(_backendUsageBuilder.registerGlobalFunctionDependency);
         }
         // Force the generation of the type constant that is the key to an entry
         // in the generated table.

diff --git a/pkg/compiler/lib/src/js_backend/namer.dart b/pkg/compiler/lib/src/js_backend/namer.dart
@@ -425,10 +425,6 @@ class Namer extends ModularNamer {
 
       case SelectorKind.SPECIAL:
         return specialSelectorName(selector);
-
-      default:
-        throw failedAt(CURRENT_ELEMENT_SPANNABLE,
-            'Unexpected selector kind: ${selector.kind}');
     }
   }