-
Notifications
You must be signed in to change notification settings - Fork 4.1k
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.
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
Remove dead code from diagnostics subsystem #77034
Merged
CyrusNajmabadi
merged 5 commits into
dotnet:main
from
CyrusNajmabadi:diagnosticEventArgs2
Feb 5, 2025
Merged
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
03edf13
Remove unnecessary diagnostic eventing code
CyrusNajmabadi 93b09f4
Remove more dead code
CyrusNajmabadi 93537dd
Merge remote-tracking branch 'upstream/main' into diagnosticEventArgs2
CyrusNajmabadi 3e3b7d3
Merge branch 'main' into diagnosticEventArgs2
CyrusNajmabadi cc95605
Merge branch 'main' into diagnosticEventArgs2
CyrusNajmabadi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -107,8 +107,7 @@ private async Task<ProjectAnalyzerStateSets> UpdateProjectStateSetsAsync(Project | |
if (projectStateSets == null) | ||
{ | ||
projectStateSets = CreateProjectStateSets(project); | ||
|
||
analyzerReferenceChangedEventArgs = GetProjectAnalyzerReferenceChangedEventArgs(project, projectStateSets.Value.MapPerReferences, projectStateSets.Value.StateSetMap); | ||
analyzerReferenceChangedEventArgs = GetProjectAnalyzerReferenceChangedEventArgs(project); | ||
|
||
// update cache. | ||
_projectAnalyzerStateMap = _projectAnalyzerStateMap.SetItem(project.Id, projectStateSets.Value); | ||
|
@@ -121,37 +120,22 @@ private async Task<ProjectAnalyzerStateSets> UpdateProjectStateSetsAsync(Project | |
return projectStateSets.Value; | ||
} | ||
|
||
private ProjectAnalyzerReferenceChangedEventArgs? GetProjectAnalyzerReferenceChangedEventArgs( | ||
Project project, | ||
ImmutableDictionary<object, ImmutableArray<DiagnosticAnalyzer>> newMapPerReference, | ||
ImmutableDictionary<DiagnosticAnalyzer, StateSet> newMap) | ||
private ProjectAnalyzerReferenceChangedEventArgs? GetProjectAnalyzerReferenceChangedEventArgs(Project project) | ||
{ | ||
// No need to use _projectAnalyzerStateMapGuard during reads of _projectAnalyzerStateMap | ||
if (!_projectAnalyzerStateMap.TryGetValue(project.Id, out var entry)) | ||
{ | ||
// no previous references and we still don't have any references | ||
if (newMap.Count == 0) | ||
{ | ||
return null; | ||
} | ||
|
||
// new reference added | ||
return new ProjectAnalyzerReferenceChangedEventArgs(project, newMap.Values.ToImmutableArrayOrEmpty(), []); | ||
return null; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. converted to 'null', since hte only code that reads the 'removed' argument bails out if it is empty. |
||
} | ||
|
||
Debug.Assert(!entry.AnalyzerReferences.Equals(project.AnalyzerReferences)); | ||
|
||
// there has been change. find out what has changed | ||
var addedStates = DiffStateSets(project.AnalyzerReferences.Except(entry.AnalyzerReferences), newMapPerReference, newMap); | ||
var removedStates = DiffStateSets(entry.AnalyzerReferences.Except(project.AnalyzerReferences), entry.MapPerReferences, entry.StateSetMap); | ||
|
||
// nothing has changed | ||
if (addedStates.Length == 0 && removedStates.Length == 0) | ||
{ | ||
if (removedStates.Length == 0) | ||
return null; | ||
} | ||
|
||
return new ProjectAnalyzerReferenceChangedEventArgs(project, addedStates, removedStates); | ||
return new ProjectAnalyzerReferenceChangedEventArgs(removedStates); | ||
} | ||
|
||
private static ImmutableArray<StateSet> DiffStateSets( | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the above two values were never read.