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

Jump to bottom

Merge features/interpolated-string into main #54692

Merged
merged 53 commits into from Jul 9, 2021
Merged

Merge features/interpolated-string into main #54692

merged 53 commits into from Jul 9, 2021

Conversation

333fred
Copy link
Member

@333fred 333fred commented Jul 8, 2021

No description provided.

msftbot[bot] and others added 30 commits February 28, 2021 01:41
Merge pull request #51543 from dotnet/merges/master-to-features/inter…
a2197d9 
…polated-string

Merge master to features/interpolated-string
Merge pull request #51719 from dotnet/merges/main-to-features/interpo…
58ee9c5 
…lated-string

Merge main to features/interpolated-string
Merge pull request #51865 from dotnet/merges/main-to-features/interpo…
c94fa54 
…lated-string

Merge main to features/interpolated-string
Merge pull request #52026 from dotnet/merges/main-to-features/interpo…
2b5d67b 
…lated-string

Merge main to features/interpolated-string
@333fred
Merge remote-tracking branch 'upstream/main' into merge-main
fd2072d 
* upstream/main: (75 commits)
  Split BoundInterpolatedString into BoundInterpolatedString and BoundUnconvertedInterpolatedString (#52061)
  Combine VB comparers into one, and combine VB and C# comparers together (#51834)
  Use OptimizedVSCompletionList in LSP scenarios.
  F5 Hot Reload (#52101)
  Fix typescript shim
  Add tests for lazy syntax trees coming from the GeneratorDriver
  React to code review feedback.
  Simplify the lazy-initalization pattern used in GetRoot
  Remove an unnecessary override. (#52140)
  Update issue number (#52130)
  Enable CodeActions support for XAML using its own provider and CodeActionCache. The handlers are actually shared with Roslyn as is. (#52129)
  Add RestrictedIVT to dotnet watch to Features (#52087)
  Don't try to highlight operators (#52041)
  Use `null` instead of empty signature helps in LSP
  Use member type for relational pattern even in error cases (#51950)
  Update src/VisualStudio/Xaml/Impl/Implementation/LanguageServer/Extensions/SymbolExtensions.cs
  Use new QuickInfoUtilities helper
  Rebuild API shape (#52079)
  Added position parameter name
  Updated XAML QuickInfo to show more info like C# by using ISymbolDisplayService and adding more documentation parts.
  ...
Merge pull request #52156 from 333fred/merge-main
8623b91 
merge main
Merge pull request #52199 from dotnet/merges/main-to-features/interpo…
54d3c06 
…lated-string

Merge main to features/interpolated-string
Merge pull request #52403 from dotnet/merges/main-to-features/interpo…
21fc275 
…lated-string

Merge main to features/interpolated-string
Merge pull request #52549 from dotnet/merges/main-to-features/interpo…
b2afcc1 
…lated-string

Merge main to features/interpolated-string
@333fred
Merge pull request #52899 from dotnet/merges/main-to-features/interpo…
3efe70d 
…lated-string

Merge main to features/interpolated-string
Merge pull request #53083 from dotnet/merges/main-to-features/interpo…
0a86282 
…lated-string

Merge main to features/interpolated-string
@333fred
Implement binding and lowering for InterpolatedStringBuilder (#52422)
8a59240 
* Implement binding and lowering for InterpolatedStringBuilder

This implements initial binding and lowering for the InterpolatedStringBuilder, used when an interpolated string is converted directly to a `string`, and not to some other builder type. I've written it in such a way as to make future refactorings to support general builder types simple, but some of the steps (particularly lowering) are more simplistic for now. I did _not_ implement nullable analysis or definite assignment in this PR, prototype comments have been left to make sure that those are handled later. The spec for this feature is located at https://github.com/dotnet/csharplang/blob/main/proposals/improved-interpolated-strings.md, I will have a PR out later today or tomorrow to reflect the changes from LDM earlier today.
@333fred
Merge remote-tracking branch 'upstream/main' into merges/main-to-feat…
253c752 
…ures/interpolated-string

* upstream/main: (332 commits)
  Simplify
  Simplify
  Simplify
  Simplify
  Simplify
  Simplify
  Use patterns
  Warning
  More cases
  Use separate equivalence keys for pattern matching fixes.
  Use the not pattern
  use NRT
  use NRT
  use NRT
  use NRT
  use NRT
  use NRT
  use NRT
  use NRT
  use NRT
  ...
Merge pull request #53283 from dotnet/merges/main-to-features/interpo…
38df25e 
…lated-string

Merge main to features/interpolated-string
@333fred
Move from calling Create to calling a specific constructor (#53262)
a4ebff3
@333fred
Merge pull request #53443 from dotnet/merges/main-to-features/interpo…
a520ef8 
…lated-string

Merge main to features/interpolated-string
@333fred
Merge remote-tracking branch 'upstream/main' into merges/main-to-feat…
77ec844 
…ures/interpolated-string

* upstream/main: (92 commits)
  Keep casts when necessary to prefer a constant pattern over a type pattern
  Remove SyntaxKind.DataKeyword (#53614)
  Display 'readonly' for record structs (#53634)
  Update Building, Debugging, and Testing on Windows.md (#53543)
  Update dependencies from https://github.com/dotnet/arcade build 20210521.3 (#53617)
  Introduce resx for BuildValidator and MS.CA.Rebuild to allow localization (#53447)
  Report obsoletion diagnostics for slice and indexer (#53463)
  Update BasicGenerateConstructorDialog.cs
  Add searchbox in generate overrides dialog
  Allow `with` on anonymous types (#53248)
  Report diagnostic on correct node (#53538)
  Fix NotNullIfNotNull delegate conversion (#53409)
  Verify quick info session in InvokeQuickInfo
  Remove unnecessary retry
  Ensure no navbar IO on the UI thread
  Enable nullable reference types
  Fix timeout behavior in GetQuickInfo
  Add a semantic model based GetQuickInfoAsync entry point into QuickInfoServiceWithProviders
  Move semantic model based quick info API up to CommonQuickInfoProvider type
  Fix dnceng build by forcing the use of xcopy msbuild
  ...
Merge pull request #53622 from dotnet/merges/main-to-features/interpo…
ffee833 
…lated-string

Merge main to features/interpolated-string
Merge pull request #53774 from dotnet/merges/main-to-features/interpo…
e7e6d24 
…lated-string

Merge main to features/interpolated-string
@333fred
Add support for interpolated string handler conversions (#53602)
66267da 
* Add support for interpolated string handler conversions

This PR allows interpolated strings to convert to types marked with InterpolatedStringBuilderAttribute, allows the RefKind to mismatch, and implements support for the better conversion rules.
Merge pull request #53900 from dotnet/merges/main-to-features/interpo…
5facc75 
…lated-string

Merge main to features/interpolated-string
@333fred
InterpolatedStringHandlerArgumentAttribute Decoding (#53932)
e0a2cd6 
* Support validating InterpolatedStringHandlerArgumentAttribute from source.

* Nullable enable decoding parts of PEModule.

* Add support for decoding InterpolatedStringHandlerArgumentAttribute from metadata.

* Fixup annotations in DiagnosticAnalyzer and a test mistake.

* Update warning level test.

* Minor code review refactoring.

* PR Feedback:

* Remove attribute constructor resolution during source binding
* More tests
* Small refactorings.

* PR feedback around condensing flags.

* Fix misnamed XML section.
@333fred
Merge remote-tracking branch 'upstream/main' into merges/main-to-feat…
520d492 
…ures/interpolated-string

* upstream/main: (95 commits)
  Update official build number in separate job
  Update Language Feature Status.md (#54015)
  Remove IRazorDocumentOptionsService inheritance interface (#54047)
  Fix comment
  Simplify
  Do not create a cache field for lambda if it depends on caller's type argument (#44939)
  Documentation
  Documentation
  Documentation
  Update test impls
  Just pass null
  Pull diagnostics should just request from the doc, not the whole project.
  Add test plan for file-scoped namespace (#54003)
  Add source build to official build
  Improved nullable 'is' analysis (#53311)
  Multi session service (#53762)
  Resolve Versions.props conflicts
  Revert "Revert "Require partial method signatures to match" (47576) (#47879)" (#53352)
  Broaden enforcement on prototype marker (#53886)
  Update Language Feature Status.md (#53926)
  ...
Merge pull request #54063 from dotnet/merges/main-to-features/interpo…
192709e 
…lated-string

Merge main to features/interpolated-string
@333fred
Add support for InterpolatedStringBuilderArgumentAttribute
e335d4d 
This adds binding and lowering support for InterpolatedStringBuilderArgumentAttribute. For initial binding, we have an existing method that all argument binding goes through: CoerceArguments. However, lowering did not have a similar chokepoint, as every argument location started by calling `VisitList`, then `MakeArguments` at a later point. In order to ensure that the rewrite is handled correctly, I've done a refactor on `MakeArguments` to turn it into `VisitArguments` and update every place that handles arguments to instead use this new helper, which takes care of the rest of the argument rewrites (such as params) and will additionally update the receiver if needed.
@333fred
PR feedback.
6f901de
@333fred
Address feedback in the local rewriter. Initial binding feedback is s…
ad95c65 
…till mostly unaddressed.
@333fred
Initial binding feedback and additional tests.
af0b518
@333fred
Actually rewrite function pointer arguments, fix warning.
3a9ed5a
@333fred
PR Feedback.
7c90a20
333fred and others added 13 commits July 6, 2021 17:50
@333fred
Correctly handle ref-safe-to-escape.
83395ca
@333fred
Correct ref-safe-to-escape lifetimes, fix bootstrap build.
e77a649
@333fred
PR feedback.
73be92a
@333fred
More PR feedback.
2db9f36
@333fred
Remove double spacing.
ae6c341
@333fred
Prevent null refs for invalid scenarios.
c5312b7
@333fred
Fix formatting and test.
ba890dd
@333fred
More formatting.
7659bdc
@333fred
Merge pull request #54585 from 333fred/cleanup
93b9822 
Definite assignment, initial nullable, IOperation, and some cleanup
@333fred
Merge remote-tracking branch 'upstream/main' into merge-main
2b1004b 
* upstream/main: (559 commits)
  Remove a few unused error codes (#54663)
  Use specific error message for wrong arity in async builder (#54632)
  Update azure-pipelines-richnav.yml (#54662)
  Capture file content on open instead of save (#54643)
  Add docs
  Further FAR simplifications
  Handle enhanced #line directive in DirectiveTriviaSyntax.DirectiveNameToken (#54636)
  move server name outside of loop
  Fix functionid
  Reduce telemetry output from find document in workspace
  Ensure we don't try and build an empty table when modifying entries with no values (#54639)
  Feedback
  Ensure we don't try and build an empty table when modifying entries with no values (#54639)
  No need to specialized logic for determining set of projects to search
  Defer group computation till reporting time
  Handle FAR for global suppressions in a consistent fashion
  Update status for enhanced `#line` directive (#54581)
  Split IOperationTests into one part per type
  [LSP] Revert semantic tokens change in main (#54570)
  Add exceptionutilities unreachable to catch blocks that should not be hit
  ...
@333fred
Condense error messages and update tests for CSharp 10.
092b022
@333fred
Add missing warning to the non-nullable warnings list.
cf9f752
@333fred
Merge pull request #54680 from 333fred/merge-main
e7f4323 
Merge main into features/interpolated-string and condense errors
@333fred 333fred requested a review from jaredpar July 8, 2021 21:19
@333fred 333fred requested a review from a team as a code owner July 8, 2021 21:19
@333fred 333fred enabled auto-merge July 8, 2021 21:19
jaredpar
jaredpar approved these changes Jul 8, 2021
View reviewed changes
Copy link
Member

@jaredpar jaredpar left a comment

Choose a reason for hiding this comment

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

Status($"Is approved{true}");

@RikkiGibson
Copy link
Contributor

RikkiGibson commented Jul 8, 2021 •
edited

Could I ask you to wait to merge this till I've managed to kick off a VS validation insertion for FileScopedNamespaces (requires first merging #54687)? It might save me another merge into the feature branch in the immediate term, since the validation pipeline auto-merges main-vs-deps into the PR and fails if the merge has conflicts.

If that works for you, I'll just follow up within a couple hours to let you know once I've got my validation run going.

@333fred 333fred disabled auto-merge July 8, 2021 22:25
@333fred 333fred enabled auto-merge July 9, 2021 00:07
@333fred 333fred disabled auto-merge July 9, 2021 00:11
@333fred
Copy link
Member Author

333fred commented Jul 9, 2021

We've been getting large queuing and timeout issues on a few of the branches here. Everything but the macos leg has passed at this point, and the macos leg passed on the merge into the feature branch. I'm going to override that last test and merge.

@333fred 333fred enabled auto-merge July 9, 2021 00:13
@333fred 333fred disabled auto-merge July 9, 2021 00:13
@333fred 333fred merged commit 1119ab9 into main Jul 9, 2021
@ghost ghost added this to the Next milestone Jul 9, 2021
@333fred 333fred deleted the features/interpolated-string branch July 9, 2021 00:13
@allisonchou allisonchou modified the milestones: Next, 17.0.P3 Jul 27, 2021
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

Assignees
No one assigned
Labels
Area-Compilers
Projects
None yet
Milestone
17.0.P3
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@333fred @RikkiGibson @jaredpar @allisonchou