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

Fix @inherits mapping for fuse #10985

Merged
merged 8 commits into from
Oct 9, 2024
Merged

Fix @inherits mapping for fuse #10985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
87b563d
Make base type a token rather than a string
chsienki Oct 7, 2024
6b71194
Track inherits source location and emit it when present
chsienki Oct 8, 2024
4212c2d
Update baselines
chsienki Oct 8, 2024
d77fc1d
Add simple inherits test for components
chsienki Oct 8, 2024
a9125ce
Add razor page inherits test
chsienki Oct 8, 2024
1dcd1bb
Fix inherits for razor pages and update baselines
chsienki Oct 8, 2024
a790e33
Fix tests and missed baseline
chsienki Oct 8, 2024
79917e2
More baselines
chsienki Oct 8, 2024
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: 6 additions & 6 deletions src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ModelDirectiveTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ @model Type1
// Assert
var @class = FindClassNode(irDocument);
Assert.NotNull(@class);
Assert.Equal("BaseType<Type1>", @class.BaseType);
Assert.Equal("BaseType<Type1>", @class.BaseType.Content);
}

[Fact]
Expand All @@ -103,7 +103,7 @@ @model Type2
// Assert
var @class = FindClassNode(irDocument);
Assert.NotNull(@class);
Assert.Equal("BaseType<Type1>", @class.BaseType);
Assert.Equal("BaseType<Type1>", @class.BaseType.Content);
}

[Fact]
Expand All @@ -129,7 +129,7 @@ @model Type1
// Assert
var @class = FindClassNode(irDocument);
Assert.NotNull(@class);
Assert.Equal("BaseType", @class.BaseType);
Assert.Equal("BaseType", @class.BaseType.Content);
}

[Fact]
Expand All @@ -154,7 +154,7 @@ @inherits BaseType<TModel>
// Assert
var @class = FindClassNode(irDocument);
Assert.NotNull(@class);
Assert.Equal("BaseType<dynamic>", @class.BaseType);
Assert.Equal("BaseType<dynamic>", @class.BaseType.Content);
}

[Fact]
Expand All @@ -179,7 +179,7 @@ @inherits BaseType<TModel>
// Assert
var @class = FindClassNode(irDocument);
Assert.NotNull(@class);
Assert.Equal("BaseType<dynamic>", @class.BaseType);
Assert.Equal("BaseType<dynamic>", @class.BaseType.Content);

var @namespace = FindNamespaceNode(irDocument);
var usingNode = Assert.IsType<UsingDirectiveIntermediateNode>(@namespace.Children[0]);
Expand Down Expand Up @@ -209,7 +209,7 @@ @model SomeType
// Assert
var @class = FindClassNode(irDocument);
Assert.NotNull(@class);
Assert.Equal("BaseType<SomeType>", @class.BaseType);
Assert.Equal("BaseType<SomeType>", @class.BaseType.Content);

var @namespace = FindNamespaceNode(irDocument);
var usingNode = Assert.IsType<UsingDirectiveIntermediateNode>(@namespace.Children[0]);
Expand Down
4 changes: 2 additions & 2 deletions ...soft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/MvcViewDocumentClassifierPassTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public void MvcViewDocumentClassifierPass_SetsClass()
visitor.Visit(irDocument);

// Assert
Assert.Equal("global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>", visitor.Class.BaseType);
Assert.Equal("global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>", visitor.Class.BaseType.Content);
Assert.Equal(new[] { "public" }, visitor.Class.Modifiers);
Assert.Equal("Test", visitor.Class.ClassName);
}
Expand All @@ -122,7 +122,7 @@ public void MvcViewDocumentClassifierPass_NullFilePath_SetsClass()
visitor.Visit(irDocument);

// Assert
Assert.Equal("global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>", visitor.Class.BaseType);
Assert.Equal("global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>", visitor.Class.BaseType.Content);
Assert.Equal(new[] { "public" }, visitor.Class.Modifiers);
AssertEx.Equal("AspNetCore_ec563e63d931b806184cb02f79875e4f3b21d1ca043ad06699424459128b58c0", visitor.Class.ClassName);
}
Expand Down
12 changes: 6 additions & 6 deletions src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ModelDirectiveTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ @model Type1
// Assert
var @class = FindClassNode(irDocument);
Assert.NotNull(@class);
Assert.Equal("BaseType<Type1>", @class.BaseType);
Assert.Equal("BaseType<Type1>", @class.BaseType.Content);
}

[Fact]
Expand All @@ -103,7 +103,7 @@ @model Type2
// Assert
var @class = FindClassNode(irDocument);
Assert.NotNull(@class);
Assert.Equal("BaseType<Type1>", @class.BaseType);
Assert.Equal("BaseType<Type1>", @class.BaseType.Content);
}

[Fact]
Expand All @@ -129,7 +129,7 @@ @model Type1
// Assert
var @class = FindClassNode(irDocument);
Assert.NotNull(@class);
Assert.Equal("BaseType", @class.BaseType);
Assert.Equal("BaseType", @class.BaseType.Content);
}

[Fact]
Expand All @@ -154,7 +154,7 @@ @inherits BaseType<TModel>
// Assert
var @class = FindClassNode(irDocument);
Assert.NotNull(@class);
Assert.Equal("BaseType<dynamic>", @class.BaseType);
Assert.Equal("BaseType<dynamic>", @class.BaseType.Content);
}

[Fact]
Expand All @@ -179,7 +179,7 @@ @inherits BaseType<TModel>
// Assert
var @class = FindClassNode(irDocument);
Assert.NotNull(@class);
Assert.Equal("BaseType<dynamic>", @class.BaseType);
Assert.Equal("BaseType<dynamic>", @class.BaseType.Content);

var @namespace = FindNamespaceNode(irDocument);
var usingNode = Assert.IsType<UsingDirectiveIntermediateNode>(@namespace.Children[0]);
Expand Down Expand Up @@ -209,7 +209,7 @@ @model SomeType
// Assert
var @class = FindClassNode(irDocument);
Assert.NotNull(@class);
Assert.Equal("BaseType<SomeType>", @class.BaseType);
Assert.Equal("BaseType<SomeType>", @class.BaseType.Content);

var @namespace = FindNamespaceNode(irDocument);
var usingNode = Assert.IsType<UsingDirectiveIntermediateNode>(@namespace.Children[0]);
Expand Down
4 changes: 2 additions & 2 deletions ...soft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/MvcViewDocumentClassifierPassTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public void MvcViewDocumentClassifierPass_SetsClass()
visitor.Visit(irDocument);

// Assert
Assert.Equal("global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>", visitor.Class.BaseType);
Assert.Equal("global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>", visitor.Class.BaseType.Content);
Assert.Equal(new[] { "public" }, visitor.Class.Modifiers);
Assert.Equal("Test", visitor.Class.ClassName);
}
Expand All @@ -122,7 +122,7 @@ public void MvcViewDocumentClassifierPass_NullFilePath_SetsClass()
visitor.Visit(irDocument);

// Assert
Assert.Equal("global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>", visitor.Class.BaseType);
Assert.Equal("global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>", visitor.Class.BaseType.Content);
Assert.Equal(new[] { "public" }, visitor.Class.Modifiers);
AssertEx.Equal("AspNetCore_ec563e63d931b806184cb02f79875e4f3b21d1ca043ad06699424459128b58c0", visitor.Class.ClassName);
}
Expand Down
4 changes: 2 additions & 2 deletions ...ft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/RazorPageDocumentClassifierPassTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ public void RazorPageDocumentClassifierPass_SetsClass()
visitor.Visit(irDocument);

// Assert
Assert.Equal("global::Microsoft.AspNetCore.Mvc.RazorPages.Page", visitor.Class.BaseType);
Assert.Equal("global::Microsoft.AspNetCore.Mvc.RazorPages.Page", visitor.Class.BaseType.Content);
Assert.Equal(new[] { "public" }, visitor.Class.Modifiers);
Assert.Equal("Test", visitor.Class.ClassName);
}
Expand All @@ -249,7 +249,7 @@ public void RazorPageDocumentClassifierPass_NullFilePath_SetsClass()
visitor.Visit(irDocument);

// Assert
Assert.Equal("global::Microsoft.AspNetCore.Mvc.RazorPages.Page", visitor.Class.BaseType);
Assert.Equal("global::Microsoft.AspNetCore.Mvc.RazorPages.Page", visitor.Class.BaseType.Content);
Assert.Equal(new[] { "public" }, visitor.Class.Modifiers);
AssertEx.Equal("AspNetCore_c3b458108610c1a2aa6eede0a5685ede853e036732db515609b2a23ca15359e1", visitor.Class.ClassName);
}
Expand Down
8 changes: 7 additions & 1 deletion ...Files/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_Runtime.codegen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,13 @@ namespace AspNetCore
#line default
#line hidden
[global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"Sha256", @"1ca5ae8e569aefa6575a68e8d8b2d375ed79deec6565fb893b72b89423f55abd", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml")]
public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel : MyBasePageForViews<MyModel>
public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsViewModel :
#line (1,11)-(1,37) "TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel.cshtml"
MyBasePageForViews<MyModel>

#line default
#line hidden

{
#pragma warning disable 1998
public async override global::System.Threading.Tasks.Task ExecuteAsync()
Expand Down
8 changes: 7 additions & 1 deletion ...IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_Runtime.codegen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,13 @@ namespace AspNetCore
#line hidden
[global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"Sha256", @"a652fac42d6a27ace9b45de079bd1bd21d47f29255b96899785aaa55a4a8e354", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports.cshtml")]
[global::Microsoft.AspNetCore.Razor.Hosting.RazorSourceChecksumAttribute(@"Sha256", @"0fd3e40bc660f76f39c803bba3ce5cbaf8ca19f7a8c1563212571e769673e06a", @"/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports.cshtml")]
public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports : MyPageModel<MyModel>
public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_InheritsWithViewImports :
#line (1,11)-(1,30) "TestFiles\IntegrationTests\CodeGenerationIntegrationTest\_ViewImports.cshtml"
MyPageModel<MyModel>

#line default
#line hidden

{
#pragma warning disable 1998
public async override global::System.Threading.Tasks.Task ExecuteAsync()
Expand Down
4 changes: 2 additions & 2 deletions ...oft.AspNetCore.Mvc.Razor.Extensions/test/ConsolidatedMvcViewDocumentClassifierPassTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public void ConsolidatedMvcViewDocumentClassifierPass_SetsClass()
visitor.Visit(irDocument);

// Assert
Assert.Equal("global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>", visitor.Class.BaseType);
Assert.Equal("global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>", visitor.Class.BaseType.Content);
Assert.Equal(new[] { "internal", "sealed" }, visitor.Class.Modifiers);
Assert.Equal("Test", visitor.Class.ClassName);
}
Expand All @@ -81,7 +81,7 @@ public void MvcViewDocumentClassifierPass_NullFilePath_SetsClass()
visitor.Visit(irDocument);

// Assert
Assert.Equal("global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>", visitor.Class.BaseType);
Assert.Equal("global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>", visitor.Class.BaseType.Content);
Assert.Equal(new[] { "internal", "sealed" }, visitor.Class.Modifiers);
AssertEx.Equal("AspNetCore_ec563e63d931b806184cb02f79875e4f3b21d1ca043ad06699424459128b58c0", visitor.Class.ClassName);
}
Expand Down
49 changes: 49 additions & 0 deletions ...ft.AspNetCore.Mvc.Razor.Extensions/test/IntegrationTests/CodeGenerationIntegrationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,6 +879,31 @@ @inherits MyBasePage<TestModel?>
AssertCSharpDocumentMatchesBaseline(csharp);
CompileToAssembly(generated);
}

[Fact]
public void InheritsDirective_RazorPages_Runtime()
{
// Arrange
AddCSharpSyntaxTree("""
public abstract class MyBase : global::Microsoft.AspNetCore.Mvc.RazorPages.Page {

}
""");

// Act
var generated = CompileToCSharp("""
@page
@inherits MyBase
""");

// Assert
var intermediate = generated.CodeDocument.GetDocumentIntermediateNode();
var csharp = generated.CodeDocument.GetCSharpDocument();
AssertDocumentNodeMatchesBaseline(intermediate);
AssertCSharpDocumentMatchesBaseline(csharp);
CompileToAssembly(generated);
}

#endregion

#region DesignTime
Expand Down Expand Up @@ -1467,6 +1492,30 @@ public void RazorPageWithNoLeadingPageDirective_DesignTime()
Assert.Equal("RZ3906", Assert.Single(diagnotics).Id);
}

[Fact]
public void InheritsDirective_RazorPages_DesignTime()
{
// Arrange
AddCSharpSyntaxTree("""
public abstract class MyBase : global::Microsoft.AspNetCore.Mvc.RazorPages.Page {

}
""");

// Act
var generated = CompileToCSharp("""
@page
@inherits MyBase
""", designTime: true);

// Assert
var intermediate = generated.CodeDocument.GetDocumentIntermediateNode();
var csharp = generated.CodeDocument.GetCSharpDocument();
AssertDocumentNodeMatchesBaseline(intermediate);
AssertCSharpDocumentMatchesBaseline(csharp);
CompileToAssembly(generated);
}

#endregion

[Theory, CombinatorialData, WorkItem("https://github.com/dotnet/razor/issues/7286")]
Expand Down
12 changes: 6 additions & 6 deletions src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ModelDirectiveTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ @model Type1
// Assert
var @class = FindClassNode(irDocument);
Assert.NotNull(@class);
Assert.Equal("BaseType<Type1>", @class.BaseType);
Assert.Equal("BaseType<Type1>", @class.BaseType.Content);
}

[Fact]
Expand All @@ -102,7 +102,7 @@ @model Type2
// Assert
var @class = FindClassNode(irDocument);
Assert.NotNull(@class);
Assert.Equal("BaseType<Type1>", @class.BaseType);
Assert.Equal("BaseType<Type1>", @class.BaseType.Content);
}

[Fact]
Expand All @@ -128,7 +128,7 @@ @model Type1
// Assert
var @class = FindClassNode(irDocument);
Assert.NotNull(@class);
Assert.Equal("BaseType", @class.BaseType);
Assert.Equal("BaseType", @class.BaseType.Content);
}

[Fact]
Expand All @@ -153,7 +153,7 @@ @inherits BaseType<TModel>
// Assert
var @class = FindClassNode(irDocument);
Assert.NotNull(@class);
Assert.Equal("BaseType<dynamic>", @class.BaseType);
Assert.Equal("BaseType<dynamic>", @class.BaseType.Content);
}

[Fact]
Expand All @@ -178,7 +178,7 @@ @inherits BaseType<TModel>
// Assert
var @class = FindClassNode(irDocument);
Assert.NotNull(@class);
Assert.Equal("BaseType<dynamic>", @class.BaseType);
Assert.Equal("BaseType<dynamic>", @class.BaseType.Content);

var @namespace = FindNamespaceNode(irDocument);
var usingNode = Assert.IsType<UsingDirectiveIntermediateNode>(@namespace.Children[0]);
Expand Down Expand Up @@ -208,7 +208,7 @@ @model SomeType
// Assert
var @class = FindClassNode(irDocument);
Assert.NotNull(@class);
Assert.Equal("BaseType<SomeType>", @class.BaseType);
Assert.Equal("BaseType<SomeType>", @class.BaseType.Content);

var @namespace = FindNamespaceNode(irDocument);
var usingNode = Assert.IsType<UsingDirectiveIntermediateNode>(@namespace.Children[0]);
Expand Down
4 changes: 2 additions & 2 deletions ...piler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/MvcViewDocumentClassifierPassTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public void MvcViewDocumentClassifierPass_SetsClass()
visitor.Visit(irDocument);

// Assert
Assert.Equal("global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>", visitor.Class.BaseType);
Assert.Equal("global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>", visitor.Class.BaseType.Content);
Assert.Equal(new[] { "public" }, visitor.Class.Modifiers);
Assert.Equal("Test", visitor.Class.ClassName);
}
Expand All @@ -122,7 +122,7 @@ public void MvcViewDocumentClassifierPass_NullFilePath_SetsClass()
visitor.Visit(irDocument);

// Assert
Assert.Equal("global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>", visitor.Class.BaseType);
Assert.Equal("global::Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>", visitor.Class.BaseType.Content);
Assert.Equal(new[] { "public" }, visitor.Class.Modifiers);
AssertEx.Equal("AspNetCore_ec563e63d931b806184cb02f79875e4f3b21d1ca043ad06699424459128b58c0", visitor.Class.ClassName);
}
Expand Down
4 changes: 2 additions & 2 deletions ...ler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/RazorPageDocumentClassifierPassTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ public void RazorPageDocumentClassifierPass_SetsClass()
visitor.Visit(irDocument);

// Assert
Assert.Equal("global::Microsoft.AspNetCore.Mvc.RazorPages.Page", visitor.Class.BaseType);
Assert.Equal("global::Microsoft.AspNetCore.Mvc.RazorPages.Page", visitor.Class.BaseType.Content);
Assert.Equal(new[] { "public" }, visitor.Class.Modifiers);
Assert.Equal("Test", visitor.Class.ClassName);
}
Expand All @@ -249,7 +249,7 @@ public void RazorPageDocumentClassifierPass_NullFilePath_SetsClass()
visitor.Visit(irDocument);

// Assert
Assert.Equal("global::Microsoft.AspNetCore.Mvc.RazorPages.Page", visitor.Class.BaseType);
Assert.Equal("global::Microsoft.AspNetCore.Mvc.RazorPages.Page", visitor.Class.BaseType.Content);
Assert.Equal(new[] { "public" }, visitor.Class.Modifiers);
AssertEx.Equal("AspNetCore_c3b458108610c1a2aa6eede0a5685ede853e036732db515609b2a23ca15359e1", visitor.Class.ClassName);
}
Expand Down
Loading