dart-lang
diff --git a/‎pkg/analysis_server/lib/src/lsp/handlers/handler_text_document_changes.dart‎
Lines changed: 17 additions & 9 deletions b/‎pkg/analysis_server/lib/src/lsp/handlers/handler_text_document_changes.dart‎
Lines changed: 17 additions & 9 deletions
diff --git a/‎pkg/analysis_server/lib/src/lsp/lsp_analysis_server.dart‎
Lines changed: 21 additions & 14 deletions b/‎pkg/analysis_server/lib/src/lsp/lsp_analysis_server.dart‎
Lines changed: 21 additions & 14 deletions
diff --git a/‎pkg/analysis_server/lib/src/lsp/mapping.dart‎
Lines changed: 20 additions & 0 deletions b/‎pkg/analysis_server/lib/src/lsp/mapping.dart‎
Lines changed: 20 additions & 0 deletions
diff --git a/‎pkg/analysis_server/lib/src/lsp/source_edits.dart‎
Lines changed: 34 additions & 11 deletions b/‎pkg/analysis_server/lib/src/lsp/source_edits.dart‎
Lines changed: 34 additions & 11 deletions
diff --git a/‎pkg/analysis_server/lib/src/plugin/plugin_manager.dart‎
Lines changed: 16 additions & 7 deletions b/‎pkg/analysis_server/lib/src/plugin/plugin_manager.dart‎
Lines changed: 16 additions & 7 deletions
diff --git a/‎pkg/analysis_server/lib/src/status/pages/timing_page.dart‎
Lines changed: 30 additions & 0 deletions b/‎pkg/analysis_server/lib/src/status/pages/timing_page.dart‎
Lines changed: 30 additions & 0 deletions
diff --git a/‎pkg/analysis_server/lib/src/utilities/mocks.dart‎
Lines changed: 3 additions & 2 deletions b/‎pkg/analysis_server/lib/src/utilities/mocks.dart‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎pkg/analysis_server/tool/benchmark_tools/lsp_messages.dart‎
Lines changed: 9 additions & 0 deletions b/‎pkg/analysis_server/tool/benchmark_tools/lsp_messages.dart‎
Lines changed: 9 additions & 0 deletions
@@ -11,6 +11,9 @@ import 'package:analysis_server/src/lsp/handlers/handlers.dart';
 import 'package:analysis_server/src/lsp/registration/feature_registration.dart';
 import 'package:analysis_server/src/lsp/source_edits.dart';
 
+const String textDocumentChangeHandlerPerformanceCaption =
+    'change file request processing';
+
 typedef StaticOptions = Either2<TextDocumentSyncKind, TextDocumentSyncOptions>;
 
 class TextDocumentChangeHandler
@@ -29,15 +32,20 @@ class TextDocumentChangeHandler
     MessageInfo message,
     CancellationToken token,
   ) {
-    var doc = params.textDocument;
-    // Editors should never try to change our macro files, but just in case
-    // we get these requests, ignore them.
-    if (!isEditableDocument(doc.uri)) {
-      return success(null);
-    }
-
-    var path = pathOfDoc(doc);
-    return path.mapResultSync((path) => _changeFile(path, params));
+    return message.performance.run(
+      textDocumentChangeHandlerPerformanceCaption,
+      (_) {
+        var doc = params.textDocument;
+        // Editors should never try to change our macro files, but just in case
+        // we get these requests, ignore them.
+        if (!isEditableDocument(doc.uri)) {
+          return success(null);
+        }
+
+        var path = pathOfDoc(doc);
+        return path.mapResultSync((path) => _changeFile(path, params));
+      },
+    );
   }
 
   ErrorOr<void> _changeFile(String path, DidChangeTextDocumentParams params) {
 
@@ -660,28 +660,25 @@ class LspAnalysisServer extends AnalysisServer {
   }
 
   /// Updates an overlay on [path] by applying the [edits] to the current
-  /// overlay.
-  ///
-  /// If the result of applying the edits is already known, [newContent] can be
-  /// set to avoid doing that calculation twice.
+  /// overlay with the result [newContent].
   void onOverlayUpdated(
     String path,
     List<plugin.SourceEdit> edits, {
-    String? newContent,
+    required String newContent,
   }) {
     assert(resourceProvider.hasOverlay(path));
-    if (newContent == null) {
-      var oldContent = resourceProvider.getFile(path).readAsStringSync();
-      newContent = plugin.applySequenceOfEdits(oldContent, edits);
-    }
 
     resourceProvider.setOverlay(
       path,
       content: newContent,
       modificationStamp: overlayModificationStamp++,
     );
 
-    _afterOverlayChanged(path, plugin.ChangeContentOverlay(edits));
+    _afterOverlayChanged(
+      path,
+      plugin.ChangeContentOverlay(edits),
+      precomputedNewContentForChange: newContent,
+    );
   }
 
   void publishClosingLabels(String path, List<ClosingLabel> labels) {
@@ -1034,11 +1031,19 @@ class LspAnalysisServer extends AnalysisServer {
     await _refreshAnalysisRoots();
   }
 
-  void _afterOverlayChanged(String path, plugin.HasToJson changeForPlugins) {
+  void _afterOverlayChanged(
+    String path,
+    plugin.HasToJson changeForPlugins, {
+    String? precomputedNewContentForChange,
+  }) {
     for (var driver in driverMap.values) {
       driver.changeFile(path);
     }
-    _notifyPluginsOverlayChanged(path, changeForPlugins);
+    _notifyPluginsOverlayChanged(
+      path,
+      changeForPlugins,
+      precomputedNewContentForChange: precomputedNewContentForChange,
+    );
 
     notifyDeclarationsTracker(path);
     notifyFlutterWidgetDescriptions(path);
@@ -1112,10 +1117,12 @@ class LspAnalysisServer extends AnalysisServer {
 
   void _notifyPluginsOverlayChanged(
     String path,
-    plugin.HasToJson changeForPlugins,
-  ) {
+    plugin.HasToJson changeForPlugins, {
+    String? precomputedNewContentForChange,
+  }) {
     pluginManager.setAnalysisUpdateContentParams(
       plugin.AnalysisUpdateContentParams({path: changeForPlugins}),
+      precomputedNewContentForChange: precomputedNewContentForChange,
     );
   }
 
 
@@ -1473,6 +1473,26 @@ ErrorOr<int> toOffset(
   );
 }
 
+ErrorOr<int> toOffsetFromOffsetLineAndColumn(
+  int? offsetOfLine,
+  int column,
+  int originalLine, {
+  bool failureIsCritical = false,
+}) {
+  if (offsetOfLine == null) {
+    return ErrorOr<int>.error(
+      lsp.ResponseError(
+        code: failureIsCritical
+            ? lsp.ServerErrorCodes.ClientServerInconsistentState
+            : lsp.ServerErrorCodes.InvalidFileLineCol,
+        message: 'Invalid line number',
+        data: originalLine.toString(),
+      ),
+    );
+  }
+  return ErrorOr<int>.success(offsetOfLine + column);
+}
+
 lsp.Outline toOutline(server.LineInfo lineInfo, server.Outline outline) {
   var children = outline.children;
   return lsp.Outline(
 
@@ -45,17 +45,40 @@ applyAndConvertEditsToServer(
       // TextDocumentContentChangeEvent1
       // {range, text}
       (change) {
-        var lines = LineInfo.fromContent(newContent);
-        var offsetStart = toOffset(
-          lines,
-          change.range.start,
-          failureIsCritical: failureIsCritical,
-        );
-        var offsetEnd = toOffset(
-          lines,
-          change.range.end,
-          failureIsCritical: failureIsCritical,
-        );
+        ErrorOr<int> offsetStart;
+        ErrorOr<int> offsetEnd;
+
+        var start = change.range.start;
+        var end = change.range.end;
+        if (start.line == end.line) {
+          // We only need a single line, so we skip the creation of `LineInfo`
+          // which is faster.
+          var offsetOfLine = LineInfo.getOffsetForLine(start.line, newContent);
+          offsetStart = toOffsetFromOffsetLineAndColumn(
+            offsetOfLine,
+            start.character,
+            start.line,
+            failureIsCritical: failureIsCritical,
+          );
+          offsetEnd = toOffsetFromOffsetLineAndColumn(
+            offsetOfLine,
+            end.character,
+            end.line,
+            failureIsCritical: failureIsCritical,
+          );
+        } else {
+          var lines = LineInfo.fromContent(newContent);
+          offsetStart = toOffset(
+            lines,
+            start,
+            failureIsCritical: failureIsCritical,
+          );
+          offsetEnd = toOffset(
+            lines,
+            end,
+            failureIsCritical: failureIsCritical,
+          );
+        }
         if (offsetStart.isError) {
           return failure(offsetStart);
         }
 
@@ -432,7 +432,10 @@ class PluginManager {
   /// content overlays to those specified by the [params]. As a side-effect,
   /// update the overlay state so that it can be sent to any newly started
   /// plugins.
-  void setAnalysisUpdateContentParams(AnalysisUpdateContentParams params) {
+  void setAnalysisUpdateContentParams(
+    AnalysisUpdateContentParams params, {
+    String? precomputedNewContentForChange,
+  }) {
     for (var plugin in _pluginMap.values) {
       plugin.sendRequest(params);
     }
@@ -444,12 +447,18 @@ class PluginManager {
       } else if (overlay is AddContentOverlay) {
         _overlayState[file] = overlay;
       } else if (overlay is ChangeContentOverlay) {
-        var previousOverlay = _overlayState[file]!;
-        var newContent = SourceEdit.applySequence(
-          previousOverlay.content,
-          overlay.edits,
-        );
-        _overlayState[file] = AddContentOverlay(newContent);
+        if (precomputedNewContentForChange != null) {
+          _overlayState[file] = AddContentOverlay(
+            precomputedNewContentForChange,
+          );
+        } else {
+          var previousOverlay = _overlayState[file]!;
+          var newContent = SourceEdit.applySequence(
+            previousOverlay.content,
+            overlay.edits,
+          );
+          _overlayState[file] = AddContentOverlay(newContent);
+        }
       } else {
         throw ArgumentError('Invalid class of overlay: ${overlay.runtimeType}');
       }
 
@@ -3,6 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
 
 import 'package:analysis_server/src/status/diagnostics.dart';
 import 'package:analysis_server/src/status/pages.dart';
@@ -13,6 +15,14 @@ class TimingPage extends DiagnosticPageWithNav with PerformanceChartMixin {
   TimingPage(DiagnosticsSite site)
     : super(site, 'timing', 'Timing', description: 'Timing statistics.');
 
+  @override
+  ContentType contentType(Map<String, String> params) {
+    if (params['asJson'] != null) {
+      return ContentType.json;
+    }
+    return super.contentType(params);
+  }
+
   @override
   Future<void> generateContent(Map<String, String> params) async {
     var kind = params['kind'];
@@ -40,6 +50,26 @@ class TimingPage extends DiagnosticPageWithNav with PerformanceChartMixin {
     }
   }
 
+  @override
+  Future<void> generatePage(Map<String, String> params) async {
+    if (params['asJson'] != null) {
+      var data = [];
+      // No added header etc.
+      for (var item in server.recentPerformance.requests.items.toList()) {
+        data.add({
+          'id': item.id,
+          'operation': item.operation,
+          'elapsedMs': item.performance.elapsed.inMilliseconds,
+          'latency': item.requestLatency,
+          'performance': item.performance.toJson(),
+        });
+      }
+      buf.write(json.encode(data));
+      return;
+    }
+    return await super.generatePage(params);
+  }
+
   void _emitTable(List<RequestPerformance> items) {
     buf.writeln('<table>');
     buf.writeln('<tr><th>Time</th><th>Request</th></tr>');
 
@@ -298,8 +298,9 @@ class TestPluginManager implements PluginManager {
 
   @override
   void setAnalysisUpdateContentParams(
-    plugin.AnalysisUpdateContentParams params,
-  ) {
+    plugin.AnalysisUpdateContentParams params, {
+    String? precomputedNewContentForChange,
+  }) {
     analysisUpdateContentParams = params;
   }
 }
@@ -94,6 +94,15 @@ class LspMessages {
     };
   }
 
+  static Map<String, dynamic> diagnosticServer(int id) {
+    return {
+      'jsonrpc': '2.0',
+      'id': id,
+      'method': 'dart/diagnosticServer',
+      'clientRequestTime': DateTime.now().millisecondsSinceEpoch,
+    };
+  }
+
   static Map<String, dynamic> didChange(
     Uri uri, {
     required int version,
Original file line number	Diff line number	Diff line change
`@@ -298,8 +298,9 @@ class TestPluginManager implements PluginManager {`
`298`	`298`
`299`	`299`	`@override`
`300`	`300`	`void setAnalysisUpdateContentParams(`
`301`		`- plugin.AnalysisUpdateContentParams params,`
`302`		`- ) {`
	`301`	`+ plugin.AnalysisUpdateContentParams params, {`
	`302`	`+ String? precomputedNewContentForChange,`
	`303`	`+ }) {`
`303`	`304`	`analysisUpdateContentParams = params;`
`304`	`305`	`}`
`305`	`306`	`}`