KEMBAR78
Merge features/CollectionLiterals into main by cston · Pull Request #68831 · dotnet/roslyn · GitHub
Skip to content

Conversation

@cston
Copy link
Contributor

@cston cston commented Jun 29, 2023

Test plan #66418

CyrusNajmabadi and others added 30 commits January 13, 2023 10:15
…Syntax

Initial syntax types for collection literals
Merge 'main' into 'features\CollectionLiterals'
Merge 'main' into 'features/CollectionLiterals'
* Do not parse out an attribute that will actually be a collection literal

* No need to check for attributes here.  They have already been parsed out

* Initial parsing

* Add handling for certain cases

* Rename method

* Start a parser test file with a few initial tests

* Support parsing -> and ?.

* Adding parser tests

* Adding parser tests

* Improve error recovery

* Improve error recovery

* Fix parsing

* Update test

* Update test

* Update test

* Update test

* Update test

* BadExpr

* Update test

* Update test

* Lint

* Update comment

* Add tests

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

* Don't allocate in failure path

* Revise comment

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

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

* Not in expression context

* Attributed blocks are not an expr context

* Rename

* Rename

* Rename

* not an expression context

* Add test marker

* Add prototype comment

* Add version test

* Improve error tolerance

* Add tests

* Add tests

* Add tests

* Add tests

* Rename

* Change indentation

* Add tests

* Add tests

* remove line

* Add test

* Add tests

* Add tests

* Cast parsing

* Lint

* Add parsing tests

* Add incremental parsing tests

* use file scoped namespaces

* Simplify

* Add syntax test

* Copy diagnostics when converting token

---------

Co-authored-by: jnm2 <me@jnm2.com>
Merge main to features/CollectionLiterals
Merge main to features/CollectionLiterals
Merge main to features/CollectionLiterals
Merge main to features/CollectionLiterals
…collection literals (dotnet#68456)

* Refine parsing of potentially ambiguous casts/index expressions with collection literals

* Update tests

* Update tests

* Add tests

* remove branch

* tweak wording

* Add test
* Improve parsing in more situations

* Add tests

* Add test

* Add clarity

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

* Tweak
* Fix issue parsing collection literal containing lambdas

* Add tests
CyrusNajmabadi and others added 16 commits June 23, 2023 13:26
dotnet#68737)

* Fix issue parsing collection literal containing lambdas

* Fix parsing collection literals at the start of statement expressions

* More cases

* Simplify

* Avoid any costs in the common cases

* Handle indexing case

* Improvements

* Update tests

* Add tests

* manual merge

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

Co-authored-by: Charles Stoner <10732005+cston@users.noreply.github.com>

* Add tests

* Simplify

* docs

* Add tests

* Add tests

* Simplify

* REname

* Add tests

* Simplify

* Simplify

* Inline

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

Co-authored-by: Charles Stoner <10732005+cston@users.noreply.github.com>

* Remove allocations

* Add tests

* Add tests

---------

Co-authored-by: Charles Stoner <10732005+cston@users.noreply.github.com>
…erals (dotnet#68787)

* Fix parsing certain postfix expressions with top level collection literals

* Update test
…pressions (dotnet#68756)

* Fix ambiguity parsing collection expressions vs conditional access expressions

* Simplify

* Fix test

* Add tests

* Switch to a simpler contextual model

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

* invert

* Simplify

* Reset when we go into a new scope

* Add test cases

* Add test cases

* Add incremental test

* Add docs
…29-87bb-f3be4f61f22b

Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 2211254
Merge main to features/CollectionLiterals
@cston cston requested review from a team as code owners June 29, 2023 01:16
@ghost ghost added Area-Compilers untriaged Issues and PRs which have not yet been triaged by a lead labels Jun 29, 2023
@jaredpar jaredpar changed the base branch from release/dev17.7 to main June 29, 2023 15:28
@cston cston changed the title Merge features/CollectionLiterals into release/dev17.7 Merge features/CollectionLiterals into main Jun 29, 2023
@cston cston merged commit 8817655 into dotnet:main Jun 30, 2023
@cston cston deleted the collections-merge-feature branch June 30, 2023 03:11
@ghost ghost added this to the Next milestone Jun 30, 2023
@allisonchou allisonchou modified the milestones: Next, 17.8 P1 Jul 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area-Compilers 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.

7 participants