Version 3.8.0-214.0.dev

Merge ae6da8b into dev

Author: Dart CI

DEPS

@@ -130,10 +130,10 @@ vars = {
   # 'tools/rev_sdk_deps.dart' will rev pkg dependencies to their latest; put an
   # EOL comment after a dependency to instead pin at the current revision.
   "core_rev": "61e677100b06d56a1b3731ab1178ebf9102ecb1f",
-  "dartdoc_rev": "c41b86b98ca935ec3c29cdb04cb190df30afb242",
-  "ecosystem_rev": "5b8e6b8973663a64be5b98159da51409267a685b",
+  "dartdoc_rev": "d40067626b8c419e451897447e4dae74d25bcc37",
+  "ecosystem_rev": "23172636e60c52384b40e6bd1240d12c8e860122",
   "flute_rev": "e4ea0459a7debae5e9592c85141707b01fac86c9",
-  "http_rev": "9129a96be871a5779436f042bd13790960171373",
+  "http_rev": "1b6e28d7e1c61f7b0f8561be7aee9c35b03de193",
   "i18n_rev": "d9cce0b6348b51872fb269e43ff8a43120fe191d",
   "leak_tracker_rev": "f5620600a5ce1c44f65ddaa02001e200b096e14c", # rolled manually
   "material_color_utilities_rev": "799b6ba2f3f1c28c67cc7e0b4f18e0c7d7f3c03e",

pkg/analysis_server/lib/src/analysis_server.dart

@@ -32,6 +32,7 @@ import 'package:analysis_server/src/server/message_scheduler.dart';
 import 'package:analysis_server/src/services/completion/completion_performance.dart';
 import 'package:analysis_server/src/services/correction/fix_performance.dart';
 import 'package:analysis_server/src/services/correction/namespace.dart';
+import 'package:analysis_server/src/services/correction/refactoring_performance.dart';
 import 'package:analysis_server/src/services/dart_tooling_daemon/dtd_services.dart';
 import 'package:analysis_server/src/services/pub/pub_api.dart';
 import 'package:analysis_server/src/services/pub/pub_command.dart';
@@ -1223,6 +1224,11 @@ class ServerRecentPerformance {
   final RecentBuffer<GetFixesPerformance> getFixes =
       RecentBuffer<GetFixesPerformance>(performanceListMaxLength);
 
+  /// A list of performance measurements for the latest requests to get refactorings
+  /// up to [performanceListMaxLength] measurements.
+  final RecentBuffer<GetRefactoringsPerformance> getRefactorings =
+      RecentBuffer<GetRefactoringsPerformance>(performanceListMaxLength);
+
   /// A [RecentBuffer] for performance information about the most recent
   /// requests.
   final RecentBuffer<RequestPerformance> requests = RecentBuffer(

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

@@ -180,7 +180,9 @@ abstract class AbstractCodeActionsProducer
     OperationPerformance? performance,
   );
 
-  Future<List<Either2<CodeAction, Command>>> getRefactorActions();
+  Future<List<Either2<CodeAction, Command>>> getRefactorActions(
+    OperationPerformance? performance,
+  );
 
   Future<List<Either2<CodeAction, Command>>> getSourceActions();
 

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

@@ -111,7 +111,9 @@ class AnalysisOptionsCodeActionsProducer extends AbstractCodeActionsProducer {
   }
 
   @override
-  Future<List<Either2<CodeAction, Command>>> getRefactorActions() async => [];
+  Future<List<Either2<CodeAction, Command>>> getRefactorActions(
+    OperationPerformance? performance,
+  ) async => [];
 
   @override
   Future<List<Either2<CodeAction, Command>>> getSourceActions() async => [];

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

@@ -12,6 +12,7 @@ import 'package:analysis_server/src/protocol_server.dart'
     hide AnalysisOptions, Position;
 import 'package:analysis_server/src/services/correction/assist.dart';
 import 'package:analysis_server/src/services/correction/fix_performance.dart';
+import 'package:analysis_server/src/services/correction/refactoring_performance.dart';
 import 'package:analysis_server/src/services/refactoring/framework/refactoring_context.dart';
 import 'package:analysis_server/src/services/refactoring/framework/refactoring_processor.dart';
 import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart';
@@ -264,14 +265,17 @@ class DartCodeActionsProducer extends AbstractCodeActionsProducer {
   }
 
   @override
-  Future<List<Either2<CodeAction, Command>>> getRefactorActions() async {
+  Future<List<Either2<CodeAction, Command>>> getRefactorActions(
+    OperationPerformance? performance,
+  ) async {
     // If the client does not support workspace/applyEdit, we won't be able to
     // run any of these.
     if (!supportsApplyEdit) {
       return const [];
     }
 
     var refactorActions = <Either2<CodeAction, Command>>[];
+    var performanceTracker = RefactoringPerformance();
 
     try {
       // New interactive refactors.
@@ -286,12 +290,16 @@ class DartCodeActionsProducer extends AbstractCodeActionsProducer {
         includeExperimental:
             server.lspClientConfiguration.global.experimentalRefactors,
       );
-      var processor = RefactoringProcessor(context);
+      var processor = RefactoringProcessor(
+        context,
+        performance: performanceTracker,
+      );
       var actions = await processor.compute();
       refactorActions.addAll(actions.map(Either2<CodeAction, Command>.t1));
 
       // Extracts
       if (shouldIncludeKind(CodeActionKind.RefactorExtract)) {
+        var timer = Stopwatch()..start();
         // Extract Method
         if (ExtractMethodRefactoring(
           server.searchEngine,
@@ -307,6 +315,10 @@ class DartCodeActionsProducer extends AbstractCodeActionsProducer {
             ),
           );
         }
+        performanceTracker.addTiming(
+          className: 'ExtractMethodRefactoring',
+          timer: timer,
+        );
 
         // Extract Local Variable
         if (ExtractLocalRefactoring(unitResult, offset, length).isAvailable()) {
@@ -318,6 +330,10 @@ class DartCodeActionsProducer extends AbstractCodeActionsProducer {
             ),
           );
         }
+        performanceTracker.addTiming(
+          className: 'ExtractLocalRefactoring',
+          timer: timer,
+        );
 
         // Extract Widget
         if (ExtractWidgetRefactoring(
@@ -334,10 +350,16 @@ class DartCodeActionsProducer extends AbstractCodeActionsProducer {
             ),
           );
         }
+        performanceTracker.addTiming(
+          className: 'ExtractWidgetRefactoring',
+          timer: timer,
+        );
       }
 
+      var timer = Stopwatch();
       // Inlines
       if (shouldIncludeKind(CodeActionKind.RefactorInline)) {
+        timer.start();
         // Inline Local Variable
         if (InlineLocalRefactoring(
           server.searchEngine,
@@ -352,6 +374,10 @@ class DartCodeActionsProducer extends AbstractCodeActionsProducer {
             ),
           );
         }
+        performanceTracker.addTiming(
+          className: 'InlineLocalRefactoring',
+          timer: timer,
+        );
 
         // Inline Method
         if (InlineMethodRefactoring(
@@ -367,10 +393,16 @@ class DartCodeActionsProducer extends AbstractCodeActionsProducer {
             ),
           );
         }
+        performanceTracker.addTiming(
+          className: 'InlineMethodRefactoring',
+          timer: timer,
+        );
       }
 
       // Converts/Rewrites
       if (shouldIncludeKind(CodeActionKind.RefactorRewrite)) {
+        timer.restart();
+
         var node = NodeLocator(offset).searchWithin(unitResult.unit);
         var element = server.getElementOfNode(node);
 
@@ -389,6 +421,10 @@ class DartCodeActionsProducer extends AbstractCodeActionsProducer {
             ),
           );
         }
+        performanceTracker.addTiming(
+          className: 'ConvertGetterToMethodRefactoring',
+          timer: timer,
+        );
 
         // Method to Getter
         if (element is ExecutableElement2 &&
@@ -405,6 +441,22 @@ class DartCodeActionsProducer extends AbstractCodeActionsProducer {
             ),
           );
         }
+        performanceTracker.addTiming(
+          className: 'ConvertMethodToGetterRefactoring',
+          timer: timer,
+        );
+      }
+      if (performance != null) {
+        server.recentPerformance.getRefactorings.add(
+          GetRefactoringsPerformance(
+            performance: performance,
+            path: path,
+            content: unitResult.content,
+            offset: offset,
+            requestLatency: performanceTracker.computeTime!.inMilliseconds,
+            producerTimings: performanceTracker.producerTimings,
+          ),
+        );
       }
 
       return refactorActions;
@@ -457,3 +509,20 @@ class DartCodeActionsProducer extends AbstractCodeActionsProducer {
         : Either2<CodeAction, Command>.t2(command);
   }
 }
+
+extension on Stopwatch {
+  void restart() {
+    reset();
+    start();
+  }
+}
+
+extension on RefactoringPerformance {
+  void addTiming({required String className, required Stopwatch timer}) {
+    producerTimings.add((
+      className: 'InlineMethodRefactoring',
+      elapsedTime: timer.elapsedMilliseconds,
+    ));
+    timer.restart();
+  }
+}

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

@@ -71,7 +71,9 @@ class PluginCodeActionsProducer extends AbstractCodeActionsProducer {
   }
 
   @override
-  Future<List<Either2<CodeAction, Command>>> getRefactorActions() async => [];
+  Future<List<Either2<CodeAction, Command>>> getRefactorActions(
+    OperationPerformance? performance,
+  ) async => [];
 
   @override
   Future<List<Either2<CodeAction, Command>>> getSourceActions() async => [];

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

@@ -97,7 +97,9 @@ class PubspecCodeActionsProducer extends AbstractCodeActionsProducer {
   }
 
   @override
-  Future<List<Either2<CodeAction, Command>>> getRefactorActions() async => [];
+  Future<List<Either2<CodeAction, Command>>> getRefactorActions(
+    OperationPerformance? performance,
+  ) async => [];
 
   @override
   Future<List<Either2<CodeAction, Command>>> getSourceActions() async => [];

pkg/analysis_server/lib/src/lsp/handlers/handler_code_actions.dart

@@ -256,7 +256,7 @@ class CodeActionHandler
             for (var computer in actionComputers)
               ...await performance.runAsync(
                 '${computer.name}.getRefactorActions',
-                (_) => computer.getRefactorActions(),
+                (_) => computer.getRefactorActions(message.performance),
               ),
         ];
 

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

@@ -0,0 +1,23 @@
+// Copyright (c) 2025, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'package:analysis_server_plugin/src/correction/performance.dart';
+
+/// Overall performance of a request for refactorings operation.
+class GetRefactoringsPerformance extends ProducerRequestPerformance {
+  GetRefactoringsPerformance({
+    required super.performance,
+    required super.path,
+    super.requestLatency,
+    required super.content,
+    required super.offset,
+    required super.producerTimings,
+  }) : super(operation: 'GetRefactorings');
+}
+
+/// A callback for recording refactoring request timings.
+class RefactoringPerformance {
+  Duration? computeTime;
+  List<ProducerTiming> producerTimings = [];
+}

pkg/analysis_server/lib/src/services/refactoring/framework/refactoring_processor.dart

@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analysis_server/src/lsp/constants.dart';
+import 'package:analysis_server/src/services/correction/refactoring_performance.dart';
 import 'package:analysis_server/src/services/refactoring/convert_all_formal_parameters_to_named.dart';
 import 'package:analysis_server/src/services/refactoring/convert_selected_formal_parameters_to_named.dart';
 import 'package:analysis_server/src/services/refactoring/framework/refactoring_context.dart';
@@ -30,11 +31,17 @@ class RefactoringProcessor {
   /// The context in which the refactorings could be applied.
   final RefactoringContext context;
 
-  RefactoringProcessor(this.context);
+  final RefactoringPerformance? _performance;
+
+  final Stopwatch _timer = Stopwatch();
+
+  RefactoringProcessor(this.context, {RefactoringPerformance? performance})
+    : _performance = performance;
 
   /// Return a list containing one code action for each of the refactorings that
   /// are available in the current context.
   Future<List<CodeAction>> compute() async {
+    _timer.start();
     var refactorings = <CodeAction>[];
     for (var entry in RefactoringProcessor.generators.entries) {
       var generator = entry.value;
@@ -43,9 +50,14 @@ class RefactoringProcessor {
       if (producer.isExperimental && !context.includeExperimental) {
         continue;
       }
-
+      var startTime = _timer.elapsedMilliseconds;
       var isAvailable = producer.isAvailable();
       if (!isAvailable) {
+        // Track time checking for availablity before continuing.
+        _performance?.producerTimings.add((
+          className: producer.runtimeType.toString(),
+          elapsedTime: _timer.elapsedMilliseconds - startTime,
+        ));
         continue;
       }
 
@@ -90,7 +102,13 @@ class RefactoringProcessor {
           data: {'parameters': parameters},
         ),
       );
+      _performance?.producerTimings.add((
+        className: producer.runtimeType.toString(),
+        elapsedTime: _timer.elapsedMilliseconds - startTime,
+      ));
     }
+    _timer.stop();
+    _performance?.computeTime = _timer.elapsed;
     return refactorings;
   }
 }