Version 3.5.0-14.0.dev

Merge 769cfb3 into dev

build/config/clang/clang.gni

@@ -2,13 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("../../toolchain/goma.gni")
-
 _toolchain_cpu = host_cpu
-if (host_os == "mac" && use_goma) {
-  # Goma does not support ARM64.
-  _toolchain_cpu = "x64"
-}
 
 default_clang_prefix =
     rebase_path("//buildtools/${host_os}-${_toolchain_cpu}/clang/bin",

build/config/compiler/BUILD.gn

@@ -921,12 +921,7 @@ config("optimize_speed") {
 
 config("symbols") {
   if (is_win) {
-    import("//build/toolchain/goma.gni")
-    if (use_goma) {
-      cflags = [ "/Z7" ]  # No PDB file
-    } else {
-      cflags = [ "/Zi" ]  # Produce PDB file, no edit and continue.
-    }
+    cflags = [ "/Zi" ]  # Produce PDB file, no edit and continue.
     ldflags = [ "/DEBUG" ]
   } else {
     cflags = [

build/config/mac/mac_sdk.gni

@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/toolchain/goma.gni")
 import("//build/toolchain/rbe.gni")
 
 declare_args() {
@@ -18,15 +17,15 @@ declare_args() {
   # mac_sdk_min is used.
   mac_sdk_path = ""
 
-  mac_enable_relative_sdk_path = use_rbe || use_goma
+  mac_enable_relative_sdk_path = use_rbe
 }
 
 find_sdk_args = [
   "--print_sdk_path",
   mac_sdk_min,
 ]
 
-if (use_rbe || use_goma) {
+if (use_rbe) {
   find_sdk_args += [
     "--create_symlink_at",
 

build/toolchain/android/BUILD.gn

@@ -5,7 +5,6 @@
 import("//build/config/sysroot.gni")  # Imports android/config.gni.
 import("//build/toolchain/ccache.gni")
 import("//build/toolchain/gcc_toolchain.gni")
-import("//build/toolchain/goma.gni")
 import("//build/toolchain/rbe.gni")
 
 # The Android GCC toolchains share most of the same parameters, so we have this
@@ -20,12 +19,7 @@ import("//build/toolchain/rbe.gni")
 #      Same as gcc_toolchain
 template("android_toolchain") {
   gcc_toolchain(target_name) {
-    if (use_goma) {
-      assert(!use_ccache, "Goma and ccache can't be used together.")
-      assembler_prefix = "$goma_dir/gomacc "
-      compiler_prefix = "$goma_dir/gomacc "
-      link_prefix = "$goma_dir/gomacc "
-    } else if (use_rbe) {
+    if (use_rbe) {
       compiler_args =
           rewrapper_args + [ "--labels=type=compile,compiler=clang,lang=cpp" ]
 

build/toolchain/fuchsia/BUILD.gn

@@ -5,15 +5,9 @@
 import("//build/config/sysroot.gni")
 import("//build/toolchain/ccache.gni")
 import("//build/toolchain/gcc_toolchain.gni")
-import("//build/toolchain/goma.gni")
 import("//build/toolchain/rbe.gni")
 
-if (use_goma) {
-  assert(!use_ccache, "Goma and ccache can't be used together.")
-  assembler_prefix = "$goma_dir/gomacc "
-  compiler_prefix = "$goma_dir/gomacc "
-  link_prefix = "$goma_dir/gomacc "
-} else if (use_ccache) {
+if (use_ccache) {
   assembler_prefix = "ccache "
   compiler_prefix = "ccache "
   link_prefix = "ccache "

build/toolchain/linux/BUILD.gn

@@ -5,7 +5,6 @@
 import("//build/config/sysroot.gni")
 import("//build/toolchain/ccache.gni")
 import("//build/toolchain/gcc_toolchain.gni")
-import("//build/toolchain/goma.gni")
 import("//build/toolchain/rbe.gni")
 
 declare_args() {
@@ -17,13 +16,7 @@ declare_args() {
   riscv64_toolchain_prefix = ""
 }
 
-if (use_goma) {
-  assert(!use_ccache, "Goma and ccache can't be used together.")
-  assembler_prefix = "$goma_dir/gomacc "
-  compiler_prefix = "$goma_dir/gomacc "
-  link_prefix = "$goma_dir/gomacc "
-  gcc_compiler_prefix = compiler_prefix
-} else if (use_rbe) {
+if (use_rbe) {
   compiler_args =
       rewrapper_args + [ "--labels=type=compile,compiler=clang,lang=cpp" ]
 

build/toolchain/mac/BUILD.gn

@@ -7,20 +7,14 @@
 # Linux.
 
 import("//build/config/mac/mac_sdk.gni")
-import("../goma.gni")
 
 assert(host_os == "mac")
 
 import("//build/config/sysroot.gni")
-import("//build/toolchain/goma.gni")
 import("//build/toolchain/rbe.gni")
 import("//build/toolchain/signing.gni")
 
-if (use_goma) {
-  assembler_prefix = "$goma_dir/gomacc "
-  compiler_prefix = "$goma_dir/gomacc "
-  link_prefix = "$goma_dir/gomacc "
-} else if (use_rbe) {
+if (use_rbe) {
   compiler_args =
       rewrapper_args + [ "--labels=type=compile,compiler=clang,lang=cpp" ]
   if (rbe_os != host_os || rbe_cpu != host_cpu) {
@@ -38,8 +32,7 @@ if (use_goma) {
   link_prefix = ""
 }
 
-# Goma doesn't support the host-arm64 toolchain, so continue using Rosetta.
-if (host_cpu == "arm64" && !use_goma) {
+if (host_cpu == "arm64") {
   rebased_clang_dir =
       rebase_path("//buildtools/mac-arm64/clang/bin", root_build_dir)
 } else {

build/toolchain/win/BUILD.gn

@@ -8,7 +8,6 @@ declare_args() {
 }
 
 import("//build/config/win/visual_studio_version.gni")
-import("//build/toolchain/goma.gni")
 import("//build/toolchain/rbe.gni")
 
 # Should only be running on Windows.
@@ -25,9 +24,7 @@ tool_wrapper_path = rebase_path("tool_wrapper.py", root_build_dir)
 
 ninja_path = rebase_path("//buildtools/ninja/ninja")
 
-if (use_goma) {
-  compiler_prefix = "$goma_dir/gomacc.exe "
-} else if (use_rbe) {
+if (use_rbe) {
   compiler_args =
       rewrapper_args + [ "--labels=type=compile,compiler=clang-cl,lang=cpp" ]
   if (rbe_os != host_os || rbe_cpu != host_cpu) {

pkg/analysis_server/lib/src/analysis_server.dart

@@ -999,18 +999,6 @@ abstract class CommonServerContextManagerCallbacks
     var path = result.path;
     filesToFlush.add(path);
 
-    if (result is AnalysisResultWithErrors) {
-      if (analysisServer.isAnalyzed(path)) {
-        final serverErrors = server.doAnalysisError_listFromEngine(result);
-        recordAnalysisErrors(path, serverErrors);
-      }
-    }
-
-    if (result is ResolvedUnitResult) {
-      analysisServer.filesResolvedSinceLastIdle.add(path);
-      handleResolvedUnitResult(result);
-    }
-
     // If this is a virtual file and the client supports URIs, we need to notify
     // that it's been updated.
     var lspUri = analysisServer.uriConverter.toClientUri(result.path);
@@ -1027,6 +1015,18 @@ abstract class CommonServerContextManagerCallbacks
       );
       analysisServer.sendLspNotification(message);
     }
+
+    if (result is AnalysisResultWithErrors) {
+      if (analysisServer.isAnalyzed(path)) {
+        final serverErrors = server.doAnalysisError_listFromEngine(result);
+        recordAnalysisErrors(path, serverErrors);
+      }
+    }
+
+    if (result is ResolvedUnitResult) {
+      analysisServer.filesResolvedSinceLastIdle.add(path);
+      handleResolvedUnitResult(result);
+    }
   }
 
   void handleResolvedUnitResult(ResolvedUnitResult result);

pkg/analysis_server/lib/src/computer/computer_highlights.dart

@@ -1248,6 +1248,12 @@ class _DartUnitHighlightsComputerVisitor extends RecursiveAstVisitor<void> {
     super.visitMixinDeclaration(node);
   }
 
+  @override
+  void visitMixinOnClause(MixinOnClause node) {
+    computer._addRegion_token(node.onKeyword, HighlightRegionType.BUILT_IN);
+    super.visitMixinOnClause(node);
+  }
+
   @override
   void visitNamedType(NamedType node) {
     if (node.importPrefix case final importPrefix?) {
@@ -1300,12 +1306,6 @@ class _DartUnitHighlightsComputerVisitor extends RecursiveAstVisitor<void> {
     super.visitNullLiteral(node);
   }
 
-  @override
-  void visitOnClause(OnClause node) {
-    computer._addRegion_token(node.onKeyword, HighlightRegionType.BUILT_IN);
-    super.visitOnClause(node);
-  }
-
   @override
   void visitPartDirective(PartDirective node) {
     computer._addRegion_node(node, HighlightRegionType.DIRECTIVE);

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

@@ -159,7 +159,7 @@ class DartCompletionManager {
     if (selection == null) {
       throw AbortCompletion();
     }
-    var state = CompletionState(request, selection);
+    var state = CompletionState(request, selection, budget);
     var pass = InScopeCompletionPass(
       state: state,
       collector: collector,

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

@@ -14,35 +14,41 @@ class CompletionState {
   /// The completion request being processed.
   final DartCompletionRequest request;
 
-  /// The selection at the time completion was requested. The selection is
-  /// required to have a length of zero.
+  /// The selection at the time completion was requested.
+  ///
+  /// The selection is required to have a length of zero.
   final Selection selection;
 
+  /// The budget controlling how much time can be spent computing completion
+  /// suggestions.
+  final CompletionBudget budget;
+
   /// Initialize a newly created completion state.
-  CompletionState(this.request, this.selection) : assert(selection.length == 0);
+  CompletionState(this.request, this.selection, this.budget)
+      : assert(selection.length == 0);
 
-  /// Returns the type of value required by the context in which completion was
+  /// The type of value required by the context in which completion was
   /// requested.
   DartType? get contextType => request.contextType;
 
-  /// Return the [ClassMember] that encloses the completion location, or `null`
-  /// if the completion location isn't in a class member.
+  /// The [ClassMember] that encloses the completion location, or `null` if the
+  /// completion location isn't in a class member.
   ClassMember? get enclosingMember {
     return selection.coveringNode.thisOrAncestorOfType<ClassMember>();
   }
 
-  /// Return `true` if the completion location is inside an instance member, and
-  /// hence there is a binding for `this`.
+  /// Whether the completion location is inside an instance member, and hence
+  /// whether there is a binding for `this`.
   bool get inInstanceScope {
     var member = enclosingMember;
     return member != null && !member.isStatic;
   }
 
-  /// Returns the element of the library containing the completion location.
+  /// The element of the library containing the completion location.
   LibraryElement get libraryElement => request.libraryElement;
 
-  /// Return the type of `this` at the completion location, or `null`
-  /// if the completion location doesn't allow `this` to be used.
+  /// The type of `this` at the completion location, or `null` if the completion
+  /// location doesn't allow `this` to be used.
   DartType? get thisType {
     AstNode? node = selection.coveringNode;
     while (node != null) {
@@ -70,16 +76,16 @@ class CompletionState {
     return null;
   }
 
-  /// Return `true` if the given `feature` is enabled in the library containing
-  /// the selection.
+  /// Whether the given `feature` is enabled in the library containing the
+  /// selection.
   bool isFeatureEnabled(Feature feature) {
     return libraryElement.featureSet.isEnabled(feature);
   }
 }
 
 // TODO(brianwilkerson): Move to 'package:analysis_server/src/utilities/extensions/ast.dart'
 extension on ClassMember {
-  /// Return `true` if this member is a static member.
+  /// Whether this member is a static member.
   bool get isStatic {
     var self = this;
     if (self is MethodDeclaration) {

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

@@ -1795,6 +1795,16 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
     }
   }
 
+  @override
+  void visitMixinOnClause(MixinOnClause node) {
+    var onKeyword = node.onKeyword;
+    if (offset <= onKeyword.end) {
+      keywordHelper.addKeyword(Keyword.ON);
+    } else {
+      _forTypeAnnotation(node);
+    }
+  }
+
   @override
   void visitNamedExpression(NamedExpression node) {
     if (offset <= node.name.label.end) {
@@ -1882,16 +1892,6 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
     }
   }
 
-  @override
-  void visitOnClause(OnClause node) {
-    var onKeyword = node.onKeyword;
-    if (offset <= onKeyword.end) {
-      keywordHelper.addKeyword(Keyword.ON);
-    } else {
-      _forTypeAnnotation(node);
-    }
-  }
-
   @override
   void visitParenthesizedExpression(ParenthesizedExpression node) {
     var expression = node.expression;
@@ -3468,8 +3468,10 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
     required InterfaceElement? element,
     bool skipAt = false,
   }) {
-    // TODO(brianwilkerson): Check whether there's sufficient remaining time
-    //  before computing suggestions for overrides.
+    if (state.budget.isEmpty) {
+      // Don't suggest overrides if the time budget has already been spent.
+      return;
+    }
     if (suggestOverrides && element != null) {
       overrideHelper.computeOverridesFor(
         interfaceElement: element,
@@ -3671,9 +3673,9 @@ extension on AstNode {
       MethodDeclaration(:var metadata) => metadata.contains(child),
       MixinDeclaration(:var members, :var metadata) =>
         members.contains(child) || metadata.contains(child),
-      ObjectPattern(:var fields) => fields.contains(child),
-      OnClause(:var superclassConstraints) =>
+      MixinOnClause(:var superclassConstraints) =>
         superclassConstraints.contains(child),
+      ObjectPattern(:var fields) => fields.contains(child),
       PartDirective(:var metadata) => metadata.contains(child),
       PartOfDirective(:var metadata) => metadata.contains(child),
       PatternVariableDeclaration(:var metadata) => metadata.contains(child),