Skip to content

Fix syntax highlighting for tuple deconstruction in for loop initializers #349

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

Merged
JoeRobich merged 2 commits into from
Dec 19, 2025
Merged

Fix syntax highlighting for tuple deconstruction in for loop initializers #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3847de3
Initial plan
Copilot Dec 19, 2025
feab5d8
Add support for tuple deconstruction in for loop initializers
Copilot Dec 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions grammars/csharp.tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4180,6 +4180,18 @@
<key>include</key>
<string>#local-variable-declaration</string>
</dict>
<dict>
<key>include</key>
<string>#local-tuple-var-deconstruction</string>
</dict>
<dict>
<key>include</key>
<string>#tuple-deconstruction-assignment</string>
</dict>
<dict>
<key>include</key>
<string>#expression</string>
</dict>
</array>
</dict>
<dict>
Expand Down
9 changes: 9 additions & 0 deletions grammars/csharp.tmLanguage.cson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2562,6 +2562,15 @@ repository:
{
include: "#local-variable-declaration"
}
{
include: "#local-tuple-var-deconstruction"
}
{
include: "#tuple-deconstruction-assignment"
}
{
include: "#expression"
}
]
}
{
Expand Down
3 changes: 3 additions & 0 deletions src/csharp.tmLanguage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1498,6 +1498,9 @@ repository:
patterns:
- include: '#intrusive'
- include: '#local-variable-declaration'
- include: '#local-tuple-var-deconstruction'
- include: '#tuple-deconstruction-assignment'
- include: '#expression'
- begin: (?=;)
end: (?=\))
patterns:
Expand Down
74 changes: 74 additions & 0 deletions test/statements.tests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,80 @@ for (;;)
Token.Punctuation.CloseBrace,
]);
});

it("for loop with tuple deconstruction initializer", async () => {
const input = Input.InMethod(`for ((int i, int a1, int a2) = (0, 0, 0); i < 10; i++) { }`);
const tokens = await tokenize(input);

tokens.should.deep.equal([
Token.Keyword.Loop.For,
Token.Punctuation.OpenParen,
Token.Punctuation.OpenParen,
Token.PrimitiveType.Int,
Token.Identifier.TupleElementName("i"),
Token.Punctuation.Comma,
Token.PrimitiveType.Int,
Token.Identifier.TupleElementName("a1"),
Token.Punctuation.Comma,
Token.PrimitiveType.Int,
Token.Identifier.TupleElementName("a2"),
Token.Punctuation.CloseParen,
Token.Operator.Assignment,
Token.Punctuation.OpenParen,
Token.Literal.Numeric.Decimal("0"),
Token.Punctuation.Comma,
Token.Literal.Numeric.Decimal("0"),
Token.Punctuation.Comma,
Token.Literal.Numeric.Decimal("0"),
Token.Punctuation.CloseParen,
Token.Punctuation.Semicolon,
Token.Variable.ReadWrite("i"),
Token.Operator.Relational.LessThan,
Token.Literal.Numeric.Decimal("10"),
Token.Punctuation.Semicolon,
Token.Variable.ReadWrite("i"),
Token.Operator.Increment,
Token.Punctuation.CloseParen,
Token.Punctuation.OpenBrace,
Token.Punctuation.CloseBrace,
]);
});

it("for loop with var tuple deconstruction initializer", async () => {
const input = Input.InMethod(`for (var (i, a1, a2) = (0, 0, 0); i < 10; i++) { }`);
const tokens = await tokenize(input);

tokens.should.deep.equal([
Token.Keyword.Loop.For,
Token.Punctuation.OpenParen,
Token.Keyword.Definition.Var,
Token.Punctuation.OpenParen,
Token.Identifier.TupleElementName("i"),
Token.Punctuation.Comma,
Token.Identifier.TupleElementName("a1"),
Token.Punctuation.Comma,
Token.Identifier.TupleElementName("a2"),
Token.Punctuation.CloseParen,
Token.Operator.Assignment,
Token.Punctuation.OpenParen,
Token.Literal.Numeric.Decimal("0"),
Token.Punctuation.Comma,
Token.Literal.Numeric.Decimal("0"),
Token.Punctuation.Comma,
Token.Literal.Numeric.Decimal("0"),
Token.Punctuation.CloseParen,
Token.Punctuation.Semicolon,
Token.Variable.ReadWrite("i"),
Token.Operator.Relational.LessThan,
Token.Literal.Numeric.Decimal("10"),
Token.Punctuation.Semicolon,
Token.Variable.ReadWrite("i"),
Token.Operator.Increment,
Token.Punctuation.CloseParen,
Token.Punctuation.OpenBrace,
Token.Punctuation.CloseBrace,
]);
});
});

describe("ForEach", () => {
Expand Down