analysis server: simplify LegacyAnalysisServer

This class had a few methods which only pertain to the resource provider
and can just be extensions on ResourceProvider. They also have the
exact same impl! So one can redirect to the other.

Change-Id: I3a0433304adba1b71f69d0a4afc8a44515a23d10
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/405600
Commit-Queue: Samuel Rawlins <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>

Author: srawlins

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

@@ -7,6 +7,7 @@ import 'dart:async';
 import 'package:analysis_server/protocol/protocol.dart';
 import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/handler/legacy/legacy_handler.dart';
+import 'package:analysis_server/src/utilities/extensions/resource_provider.dart';
 
 /// The handler for the `analysis.setAnalysisRoots` request.
 class AnalysisSetAnalysisRootsHandler extends LegacyHandler {
@@ -32,13 +33,13 @@ class AnalysisSetAnalysisRootsHandler extends LegacyHandler {
 
     // validate
     for (var path in includedPathList) {
-      if (!server.isValidFilePath(path)) {
+      if (!server.resourceProvider.isValidFilePath(path)) {
         sendResponse(Response.invalidFilePathFormat(request, path));
         return;
       }
     }
     for (var path in excludedPathList) {
-      if (!server.isValidFilePath(path)) {
+      if (!server.resourceProvider.isValidFilePath(path)) {
         sendResponse(Response.invalidFilePathFormat(request, path));
         return;
       }

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

@@ -9,6 +9,7 @@ import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/handler/legacy/legacy_handler.dart';
 import 'package:analysis_server/src/plugin/request_converter.dart';
+import 'package:analysis_server/src/utilities/extensions/resource_provider.dart';
 
 /// The handler for the `analysis.setPriorityFiles` request.
 class AnalysisSetPriorityFilesHandler extends LegacyHandler {
@@ -31,7 +32,7 @@ class AnalysisSetPriorityFilesHandler extends LegacyHandler {
     server.analyticsManager.startedSetPriorityFiles(params);
 
     for (var file in params.files) {
-      if (!server.isAbsoluteAndNormalized(file)) {
+      if (!server.resourceProvider.isAbsoluteAndNormalized(file)) {
         sendResponse(Response.invalidFilePathFormat(request, file));
         return;
       }

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

@@ -10,6 +10,7 @@ import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/handler/legacy/legacy_handler.dart';
 import 'package:analysis_server/src/plugin/request_converter.dart';
 import 'package:analysis_server/src/protocol/protocol_internal.dart';
+import 'package:analysis_server/src/utilities/extensions/resource_provider.dart';
 
 /// The handler for the `analysis.setSubscriptions` request.
 class AnalysisSetSubscriptionsHandler extends LegacyHandler {
@@ -31,7 +32,7 @@ class AnalysisSetSubscriptionsHandler extends LegacyHandler {
 
     for (var fileList in params.subscriptions.values) {
       for (var file in fileList) {
-        if (!server.isAbsoluteAndNormalized(file)) {
+        if (!server.resourceProvider.isAbsoluteAndNormalized(file)) {
           sendResponse(Response.invalidFilePathFormat(request, file));
         }
       }

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

@@ -8,6 +8,7 @@ import 'package:analysis_server/protocol/protocol.dart';
 import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/handler/legacy/legacy_handler.dart';
 import 'package:analysis_server/src/plugin/request_converter.dart';
+import 'package:analysis_server/src/utilities/extensions/resource_provider.dart';
 
 /// The handler for the `analysis.updateContent` request.
 class AnalysisUpdateContentHandler extends LegacyHandler {
@@ -28,7 +29,7 @@ class AnalysisUpdateContentHandler extends LegacyHandler {
     );
 
     for (var file in params.files.keys) {
-      if (!server.isAbsoluteAndNormalized(file)) {
+      if (!server.resourceProvider.isAbsoluteAndNormalized(file)) {
         sendResponse(Response.invalidFilePathFormat(request, file));
         return;
       }

pkg/analysis_server/lib/src/legacy_analysis_server.dart

@@ -94,6 +94,7 @@ import 'package:analysis_server/src/services/completion/completion_state.dart';
 import 'package:analysis_server/src/services/execution/execution_context.dart';
 import 'package:analysis_server/src/services/flutter/widget_descriptions.dart';
 import 'package:analysis_server/src/services/refactoring/legacy/refactoring_manager.dart';
+import 'package:analysis_server/src/utilities/extensions/resource_provider.dart';
 import 'package:analysis_server/src/utilities/process.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/analysis/session.dart';
@@ -468,7 +469,7 @@ class LegacyAnalysisServer extends AnalysisServer {
 
   /// The [Future] that completes when analysis is complete.
   Future<void> get onAnalysisComplete {
-    if (isAnalysisComplete()) {
+    if (_isAnalysisComplete) {
       return Future.value();
     }
     var completer = _onAnalysisCompleteCompleter ??= Completer<void>();
@@ -525,6 +526,8 @@ class LegacyAnalysisServer extends AnalysisServer {
   bool get supportsShowMessageRequest =>
       clientCapabilities.requests.contains('showMessageRequest');
 
+  bool get _isAnalysisComplete => !analysisDriverScheduler.isWorking;
+
   void cancelRequest(String id) {
     cancellationTokens[id]?.cancel();
   }
@@ -679,25 +682,6 @@ class LegacyAnalysisServer extends AnalysisServer {
     sendLspNotifications = true;
   }
 
-  /// Return `true` if the [path] is both absolute and normalized.
-  bool isAbsoluteAndNormalized(String path) {
-    var pathContext = resourceProvider.pathContext;
-    return pathContext.isAbsolute(path) && pathContext.normalize(path) == path;
-  }
-
-  /// Return `true` if analysis is complete.
-  bool isAnalysisComplete() {
-    return !analysisDriverScheduler.isWorking;
-  }
-
-  /// Return `true` if the given path is a valid `FilePath`.
-  ///
-  /// This means that it is absolute and normalized.
-  bool isValidFilePath(String path) {
-    return resourceProvider.pathContext.isAbsolute(path) &&
-        resourceProvider.pathContext.normalize(path) == path;
-  }
-
   @override
   void notifyFlutterWidgetDescriptions(String path) {
     flutterWidgetDescriptions.flush();
@@ -786,7 +770,7 @@ class LegacyAnalysisServer extends AnalysisServer {
   /// If the [path] is not a valid file path, that is absolute and normalized,
   /// send an error response, and return `true`. If OK then return `false`.
   bool sendResponseErrorIfInvalidFilePath(Request request, String path) {
-    if (!isAbsoluteAndNormalized(path)) {
+    if (!resourceProvider.isAbsoluteAndNormalized(path)) {
       sendResponse(Response.invalidFilePathFormat(request, path));
       return true;
     }
@@ -926,16 +910,18 @@ class LegacyAnalysisServer extends AnalysisServer {
     List<GeneralAnalysisService> subscriptions,
   ) {
     var newServices = subscriptions.toSet();
-    if (newServices.contains(GeneralAnalysisService.ANALYZED_FILES) &&
-        !generalAnalysisServices.contains(
-          GeneralAnalysisService.ANALYZED_FILES,
-        ) &&
-        isAnalysisComplete()) {
+    var newServicesContainsAnalyzedFiles = newServices.contains(
+      GeneralAnalysisService.ANALYZED_FILES,
+    );
+    var generalServicesContainsAnalyzedFiles = generalAnalysisServices.contains(
+      GeneralAnalysisService.ANALYZED_FILES,
+    );
+    if (newServicesContainsAnalyzedFiles &&
+        !generalServicesContainsAnalyzedFiles &&
+        _isAnalysisComplete) {
       sendAnalysisNotificationAnalyzedFiles(this);
-    } else if (!newServices.contains(GeneralAnalysisService.ANALYZED_FILES) &&
-        generalAnalysisServices.contains(
-          GeneralAnalysisService.ANALYZED_FILES,
-        )) {
+    } else if (!newServicesContainsAnalyzedFiles &&
+        generalServicesContainsAnalyzedFiles) {
       prevAnalyzedFiles = null;
     }
     generalAnalysisServices = newServices;

pkg/analysis_server/lib/src/utilities/extensions/resource_provider.dart

@@ -0,0 +1,16 @@
+// 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:analyzer/file_system/file_system.dart';
+
+extension ResourceProviderExtension on ResourceProvider {
+  /// Whether [path] is both absolute and normalized.
+  bool isAbsoluteAndNormalized(String path) =>
+      pathContext.isAbsolute(path) && pathContext.normalize(path) == path;
+
+  /// Whether [path] is a valid `FilePath`.
+  ///
+  /// This means that it is absolute and normalized.
+  bool isValidFilePath(String path) => isAbsoluteAndNormalized(path);
+}