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

Merge main into features/struct-ctors #55037

Merged
merged 617 commits into from
Jul 22, 2021
Merged

Conversation

jcouv
Copy link
Member

@jcouv jcouv commented Jul 22, 2021

Only the usual minor conflicts (error codes, message ids, resources).

Test plan: #51698

CyrusNajmabadi and others added 30 commits July 6, 2021 21:41
Definite assignment, initial nullable, IOperation, and some cleanup
* upstream/main: (559 commits)
  Remove a few unused error codes (dotnet#54663)
  Use specific error message for wrong arity in async builder (dotnet#54632)
  Update azure-pipelines-richnav.yml (dotnet#54662)
  Capture file content on open instead of save (dotnet#54643)
  Add docs
  Further FAR simplifications
  Handle enhanced #line directive in DirectiveTriviaSyntax.DirectiveNameToken (dotnet#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 (dotnet#54639)
  Feedback
  Ensure we don't try and build an empty table when modifying entries with no values (dotnet#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 (dotnet#54581)
  Split IOperationTests into one part per type
  [LSP] Revert semantic tokens change in main (dotnet#54570)
  Add exceptionutilities unreachable to catch blocks that should not be hit
  ...
Capture file content on open instead of save (dotnet#54643)
CyrusNajmabadi and others added 18 commits July 20, 2021 14:41
…ginZoomLevelFix

Make Inheritance Margin Zoom Level is divided by 100
…ceNameCompletion

Fix 'name completion' with file scoped namespaces
…ation

Remove dependency on Type.IsSerializable from OptionSet serialization
Don't combine 'this.' with underscore named fields
…eSortUsings

Fix 'group usings' with file scoped namespaces
…eAddUsing

Fix 'add extern alias' with file scoped namespaces
[main] Update dependencies from dotnet/source-build
* Pull Members Up adds Usings/Imports

Add symbol annotations so that members pulled up will also include correct usings/imports.
Add 12 new C# tests regarding pulling members up and import adding.

* Change way to add symbol annotations, add test importing System.Linq and non-declared type

* Working on adding using statements, tests failing

* converted to language service to filter syntaxnode types, added more tests

* Removed VB as there is no refactoring provider, passing tests

* Remove add line to first member as elastic trivia already adds those lines

* Re-added space for first member, only in case of no imports remaining in destination file

* Fixed first member leading trivia and added a few comment tests, should just keep all leading trivia now.

* Fixed line spacing issue

* Updated to use syntax factory equivalence instead of just name equivalence, removed Distinct call, and refactored some language-agnostic code into abstract class as a private method

* Remove unneccessary import

* Refactored more functionality into abstract provider, added context node for namespace imports and added namespace & alias tests.

* Update src/Features/Core/Portable/PullMemberUp/IMembersPullerService.cs

Remove extra angle bracket. I thought I had done this, it must have been reverted somehow.

Co-authored-by: Youssef Victor <youssefvictor00@gmail.com>

* WIP

* More refactoring, now adds imports for all containing namespaces, add more tests too for namespaces, aliases, and extensions.

* Added documentation, changed namespace import generation, added nested namespace import test.

* Reverted some line change tests, failing now because the formatter deleted a line that should probably stay there.

* Replaced all trivia from source imports with elastic line trivia. Fixed an error with duplicating first member trivia. Fixed tests that expected duplicate first member trivia.

* Removed initial whitespace line on moved imports as it forced extra newlines when they weren't necessary.

* Refactor import getting into syntax facts, revert names/services back to before + refactor service usages

* Rename in syntaxfacts to handle file scoped namespaces, add test to make sure we find those namespaces.

Co-authored-by: Youssef Victor <youssefvictor00@gmail.com>
…o-release/dev17.0

Merge release/dev16.11 to release/dev17.0
@jcouv jcouv marked this pull request as ready for review July 22, 2021 04:35
@jcouv jcouv requested review from a team as code owners July 22, 2021 04:35
@jcouv jcouv merged commit 60c6b35 into dotnet:features/struct-ctors Jul 22, 2021
@jcouv jcouv deleted the merge-main branch July 22, 2021 04:42
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.