Skip to content
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

Do less work computing diff-merge results in the common case. #73430

Merged
merged 49 commits into from
May 13, 2024

Conversation

CyrusNajmabadi
Copy link
Member

@CyrusNajmabadi CyrusNajmabadi commented May 10, 2024

Followup to #73424

@dotnet-issue-labeler dotnet-issue-labeler bot added Area-IDE untriaged Issues and PRs which have not yet been triaged by a lead labels May 10, 2024
less work

Simplify

Fix test

Add back

Simplify

Fix

rename

lint
@@ -5769,7 +5769,7 @@ public class Goo
{
public void Bar()
{
var target = new List<object;gt>();
var target = new List<object>();
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tests were wonky.

appliedChanges = await AddDocumentMergeChangesAsync(
oldSolution.GetDocument(documentId),
newSolution.GetDocument(documentId),
[.. appliedChanges],
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was converting an IA into a list, that was never mutated. made the input/output entirely IA bases.

Copy link
Contributor

@ToddGrun ToddGrun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit:

@CyrusNajmabadi CyrusNajmabadi marked this pull request as ready for review May 10, 2024 21:57
@CyrusNajmabadi CyrusNajmabadi requested a review from a team as a code owner May 10, 2024 21:57
@CyrusNajmabadi CyrusNajmabadi merged commit f52d2f0 into dotnet:main May 13, 2024
25 checks passed
@CyrusNajmabadi CyrusNajmabadi deleted the lessWork branch May 13, 2024 16:32
@dotnet-policy-service dotnet-policy-service bot added this to the Next milestone May 13, 2024
@Cosifne Cosifne modified the milestones: Next, 17.11 P2 May 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-IDE untriaged Issues and PRs which have not yet been triaged by a lead
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants