Version 2.19.0-4.0.dev

Merge commit '54b7f4b72a1701f8f9a0334c94ce6f59732bd261' into 'dev'

Author: Dart CI

pkg/analysis_server/lib/src/context_manager.dart

@@ -454,7 +454,7 @@ class ContextManagerImpl implements ContextManager {
       /// A helper that performs the context rebuild and waits for all watchers
       /// to be fully initialized.
       Future<void> performContextRebuild() async {
-        _destroyAnalysisContexts();
+        await _destroyAnalysisContexts();
         _fileContentCache.invalidateAll();
 
         var watchers = <ResourceWatcher>[];
@@ -610,7 +610,6 @@ class ContextManagerImpl implements ContextManager {
 
   /// Clean up and destroy the context associated with the given folder.
   void _destroyAnalysisContext(DriverBasedAnalysisContext context) {
-    context.driver.dispose();
     var rootFolder = context.contextRoot.root;
     var watched = bazelWatchedPathsPerFolder.remove(rootFolder);
     if (watched != null) {
@@ -623,15 +622,16 @@ class ContextManagerImpl implements ContextManager {
     driverMap.remove(rootFolder);
   }
 
-  void _destroyAnalysisContexts() {
-    var collection = _collection;
+  Future<void> _destroyAnalysisContexts() async {
+    final collection = _collection;
     if (collection != null) {
       for (final subscription in watcherSubscriptions) {
-        subscription.cancel();
+        await subscription.cancel();
       }
-      for (var analysisContext in collection.contexts) {
+      for (final analysisContext in collection.contexts) {
         _destroyAnalysisContext(analysisContext);
       }
+      await collection.dispose();
       callbacks.afterContextsDestroyed();
     }
   }

pkg/analysis_server/test/analysis/set_priority_files_test.dart

@@ -72,6 +72,7 @@ analyzer:
   exclude:
     - 'samples/**'
 ''');
+    await pumpEventQueue(times: 5000);
     var file = newFile('$testPackageRootPath/samples/sample.dart', '');
     // attempt to set priority file
     await _setPriorityFile(file);
@@ -90,6 +91,7 @@ analyzer:
   exclude:
     - 'samples/**'
 ''');
+    await pumpEventQueue(times: 5000);
     // attempt to set priority file
     await _setPriorityFile(sampleFile);
     _verifyPriorityFiles(sampleFile);
@@ -107,6 +109,7 @@ analyzer:
   exclude:
     - 'child/samples/**'
 ''');
+    await pumpEventQueue(times: 5000);
     // attempt to set priority file
     await _setPriorityFile(sampleFile);
     _verifyPriorityFiles(sampleFile);

pkg/analysis_server/test/domain_analysis_test.dart

@@ -58,7 +58,7 @@ void f(int? a) {}
 dart_package(null_safety = True)
 ''');
 
-    await pumpEventQueue();
+    await pumpEventQueue(times: 5000);
     await server.onAnalysisComplete;
 
     // We have null safety enabled, so no errors.

pkg/analysis_server/test/edit/sort_members_test.dart

@@ -203,10 +203,6 @@ class MyAnnotation {
   }
 
   Future<void> test_OK_genericFunctionType() async {
-    newAnalysisOptionsYamlFile(testPackageRootPath, '''
-analyzer:
-  strong-mode: true
-''');
     addTestFile('''
 class C {
   void caller() {

pkg/analysis_server/test/lsp/code_actions_refactor_test.dart

@@ -262,11 +262,12 @@ void f() {
 
     // Send an edit request immediately after the refactor request.
     final req1 = executeCodeAction(codeAction);
-    await replaceFile(100, mainFileUri, 'new test content');
+    final req2 = replaceFile(100, mainFileUri, 'new test content');
 
     // Expect the first to fail because of the modified content.
     await expectLater(
         req1, throwsA(isResponseError(ErrorCodes.ContentModified)));
+    await req2;
   }
 
   Future<void> test_filtersCorrectly() async {

pkg/analysis_server/test/lsp/server_abstract.dart

@@ -167,7 +167,7 @@ abstract class AbstractLspAnalysisServerTest
   @override
   Future sendNotificationToServer(NotificationMessage notification) async {
     channel.sendNotificationToServer(notification);
-    await pumpEventQueue();
+    await pumpEventQueue(times: 5000);
   }
 
   @override

pkg/analysis_server/test/services/completion/dart/location/directive_uri_test.dart

@@ -4,6 +4,7 @@
 
 import 'package:analyzer/src/test_utilities/package_config_file_builder.dart';
 import 'package:analyzer_utilities/check/check.dart';
+import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
 import '../../../../client/completion_driver_test.dart';
@@ -59,6 +60,7 @@ class DirectiveUriTest extends AbstractCompletionDriverTest {
     required void Function(CompletionResponseForTesting response) validator,
   }) async {
     _configurePackagesFooBar();
+    await pumpEventQueue(times: 5000);
 
     {
       var response = await getTestCodeSuggestions('''

pkg/analyzer/lib/dart/constant/value.dart

@@ -64,6 +64,9 @@ abstract class DartObject {
   /// would return `false` from [hasKnownValue].
   DartType? get type;
 
+  /// If this object is the value of a constant variable, the variable.
+  VariableElement? get variable;
+
   /// Return a representation of the value of the field with the given [name].
   ///
   /// Return `null` if either the object being represented does not have a field

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

@@ -525,13 +525,15 @@ abstract class DirectiveUri {}
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class DirectiveUriWithAugmentation extends DirectiveUriWithSource {
+  /// The library augmentation referenced by the [source].
   LibraryAugmentationElement get augmentation;
 }
 
 /// [DirectiveUriWithSource] that references a [LibraryElement].
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class DirectiveUriWithLibrary extends DirectiveUriWithSource {
+  /// The library referenced by the [source].
   LibraryElement get library;
 }
 
@@ -540,27 +542,31 @@ abstract class DirectiveUriWithLibrary extends DirectiveUriWithSource {
 /// Clients may not extend, implement or mix-in this class.
 abstract class DirectiveUriWithRelativeUri
     extends DirectiveUriWithRelativeUriString {
+  /// The relative URI, parsed from [relativeUriString].
   Uri get relativeUri;
 }
 
 /// [DirectiveUri] for which we can get its relative URI string.
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class DirectiveUriWithRelativeUriString extends DirectiveUri {
+  /// The relative URI string specified in code.
   String get relativeUriString;
 }
 
 /// [DirectiveUriWithRelativeUri] that resolves to a [Source].
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class DirectiveUriWithSource extends DirectiveUriWithRelativeUri {
+  /// The result of resolving [relativeUri] against the enclosing URI.
   Source get source;
 }
 
 /// [DirectiveUriWithSource] that references a [CompilationUnitElement].
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class DirectiveUriWithUnit extends DirectiveUriWithSource {
+  /// The unit referenced by the [source].
   CompilationUnitElement get unit;
 }
 

pkg/analyzer/lib/src/dart/analysis/analysis_context_collection.dart

@@ -140,16 +140,16 @@ class AnalysisContextCollectionImpl implements AnalysisContextCollection {
     throw StateError('Unable to find the context to $path');
   }
 
-  void dispose({
+  Future<void> dispose({
     bool forTesting = false,
-  }) {
-    for (var analysisContext in contexts) {
-      analysisContext.driver.dispose();
+  }) async {
+    for (final analysisContext in contexts) {
+      await analysisContext.driver.dispose2();
     }
-    macroExecutor.close();
+    await macroExecutor.close();
     // If there are other collections, they will have to start it again.
     if (!forTesting) {
-      KernelCompilationService.dispose();
+      await KernelCompilationService.dispose();
     }
   }