Version 3.3.0-175.0.dev

Merge ebf05be into dev

DEPS

@@ -517,6 +517,16 @@ Var("dart_root") + "/third_party/pkg/tar":
       "condition": "host_os == linux",
       "dep_type": "cipd",
   },
+  Var("dart_root") + "/buildtools/sysroot/focal": {
+      "packages": [
+          {
+              "package": "fuchsia/third_party/sysroot/focal",
+              "version": "git_revision:fa7a5a9710540f30ff98ae48b62f2cdf72ed2acd",
+          },
+      ],
+      "condition": "host_os == linux",
+      "dep_type": "cipd",
+  },
 
   # Keep consistent with pkg/test_runner/lib/src/options.dart.
   Var("dart_root") + "/buildtools/linux-x64/clang": {

build/config/compiler/BUILD.gn

@@ -422,8 +422,20 @@ config("compiler") {
       toolchain_stamp_file =
           "//buildtools/mac-x64/clang/.versions/clang.cipd_version"
     }
-    cipd_version = read_file(toolchain_stamp_file, "json")
-    defines = [ "TOOLCHAIN_VERSION=${cipd_version.instance_id}" ]
+    toolchain_cipd_version = read_file(toolchain_stamp_file, "json")
+    defines = [ "TOOLCHAIN_VERSION=${toolchain_cipd_version.instance_id}" ]
+
+    if (is_linux) {
+      if (current_cpu == "riscv64") {
+        sysroot_stamp_file =
+            "//buildtools/sysroot/focal/.versions/sysroot.cipd_version"
+      } else {
+        sysroot_stamp_file =
+            "//buildtools/sysroot/linux/.versions/sysroot.cipd_version"
+      }
+      sysroot_cipd_version = read_file(sysroot_stamp_file, "json")
+      defines += [ "SYSROOT_VERSION=${sysroot_cipd_version.instance_id}" ]
+    }
   }
 
   # Assign any flags set for the C compiler to asmflags so that they are sent

build/config/sysroot.gni

@@ -37,7 +37,12 @@ if (is_linux) {
       assert(false)
     }
   } else if (dart_sysroot == "debian") {
-    target_sysroot = rebase_path("//buildtools/sysroot/linux", root_build_dir)
+    if (current_cpu == "riscv64") {
+      target_sysroot = rebase_path("//buildtools/sysroot/focal", root_build_dir)
+    } else {
+      # Updating to focal would increase the required libc from 2.17 to 2.28.
+      target_sysroot = rebase_path("//buildtools/sysroot/linux", root_build_dir)
+    }
   } else if (dart_sysroot != "") {
     print("There is no $dart_sysroot sysroot support")
     assert(false)

pkg/_fe_analyzer_shared/lib/src/macros/executor/multi_executor.dart

@@ -5,8 +5,8 @@
 import 'dart:async';
 
 import '../api.dart';
-import '../executor/augmentation_library.dart';
 import '../executor.dart';
+import '../executor/augmentation_library.dart';
 
 /// A [MacroExecutor] implementation which delegates most work to other
 /// executors which are spawned through a provided callback.
@@ -83,6 +83,13 @@ class MultiMacroExecutor extends MacroExecutor with AugmentationLibraryBuilder {
     }
   }
 
+  /// Shuts down all executors and clears all configuration.
+  Future<void> closeAndReset() async {
+    await Future.wait(_executorFactoryTokens
+        .toList()
+        .map((token) => unregisterExecutorFactory(token)));
+  }
+
   /// Shuts down all executors, but does not clear [_libraryExecutorFactories]
   /// or [_executorFactoryTokens].
   @override

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

@@ -132,6 +132,7 @@ class EditGetFixesHandler extends LegacyHandler
           lineInfo: lineInfo,
           isAugmentation: false,
           isLibrary: true,
+          isMacroAugmentation: false,
           isPart: false,
           errors: errors,
         );
@@ -248,6 +249,7 @@ error.errorCode: ${error.errorCode}
           lineInfo: lineInfo,
           isAugmentation: false,
           isLibrary: true,
+          isMacroAugmentation: false,
           isPart: false,
           errors: errors,
         );

pkg/analysis_server/lib/src/lsp/handlers/code_actions/abstract_code_actions_producer.dart

@@ -137,6 +137,7 @@ abstract class AbstractCodeActionsProducer
         lineInfo: lineInfo,
         isAugmentation: false,
         isLibrary: true,
+        isMacroAugmentation: false,
         isPart: false,
         errors: errors);
   }

pkg/analysis_server/lib/src/services/completion/dart/declaration_helper.dart

@@ -33,7 +33,8 @@ class DeclarationHelper {
   final VisibilityTracker visibilityTracker = VisibilityTracker();
 
   /// A flag indicating whether suggestions should be limited to only include
-  /// valid constants.
+  /// those to which a value can be assigned: either a setter or a local
+  /// variable.
   final bool mustBeAssignable;
 
   /// A flag indicating whether suggestions should be limited to only include