Skip to content

Merge "null conditional assignment" to main #77867

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

Jump to bottom
Merged
RikkiGibson merged 34 commits into from
Mar 27, 2025
Merged

Merge "null conditional assignment" to main #77867

RikkiGibson merged 34 commits into from
Mar 27, 2025

Conversation

@RikkiGibson
Copy link
Member

@RikkiGibson RikkiGibson commented Mar 27, 2025

RikkiGibson and others added 30 commits November 8, 2024 15:56
@RikkiGibson
Extract local functions to members (#75837)
e30ffb8
@CyrusNajmabadi
Merges/main to features/null conditional assignment (#75910)
a2e3c90
@CyrusNajmabadi @RikkiGibson
Update parsing code for conditional access expressions (#75849)
e176253 
* Rename parser method

* Cleanup

* Inline methods

* Share

* fix

* Docs

* rename

* Remove unnecessayr check

* Update src/Compilers/CSharp/Portable/Parser/LanguageParser.cs

Co-authored-by: Rikki Gibson <[email protected]>

* Fix

* Cleaner

* Update src/Compilers/CSharp/Portable/Parser/LanguageParser.cs

Co-authored-by: Rikki Gibson <[email protected]>

* Apply suggestions from code review

---------

Co-authored-by: Rikki Gibson <[email protected]>
@RikkiGibson @CyrusNajmabadi
Null-conditional assignment 1 (#75821)
7c84cba 
Co-authored-by: Cyrus Najmabadi <[email protected]>
@RikkiGibson
Merge remote-tracking branch 'upstream/main' into nca-update-main
06fc748
@RikkiGibson
Update null-conditional-assignment branch from main (#76637)
be43638
@RikkiGibson
Merge remote-tracking branch 'upstream/main' into nca-merge-main
4c54ed8
@CyrusNajmabadi
Add formatting test
4d44910
@CyrusNajmabadi
Add goto def test
7ff86a6
@CyrusNajmabadi
Add quick info test
2a75966
@RikkiGibson
Update null-conditional-assignment branch from main (#77449)
1aa4d4f
@CyrusNajmabadi
Add null-conditional-assignment tests. (#77450)
5ebeaef
@CyrusNajmabadi
Update generate-variable to understand null-conditional-assignment
b125363
@CyrusNajmabadi
Update 'use null prop' to support null-conditional-assignment
d54dce4
@CyrusNajmabadi
Update 'use conditional expr' to support null-conditional-assignment
9e2eae2
@CyrusNajmabadi
Update generate-variable to understand null-conditional-assignment (#…
7bf11b8 
…77482)
@CyrusNajmabadi
Update 'use null prop' to support null-conditional-assignment (#77483)
f5900ff
@CyrusNajmabadi
Update 'use conditional expr' to support null-conditional-assignment (#…
e405091 
…77484)
@CyrusNajmabadi
Add completion validation tests
ec5d4f0
@CyrusNajmabadi
Remove dead code
d18e011
@CyrusNajmabadi
Add completion validation tests (#77511)
fbf1377
@CyrusNajmabadi
Fix issue with 'null conditional assignment' and 'generate variable'
5ca89a2
@CyrusNajmabadi
Simplify
5ef1fc7
@CyrusNajmabadi
Add test
c66f415
@CyrusNajmabadi
Fix
601d2f2
@CyrusNajmabadi
Fix
5054881
@CyrusNajmabadi
Merge branch 'ncaVarGen' into ncaGenMethod
fd2b4f7
@CyrusNajmabadi
Support generate method in null-conditional-assignment
727cf30
@CyrusNajmabadi
Simplify
6cdcfe9
@CyrusNajmabadi
Support generate method in null-conditional-assignment (#77526)
433c8b4
@RikkiGibson RikkiGibson requested review from a team as code owners March 27, 2025 16:34
@ghost ghost added Area-Infrastructure untriaged Issues and PRs which have not yet been triaged by a lead labels Mar 27, 2025
@RikkiGibson RikkiGibson requested a review from jaredpar March 27, 2025 16:34
CyrusNajmabadi
CyrusNajmabadi approved these changes Mar 27, 2025
View reviewed changes
Copy link
Member

@CyrusNajmabadi CyrusNajmabadi left a comment

Choose a reason for hiding this comment

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

IDE side lgtm.

@RikkiGibson
Copy link
Member Author

RikkiGibson commented Mar 27, 2025

/azp run

@azure-pipelines
Copy link

azure-pipelines bot commented Mar 27, 2025

Azure Pipelines successfully started running 3 pipeline(s).

@RikkiGibson
Copy link
Member Author

RikkiGibson commented Mar 27, 2025 •
edited
Loading

Between the PR branch run and feature branch rolling run, the macOS tests are failing on multiple attempts.

image

It's a few VB tests that are failing:

  • Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics.BinaryOperators.Test5_DateConst
  • Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics.BinaryOperators.Test1_Date

This is unlikely to be an issue with the feature, but, I want to take care we don't introduce a weird failure to main, which is not already there. Possibly an with GitHub grouping CI runs by head SHA is in the mix here making things weird as well.

@jjonescz
Copy link
Member

jjonescz commented Mar 27, 2025

macOS leg shouldn't be running on PRs and i think it's not a "required" CI check so you can probably ignore it failing; otherwise you might need to merge main back here, because there were some failing tests that needed to be skipped - see 53062f4

@RikkiGibson
Copy link
Member Author

RikkiGibson commented Mar 27, 2025

there were some failing tests that needed to be skipped

The tests we skipped in main, are exactly the ones failing here, so it sounds like we will not break main by merging here. Thanks!

@RikkiGibson RikkiGibson merged commit 2437c72 into main Mar 27, 2025
22 of 41 checks passed
@dotnet-policy-service dotnet-policy-service bot added this to the Next milestone Mar 27, 2025
@JoeRobich JoeRobich mentioned this pull request Mar 28, 2025
Merged
@jjonescz jjonescz modified the milestones: Next, 17.14 P3 Apr 1, 2025
@BillWagner BillWagner mentioned this pull request Apr 2, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jaredpar jaredpar jaredpar approved these changes

@CyrusNajmabadi CyrusNajmabadi CyrusNajmabadi approved these changes

Assignees

No one assigned

Labels

Area-Infrastructure untriaged Issues and PRs which have not yet been triaged by a lead VSCode

Projects

None yet

Milestone

17.14 P3

Development

Successfully merging this pull request may close these issues.

5 participants

@RikkiGibson @jjonescz @jaredpar @CyrusNajmabadi