Skip to content

Commit 9033bc1

Browse files
committed
move unique identifier generation to Coverage class
1 parent c82cebe commit 9033bc1

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

src/coverlet.core/Coverage.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,35 +14,35 @@ public class Coverage
1414
private string _module;
1515
private string _identifier;
1616
private string[] _filters;
17-
private string[] _rules;
17+
private string[] _excludes;
1818
private List<InstrumenterResult> _results;
1919

2020
public string Identifier
2121
{
2222
get { return _identifier; }
2323
}
2424

25-
public Coverage(string module, string[] filters, string[] rules)
25+
public Coverage(string module, string[] filters, string[] excludes)
2626
{
2727
_module = module;
2828
_filters = filters;
29-
_rules = rules;
29+
_excludes = excludes;
3030
_identifier = Guid.NewGuid().ToString();
3131
_results = new List<InstrumenterResult>();
3232
}
3333

3434
public void PrepareModules()
3535
{
3636
string[] modules = InstrumentationHelper.GetCoverableModules(_module);
37-
string[] excludedFiles = InstrumentationHelper.GetExcludedFiles(_rules);
37+
string[] excludes = InstrumentationHelper.GetExcludedFiles(_excludes);
3838
_filters = _filters?.Where(f => InstrumentationHelper.IsValidFilterExpression(f)).ToArray();
3939

4040
foreach (var module in modules)
4141
{
4242
if (InstrumentationHelper.IsModuleExcluded(module, _filters))
4343
continue;
4444

45-
var instrumenter = new Instrumenter(module, _identifier, _filters, excludedFiles);
45+
var instrumenter = new Instrumenter(module, _identifier, _filters, excludes);
4646
if (instrumenter.CanInstrument())
4747
{
4848
InstrumentationHelper.BackupOriginalModule(module, _identifier);

src/coverlet.core/Helpers/InstrumentationHelper.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,15 +166,15 @@ public static bool IsTypeExcluded(string module, string type, string[] filters)
166166
public static bool IsLocalMethod(string method)
167167
=> new Regex(WildcardToRegex("<*>*__*|*")).IsMatch(method);
168168

169-
public static string[] GetExcludedFiles(string[] rules)
169+
public static string[] GetExcludedFiles(string[] excludes)
170170
{
171171
const string RELATIVE_KEY = nameof(RELATIVE_KEY);
172172
string parentDir = Directory.GetCurrentDirectory();
173173

174-
if (rules == null || !rules.Any()) return Array.Empty<string>();
174+
if (excludes == null || !excludes.Any()) return Array.Empty<string>();
175175

176176
var matcherDict = new Dictionary<string, Matcher>() { { RELATIVE_KEY, new Matcher() } };
177-
foreach (var excludeRule in rules)
177+
foreach (var excludeRule in excludes)
178178
{
179179
if (Path.IsPathRooted(excludeRule))
180180
{

src/coverlet.msbuild.tasks/InstrumentationTask.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ public override bool Execute()
4040
{
4141
try
4242
{
43-
var rules = _excludeByFile?.Split(',');
43+
var excludes = _excludeByFile?.Split(',');
4444
var filters = _exclude?.Split(',');
4545

46-
_coverage = new Coverage(_path, filters, rules);
46+
_coverage = new Coverage(_path, filters, excludes);
4747
_coverage.PrepareModules();
4848
}
4949
catch (Exception ex)

0 commit comments

Comments
 (0)