Skip to content
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -12163,6 +12163,28 @@ @rendermode Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer
CompileToAssembly(generated);
}

[IntegrationTestFact]
public void RenderMode_Directive_WithTypeParam_Razor9()
{
var generated = CompileToCSharp("""
@typeparam T
@rendermode Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer
""",
configuration: Configuration with { LanguageVersion = RazorLanguageVersion.Version_9_0 },
expectedCSharpDiagnostics:
// (17,19): error CS0305: Using the generic type 'TestComponent<T>' requires 1 type arguments
// [global::Test.TestComponent.__PrivateComponentRenderModeAttribute]
Diagnostic(ErrorCode.ERR_BadArity, "TestComponent").WithArguments("Test.TestComponent<T>", "type", "1").WithLocation(17, 19));

// Assert
AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
CompileToAssembly(generated,
// (13,19): error CS0305: Using the generic type 'TestComponent<T>' requires 1 type arguments
// [global::Test.TestComponent.__PrivateComponentRenderModeAttribute]
Diagnostic(ErrorCode.ERR_BadArity, "TestComponent").WithArguments("Test.TestComponent<T>", "type", "1").WithLocation(13, 19));
}

[IntegrationTestFact]
public void RenderMode_Directive_WithTypeParam_First()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,13 @@ @rendermode Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer
VerifyRenderModeAttribute(component, $$"""
file sealed class __PrivateComponentRenderModeAttribute : global::Microsoft.AspNetCore.Components.RenderModeAttribute
{
private static global::Microsoft.AspNetCore.Components.IComponentRenderMode ModeImpl => Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer
private static global::Microsoft.AspNetCore.Components.IComponentRenderMode ModeImpl =>
#nullable restore
#line (3,13)-(3,77) "{{DefaultDocumentPath}}"
Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer
#line default
#line hidden
#nullable disable
;
public override global::Microsoft.AspNetCore.Components.IComponentRenderMode Mode => ModeImpl;
}
Expand Down Expand Up @@ -80,10 +86,16 @@ @rendermode Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer
""");

// Assert
VerifyRenderModeAttribute(component, """
VerifyRenderModeAttribute(component, $$"""
private sealed class __PrivateComponentRenderModeAttribute : global::Microsoft.AspNetCore.Components.RenderModeAttribute
{
private static global::Microsoft.AspNetCore.Components.IComponentRenderMode ModeImpl => Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer
private static global::Microsoft.AspNetCore.Components.IComponentRenderMode ModeImpl =>
#nullable restore
#line (1,13)-(1,77) "{{DefaultDocumentPath}}"
Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer
#line default
#line hidden
#nullable disable
;
public override global::Microsoft.AspNetCore.Components.IComponentRenderMode Mode => ModeImpl;
}
Expand All @@ -100,10 +112,16 @@ @rendermode InteractiveServer
""");

// Assert
VerifyRenderModeAttribute(component, """
VerifyRenderModeAttribute(component, $$"""
private sealed class __PrivateComponentRenderModeAttribute : global::Microsoft.AspNetCore.Components.RenderModeAttribute
{
private static global::Microsoft.AspNetCore.Components.IComponentRenderMode ModeImpl => InteractiveServer
private static global::Microsoft.AspNetCore.Components.IComponentRenderMode ModeImpl =>
#nullable restore
#line (2,13)-(2,30) "{{DefaultDocumentPath}}"
InteractiveServer
#line default
#line hidden
#nullable disable
;
public override global::Microsoft.AspNetCore.Components.IComponentRenderMode Mode => ModeImpl;
}
Expand All @@ -121,10 +139,16 @@ @rendermode InteractiveServer
""", genericArity: 1);

// Assert
VerifyRenderModeAttribute(component, """
VerifyRenderModeAttribute(component, $$"""
file sealed class __PrivateComponentRenderModeAttribute : global::Microsoft.AspNetCore.Components.RenderModeAttribute
{
private static global::Microsoft.AspNetCore.Components.IComponentRenderMode ModeImpl => InteractiveServer
private static global::Microsoft.AspNetCore.Components.IComponentRenderMode ModeImpl =>
#nullable restore
#line (3,13)-(3,30) "{{DefaultDocumentPath}}"
InteractiveServer
#line default
#line hidden
#nullable disable
;
public override global::Microsoft.AspNetCore.Components.IComponentRenderMode Mode => ModeImpl;
}
Expand Down Expand Up @@ -171,10 +195,9 @@ @rendermode NoExist
Assert.Empty(compilationResult.RazorDiagnostics);

CompileToAssembly(compilationResult,
// x:\dir\subdir\Test\TestComponent.cshtml(25,101): error CS0103: The name 'NoExist' does not exist in the current context
// NoExist
Diagnostic(ErrorCode.ERR_NameNotInContext, "NoExist").WithArguments("NoExist").WithLocation(25, 101)
);
// x:\dir\subdir\Test\TestComponent.cshtml(1,13): error CS0103: The name 'NoExist' does not exist in the current context
// NoExist
Diagnostic(ErrorCode.ERR_NameNotInContext, "NoExist").WithArguments("NoExist").WithLocation(1, 13));
}

[Fact]
Expand Down Expand Up @@ -234,7 +257,6 @@ @rendermode Foo
);
}


[Fact]
public void RenderMode_Referencing_Instance_Code()
{
Expand All @@ -249,10 +271,9 @@ @rendermode myRenderMode
Assert.Empty(compilationResult.RazorDiagnostics);

CompileToAssembly(compilationResult,
// x:\dir\subdir\Test\TestComponent.cshtml(34, 101): error CS0120: An object reference is required for the non-static field, method, or property 'TestComponent.myRenderMode'
// myRenderMode
Diagnostic(ErrorCode.ERR_ObjectRequired, "myRenderMode").WithArguments("Test.TestComponent.myRenderMode").WithLocation(34, 101)
);
// x:\dir\subdir\Test\TestComponent.cshtml(1,13): error CS0120: An object reference is required for the non-static field, method, or property 'TestComponent.myRenderMode'
// myRenderMode
Diagnostic(ErrorCode.ERR_ObjectRequired, "myRenderMode").WithArguments("Test.TestComponent.myRenderMode").WithLocation(1, 13));
}

[Fact]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
CSharpCode -
IntermediateToken - - CSharp - private static global::Microsoft.AspNetCore.Components.IComponentRenderMode ModeImpl =>
CSharpCode - (12:0,12 [64] x:\dir\subdir\Test\TestComponent.cshtml)
IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer
IntermediateToken - (12:0,12 [64] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer
IntermediateToken - - CSharp - ;
CSharpCode -
IntermediateToken - - CSharp - public override global::Microsoft.AspNetCore.Components.IComponentRenderMode Mode => ModeImpl;
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,8 @@
Generated Location: (799:22,44 [64] )
|Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|

Source Location: (12:0,12 [64] x:\dir\subdir\Test\TestComponent.cshtml)
|Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|
Generated Location: (1950:51,12 [64] )
|Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|

Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
CSharpCode -
IntermediateToken - - CSharp - private static global::Microsoft.AspNetCore.Components.IComponentRenderMode ModeImpl =>
CSharpCode - (43:2,12 [64] x:\dir\subdir\Test\TestComponent.cshtml)
IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer
IntermediateToken - (43:2,12 [64] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer
IntermediateToken - - CSharp - ;
CSharpCode -
IntermediateToken - - CSharp - public override global::Microsoft.AspNetCore.Components.IComponentRenderMode Mode => ModeImpl;
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,8 @@ Source Location: (43:2,12 [64] x:\dir\subdir\Test\TestComponent.cshtml)
Generated Location: (1075:32,44 [64] )
|Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|

Source Location: (43:2,12 [64] x:\dir\subdir\Test\TestComponent.cshtml)
|Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|
Generated Location: (2226:61,12 [64] )
|Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|

Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
CSharpCode -
IntermediateToken - - CSharp - private static global::Microsoft.AspNetCore.Components.IComponentRenderMode ModeImpl =>
CSharpCode - (26:1,12 [64] x:\dir\subdir\Test\TestComponent.cshtml)
IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer
IntermediateToken - (26:1,12 [64] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer
IntermediateToken - - CSharp - ;
CSharpCode -
IntermediateToken - - CSharp - public override global::Microsoft.AspNetCore.Components.IComponentRenderMode Mode => ModeImpl;
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,8 @@ Source Location: (26:1,12 [64] x:\dir\subdir\Test\TestComponent.cshtml)
Generated Location: (971:33,44 [64] )
|Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|

Source Location: (26:1,12 [64] x:\dir\subdir\Test\TestComponent.cshtml)
|Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|
Generated Location: (2086:63,12 [64] )
|Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|

Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
CSharpCode -
IntermediateToken - - CSharp - private static global::Microsoft.AspNetCore.Components.IComponentRenderMode ModeImpl =>
CSharpCode - (12:0,12 [64] x:\dir\subdir\Test\TestComponent.cshtml)
IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer
IntermediateToken - (12:0,12 [64] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer
IntermediateToken - - CSharp - ;
CSharpCode -
IntermediateToken - - CSharp - public override global::Microsoft.AspNetCore.Components.IComponentRenderMode Mode => ModeImpl;
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,8 @@ Source Location: (12:0,12 [64] x:\dir\subdir\Test\TestComponent.cshtml)
Generated Location: (903:30,44 [64] )
|Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|

Source Location: (12:0,12 [64] x:\dir\subdir\Test\TestComponent.cshtml)
|Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|
Generated Location: (2086:63,12 [64] )
|Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|

Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
// <auto-generated/>
#pragma warning disable 1591
namespace Test
{
#line default
using global::System;
using global::System.Collections.Generic;
using global::System.Linq;
using global::System.Threading.Tasks;
using global::Microsoft.AspNetCore.Components;
#line default
#line hidden
[global::Test.TestComponent.__PrivateComponentRenderModeAttribute]
#nullable restore
public partial class TestComponent<
#nullable restore
#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
T

#line default
#line hidden
#nullable disable
> : global::Microsoft.AspNetCore.Components.ComponentBase
#nullable disable
{
#pragma warning disable 219
private void __RazorDirectiveTokenHelpers__() {
((global::System.Action)(() => {
}
))();
((global::System.Action)(() => {
#nullable restore
#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
global::System.Object __typeHelper = nameof(Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer);

#line default
#line hidden
#nullable disable
}
))();
}
#pragma warning restore 219
#pragma warning disable 0414
private static object __o = null;
#pragma warning restore 0414
#pragma warning disable 1998
protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
{
}
#pragma warning restore 1998
private sealed class __PrivateComponentRenderModeAttribute : global::Microsoft.AspNetCore.Components.RenderModeAttribute
{
#pragma warning disable 219
private void __RazorDirectiveTokenHelpers__() {
}
#pragma warning restore 219
#pragma warning disable 0414
private static object __o = null;
#pragma warning restore 0414
private static global::Microsoft.AspNetCore.Components.IComponentRenderMode ModeImpl =>
#nullable restore
#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer

#line default
#line hidden
#nullable disable
;
public override global::Microsoft.AspNetCore.Components.IComponentRenderMode Mode => ModeImpl;
}
}
}
#pragma warning restore 1591
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
Document -
NamespaceDeclaration - - Test
UsingDirective - (3:1,1 [20] ) - global::System
UsingDirective - (26:2,1 [40] ) - global::System.Collections.Generic
UsingDirective - (69:3,1 [25] ) - global::System.Linq
UsingDirective - (97:4,1 [36] ) - global::System.Threading.Tasks
UsingDirective - (136:5,1 [45] ) - global::Microsoft.AspNetCore.Components
CSharpCode -
IntermediateToken - - CSharp - [global::Test.TestComponent.__PrivateComponentRenderModeAttribute]
ClassDeclaration - - public partial - TestComponent - global::Microsoft.AspNetCore.Components.ComponentBase - - T
DesignTimeDirective -
DirectiveToken - (11:0,11 [1] x:\dir\subdir\Test\TestComponent.cshtml) - T
DirectiveToken - (26:1,12 [64] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer
CSharpCode -
IntermediateToken - - CSharp - #pragma warning disable 0414
CSharpCode -
IntermediateToken - - CSharp - private static object __o = null;
CSharpCode -
IntermediateToken - - CSharp - #pragma warning restore 0414
MethodDeclaration - - protected override - void - BuildRenderTree
ClassDeclaration - - private sealed - __PrivateComponentRenderModeAttribute - global::Microsoft.AspNetCore.Components.RenderModeAttribute -
DesignTimeDirective -
CSharpCode -
IntermediateToken - - CSharp - #pragma warning disable 0414
CSharpCode -
IntermediateToken - - CSharp - private static object __o = null;
CSharpCode -
IntermediateToken - - CSharp - #pragma warning restore 0414
CSharpCode -
IntermediateToken - - CSharp - private static global::Microsoft.AspNetCore.Components.IComponentRenderMode ModeImpl =>
CSharpCode - (26:1,12 [64] x:\dir\subdir\Test\TestComponent.cshtml)
IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer
IntermediateToken - - CSharp - ;
CSharpCode -
IntermediateToken - - CSharp - public override global::Microsoft.AspNetCore.Components.IComponentRenderMode Mode => ModeImpl;
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Source Location: (11:0,11 [1] x:\dir\subdir\Test\TestComponent.cshtml)
|T|
Generated Location: (534:17,0 [1] )
|T|

Source Location: (26:1,12 [64] x:\dir\subdir\Test\TestComponent.cshtml)
|Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|
Generated Location: (998:33,44 [64] )
|Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|

Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,15 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
#pragma warning restore 1998
private sealed class __PrivateComponentRenderModeAttribute : global::Microsoft.AspNetCore.Components.RenderModeAttribute
{
private static global::Microsoft.AspNetCore.Components.IComponentRenderMode ModeImpl => Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer
private static global::Microsoft.AspNetCore.Components.IComponentRenderMode ModeImpl =>
#nullable restore
#line (1,13)-(1,77) "x:\dir\subdir\Test\TestComponent.cshtml"
Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer

#line default
#line hidden
#nullable disable

;
public override global::Microsoft.AspNetCore.Components.IComponentRenderMode Mode => ModeImpl;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
CSharpCode -
IntermediateToken - - CSharp - private static global::Microsoft.AspNetCore.Components.IComponentRenderMode ModeImpl =>
CSharpCode - (12:0,12 [64] x:\dir\subdir\Test\TestComponent.cshtml)
IntermediateToken - - CSharp - Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer
IntermediateToken - (12:0,12 [64] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer
IntermediateToken - - CSharp - ;
CSharpCode -
IntermediateToken - - CSharp - public override global::Microsoft.AspNetCore.Components.IComponentRenderMode Mode => ModeImpl;
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Source Location: (12:0,12 [64] x:\dir\subdir\Test\TestComponent.cshtml)
|Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|
Generated Location: (1100:27,0 [64] )
|Microsoft.AspNetCore.Components.Web.RenderMode.InteractiveServer|

Loading