Skip to content

Combine multiple suppressions applied to the same diagnostic #1699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjmholt merged 16 commits into from
Jul 23, 2021
Merged

Combine multiple suppressions applied to the same diagnostic #1699

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
05a275d
Ensure multiply suppressed diagnostics only create one output
rjmholt Jul 21, 2021
e486374
Fix suppression with no offset
rjmholt Jul 21, 2021
4efd640
Defend against NRE
rjmholt Jul 21, 2021
2874be3
Complete comment help
rjmholt Jul 21, 2021
abdaefd
Add error emission comment
rjmholt Jul 21, 2021
177ed88
Fix justification test
rjmholt Jul 21, 2021
37a0104
Add extra tests
rjmholt Jul 21, 2021
e4ea36f
Try error redirection
rjmholt Jul 21, 2021
5eccd72
Try to fix errors
rjmholt Jul 21, 2021
200f0ad
Go back to ErrorAction
rjmholt Jul 21, 2021
c942343
Fix tests
rjmholt Jul 22, 2021
6bfdd25
Fix tests
rjmholt Jul 22, 2021
f1391d3
Fix error variable
rjmholt Jul 23, 2021
99f146e
Try to filter out other diagnostics
rjmholt Jul 23, 2021
f93ad20
Remove redundant filters
rjmholt Jul 23, 2021
498a8c9
Use other API for attribute types
rjmholt Jul 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix suppression with no offset
  • Loading branch information
@rjmholt
rjmholt committed Jul 21, 2021
commit e486374c1571a5912758a07b435e3d6d20cacc6c
14 changes: 3 additions & 11 deletions Engine/Helper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1364,20 +1364,12 @@ public Tuple<List<SuppressedRecord>, List<DiagnosticRecord>> SuppressRule(
{
Tuple<int, int> offsetPair = GetOffset(diagnostic);

// If we have no offset, we can't suppress anything
if (offsetPair is null)
{
unsuppressedRecords.Add(diagnostic);
continue;
}

(int startOffset, int endOffset) = offsetPair;

var appliedSuppressions = new List<RuleSuppression>();
foreach (RuleSuppression suppression in ruleSuppressions)
{
// Check that the diagnostic is within the suppressed extent
if (startOffset < suppression.StartOffset || endOffset > suppression.EndOffset)
// Check that the diagnostic is within the suppressed extent, if we have such an extent
if (!(offsetPair is null)
&& (offsetPair.Item1 < suppression.StartOffset || offsetPair.Item2 > suppression.EndOffset))
{
continue;
}
Expand Down