Revert "[analysis_server] Analyze fix data in fix_data folder"

This reverts commit bbacf39.

Reason for revert: Causing flutter/engine to fail to roll into flutter/flutter. See flutter/flutter#125363.

Original change's description:
> [analysis_server] Analyze fix data in fix_data folder
>
> Fixes part of #52126.
>
> Change-Id: Ib4bd7830a2f644eacedccd375c7c8dc60f040d33
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/296801
> Commit-Queue: Brian Wilkerson <[email protected]>
> Reviewed-by: Brian Wilkerson <[email protected]>

Change-Id: I109a4b2c596ad22d73eaf0ac3e25f53a35ba5e28
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/297320
Bot-Commit: Rubber Stamper <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Zach Anderson <[email protected]>

Author: zanderso

pkg/analysis_server/lib/src/context_manager.dart

@@ -344,28 +344,14 @@ class ContextManagerImpl implements ContextManager {
     callbacks.recordAnalysisErrors(path, convertedErrors);
   }
 
-  /// Use the given analysis [driver] to analyze the content of yaml files
-  /// inside [folder].
-  void _analyzeFixDataFolder(
-      AnalysisDriver driver, Folder folder, String packageName) {
-    for (var resource in folder.getChildren()) {
-      if (resource is File) {
-        if (resource.shortName.endsWith('.yaml')) {
-          _analyzeFixDataYaml(driver, resource, packageName);
-        }
-      } else if (resource is Folder) {
-        _analyzeFixDataFolder(driver, resource, packageName);
-      }
-    }
-  }
-
   /// Use the given analysis [driver] to analyze the content of the
-  /// given [File].
-  void _analyzeFixDataYaml(
-      AnalysisDriver driver, File file, String packageName) {
+  /// data file at the given [path].
+  void _analyzeFixDataYaml(AnalysisDriver driver, String path) {
     var convertedErrors = const <protocol.AnalysisError>[];
     try {
-      var content = file.readAsStringSync();
+      var file = resourceProvider.getFile(path);
+      var packageName = file.parent.parent.shortName;
+      var content = _readFile(path);
       var errorListener = RecordingErrorListener();
       var errorReporter = ErrorReporter(
         errorListener,
@@ -382,7 +368,7 @@ class ContextManagerImpl implements ContextManager {
       // If the file cannot be analyzed, fall through to clear any previous
       // errors.
     }
-    callbacks.recordAnalysisErrors(file.path, convertedErrors);
+    callbacks.recordAnalysisErrors(path, convertedErrors);
   }
 
   /// Use the given analysis [driver] to analyze the content of the pubspec file
@@ -450,31 +436,10 @@ class ContextManagerImpl implements ContextManager {
   }
 
   void _checkForFixDataYamlUpdate(String path) {
-    String? extractPackageNameFromPath(String path) {
-      String? packageName;
-      var pathSegments = pathContext.split(path);
-      if (pathContext.basename(path) == file_paths.fixDataYaml &&
-          pathSegments.length >= 3) {
-        // packageName/lib/fix_data.yaml
-        packageName = pathSegments[pathSegments.length - 3];
-      } else {
-        var fixDataIndex = pathSegments.indexOf('fix_data');
-        if (fixDataIndex >= 2) {
-          // packageName/lib/fix_data/foo/bar/fix.yaml
-          packageName = pathSegments[fixDataIndex - 2];
-        }
-      }
-      return packageName;
-    }
-
     if (file_paths.isFixDataYaml(pathContext, path)) {
       var driver = getDriverFor(path);
       if (driver != null) {
-        String? packageName = extractPackageNameFromPath(path);
-        if (packageName != null) {
-          var file = resourceProvider.getFile(path);
-          _analyzeFixDataYaml(driver, file, packageName);
-        }
+        _analyzeFixDataYaml(driver, path);
       }
     }
   }
@@ -564,19 +529,11 @@ class ContextManagerImpl implements ContextManager {
             _analyzeAnalysisOptionsYaml(driver, optionsFile.path);
           }
 
-          var packageName = rootFolder.shortName;
           var fixDataYamlFile = rootFolder
               .getChildAssumingFolder('lib')
               .getChildAssumingFile(file_paths.fixDataYaml);
           if (fixDataYamlFile.exists) {
-            _analyzeFixDataYaml(driver, fixDataYamlFile, packageName);
-          }
-
-          var fixDataFolder = rootFolder
-              .getChildAssumingFolder('lib')
-              .getChildAssumingFolder('fix_data');
-          if (fixDataFolder.exists) {
-            _analyzeFixDataFolder(driver, fixDataFolder, packageName);
+            _analyzeFixDataYaml(driver, fixDataYamlFile.path);
           }
 
           var pubspecFile =

pkg/analysis_server/lib/src/lsp/server_capabilities_computer.dart

@@ -164,9 +164,7 @@ class ServerCapabilitiesComputer {
   final analysisOptionsFile = TextDocumentFilterWithScheme(
       language: 'yaml', scheme: 'file', pattern: '**/analysis_options.yaml');
   final fixDataFile = TextDocumentFilterWithScheme(
-      language: 'yaml',
-      scheme: 'file',
-      pattern: '**/lib/{fix_data.yaml,fix_data/**.yaml}');
+      language: 'yaml', scheme: 'file', pattern: '**/lib/fix_data.yaml');
 
   ServerCapabilitiesComputer(this._server);
   ServerCapabilities computeServerCapabilities(

pkg/analysis_server/test/domain_analysis_test.dart

@@ -238,28 +238,6 @@ class A {}
     assertNoErrors(b_path);
   }
 
-  Future<void> test_fileSystem_addFile_fixDataFolderYaml() async {
-    var path = '$testPackageLibPath/fix_data/foo.yaml';
-
-    newFile('$testPackageLibPath/a.dart', '');
-
-    await setRoots(included: [workspaceRootPath], excluded: []);
-
-    // No `fix_data.yaml` to analyze yet.
-    assertNoErrorsNotification(path);
-
-    // Create it, will be analyzed.
-    newFile(path, '0: 1');
-    await pumpEventQueue();
-    await server.onAnalysisComplete;
-
-    // And it has errors.
-    assertHasErrors(path);
-
-    // We don't recreate analysis contexts.
-    _assertFlushedResults([]);
-  }
-
   Future<void> test_fileSystem_addFile_fixDataYaml() async {
     var path = '$testPackageLibPath/fix_data.yaml';
 
@@ -553,34 +531,6 @@ class A {}
     assertNoErrors(b_path);
   }
 
-  Future<void> test_fileSystem_changeFile_fixDataFolderYaml() async {
-    var path = '$testPackageLibPath/fix_data/foo.yaml';
-
-    newFile('$testPackageLibPath/a.dart', '');
-
-    // This file has an error.
-    newFile(path, '0: 1');
-
-    await setRoots(included: [workspaceRootPath], excluded: []);
-
-    // The file was analyzed.
-    assertHasErrors(path);
-
-    // Replace with the content that does not have errors.
-    newFile(path, r'''
-version: 1
-transforms: []
-''');
-    await pumpEventQueue();
-    await server.onAnalysisComplete;
-
-    // And it has errors.
-    assertNoErrors(path);
-
-    // We don't recreate analysis contexts.
-    _assertFlushedResults([]);
-  }
-
   Future<void> test_fileSystem_changeFile_fixDataYaml() async {
     var path = '$testPackageLibPath/fix_data.yaml';
 
@@ -594,7 +544,7 @@ transforms: []
     // The file was analyzed.
     assertHasErrors(path);
 
-    // Replace with the content that does not have errors.
+    // Replace with the context that does not have errors.
     newFile(path, r'''
 version: 1
 transforms: []

pkg/analyzer/lib/src/util/file_paths.dart

@@ -31,9 +31,6 @@ const String dotDartTool = '.dart_tool';
 /// The name of the data file used to specify data-driven fixes.
 const String fixDataYaml = 'fix_data.yaml';
 
-/// The name of the data folder used to specify data-driven fixes.
-const String fixDataYamlFolder = 'fix_data';
-
 /// The name of the package config files.
 const String packageConfigJson = 'package_config.json';
 
@@ -68,12 +65,10 @@ bool isDart(p.Context pathContext, String path) {
   return pathContext.extension(path) == '.dart';
 }
 
-/// Return `true` if the [path] is a `fix_data.yaml` or `fix_data/**.yaml` file.
+/// Return `true` if the [path] is a `fix_data.yaml` file.
 /// Such files specify data-driven fixes.
 bool isFixDataYaml(p.Context pathContext, String path) {
-  return pathContext.basename(path) == fixDataYaml ||
-      (pathContext.split(path).contains('fix_data') &&
-          pathContext.extension(path) == '.yaml');
+  return pathContext.basename(path) == fixDataYaml;
 }
 
 /// Return `true` if the given [path] refers to a file that is assumed to be