Skip to content

Allow non-numeric warnings in #pragma #359

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

Open
trolleyman wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Allow non-numeric warnings in #pragma #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f42cbdb
Fix non-integer warning disables
trolleyman Jan 6, 2026
64654e2
Add test for >2 warnings
trolleyman Jan 6, 2026
01b20f2
Newline
trolleyman Jan 6, 2026
adb4cf4
Merge branch 'main' into fix-pragma-comment
trolleyman Jan 23, 2026
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ out/
grammars/*.json
npm-debug.log*
copy.sh
bun.lock
4 changes: 2 additions & 2 deletions grammars/csharp.tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9075,7 +9075,7 @@
<key>preprocessor-pragma-warning</key>
<dict>
<key>match</key>
<string>\b(pragma)\b\s*\b(warning)\b\s*\b(?:(disable)|(restore))\b(\s*[0-9]+(?:\s*,\s*[0-9]+)?)?</string>
<string>\b(pragma)\b\s*\b(warning)\b\s*\b(?:(disable)|(restore))\b([A-Za-z0-9\s,]+)</string>
<key>captures</key>
<dict>
<key>1</key>
Expand Down Expand Up @@ -9104,7 +9104,7 @@
<array>
<dict>
<key>match</key>
<string>[0-9]+</string>
<string>[A-Za-z0-9]+</string>
<key>captures</key>
<dict>
<key>0</key>
Expand Down
4 changes: 2 additions & 2 deletions grammars/csharp.tmLanguage.cson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5445,7 +5445,7 @@ repository:
}
]
"preprocessor-pragma-warning":
match: "\\b(pragma)\\b\\s*\\b(warning)\\b\\s*\\b(?:(disable)|(restore))\\b(\\s*[0-9]+(?:\\s*,\\s*[0-9]+)?)?"
match: "\\b(pragma)\\b\\s*\\b(warning)\\b\\s*\\b(?:(disable)|(restore))\\b([A-Za-z0-9\\s,]+)"
captures:
"1":
name: "keyword.preprocessor.pragma.cs"
Expand All @@ -5458,7 +5458,7 @@ repository:
"5":
patterns: [
{
match: "[0-9]+"
match: "[A-Za-z0-9]+"
captures:
"0":
name: "constant.numeric.decimal.cs"
Expand Down
4 changes: 2 additions & 2 deletions src/csharp.tmLanguage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3559,15 +3559,15 @@ repository:
'0': { name: string.quoted.double.cs }

preprocessor-pragma-warning:
match: \b(pragma)\b\s*\b(warning)\b\s*\b(?:(disable)|(restore))\b(\s*[0-9]+(?:\s*,\s*[0-9]+)?)?
match: \b(pragma)\b\s*\b(warning)\b\s*\b(?:(disable)|(restore))\b([A-Za-z0-9\s,]+)
captures:
'1': { name: keyword.preprocessor.pragma.cs }
'2': { name: keyword.preprocessor.warning.cs }
'3': { name: keyword.preprocessor.disable.cs }
'4': { name: keyword.preprocessor.restore.cs }
'5':
patterns:
- match: '[0-9]+'
- match: '[A-Za-z0-9]+'
captures:
'0': { name: constant.numeric.decimal.cs }
- include: '#punctuation-comma'
Expand Down
204 changes: 204 additions & 0 deletions test/preprocessor.tests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,6 +745,210 @@ void Bar()
Token.Punctuation.CloseBrace
]);
});

it("#pragma warning disable with comment followed by code", async () => {
const input = Input.InClass(`
#pragma warning disable IDE0001 // Comment1
private int myField;
#pragma warning restore IDE0001 // Comment2`);
const tokens = await tokenize(input);

tokens.should.deep.equal([
Token.Punctuation.Hash,
Token.Keyword.Preprocessor.Pragma,
Token.Keyword.Preprocessor.Warning,
Token.Keyword.Preprocessor.Disable,
Token.Literal.Numeric.Decimal("IDE0001"),
Token.Comment.SingleLine.Start,
Token.Comment.SingleLine.Text(" Comment1"),
Token.Keyword.Modifier.Private,
Token.PrimitiveType.Int,
Token.Identifier.FieldName("myField"),
Token.Punctuation.Semicolon,
Token.Punctuation.Hash,
Token.Keyword.Preprocessor.Pragma,
Token.Keyword.Preprocessor.Warning,
Token.Keyword.Preprocessor.Restore,
Token.Literal.Numeric.Decimal("IDE0001"),
Token.Comment.SingleLine.Start,
Token.Comment.SingleLine.Text(" Comment2"),
]);
});

it("#pragma warning disable multiple warnings", async () => {
const input = Input.InClass(`
#pragma warning disable IDE0001, IDE0002
private int myField;
#pragma warning restore IDE0001, IDE0002
private int anotherField;
`);
const tokens = await tokenize(input);

tokens.should.deep.equal([
Token.Punctuation.Hash,
Token.Keyword.Preprocessor.Pragma,
Token.Keyword.Preprocessor.Warning,
Token.Keyword.Preprocessor.Disable,
Token.Literal.Numeric.Decimal("IDE0001"),
Token.Punctuation.Comma,
Token.Literal.Numeric.Decimal("IDE0002"),
Token.Keyword.Modifier.Private,
Token.PrimitiveType.Int,
Token.Identifier.FieldName("myField"),
Token.Punctuation.Semicolon,
Token.Punctuation.Hash,
Token.Keyword.Preprocessor.Pragma,
Token.Keyword.Preprocessor.Warning,
Token.Keyword.Preprocessor.Restore,
Token.Literal.Numeric.Decimal("IDE0001"),
Token.Punctuation.Comma,
Token.Literal.Numeric.Decimal("IDE0002"),
Token.Keyword.Modifier.Private,
Token.PrimitiveType.Int,
Token.Identifier.FieldName("anotherField"),
Token.Punctuation.Semicolon,
]);
});

it("#pragma warning disable many warnings", async () => {
const input = Input.InClass(`
#pragma warning disable IDE0001, IDE0002, 1, CS1233, XYZ9999, 404, 505, 606, 707, 808, 909
private int myField;
#pragma warning restore IDE0001, IDE0002, 1, CS1233, XYZ9999, 404, 505, 606, 707, 808, 909
private int anotherField;
`);
const tokens = await tokenize(input);

tokens.should.deep.equal([
Token.Punctuation.Hash,
Token.Keyword.Preprocessor.Pragma,
Token.Keyword.Preprocessor.Warning,
Token.Keyword.Preprocessor.Disable,
Token.Literal.Numeric.Decimal("IDE0001"),
Token.Punctuation.Comma,
Token.Literal.Numeric.Decimal("IDE0002"),
Token.Punctuation.Comma,
Token.Literal.Numeric.Decimal("1"),
Token.Punctuation.Comma,
Token.Literal.Numeric.Decimal("CS1233"),
Token.Punctuation.Comma,
Token.Literal.Numeric.Decimal("XYZ9999"),
Token.Punctuation.Comma,
Token.Literal.Numeric.Decimal("404"),
Token.Punctuation.Comma,
Token.Literal.Numeric.Decimal("505"),
Token.Punctuation.Comma,
Token.Literal.Numeric.Decimal("606"),
Token.Punctuation.Comma,
Token.Literal.Numeric.Decimal("707"),
Token.Punctuation.Comma,
Token.Literal.Numeric.Decimal("808"),
Token.Punctuation.Comma,
Token.Literal.Numeric.Decimal("909"),
Token.Keyword.Modifier.Private,
Token.PrimitiveType.Int,
Token.Identifier.FieldName("myField"),
Token.Punctuation.Semicolon,
Token.Punctuation.Hash,
Token.Keyword.Preprocessor.Pragma,
Token.Keyword.Preprocessor.Warning,
Token.Keyword.Preprocessor.Restore,
Token.Literal.Numeric.Decimal("IDE0001"),
Token.Punctuation.Comma,
Token.Literal.Numeric.Decimal("IDE0002"),
Token.Punctuation.Comma,
Token.Literal.Numeric.Decimal("1"),
Token.Punctuation.Comma,
Token.Literal.Numeric.Decimal("CS1233"),
Token.Punctuation.Comma,
Token.Literal.Numeric.Decimal("XYZ9999"),
Token.Punctuation.Comma,
Token.Literal.Numeric.Decimal("404"),
Token.Punctuation.Comma,
Token.Literal.Numeric.Decimal("505"),
Token.Punctuation.Comma,
Token.Literal.Numeric.Decimal("606"),
Token.Punctuation.Comma,
Token.Literal.Numeric.Decimal("707"),
Token.Punctuation.Comma,
Token.Literal.Numeric.Decimal("808"),
Token.Punctuation.Comma,
Token.Literal.Numeric.Decimal("909"),
Token.Keyword.Modifier.Private,
Token.PrimitiveType.Int,
Token.Identifier.FieldName("anotherField"),
Token.Punctuation.Semicolon,
]);
});

it("#pragma warning disable multiple warnings with comment", async () => {
const input = Input.InClass(`
#pragma warning disable IDE0001, IDE0002, CS1234 // Comment1
private int myField;
#pragma warning restore IDE0001, IDE0002 // Comment2
private int anotherField;
`);
const tokens = await tokenize(input);

tokens.should.deep.equal([
Token.Punctuation.Hash,
Token.Keyword.Preprocessor.Pragma,
Token.Keyword.Preprocessor.Warning,
Token.Keyword.Preprocessor.Disable,
Token.Literal.Numeric.Decimal("IDE0001"),
Token.Punctuation.Comma,
Token.Literal.Numeric.Decimal("IDE0002"),
Token.Punctuation.Comma,
Token.Literal.Numeric.Decimal("CS1234"),
Token.Comment.SingleLine.Start,
Token.Comment.SingleLine.Text(" Comment1"),
Token.Keyword.Modifier.Private,
Token.PrimitiveType.Int,
Token.Identifier.FieldName("myField"),
Token.Punctuation.Semicolon,
Token.Punctuation.Hash,
Token.Keyword.Preprocessor.Pragma,
Token.Keyword.Preprocessor.Warning,
Token.Keyword.Preprocessor.Restore,
Token.Literal.Numeric.Decimal("IDE0001"),
Token.Punctuation.Comma,
Token.Literal.Numeric.Decimal("IDE0002"),
Token.Comment.SingleLine.Start,
Token.Comment.SingleLine.Text(" Comment2"),
Token.Keyword.Modifier.Private,
Token.PrimitiveType.Int,
Token.Identifier.FieldName("anotherField"),
Token.Punctuation.Semicolon,
]);
});

it("#region and #endregion with comment", async () => {
const input = Input.InClass(`
#region My Region // This is my region
private int myField;
#endregion // End of my region
private int anotherField;
`);
const tokens = await tokenize(input);

tokens.should.deep.equal([
Token.Punctuation.Hash,
Token.Keyword.Preprocessor.Region,
Token.PreprocessorMessage("My Region // This is my region"),
Token.Keyword.Modifier.Private,
Token.PrimitiveType.Int,
Token.Identifier.FieldName("myField"),
Token.Punctuation.Semicolon,
Token.Punctuation.Hash,
Token.Keyword.Preprocessor.EndRegion,
Token.Comment.SingleLine.Start,
Token.Comment.SingleLine.Text(" End of my region"),
Token.Keyword.Modifier.Private,
Token.PrimitiveType.Int,
Token.Identifier.FieldName("anotherField"),
Token.Punctuation.Semicolon,
]);
});
});

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