Skip to content

Commit 42c98bd

Browse files
srawlinsCommit Queue
authored andcommitted
analyzer_utilities: change analysisOptionsContent.include to be a list.
Change-Id: I664a1133ab873e88a1034111b83eb70ac429c9b3 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/426985 Commit-Queue: Samuel Rawlins <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]>
1 parent a72f25e commit 42c98bd

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

pkg/analysis_server/test/domain_analysis_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2263,7 +2263,7 @@ class SetAnalysisRootsTest extends PubPackageAnalysisServerTest {
22632263
// `analysis_options.yaml`.
22642264
newAnalysisOptionsYamlFile(
22652265
join(workspaceRootPath, 'package1', 'nestedFolder1'),
2266-
analysisOptionsContent(include: '../analysis_options.yaml'),
2266+
analysisOptionsContent(includes: ['../analysis_options.yaml']),
22672267
);
22682268

22692269
// Write the single package config at the root that can resolve both

pkg/analyzer_utilities/lib/testing/test_support.dart

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
/// Returns the content for an analysis options file, specified appropriately
66
/// with the given parameter values.
77
String analysisOptionsContent({
8-
// TODO(srawlins): Change this maybe to a List<String>.
9-
String? include,
8+
List<String> includes = const [],
109
List<String> experiments = const [],
1110
List<String> legacyPlugins = const [],
1211
List<String> rules = const [],
@@ -17,8 +16,11 @@ String analysisOptionsContent({
1716
}) {
1817
var buffer = StringBuffer();
1918

20-
if (include != null) {
21-
buffer.writeln('include: $include');
19+
if (includes.isNotEmpty) {
20+
buffer.writeln('include:');
21+
for (var include in includes) {
22+
buffer.writeln(' - $include');
23+
}
2224
}
2325

2426
buffer.writeln('analyzer:');

0 commit comments

Comments
 (0)