Skip to content
This repository was archived by the owner on Jul 16, 2023. It is now read-only.

Commit c277252

Browse files
committed
revert fix: correctly split exclude path
This reverts commit 3397933
1 parent ced8074 commit c277252

File tree

13 files changed

+23
-31
lines changed

13 files changed

+23
-31
lines changed

CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
* fix: add check for supertypes for [`avoid-non-null-assertions`](https://dartcodemetrics.dev/docs/rules/common/avoid-non-null-assertion) rule.
77
* fix: cover more cases in [`prefer-immediate-return`](https://dartcodemetrics.dev/docs/rules/common/prefer-immediate-return) rule
88
* fix: support index expressions for [`no-magic-number`](https://dartcodemetrics.dev/docs/rules/common/no-magic-number) rule.
9-
* fix: correctly split exclude path
109
* chore: restrict `analyzer` version to `>=2.4.0 <3.4.0`.
1110
* fix: correctly handle nullable types of collections for [`avoid-collection-methods-with-unrelated-types`](https://dartcodemetrics.dev/docs/rules/common/avoid-collection-methods-with-unrelated-types)
1211

lib/src/analyzers/lint_analyzer/lint_config.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import '../../cli/models/parsed_arguments.dart';
22
import '../../config_builder/analysis_options_utils.dart';
33
import '../../config_builder/models/analysis_options.dart';
4-
import '../../utils/exclude_utils.dart';
54
import 'metrics/metrics_factory.dart';
65

76
/// Represents raw lint config which can be merged with other raw configs.
@@ -40,7 +39,8 @@ class LintConfig {
4039

4140
/// Creates the config from cli [arguments].
4241
factory LintConfig.fromArgs(ParsedArguments arguments) => LintConfig(
43-
excludePatterns: extractExcludes(arguments.excludePath),
42+
excludePatterns:
43+
arguments.excludePath.isNotEmpty ? [arguments.excludePath] : [],
4444
excludeForMetricsPatterns: const [],
4545
metrics: {
4646
for (final metric in getMetrics(config: {}))

lib/src/analyzers/unused_code_analyzer/unused_code_config.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import '../../config_builder/models/analysis_options.dart';
2-
import '../../utils/exclude_utils.dart';
32

43
/// Represents raw unused code config which can be merged with other raw configs.
54
class UnusedCodeConfig {
@@ -24,11 +23,11 @@ class UnusedCodeConfig {
2423

2524
/// Creates the config from cli args.
2625
factory UnusedCodeConfig.fromArgs(
27-
String excludePath, {
26+
Iterable<String> excludePatterns, {
2827
required bool isMonorepo,
2928
}) =>
3029
UnusedCodeConfig(
31-
excludePatterns: extractExcludes(excludePath),
30+
excludePatterns: excludePatterns,
3231
analyzerExcludePatterns: const [],
3332
isMonorepo: isMonorepo,
3433
);

lib/src/analyzers/unused_files_analyzer/unused_files_config.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import '../../config_builder/models/analysis_options.dart';
2-
import '../../utils/exclude_utils.dart';
32

43
/// Represents raw unused files config which can be merged with other raw configs.
54
class UnusedFilesConfig {
@@ -24,11 +23,11 @@ class UnusedFilesConfig {
2423

2524
/// Creates the config from cli args.
2625
factory UnusedFilesConfig.fromArgs(
27-
String excludePath, {
26+
Iterable<String> excludePatterns, {
2827
required bool isMonorepo,
2928
}) =>
3029
UnusedFilesConfig(
31-
excludePatterns: extractExcludes(excludePath),
30+
excludePatterns: excludePatterns,
3231
analyzerExcludePatterns: const [],
3332
isMonorepo: isMonorepo,
3433
);

lib/src/analyzers/unused_l10n_analyzer/unused_l10n_config.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import '../../config_builder/models/analysis_options.dart';
2-
import '../../utils/exclude_utils.dart';
32

43
/// Represents raw unused files config which can be merged with other raw configs.
54
class UnusedL10nConfig {
@@ -26,11 +25,11 @@ class UnusedL10nConfig {
2625

2726
/// Creates the config from cli args.
2827
factory UnusedL10nConfig.fromArgs(
29-
String excludePath,
28+
Iterable<String> excludePatterns,
3029
String classPattern,
3130
) =>
3231
UnusedL10nConfig(
33-
excludePatterns: extractExcludes(excludePath),
32+
excludePatterns: excludePatterns,
3433
analyzerExcludePatterns: const [],
3534
classPattern: classPattern,
3635
);

lib/src/cli/commands/check_unused_code_command.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class CheckUnusedCodeCommand extends BaseCommand {
3535
final noCongratulate = argResults[FlagNames.noCongratulate] as bool;
3636

3737
final config = ConfigBuilder.getUnusedCodeConfigFromArgs(
38-
excludePath,
38+
[excludePath],
3939
isMonorepo: isMonorepo,
4040
);
4141

lib/src/cli/commands/check_unused_files_command.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class CheckUnusedFilesCommand extends BaseCommand {
3636
final deleteFiles = argResults[FlagNames.deleteFiles] as bool;
3737

3838
final config = ConfigBuilder.getUnusedFilesConfigFromArgs(
39-
excludePath,
39+
[excludePath],
4040
isMonorepo: isMonorepo,
4141
);
4242

lib/src/cli/commands/check_unused_l10n_command.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class CheckUnusedL10nCommand extends BaseCommand {
3737
final folders = argResults.rest;
3838

3939
final config = ConfigBuilder.getUnusedL10nConfigFromArgs(
40-
excludePath,
40+
[excludePath],
4141
classPattern,
4242
);
4343

lib/src/config_builder/config_builder.dart

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ class ConfigBuilder {
6868
);
6969
}
7070

71-
/// Creates a raw unused files config from given [excludePath].
71+
/// Creates a raw unused files config from given [excludePatterns].
7272
static UnusedFilesConfig getUnusedFilesConfigFromArgs(
73-
String excludePath, {
73+
Iterable<String> excludePatterns, {
7474
required bool isMonorepo,
7575
}) =>
76-
UnusedFilesConfig.fromArgs(excludePath, isMonorepo: isMonorepo);
76+
UnusedFilesConfig.fromArgs(excludePatterns, isMonorepo: isMonorepo);
7777

7878
/// Creates a raw unused files config from given [options].
7979
static UnusedFilesConfig getUnusedFilesConfigFromOption(
@@ -91,12 +91,12 @@ class ConfigBuilder {
9191
prepareExcludes(config.analyzerExcludePatterns, rootPath),
9292
);
9393

94-
/// Creates a raw unused code config from given [excludePath].
94+
/// Creates a raw unused code config from given [excludePatterns].
9595
static UnusedCodeConfig getUnusedCodeConfigFromArgs(
96-
String excludePath, {
96+
Iterable<String> excludePatterns, {
9797
required bool isMonorepo,
9898
}) =>
99-
UnusedCodeConfig.fromArgs(excludePath, isMonorepo: isMonorepo);
99+
UnusedCodeConfig.fromArgs(excludePatterns, isMonorepo: isMonorepo);
100100

101101
/// Creates a raw unused code config from given [options].
102102
static UnusedCodeConfig getUnusedCodeConfigFromOption(
@@ -114,12 +114,12 @@ class ConfigBuilder {
114114
prepareExcludes(config.analyzerExcludePatterns, rootPath),
115115
);
116116

117-
/// Creates a raw unused localization config from given [excludePath] and [classPattern].
117+
/// Creates a raw unused localization config from given [excludePatterns] and [classPattern].
118118
static UnusedL10nConfig getUnusedL10nConfigFromArgs(
119-
String excludePath,
119+
Iterable<String> excludePatterns,
120120
String classPattern,
121121
) =>
122-
UnusedL10nConfig.fromArgs(excludePath, classPattern);
122+
UnusedL10nConfig.fromArgs(excludePatterns, classPattern);
123123

124124
/// Creates a raw unused localization config from given [options].
125125
static UnusedL10nConfig getUnusedL10nConfigFromOption(

lib/src/utils/exclude_utils.dart

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,3 @@ Iterable<Glob> prepareExcludes(
1515
.map((exclude) =>
1616
Glob(p.normalize(p.join(root, exclude)).replaceAll(r'\', '/')))
1717
.toList();
18-
19-
Iterable<String> extractExcludes(String excludePath) => excludePath.isNotEmpty
20-
? excludePath.split(',').map((path) => path.trim())
21-
: [];

0 commit comments

Comments
 (0)