Merge main to features/required-members #58493
Merged
Conversation
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
Fixes [AB#1449967](https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1449967) #57648 fixed a race condition in computing the host analyzer references, but introduced a leak in _hostAnalyzerStateMap, wherein each new solution opened ends up creating a new entry in this map, even though the underlying set of host analyzer references doesn't change. This is due to the fact that each new SolutionState instance creates a new instance of HostDiagnosticAnalyzers, whose constructor creates a new map from analyzer references ID to the analyzer reference. This map is used as part of the key for _hostAnalyzerStateMap, leading to the leak. This change fixes the leak by using the underlying list of host analyzer references as part of the key for _hostAnalyzerStateMap, which is reference equals across all solution instances opened in the VS session. Verified manually that after this fix, repeatedly opening and closing a solution in VS no longer leads to unbounded growth of _hostAnalyzerStateMap.
…_line_error Inline Diagnostics Multi-Line Error Bug
This type functions correctly whether or not it is explicitly disposed.
Remove unnecessary assertion that CancellationSeries is disposed
Add initial test for inline diagnostics tagger
Update underline-reassigned-variable to understand suppressed variables as well
While adjusting this code in the required-members branch I noticed the parameter is unused by the error message, so I did a small refactoring in main to clean that up.
…olution-as-default-for-vscode
…tart of build Fixes [AB#1424584](https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1424584) The primary issue is that the lingering compiler warning CS0169 from prior solution snapshot is reported in `Index.razor`, which is an Additional document, not a regular source document. Existing code in clearing build diagnostics at start of a build was only clearing diagnostics with location in source documents. Doing the same for additional documents fixes this issue.
Fix MakeFieldReadonly false positive for ref assignments
[main] Update dependencies from dotnet/arcade
Clear prior build errors for additional and analyzer config docs at s…
Improve support for TestWorkspace with source generated files
…223.1 (#58471) [main] Update dependencies from dotnet/arcade
Fixes #53192 Currently, work coordinator only enqueues source document IDs for project analysis work items. This means we don't analyze the additional documents, which can now report standalone diagnostics through RegisterAdditionalFileAction. This PR fixes this by enqueuing project's additional document IDs and analyzer config document IDs.
Enqueue additional and analyzer config documents in WorkCoordinator
Fix unused param (IDE0060) false positive
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is an automatically generated pull request from main into features/required-members.
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯
Troubleshooting conflicts
Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file containing conflicts copy its path into the following searches:
Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts.
Resolve merge conflicts using your local repo
Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub.
git fetch --all git checkout -t upstream/merges/main-to-features/required-members git reset --hard upstream/features/required-members git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-features/required-members --force