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

Support directive tokenization #10979

Merged
merged 16 commits into from
Oct 11, 2024
+8,661 −120
Merged

Support directive tokenization #10979

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
7deab2c
Add new preprocessor tests for the old parser, and copy their baselin…
333fred Aug 13, 2024
281dccc
Add line whitespace tracking for erroring when a preprocessor token i…
333fred Aug 14, 2024
90dad77
Add initial support for parsing directives in the new lexer.
333fred Aug 14, 2024
dc32d7a
Initial work on plumbing through parser changes to correctly support …
333fred Aug 22, 2024
f17e45a
Add more tests for other control flow blocks
333fred Sep 16, 2024
2f09db5
Several misc refactors
333fred Sep 19, 2024
e5a3829
Error on def and undef
333fred Sep 19, 2024
e084218
Start testing beginning-of-line enforcement.
333fred Sep 19, 2024
3d9f766
Report a warning when we see potential misplaced directives in disabl…
333fred Oct 3, 2024
64e3821
Add more tests, include the correct location in warnings.
333fred Oct 7, 2024
3450d02
Usings, recomment GenerateBaselines
333fred Oct 7, 2024
8704d08
Nullable annotations
333fred Oct 8, 2024
13b3767
Merge remote-tracking branch 'upstream/features/roslyn-tokenizer' int…
333fred Oct 8, 2024
312ad1e
Update baselines, skip design time verification where tracked by http…
333fred Oct 8, 2024
a16d0e1
Feedback.
333fred Oct 9, 2024
2c07360
More feedback.
333fred Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
353 changes: 353 additions & 0 deletions src/Compiler/Microsoft.AspNetCore.Razor.Language/legacyTest/Legacy/CSharpPreprocessorTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,353 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Collections.Immutable;
using Microsoft.CodeAnalysis.CSharp;
using Xunit;

namespace Microsoft.AspNetCore.Razor.Language.Legacy;

public class CSharpPreprocessorTest() : ParserTestBase(layer: TestProject.Layer.Compiler, validateSpanEditHandlers: true, useLegacyTokenizer: true)
{
[Fact]
public void Pragmas()
{
ParseDocumentTest("""
@{
#pragma warning disable 123
#pragma warning restore 123
#pragma checksum "file.cs" "{00000000-0000-0000-0000-000000000000}" "1234"
}
""");
}

[Fact]
public void NullableDirectives()
{
ParseDocumentTest("""
@{
#nullable enable
#nullable disable
#nullable restore
#nullable enable annotations
#nullable disable annotations
#nullable restore annotations
#nullable enable warnings
#nullable disable warnings
#nullable restore warnings
}
""");
}

[Fact]
public void DefineThenIfDef()
{
ParseDocumentTest("""
@{
#define SYMBOL
#if SYMBOL
#undef SYMBOL
#if SYMBOL
var x = 1;
#endif
#else
var x = 1;
#endif
}
""");
}

[Fact]
public void ErrorWarningLine()
{
ParseDocumentTest("""
@{
#line 1 "file.cs"
#error This is an error
#line default
#warning This is a warning
#line hidden
#line (1, 1) - (5, 60) 10 "partial-class.cs"
}
""");
}

[Fact]
public void Regions()
{
ParseDocumentTest("""
@{
#region MyRegion }
#endregion
}
""");
}

[Fact]
public void SimpleIfDef()
{
ParseDocumentTest("""
@{
#if true
var x = 1;
#endif
}
""");
}

[Fact]
public void IfDefFromParseOptions_Symbol()
{
IfDefFromParseOptions("SYMBOL");
}

[Fact]
public void IfDefFromParseOptions_Symbol2()
{
IfDefFromParseOptions("SYMBOL2");
}

[Fact]
public void IfDefFromParseOptions_None()
{
IfDefFromParseOptions(null);
}

private void IfDefFromParseOptions(string? directive)
{
var parseOptions = CSharpParseOptions.Default;

if (directive != null)
{
parseOptions = parseOptions.WithPreprocessorSymbols(ImmutableArray.Create(directive));
}

ParseDocumentTest("""
@{
#if SYMBOL
var x = 1;
#elif SYMBOL2
var x = 2;
#else
var x = 3;
#endif
}
""", parseOptions);
}

[Fact]
public void IfDefAcrossMultipleBlocks()
{
ParseDocumentTest("""
@{
#if false
var x = 1;
}

<div>
<p>Content</p>
</div>

@{
var y = 2;
#endif
}
""");
}

[Fact]
public void IfDefDisabledSectionUnbalanced()
{
ParseDocumentTest("""
@{
#if false
void M() {
#endif
}
""");
}

[Fact]
public void IfDefNotOnNewline_01()
{
ParseDocumentTest("""
@{ #if false }
<div>
<p>Content</p>
</div>
@{
#endif
}
""");
}

[Fact]
public void IfDefNotOnNewline_02()
{
ParseDocumentTest("""
@{#if false }
<div>
<p>Content</p>
</div>
@{
#endif
}
""");
}

[Fact]
public void ElIfNotOnNewline()
{
ParseDocumentTest("""
@{
#if true
}
<div>
<p>Content</p>
</div>
@{ #elif false }
<div>
<p>Content2</p>
</div>
@{
#endif
}
""");
}

[Fact]
public void ElseNotOnNewline()
{
ParseDocumentTest("""
@{
#if true
}
<div>
<p>Content</p>
</div>
@{ #else }
<div>
<p>Content2</p>
</div>
@{
#endif
}
""");
}

[Fact]
public void EndIfNotOnNewline()
{
ParseDocumentTest("""
@{
#if false
}
<div>
<p>Content</p>
</div>
@{ #endif }
""");
}

[Fact]
public void UsingStatementResults()
{
ParseDocumentTest("""
@using (var test = blah)
#if true
{
#endif
}
""");
}

[Fact]
public void IfStatementAfterIf()
{
ParseDocumentTest("""
@if (true)
#if true
{
#endif
}
""");
}

[Fact]
public void IfStatementAfterIfBlock()
{
ParseDocumentTest("""
@if (true)
{
#if true
}
#endif
""");
}

[Fact]
public void IfStatementAfterIfBeforeElseIf()
{
ParseDocumentTest("""
@if (true)
{
}
#if true
else if (false)
#endif
{
}
""");
}

[Fact]
public void IfStatementAfterElseIf()
{
ParseDocumentTest("""
@if (true)
{
}
else if (false)
#if true
{
#endif
}
""");
}

[Fact]
public void IfStatementAfterElseIfBeforeElse()
{
ParseDocumentTest("""
@if (true)
{
}
else if (false)
{
}
#if true
else
#endif
{
}
""");
}

[Fact]
public void IfStatementAfterElse()
{
ParseDocumentTest("""
@if (true)
{
}
else if (false)
{
}
else
#if true
{
#endif
}
""");
}
}
6 changes: 6 additions & 0 deletions ...nguage/legacyTest/TestFiles/ParserTests/CSharpPreprocessorTest/DefineThenIfDef.cspans.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Markup span at (0:0,0 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [115] )
Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [115] )
MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [115] )
Code span at (2:0,2 [112] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [115] )
MetaCode span at (114:10,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [115] )
Markup span at (115:10,1 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [115] )
Loading