Merge main to features/list-patterns #55106
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
…argument-expression Merge main to features/caller-argument-expression
…argument-expression Merge main to features/caller-argument-expression
…argument-expression Merge main to features/caller-argument-expression
* Initial work for caller argument expression * Add resources for caller argument expression diagnostics * Account for swapped named arguments * Add few tests * Complete implementation in PEParameterSymbol * Update tests * Produce warning for invalid parameter name * Run generate-compiler-code.cmd * Fix out of range exception and add more tests * Extract DecodeCallerArgumentExpressionAttribute extension * Fix freeing twice * Fix comments * Simplify PEParameterSymbol * Fix NullableWarnings test * Add test for two parameters referring to each other * Use warning level 1 * Add test for extension methods and remove addressed comments * Add title resources for new warnings * Use static lambda * Add PROTOTYPE comment * Add trivia test and skip PEVerification * Address feedback * Fix resources * Simplify based on @AlekseyTs feedback * Pass array builder instead of creating a temporary immutable array * Check feature availability on language version * Add "semantic check" comment * Add missing IDS_Feature resource * Don't check feature availability on attribute application * Remove helper that's used only once * Cleanup * Don't check generatedDiagnostics * Use LanguageVersion.Preview in tests * Cleanup resx * Use TestOptions.RegularPreview * ConditionalFact[typeof(CoreClrOnly)] * Add assertion * Update tests * Update test * Adjust NullableWarnings test * Address feedback * Simplify * Fix formatting * Address feedback
* upstream/main: (1224 commits) Fix NotNullIfNotNull delegate conversion (#53409) Verify quick info session in InvokeQuickInfo Remove unnecessary retry Enable nullable reference types Fix timeout behavior in GetQuickInfo Only generate build number on first run Update contrib documentation (#53504) update test to wait for workspace to be updated SImplify Fix out of bound crash in lsp navto. Revert changes to TypeScriptWaitContext wrappers Switch to ROSLYN_TEST_CI for CI detection Disable modification to CodeStyleOption<T> SImplify Simplify LoggerTestChannel using BlockingCollection Only require telemetry validation in CI Fix out of bound crash in lsp navto. Track fire-and-forget operations Avoid global option corruption Fix locked comment ...
…argument-expression Merge main to features/caller-argument-expression
…o-features/caller-argument-expression
…argument-expression Merge main to features/caller-argument-expression
…argument-expression Merge main to features/caller-argument-expression
…ures/caller-argument-expression * upstream/main: (492 commits) Add nullable ref annotations to SyntaxFactory (#54199) Add 'replace' APIs and hook them up to the IDE (#54270) Allow implicit implementation of non-public interface members (#54182) Make insertion a stage of the official build (#54376) Cleanup Remove unused property Simplify glyph computation Report all-empty top level statements. (#54385) Calculate TypeParameterKind based on the container type (#54200) vert not roaming Split tests Multple matches Report as we get results Fixup tests Update tests Avoid thread dependency in VirtualMemoryNotificationListener constructor Fast progression search. Add LanguageVersion 10 (#54359) Sure, why not ...
…argument-expression Merge main to features/caller-argument-expression
Proposal: dotnet/csharplang#287 Test plan: #52745 Addresses part of LDM notes: https://github.com/dotnet/csharplang/blob/main/meetings/2021/LDM-2021-06-14.md
…argument-expression Merge main to features/caller-argument-expression
Merge main into features/caller-argument-expression
…en this is happening and better understand the impact.
…argument-expression Merge main to features/caller-argument-expression
…d creating 100gb sized log files
* upstream/main: (249 commits) Switch back queue name to default (#55064) Fix 'code model' with file scoped namespaces Map documents to be reanalyzed back from compile-time to design-time documents (#55054) Update MSBuild Workspace test projects target framework Enable CA1069 for ErrorCode and MessageID (#54695) Dev16->17 updates Update global.json Record completion of "parameterless struct constructor" feature (#55049) Generalize rude edit messages to be applicable to both Hot Reload and EnC (#55012) Update azure-pipelines-official.yml Update azure-pipelines-integration.yml Merge pull request #54992 from jaredpar/so-big Parameterless struct constructors: Remaining work items (#54811) Update docs/wiki/Diagnosing-Project-System-Build-Errors.md update queue name Dev16->17 changes Fix test Fix 'move type' with file scoped namespaces Fix 'match folder and namespace' with file scoped namespaces Log NFW ...
Change default level to warning to avoid creating 100gb sized log files
…ies (#54012) (#55058) Contributes to dotnet/aspnetcore#33402 Co-authored-by: Pranav K <prkrishn@hotmail.com>
Merge main into features/caller-argument-expression
…sion Merge CallerArgumentExpression into main
HoistRefInitialization assumed that the declarator syntax for locals would always be an await expression, but this is not true for switch expressions. CalculateLocalSyntaxOffset already correctly handles switch expressions, so we just needed to update this call site. I also inspected any other calls to CalculateLocalSyntaxOffset to make sure that nothing else was making such an assumption, but I didn't see any that are concerning.
* Correctly set IsRetargetable for source assemblies Source assemblies weren't checking assembly flags and setting IsRetargetable, despite having already decoded all well-known attributes to find the other bits of the assembly identity. We now check and correctly set the IsRetargetable bit. Fixes #54836. * Call correct constructor from tests.
Update version of cloudcache lib we reference
Add telemetry for cursor position changes when applying rename
Fix diagnostic suppressor unit tests
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/list-patterns.
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 merges/main-to-features/list-patterns git reset --hard upstream/features/list-patterns git merge upstream/main # Fix merge conflicts git commit git push upstream merges/main-to-features/list-patterns --force