Allow excluding pubspec.yaml and analysis_options.yaml

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

Author: srawlins

pkg/analysis_server/lib/src/context_manager.dart

@@ -484,7 +484,9 @@ class ContextManagerImpl implements ContextManager {
           }
 
           var optionsFile = analysisContext.contextRoot.optionsFile;
-          if (optionsFile != null) {
+
+          if (optionsFile != null &&
+              analysisContext.contextRoot.isAnalyzed(optionsFile.path)) {
             _analyzeAnalysisOptionsYaml(driver, optionsFile.path);
           }
 
@@ -497,7 +499,8 @@ class ContextManagerImpl implements ContextManager {
 
           var pubspecFile =
               rootFolder.getChildAssumingFile(file_paths.pubspecYaml);
-          if (pubspecFile.exists) {
+          if (pubspecFile.exists &&
+              analysisContext.contextRoot.isAnalyzed(pubspecFile.path)) {
             _analyzePubspecYaml(driver, pubspecFile.path);
           }
         }

pkg/analysis_server/test/domain_analysis_test.dart

@@ -1223,6 +1223,30 @@ analyzer:
     ]);
   }
 
+  Future<void> test_setRoots_notDartFile_analysisOptions_excluded() async {
+    deleteTestPackageAnalysisOptionsFile();
+    var a_path = '$testPackageLibPath/a.dart';
+    var options_path = '$testPackageRootPath/analysis_options.yaml';
+
+    newFile2(a_path, 'error');
+
+    // 'analysis_options.yaml' that has an error and excludes itself.
+    newFile2(options_path, '''
+analyzer:
+  exclude:
+    - analysis_options.yaml
+  error:
+''');
+
+    await setRoots(included: [workspaceRootPath], excluded: []);
+    await server.onAnalysisComplete;
+
+    _assertAnalyzedFiles(
+      hasErrors: [a_path],
+      notAnalyzed: [options_path],
+    );
+  }
+
   Future<void> test_setRoots_notDartFile_androidManifestXml() async {
     var path = '$testPackageRootPath/AndroidManifest.xml';
 
@@ -1253,6 +1277,35 @@ analyzer:
     assertHasErrors(path);
   }
 
+  Future<void> test_setRoots_notDartFile_pubspec_excluded() async {
+    deleteTestPackageAnalysisOptionsFile();
+    var a_path = '$testPackageLibPath/a.dart';
+    var pubspec_path = '$testPackageRootPath/pubspec.yaml';
+    var options_path = '$testPackageRootPath/analysis_options.yaml';
+
+    newFile2(a_path, 'error');
+
+    writeTestPackagePubspecYamlFile('''
+name:
+  - error
+''');
+
+    // 'analysis_options.yaml' that excludes pubspec.yaml.
+    newFile2(options_path, '''
+analyzer:
+  exclude:
+    - pubspec.yaml
+''');
+
+    await setRoots(included: [workspaceRootPath], excluded: []);
+    await server.onAnalysisComplete;
+
+    _assertAnalyzedFiles(
+      hasErrors: [a_path],
+      notAnalyzed: [pubspec_path],
+    );
+  }
+
   Future<void> test_setRoots_packageConfigJsonFile() async {
     var aaaRootPath = '/packages/aaa';
     var a_path = '$aaaRootPath/lib/a.dart';

pkg/analyzer/test/src/dart/analysis/context_root_test.dart

@@ -113,6 +113,26 @@ class ContextRootTest with ResourceProviderMixin {
     );
   }
 
+  test_isAnalyzed_explicitlyExcluded_byFile() {
+    var excludePath = convertPath('/test/root/exclude/c.dart');
+    var siblingPath = convertPath('/test/root/exclude/d.dart');
+    contextRoot.excluded.add(newFile2(excludePath, ''));
+    expect(contextRoot.isAnalyzed(excludePath), isFalse);
+    expect(contextRoot.isAnalyzed(siblingPath), isTrue);
+  }
+
+  test_isAnalyzed_explicitlyExcluded_byFile_analysisOptions() {
+    var excludePath = convertPath('/test/root/analysis_options.yaml');
+    contextRoot.excluded.add(newFile2(excludePath, ''));
+    expect(contextRoot.isAnalyzed(excludePath), isFalse);
+  }
+
+  test_isAnalyzed_explicitlyExcluded_byFile_pubspec() {
+    var excludePath = convertPath('/test/root/pubspec.yaml');
+    contextRoot.excluded.add(newFile2(excludePath, ''));
+    expect(contextRoot.isAnalyzed(excludePath), isFalse);
+  }
+
   test_isAnalyzed_explicitlyExcluded_byFolder() {
     String excludePath = convertPath('/test/root/exclude');
     String filePath = convertPath('/test/root/exclude/root.dart');