Skip to content

Snap main to release/dev17.3#62195

Merged
RikkiGibson merged 1025 commits intorelease/dev17.3from
merges/main-to-release/dev17.3
Jun 28, 2022
Merged

Snap main to release/dev17.3#62195
RikkiGibson merged 1025 commits intorelease/dev17.3from
merges/main-to-release/dev17.3

Conversation

@RikkiGibson
Copy link
Copy Markdown
Member

No description provided.

CyrusNajmabadi and others added 30 commits June 15, 2022 15:11
Simplify FAR impl wrt searching for global namespaces
Avoid NullReferenceException in Pick Members dialog
Actually return filtered items for default implementation
NRT enable symbolfinder/find-refs code.
…rting NFE (#61792)

* Convert connection lost exceptions to cancellations to avoid overreporting NFE

* Typo and comment

* Feedback

* Refactoring
* Avoid accessing Document from formatter services

* Push async higher

* Split file

* Rename
Recently we enabled FixAll functionality for a bunch of code refactorings. We have been seen intermittent failures in CI for the FixAll tests added for this. I was able to reproduce the failures locally quite consistently by running the test under a loop with thousands of iterations. Upon investigation it was found that when the test fails, the [underlying CWT](https://github.com/dotnet/roslyn/blob/73de4e98d3020c72a2eef479d267357c15332d80/src/Compilers/Core/Portable/Syntax/SyntaxNodeExtensions_Tracking.cs#L18) used by TrackNodes functionality seems to have cleared the entries for nodes requested to be tracked by this FixAll operations. Adding a ToArray invocation to the tracked nodes to realize the nodes into an array seems to ensure that this doesn't happen and the test passes consistently after this change.

Ideally, we would have expected the `SyntaxEditor.OriginalRoot` to keep all the nodes in the original tree alive, but that doesn't seem to be the case. Long term, we may want to consider adding a new TrackNodes API that does the tracking using dictionaries instead of CWTs and returns a disposable tracker object, such that the caller explicitly controls the lifetime of the tracking.
* Add support for additional file diagnostics in workspace pull

* fix formatting

* Fix more formatting
@RikkiGibson RikkiGibson requested review from a team, 333fred and JoeRobich as code owners June 28, 2022 20:30
@RikkiGibson RikkiGibson requested review from a team and removed request for a team, 333fred and JoeRobich June 28, 2022 20:30
@ghost ghost added the Area-Infrastructure label Jun 28, 2022
@Cosifne
Copy link
Copy Markdown
Member

Cosifne commented Jun 28, 2022

@RikkiGibson
I don't know if this applies to you but for me, the default merging is 'squash' merge.
image
And I think for snapping we want a normal merge.
Just want to make sure you notice this : )

@RikkiGibson RikkiGibson merged commit 2efe6ec into release/dev17.3 Jun 28, 2022
@JoeRobich JoeRobich deleted the merges/main-to-release/dev17.3 branch May 7, 2024 07:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.