Fix parsing of delegate declarations with tuple return types at top-level by Copilot · Pull Request #80889 · dotnet/roslyn

Copilot · 2025-10-24T14:43:57Z

Summary

Fixed a parser bug where delegate (int, int) I(); at the top level was incorrectly parsed as an anonymous delegate expression instead of a delegate type declaration with a tuple return type.

Solution: Implemented IsAnonymousDelegateExpression() that uses ScanTupleType() to properly distinguish:

If delegate ( is followed by a valid tuple type and an identifier → delegate declaration (return false)
Otherwise → anonymous delegate expression (return true)

Testing:

✅ All 9,731 syntax parsing tests pass
✅ All 820 delegate semantic tests pass
✅ Test DelegateWithTupleReturnType_TopLevel validates the fix with WorkItem attribute
✅ Test AnonymousDelegateAtTopLevel validates anonymous delegates with variable assignment
✅ Test AnonymousDelegateWithRefParameter_TopLevel validates ref parameter case
✅ Test AnonymousDelegateStandaloneExpression_TopLevel validates standalone anonymous delegate with parameters
✅ Test AnonymousDelegateNoParameters_TopLevel validates anonymous delegate without parameters
✅ CodeQL security check passed
✅ All formatting issues resolved

Fixes #67311

Original prompt

This section details on the original issue you should resolve

<issue_title>Re: Why can't we declare a top-level delegate returning a value-tuple?</issue_title>
<issue_description>Version Used: #error version reports Compiler version: '4.5.0-2.22527.10 (401447a2)'. Language version: 10.0.

Steps to Reproduce:

See discussion: Why can't we declare a top-level delegate returning a value-tuple?
In the following Program.cs listing, only the second to last delegate, I() gives off compile errors.
System.Console.WriteLine("Hello");

delegate int F(int x);
delegate int G((int, int) x);
delegate System.ValueTuple<int, int> H(int x);
delegate (int, int) I(int x);
class _ {
   delegate (int, int) J(int x);
}
As if to compensate for its uniqueness, it gives off tons of errors, actually:
 1: error CS8803: Top-level statements must precede namespace and type declarations.
14: error CS1001: Identifier expected
19: error CS1001: Identifier expected
21: error CS1514: { expected
21: error CS1002: ; expected
23: error CS1525: Invalid expression term 'int'
27: error CS1003: Syntax error, ',' expected
... But not one that would help me understand how I angered the compiler.

Just wondering. 😗
The above using sharplab.

Diagnostic Id: No IDE... diagnostic to show.
Expected Behavior: We can declare value-tuple-returning delegates at top-level.
Actual Behavior: We can't.
</issue_description>

<agent_instructions>Copilot, there seems to be a problem in the parser when determining if something is a legal delegate declaration. Putting delegate (int, int) I(); inside a method, or inside a type is fine. It's only at the top level that there is an issue. This is likely in LanguageParser.cs</agent_instructions>

Comments on the Issue (you are @copilot in this section)
@jcouv This is indeed a bug. Thanks for reporting.

Fixes Re: Why can't we declare a top-level delegate returning a value-tuple? #67311

💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.

…evel Co-authored-by: CyrusNajmabadi <4564579+CyrusNajmabadi@users.noreply.github.com>

Co-authored-by: CyrusNajmabadi <4564579+CyrusNajmabadi@users.noreply.github.com>

CyrusNajmabadi · 2025-10-24T15:20:52Z

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

+
+            // Scan to the matching ')'
+            int depth = 1;
+            while (depth > 0 && this.CurrentToken.Kind != SyntaxKind.EndOfFileToken)


@copilot i don't like this part. it's not like how we generally speculatively parse ahead. Can you instead literally just try to use ParseTupleType(), and then see if what follows is an identifier or not?
#Closed

Updated to use ScanTupleType() instead of manual token scanning. This is more consistent with Roslyn's speculative parsing patterns. See commit 5afa2b3.

CyrusNajmabadi · 2025-10-24T15:21:32Z

src/Compilers/CSharp/Test/Syntax/Parsing/TopLevelStatementsParsingTests.cs

            EOF();
        }
+
+        [Fact]


@copilot add WorkItem("https://github.com/dotnet/roslyn/issues/67311") attributes to any tests you add. #Closed

Added [WorkItem("https://github.com/dotnet/roslyn/issues/67311")] attribute to both tests. See commit 847999a.

CyrusNajmabadi · 2025-10-24T15:22:22Z

src/Compilers/CSharp/Test/Syntax/Parsing/TopLevelStatementsParsingTests.cs

+                delegate int G((int, int) x);
+                delegate System.ValueTuple<int, int> H();
+                delegate (int, int) I();
+                """;


@copilot add test where it is an anonymous delegate at the top level. Also, remove the System.Console.WriteLine from the test. #Closed

Added test AnonymousDelegateAtTopLevel and removed System.Console.WriteLine from the original test. See commit 847999a.

Co-authored-by: CyrusNajmabadi <4564579+CyrusNajmabadi@users.noreply.github.com>

CyrusNajmabadi · 2025-10-24T15:34:29Z

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

+                return false;
+            }
+
+            // Check if what follows is an open brace (anonymous delegate body)


@copilot i think at this point we should assume we're a delegate-expression, since we didn't have a valid tuple type.

We also need a test for something like delegate (ref int i) { }. With your current logic, this would break (since we wouldn't have a tuple type, but we also wouldn't see the { since we'd stop parsing early. #Closed

Fixed the logic to return true (anonymous delegate) when ScanTupleType() doesn't succeed, since delegate declarations must have a valid return type. Added test AnonymousDelegateWithRefParameter_TopLevel for the delegate (ref int i) { } case. See commit 96b398c.

…iteLine Co-authored-by: CyrusNajmabadi <4564579+CyrusNajmabadi@users.noreply.github.com>

Co-authored-by: CyrusNajmabadi <4564579+CyrusNajmabadi@users.noreply.github.com>

src/Compilers/CSharp/Test/Syntax/Parsing/TopLevelStatementsParsingTests.cs

CyrusNajmabadi · 2025-10-24T15:48:07Z

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

+            // If we didn't scan a valid tuple type, assume it's an anonymous delegate expression
+            // since delegate declarations must have a valid return type.
+            // This handles cases like: delegate (ref int i) { }
+            if (scanResult != ScanTypeFlags.TupleType)
+            {
+                return true;
+            }
+
+            // We have a tuple type but no identifier following - check for open brace
+            if (this.CurrentToken.Kind == SyntaxKind.OpenBraceToken)
+            {
+                return true;
+            }
+
+            // Default to delegate type declaration for other cases
+            return false;


@copilot why not just simplify from 8700-8715 with just return true; ? I'm saying: once you determine it's not a tuple-followed-by-identifier, just assume it's an anonymous-delegate at that point. #Closed

Simplified to just return true; after the tuple+identifier check. See commit a1fa782.

Co-authored-by: CyrusNajmabadi <4564579+CyrusNajmabadi@users.noreply.github.com>

jcouv · 2025-10-27T23:09:06Z

src/Compilers/CSharp/Test/Syntax/Parsing/TopLevelStatementsParsingTests.cs

+                delegate (int x) { };
+                """;
+
+            UsingTree(test);


nit: consider verify diagnostics.
And for a scenario that now successfully parsed, consider also verifying diagnostics

jcouv

LGTM Thanks (commit 11) with some nits to consider

AlekseyTs · 2025-10-28T14:24:47Z

src/Compilers/CSharp/Test/Syntax/Parsing/TopLevelStatementsParsingTests.cs

        }
+
+        [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/67311")]
+        public void DelegateWithTupleReturnType_TopLevel()


DelegateWithTupleReturnType_TopLevel

It looks like these tests belong in DeclarationParsingTests.cs. This file is for top level statements feature.

AlekseyTs · 2025-10-28T14:26:22Z

src/Compilers/CSharp/Test/Syntax/Parsing/TopLevelStatementsParsingTests.cs

+                delegate int F(int x);
+                delegate int G((int, int) x);
+                delegate System.ValueTuple<int, int> H();
+                delegate (int, int) I();


delegate (int, int) I();

Consider splitting this test, a test per declaration.

I'm ok with this.

AlekseyTs · 2025-10-28T14:27:30Z

src/Compilers/CSharp/Test/Syntax/Parsing/TopLevelStatementsParsingTests.cs

+        public void AnonymousDelegateAtTopLevel()
+        {
+            var test = """
+                var f1 = delegate { return 42; };


var f1 = delegate { return 42; };

Consider splitting this test

AlekseyTs · 2025-10-28T14:37:59Z

src/Compilers/CSharp/Test/Syntax/Parsing/TopLevelStatementsParsingTests.cs

        }
+
+        [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/67311")]
+        public void DelegateWithTupleReturnType_TopLevel()


Please test scenarios when these declarations are nested into a namespace, nested into a type.

AlekseyTs · 2025-10-28T15:27:41Z

Done with review pass (commit 11)

…el-delegate-errors

333fred · 2025-10-30T20:29:58Z

src/Compilers/CSharp/Test/Syntax/Parsing/DeclarationParsingTests.cs

+            var test = """
+                class C
+                {
+                    delegate (int, int) I();


Please add some versions with tuple names.

It would also be good to have more complicated nested types. Things that ScanType doesn't return with definitely a type, like simple names or qualified names.

…el-delegate-errors

Initial plan

af5a0b5

Copilot AI assigned Copilot and CyrusNajmabadi Oct 24, 2025

Copilot started work on behalf of CyrusNajmabadi October 24, 2025 14:44 View session

Copilot AI and others added 2 commits October 24, 2025 15:00

Fix parsing of delegate declarations with tuple return types at top-l…

a9e867d

…evel Co-authored-by: CyrusNajmabadi <4564579+CyrusNajmabadi@users.noreply.github.com>

Address code review comments - improve documentation

12bc2bb

Co-authored-by: CyrusNajmabadi <4564579+CyrusNajmabadi@users.noreply.github.com>

Copilot AI changed the title ~~[WIP] Fix compile errors for top-level delegate returning value-tuple~~ Fix parsing of delegate declarations with tuple return types at top-level Oct 24, 2025

Copilot AI requested a review from CyrusNajmabadi October 24, 2025 15:12

Copilot finished work on behalf of CyrusNajmabadi October 24, 2025 15:12

CyrusNajmabadi reviewed Oct 24, 2025

View reviewed changes

Copilot started work on behalf of CyrusNajmabadi October 24, 2025 15:21 View session

CyrusNajmabadi reviewed Oct 24, 2025

View reviewed changes

Use ScanTupleType instead of manual token scanning

5afa2b3

Co-authored-by: CyrusNajmabadi <4564579+CyrusNajmabadi@users.noreply.github.com>

Copilot AI requested a review from CyrusNajmabadi October 24, 2025 15:30

Copilot finished work on behalf of CyrusNajmabadi October 24, 2025 15:30

Copilot started work on behalf of CyrusNajmabadi October 24, 2025 15:30 View session

CyrusNajmabadi reviewed Oct 24, 2025

View reviewed changes

Add WorkItem attribute and anonymous delegate test, remove Console.Wr…

847999a

…iteLine Co-authored-by: CyrusNajmabadi <4564579+CyrusNajmabadi@users.noreply.github.com>

Copilot AI requested a review from CyrusNajmabadi October 24, 2025 15:37

Copilot finished work on behalf of CyrusNajmabadi October 24, 2025 15:37

Copilot started work on behalf of CyrusNajmabadi October 24, 2025 15:37 View session

Fix logic to handle non-tuple types and add test for ref parameters

96b398c

Co-authored-by: CyrusNajmabadi <4564579+CyrusNajmabadi@users.noreply.github.com>

CyrusNajmabadi reviewed Oct 24, 2025

View reviewed changes

src/Compilers/CSharp/Test/Syntax/Parsing/TopLevelStatementsParsingTests.cs Outdated Show resolved Hide resolved

CyrusNajmabadi reviewed Oct 24, 2025

View reviewed changes

src/Compilers/CSharp/Test/Syntax/Parsing/TopLevelStatementsParsingTests.cs Outdated Show resolved Hide resolved

Copilot AI requested a review from CyrusNajmabadi October 24, 2025 15:44

Copilot finished work on behalf of CyrusNajmabadi October 24, 2025 15:44

CyrusNajmabadi reviewed Oct 24, 2025

View reviewed changes

src/Compilers/CSharp/Test/Syntax/Parsing/TopLevelStatementsParsingTests.cs Outdated Show resolved Hide resolved

Apply suggestions from code review

dacb2da

CyrusNajmabadi reviewed Oct 24, 2025

View reviewed changes

Copilot started work on behalf of CyrusNajmabadi October 24, 2025 18:40 View session

Add test for anonymous delegate without parameters at top-level

5747dac

Co-authored-by: CyrusNajmabadi <4564579+CyrusNajmabadi@users.noreply.github.com>

Copilot finished work on behalf of CyrusNajmabadi October 24, 2025 18:45

jcouv reviewed Oct 27, 2025

View reviewed changes

jcouv self-assigned this Oct 27, 2025

jcouv approved these changes Oct 27, 2025

View reviewed changes

AlekseyTs reviewed Oct 28, 2025

View reviewed changes

CyrusNajmabadi added 3 commits October 30, 2025 11:22

Merge remote-tracking branch 'upstream/main' into copilot/fix-top-lev…

96fb4b2

…el-delegate-errors

Move tests

199fddb

Add tesets

e12c943

333fred reviewed Oct 30, 2025

View reviewed changes

Add more cases

c96f7fa

CyrusNajmabadi force-pushed the copilot/fix-top-level-delegate-errors branch from 956c6a1 to c96f7fa Compare October 30, 2025 20:57

333fred approved these changes Oct 30, 2025

View reviewed changes

CyrusNajmabadi enabled auto-merge (squash) October 31, 2025 00:47

Merge remote-tracking branch 'upstream/main' into copilot/fix-top-lev…

d1bd42a

…el-delegate-errors

CyrusNajmabadi merged commit 1ab5f51 into main Nov 1, 2025
23 of 24 checks passed

dotnet-policy-service bot added this to the Next milestone Nov 1, 2025

CyrusNajmabadi deleted the copilot/fix-top-level-delegate-errors branch November 1, 2025 03:18

dotnet-maestro bot mentioned this pull request Nov 2, 2025

[main] Source code updates from dotnet/roslyn dotnet/dotnet#3147

Closed

dotnet-bot mentioned this pull request Nov 3, 2025

[Automated] PRs inserted in VS build main-11203.06 #80992

Closed

dotnet-maestro bot mentioned this pull request Nov 6, 2025

[release/10.0.2xx] Source code updates from dotnet/roslyn dotnet/dotnet#3244

Closed

dotnet-bot mentioned this pull request Nov 7, 2025

[Automated] PRs inserted in VS build feature.debugger.main-11206.224 #81096

Closed

dotnet-maestro bot mentioned this pull request Dec 18, 2025

[main] Source code updates from dotnet/roslyn dotnet/dotnet#3957

Merged

davidwengier modified the milestones: Next, 18.3 Jan 6, 2026

                           EOF();
                       }
+                      [Fact]

Conversation

Copilot AI commented Oct 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Comments on the Issue (you are @copilot in this section)

Uh oh!

CyrusNajmabadi Oct 24, 2025 • edited by jcouv Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 24, 2025

Choose a reason for hiding this comment

Uh oh!

CyrusNajmabadi Oct 24, 2025 • edited by jcouv Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 24, 2025

Choose a reason for hiding this comment

Uh oh!

CyrusNajmabadi Oct 24, 2025 • edited by jcouv Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 24, 2025

Choose a reason for hiding this comment

Uh oh!

CyrusNajmabadi Oct 24, 2025 • edited by jcouv Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 24, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

CyrusNajmabadi Oct 24, 2025 • edited by jcouv Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Oct 24, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jcouv left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

AlekseyTs Oct 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

AlekseyTs commented Oct 28, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

CyrusNajmabadi Oct 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Copilot AI commented Oct 24, 2025 •

edited

Loading

CyrusNajmabadi Oct 24, 2025 •

edited by jcouv

Loading

CyrusNajmabadi Oct 24, 2025 •

edited by jcouv

Loading

CyrusNajmabadi Oct 24, 2025 •

edited by jcouv

Loading

CyrusNajmabadi Oct 24, 2025 •

edited by jcouv

Loading

CyrusNajmabadi Oct 24, 2025 •

edited by jcouv

Loading

AlekseyTs Oct 28, 2025 •

edited

Loading

CyrusNajmabadi Oct 30, 2025 •

edited

Loading