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.

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

Merge features/CollectionLiterals into main #68831

Merged
merged 46 commits into from
Jun 30, 2023
Merged

Merge features/CollectionLiterals into main #68831

merged 46 commits into from
Jun 30, 2023

Commits on Jan 13, 2023

  1. Initial syntax types for collection literals

    @CyrusNajmabadi
    CyrusNajmabadi committed Jan 13, 2023
    Configuration menu
    Copy the full SHA
    c3d7fd2 View commit details
    Browse the repository at this point in the history

  2. change name for consistency

    @CyrusNajmabadi
    CyrusNajmabadi committed Jan 13, 2023
    Configuration menu
    Copy the full SHA
    d5982b0 View commit details
    Browse the repository at this point in the history

  3. Update publicapi

    @CyrusNajmabadi
    CyrusNajmabadi committed Jan 13, 2023
    Configuration menu
    Copy the full SHA
    9a3bc92 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2023

  1. Update tests

    @CyrusNajmabadi
    CyrusNajmabadi committed Jan 15, 2023
    Configuration menu
    Copy the full SHA
    75c3063 View commit details
    Browse the repository at this point in the history

  2. UPdate generated code.

    @CyrusNajmabadi
    CyrusNajmabadi committed Jan 15, 2023
    Configuration menu
    Copy the full SHA
    0e9dc16 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2023

  1. Merge pull request dotnet#66412 from CyrusNajmabadi/collectionLiteral… 

    …Syntax

Initial syntax types for collection literals
    @CyrusNajmabadi
    CyrusNajmabadi authored Jan 17, 2023
    Configuration menu
    Copy the full SHA
    465f927 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2023

  1. Merge remote-tracking branch 'upstream/main' into mainToCollections

    @CyrusNajmabadi
    CyrusNajmabadi committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    2b44cb2 View commit details
    Browse the repository at this point in the history

  2. API

    @CyrusNajmabadi
    CyrusNajmabadi committed Jan 28, 2023
    Configuration menu
    Copy the full SHA
    42b4ddd View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2023

  1. Merge pull request dotnet#66586 from CyrusNajmabadi/mainToCollections 

    Merge 'main' into 'features\CollectionLiterals'
    @CyrusNajmabadi
    CyrusNajmabadi authored Jan 29, 2023
    Configuration menu
    Copy the full SHA
    ffa3a66 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2023

  1. Merge branch 'main' into mainToCollections

    @CyrusNajmabadi
    CyrusNajmabadi committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    a4ce86a View commit details
    Browse the repository at this point in the history

  2. Merge pull request dotnet#66625 from CyrusNajmabadi/mainToCollections 

    Merge 'main' into 'features/CollectionLiterals'
    @CyrusNajmabadi
    CyrusNajmabadi authored Jan 31, 2023
    Configuration menu
    Copy the full SHA
    fe8abdb View commit details
    Browse the repository at this point in the history

  3. Initial support for collection literal parsing. (dotnet#66417) 

    * 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 <[email protected]>
    @CyrusNajmabadi @jnm2
    CyrusNajmabadi and jnm2 authored Jan 31, 2023
    Configuration menu
    Copy the full SHA
    598cbe4 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2023

  1. Merge remote-tracking branch 'upstream/main' into collections-update

    @cston
    cston committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    44dd7b2 View commit details
    Browse the repository at this point in the history

  2. Ignore primary constructor parameters in collection literals

    @cston
    cston committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    f30aa87 View commit details
    Browse the repository at this point in the history

  3. Merge pull request dotnet#67280 from cston/collections-update 

    Merge main to features/CollectionLiterals
    @cston
    cston authored Mar 13, 2023
    Configuration menu
    Copy the full SHA
    07daeef View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2023

  1. Initial binding and lowering of collection literals with single-value… 

    …d elements (dotnet#67025)
    @cston
    cston authored Mar 14, 2023
    Configuration menu
    Copy the full SHA
    02f55f6 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2023

  1. Merge remote-tracking branch 'upstream/main' into collections-merge-main

    @cston
    cston committed Apr 21, 2023
    Configuration menu
    Copy the full SHA
    1fbd1fb View commit details
    Browse the repository at this point in the history

  2. Merge pull request dotnet#67917 from cston/collections-merge-main 

    Merge main to features/CollectionLiterals
    @cston
    cston authored Apr 21, 2023
    Configuration menu
    Copy the full SHA
    372107b View commit details
    Browse the repository at this point in the history

Commits on May 12, 2023

  1. Initial support for collection literal spread elements (dotnet#67942)

    @cston
    cston authored May 12, 2023
    Configuration menu
    Copy the full SHA
    02bf874 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2023

  1. Merge remote-tracking branch 'upstream/main' into collections-merge

    @cston
    cston committed May 17, 2023
    Configuration menu
    Copy the full SHA
    4f05970 View commit details
    Browse the repository at this point in the history

  2. Merge pull request dotnet#68227 from cston/collections-merge 

    Merge main to features/CollectionLiterals
    @cston
    cston authored May 17, 2023
    Configuration menu
    Copy the full SHA
    fe79cfc View commit details
    Browse the repository at this point in the history

Commits on May 22, 2023

  1. Fix collection literal format spacing

    @CyrusNajmabadi
    CyrusNajmabadi committed May 22, 2023
    Configuration menu
    Copy the full SHA
    547e0f7 View commit details
    Browse the repository at this point in the history

  2. Merge pull request dotnet#68284 from CyrusNajmabadi/collectionFormatting 

    Fix collection literal format spacing
    @CyrusNajmabadi
    CyrusNajmabadi authored May 22, 2023
    Configuration menu
    Copy the full SHA
    5c5b672 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2023

  1. Merge remote-tracking branch 'upstream/main' into collections-merge

    @cston
    cston committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    54200de View commit details
    Browse the repository at this point in the history

  2. Merge pull request dotnet#68482 from cston/collections-merge 

    Merge main to features/CollectionLiterals
    @cston
    cston authored Jun 8, 2023
    Configuration menu
    Copy the full SHA
    0fbcee5 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2023

  1. Refine parsing of potentially ambiguous casts/index expressions with … 

    …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
    @CyrusNajmabadi
    CyrusNajmabadi authored Jun 12, 2023
    Configuration menu
    Copy the full SHA
    2955139 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. Improve collection literal parsing (dotnet#68561) 

    * Improve parsing in more situations

* Add tests

* Add test

* Add clarity

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

* Tweak
    @CyrusNajmabadi
    CyrusNajmabadi authored Jun 14, 2023
    Configuration menu
    Copy the full SHA
    6bd8524 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2023

  1. Update handling of collection literals with no target type (dotnet#68598 

    )
    @cston
    cston authored Jun 22, 2023
    Configuration menu
    Copy the full SHA
    d11bf96 View commit details
    Browse the repository at this point in the history

  2. Fix issue parsing collection literal containing lambdas (dotnet#68734) 

    * Fix issue parsing collection literal containing lambdas

* Add tests
    @CyrusNajmabadi
    CyrusNajmabadi authored Jun 22, 2023
    Configuration menu
    Copy the full SHA
    0d9509c View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2023

  1. Collection literals: type inference (dotnet#68703)

    @cston
    cston authored Jun 23, 2023
    Configuration menu
    Copy the full SHA
    4feb306 View commit details
    Browse the repository at this point in the history

  2. Fix collection literal parsing at the state of a statement expression. ( 

    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 <[email protected]>

* 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 <[email protected]>

* Remove allocations

* Add tests

* Add tests

---------

Co-authored-by: Charles Stoner <[email protected]>
    @CyrusNajmabadi @cston
    CyrusNajmabadi and cston authored Jun 23, 2023
    Configuration menu
    Copy the full SHA
    de4f0b7 View commit details
    Browse the repository at this point in the history

  3. Rename CollectionCreationExpression to CollectionExpression (dotnet#6… 

    …8747)
    @cston
    cston authored Jun 23, 2023
    Configuration menu
    Copy the full SHA
    d2d0d3c View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2023

  1. Collection literals: remove DictionaryElementSyntax (dotnet#68752)

    @cston
    cston authored Jun 26, 2023
    Configuration menu
    Copy the full SHA
    3720edc View commit details
    Browse the repository at this point in the history

  2. Fix parsing certain postfix expressions with top level collection lit… 

    …erals (dotnet#68787)

* Fix parsing certain postfix expressions with top level collection literals

* Update test
    @CyrusNajmabadi
    CyrusNajmabadi authored Jun 26, 2023
    Configuration menu
    Copy the full SHA
    c6c3595 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. Fix ambiguity parsing collection expressions vs conditional access ex… 

    …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
    @CyrusNajmabadi
    CyrusNajmabadi authored Jun 27, 2023
    Configuration menu
    Copy the full SHA
    45afaea View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2023

  1. Merge remote-tracking branch 'upstream/main' into collections-merge

    @cston
    cston committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    f4f5b39 View commit details
    Browse the repository at this point in the history

  2. Merge pull request dotnet#68821 from dotnet/merges/main-to-release/de… 

    …v17.7

Snap 17.7p3
    @RikkiGibson
    RikkiGibson authored Jun 28, 2023
    Configuration menu
    Copy the full SHA
    1f2bdd6 View commit details
    Browse the repository at this point in the history

  3. Localized file check-in by OneLocBuild Task: Build definition ID 327:… 

    … Build ID 2211254
    @dotnet-bot
    dotnet-bot committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    c53203e View commit details
    Browse the repository at this point in the history

  4. Localized file check-in by OneLocBuild Task: Build definition ID 327:… 

    … Build ID 2211254
    @dotnet-bot
    dotnet-bot committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    1b93dd2 View commit details
    Browse the repository at this point in the history

  5. Localized file check-in by OneLocBuild Task: Build definition ID 327:… 

    … Build ID 2211254
    @dotnet-bot
    dotnet-bot committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    d768e46 View commit details
    Browse the repository at this point in the history

  6. Regenerate bound nodes

    @RikkiGibson
    RikkiGibson committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    2122c82 View commit details
    Browse the repository at this point in the history

  7. Collection literals: use NoneOperation (dotnet#68795)

    @cston
    cston authored Jun 28, 2023
    Configuration menu
    Copy the full SHA
    c0a307a View commit details
    Browse the repository at this point in the history

  8. Merge pull request dotnet#68824 from dotnet/locfiles/610afbb3-1edc-43… 

    …29-87bb-f3be4f61f22b

Localized file check-in by OneLocBuild Task: Build definition ID 327: Build ID 2211254
    @Cosifne
    Cosifne authored Jun 28, 2023
    Configuration menu
    Copy the full SHA
    44ee200 View commit details
    Browse the repository at this point in the history

  9. Merge pull request dotnet#68812 from cston/collections-merge 

    Merge main to features/CollectionLiterals
    @cston
    cston authored Jun 28, 2023
    Configuration menu
    Copy the full SHA
    308b868 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2023

  1. Collection literals: address comments (dotnet#68793)

    @cston
    cston authored Jun 29, 2023
    Configuration menu
    Copy the full SHA
    77d3192 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/features/CollectionLiterals' i… 

    …nto collections-merge-feature
    @cston
    cston committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    b865d5c View commit details
    Browse the repository at this point in the history