Skip to content

Don't replace the slashes in hint names #12477

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
merged 9 commits into from
Nov 19, 2025
Merged

Don't replace the slashes in hint names #12477

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
141a929
Don't replace the slashes in hintnames
chsienki Nov 11, 2025
ad1a289
Add test
chsienki Nov 11, 2025
e8f25f8
Normalize line endings + don't allow first char to be a slash
chsienki Nov 11, 2025
68e14f1
Fix generator tests
chsienki Nov 12, 2025
22d36ca
Apply suggestions from code review
chsienki Nov 12, 2025
6f2ba63
Apply suggestion from @chsienki
chsienki Nov 12, 2025
3f7dc68
Fix
chsienki Nov 18, 2025
489c30e
Merge branch 'main' into fix/hint_names
chsienki Nov 18, 2025
75ffe1e
Merge remote-tracking branch 'upstream/main' into fix/hint_names
chsienki Nov 18, 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
4 changes: 3 additions & 1 deletion ...icrosoft.CodeAnalysis.Razor.Compiler/src/SourceGenerators/RazorSourceGenerator.Helpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ internal static string GetIdentifierFromPath(ReadOnlySpan<char> filePath)
{
switch (filePath[i])
{
case ':' or '\\' or '/':
Copy link
Member Author

@chsienki chsienki Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

':' is covered by the case below anyway.

case '\\' or '/' when i > 0:
builder.Append('/');
break;
case char ch when !char.IsLetterOrDigit(ch):
builder.Append('_');
break;
Expand Down
38 changes: 19 additions & 19 deletions ...Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/RazorSourceGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,8 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
e => e.AssertPair("RazorCodeGenerateStop", "Pages/Index.razor", "Runtime"),
e => e.AssertPair("RazorCodeGenerateStart", "Pages/Counter.razor", "Runtime"),
e => e.AssertPair("RazorCodeGenerateStop", "Pages/Counter.razor", "Runtime"),
e => e.AssertSingleItem("AddSyntaxTrees", "Pages_Index_razor.g.cs"),
e => e.AssertSingleItem("AddSyntaxTrees", "Pages_Counter_razor.g.cs")
e => e.AssertSingleItem("AddSyntaxTrees", "Pages/Index_razor.g.cs"),
e => e.AssertSingleItem("AddSyntaxTrees", "Pages/Counter_razor.g.cs")
);
}

Expand Down Expand Up @@ -456,7 +456,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
e => e.AssertSingleItem("CheckAndRewriteTagHelpersStop", "Pages/Counter.razor"),
e => e.AssertPair("RazorCodeGenerateStart", "Pages/Counter.razor", "Runtime"),
e => e.AssertPair("RazorCodeGenerateStop", "Pages/Counter.razor", "Runtime"),
e => e.AssertSingleItem("AddSyntaxTrees", "Pages_Counter_razor.g.cs")
e => e.AssertSingleItem("AddSyntaxTrees", "Pages/Counter_razor.g.cs")
);
}

Expand Down Expand Up @@ -843,7 +843,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
e => e.AssertSingleItem("CheckAndRewriteTagHelpersStop", "Pages/Counter.razor"),
e => e.AssertPair("RazorCodeGenerateStart", "Pages/Counter.razor", "Runtime"),
e => e.AssertPair("RazorCodeGenerateStop", "Pages/Counter.razor", "Runtime"),
e => e.AssertSingleItem("AddSyntaxTrees", "Pages_Counter_razor.g.cs")
e => e.AssertSingleItem("AddSyntaxTrees", "Pages/Counter_razor.g.cs")
);
}

Expand Down Expand Up @@ -1017,7 +1017,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
e => e.AssertPair("RazorCodeGenerateStop", "Pages/Index.razor", "Runtime"),
e => e.AssertPair("RazorCodeGenerateStart", "Pages/Counter.razor", "Runtime"),
e => e.AssertPair("RazorCodeGenerateStop", "Pages/Counter.razor", "Runtime"),
e => e.AssertSingleItem("AddSyntaxTrees", "Pages_Counter_razor.g.cs")
e => e.AssertSingleItem("AddSyntaxTrees", "Pages/Counter_razor.g.cs")
);
}

Expand Down Expand Up @@ -1179,7 +1179,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
e => e.AssertPair("RazorCodeGenerateStop", "Pages/Index.razor", "Runtime"),
e => e.AssertPair("RazorCodeGenerateStart", "Pages/Counter.razor", "Runtime"),
e => e.AssertPair("RazorCodeGenerateStop", "Pages/Counter.razor", "Runtime"),
e => e.AssertSingleItem("AddSyntaxTrees", "Pages_Index_razor.g.cs")
e => e.AssertSingleItem("AddSyntaxTrees", "Pages/Index_razor.g.cs")
);

// Verify caching
Expand Down Expand Up @@ -1388,8 +1388,8 @@ internal sealed class Views_Shared__Layout : global::Microsoft.AspNetCore.Mvc.Ra
e => e.AssertPair("RazorCodeGenerateStop", "Pages/Index.cshtml", "Runtime"),
e => e.AssertPair("RazorCodeGenerateStart", "Views/Shared/_Layout.cshtml", "Runtime"),
e => e.AssertPair("RazorCodeGenerateStop", "Views/Shared/_Layout.cshtml", "Runtime"),
e => e.AssertSingleItem("AddSyntaxTrees", "Pages_Index_cshtml.g.cs"),
e => e.AssertSingleItem("AddSyntaxTrees", "Views_Shared__Layout_cshtml.g.cs")
e => e.AssertSingleItem("AddSyntaxTrees", "Pages/Index_cshtml.g.cs"),
e => e.AssertSingleItem("AddSyntaxTrees", "Views/Shared/_Layout_cshtml.g.cs")
);
}

Expand Down Expand Up @@ -1729,7 +1729,7 @@ internal sealed class Views_Shared__Layout : global::Microsoft.AspNetCore.Mvc.Ra
e => e.AssertSingleItem("CheckAndRewriteTagHelpersStop", "Views/Shared/_Layout.cshtml"),
e => e.AssertPair("RazorCodeGenerateStart", "Views/Shared/_Layout.cshtml", "Runtime"),
e => e.AssertPair("RazorCodeGenerateStop", "Views/Shared/_Layout.cshtml", "Runtime"),
e => e.AssertSingleItem("AddSyntaxTrees", "Views_Shared__Layout_cshtml.g.cs")
e => e.AssertSingleItem("AddSyntaxTrees", "Views/Shared/_Layout_cshtml.g.cs")
);
}

Expand Down Expand Up @@ -2063,7 +2063,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
e => e.AssertSingleItem("CheckAndRewriteTagHelpersStop", "Views/Shared/_Layout.cshtml"),
e => e.AssertPair("RazorCodeGenerateStart", "Pages/Index.cshtml", "Runtime"),
e => e.AssertPair("RazorCodeGenerateStop", "Pages/Index.cshtml", "Runtime"),
e => e.AssertSingleItem("AddSyntaxTrees", "Pages_Index_cshtml.g.cs")
e => e.AssertSingleItem("AddSyntaxTrees", "Pages/Index_cshtml.g.cs")
);
}

Expand Down Expand Up @@ -2730,8 +2730,8 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
e => e.AssertPair("RazorCodeGenerateStop", "Pages/Index.razor", "Runtime"),
e => e.AssertPair("RazorCodeGenerateStart", "Pages/Counter.razor", "Runtime"),
e => e.AssertPair("RazorCodeGenerateStop", "Pages/Counter.razor", "Runtime"),
e => e.AssertSingleItem("AddSyntaxTrees", "Pages_Index_razor.g.cs"),
e => e.AssertSingleItem("AddSyntaxTrees", "Pages_Counter_razor.g.cs")
e => e.AssertSingleItem("AddSyntaxTrees", "Pages/Index_razor.g.cs"),
e => e.AssertSingleItem("AddSyntaxTrees", "Pages/Counter_razor.g.cs")
);

// flip the suppression state back to off
Expand Down Expand Up @@ -2852,8 +2852,8 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
e => e.AssertSingleItem("CheckAndRewriteTagHelpersStop", "Pages/Index.razor"),
e => e.AssertPair("RazorCodeGenerateStart", "Pages/Index.razor", "Runtime"),
e => e.AssertPair("RazorCodeGenerateStop", "Pages/Index.razor", "Runtime"),
e => e.AssertSingleItem("AddSyntaxTrees", "Pages_Index_razor.g.cs"),
e => e.AssertSingleItem("AddSyntaxTrees", "Pages_Counter_razor.g.cs")
e => e.AssertSingleItem("AddSyntaxTrees", "Pages/Index_razor.g.cs"),
e => e.AssertSingleItem("AddSyntaxTrees", "Pages/Counter_razor.g.cs")
);

// Flip suppression on, change the compilation, no changes
Expand Down Expand Up @@ -2881,8 +2881,8 @@ public class MyViewComponent : Microsoft.AspNetCore.Mvc.ViewComponent{}
e => e.AssertSingleItem("CheckAndRewriteTagHelpersStop", "Pages/Index.razor"),
e => e.AssertSingleItem("CheckAndRewriteTagHelpersStart", "Pages/Counter.razor"),
e => e.AssertSingleItem("CheckAndRewriteTagHelpersStop", "Pages/Counter.razor"),
e => e.AssertSingleItem("AddSyntaxTrees", "Pages_Index_razor.g.cs"),
e => e.AssertSingleItem("AddSyntaxTrees", "Pages_Counter_razor.g.cs")
e => e.AssertSingleItem("AddSyntaxTrees", "Pages/Index_razor.g.cs"),
e => e.AssertSingleItem("AddSyntaxTrees", "Pages/Counter_razor.g.cs")
);

// Flip suppression on, change the parse options, no changes
Expand Down Expand Up @@ -2924,8 +2924,8 @@ public class MyViewComponent : Microsoft.AspNetCore.Mvc.ViewComponent{}
e => e.AssertPair("RazorCodeGenerateStop", "Pages/Index.razor", "Runtime"),
e => e.AssertPair("RazorCodeGenerateStart", "Pages/Counter.razor", "Runtime"),
e => e.AssertPair("RazorCodeGenerateStop", "Pages/Counter.razor", "Runtime"),
e => e.AssertSingleItem("AddSyntaxTrees", "Pages_Index_razor.g.cs"),
e => e.AssertSingleItem("AddSyntaxTrees", "Pages_Counter_razor.g.cs")
e => e.AssertSingleItem("AddSyntaxTrees", "Pages_/Index_razor.g.cs"),
e => e.AssertSingleItem("AddSyntaxTrees", "Pages/Counter_razor.g.cs")
);

GeneratorDriver SetSuppressionState(bool state)
Expand Down Expand Up @@ -3577,7 +3577,7 @@ public async Task IncrementalCompilation_RerunsGenerator_When_AdditionalFileRena
e => e.AssertPair("RazorCodeGenerateStop", "Pages/Index.razor", "Runtime"),
e => e.AssertPair("RazorCodeGenerateStart", "Pages/NewCounter.razor", "Runtime"),
e => e.AssertPair("RazorCodeGenerateStop", "Pages/NewCounter.razor", "Runtime"),
e => e.AssertSingleItem("AddSyntaxTrees", "Pages_NewCounter_razor.g.cs")
e => e.AssertSingleItem("AddSyntaxTrees", "Pages/NewCounter_razor.g.cs")
);

// Verify the generated source has the correct namespace and class name
Expand Down
0 ...ootNamespace/Shared_Component1_razor.g.cs → ...ootNamespace/Shared/Component1_razor.g.cs
View file
Open in desktop
File renamed without changes.
0 ...ootNamespace/Views_Home_Index_cshtml.g.cs → ...ootNamespace/Views/Home/Index_cshtml.g.cs
View file
Open in desktop
File renamed without changes.
0 ...mportsRazor/Folder1_Component1_razor.g.cs → ...mportsRazor/Folder1/Component1_razor.g.cs
View file
Open in desktop
File renamed without changes.
0 .../ImportsRazor/Folder1__Imports_razor.g.cs → .../ImportsRazor/Folder1/_Imports_razor.g.cs
View file
Open in desktop
File renamed without changes.
0 ...mportsRazor/Folder2_Component2_razor.g.cs → ...mportsRazor/Folder2/Component2_razor.g.cs
View file
Open in desktop
File renamed without changes.
0 ...temInNamespace/System__Imports_razor.g.cs → ...temInNamespace/System/_Imports_razor.g.cs
View file
Open in desktop
File renamed without changes.
0 ...Tests/Inject/Shared_Component1_razor.g.cs → ...Tests/Inject/Shared/Component1_razor.g.cs
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions .../LineMapping/Shared_Component1_razor.g.cs → .../LineMapping/Shared/Component1_razor.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
#nullable restore
#line (1,39)-(1,50) 24 "Shared/Component1.razor"
__builder.AddContent(2, RaiseHere()

#line default
#line hidden
#nullable disable
Expand Down
3 changes: 2 additions & 1 deletion ...Mapping_Tabs/Shared_Component1_razor.g.cs → ...Mapping_Tabs/Shared/Component1_razor.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
#line (2,3)-(4,3) "Shared/Component1.razor"
if (true)
{


#line default
#line hidden
Expand All @@ -40,6 +40,7 @@ protected override void BuildRenderTree(global::Microsoft.AspNetCore.Components.
#nullable restore
#line (4,5)-(4,11) 24 "Shared/Component1.razor"
__builder.AddContent(1, "code"

#line default
#line hidden
#nullable disable
Expand Down
0 ...thVariable/7/Shared_Component1_razor.g.cs → ...thVariable/7/Shared/Component1_razor.g.cs
View file
Open in desktop
File renamed without changes.
0 ...thVariable/7/Views_Home_Index_cshtml.g.cs → ...thVariable/7/Views/Home/Index_cshtml.g.cs
View file
Open in desktop
File renamed without changes.
0 ...thVariable/8/Shared_Component1_razor.g.cs → ...thVariable/8/Shared/Component1_razor.g.cs
View file
Open in desktop
File renamed without changes.
0 ...thVariable/8/Views_Home_Index_cshtml.g.cs → ...thVariable/8/Views/Home/Index_cshtml.g.cs
View file
Open in desktop
File renamed without changes.
0 ...tomTagHelper/Views_Home_Index_cshtml.g.cs → ...tomTagHelper/Views/Home/Index_cshtml.g.cs
View file
Open in desktop
File renamed without changes.
0 ...iewComponent/Views_Home_Index_cshtml.g.cs → ...iewComponent/Views/Home/Index_cshtml.g.cs
View file
Open in desktop
File renamed without changes.
0 .../VoidTagName/Views_Home_Index_cshtml.g.cs → .../VoidTagName/Views/Home/Index_cshtml.g.cs
View file
Open in desktop
File renamed without changes.
0 ...ingTagHelper/Views_Home_Index_cshtml.g.cs → ...ingTagHelper/Views/Home/Index_cshtml.g.cs
View file
Open in desktop
File renamed without changes.
46 changes: 39 additions & 7 deletions ...Microsoft.VisualStudioCode.RazorExtension.Test/Endpoints/Shared/ComputedTargetPathTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ public class ComputedTargetPathTest(ITestOutputHelper testOutputHelper) : Cohost
{
// What the source generator would produce for TestProjectData.SomeProjectPath
private static readonly string s_hintNamePrefix = PlatformInformation.IsWindows
? "c__users_example_src_SomeProject"
: "_home_example_SomeProject";
? "c_/users/example/src/SomeProject"
: "/home/example/SomeProject";

[Theory]
[InlineData(true, false)]
Expand All @@ -45,7 +45,7 @@ public async Task SingleDocument(bool projectPath, bool generateConfigFile)

var generatedDocument = await document.Project.TryGetSourceGeneratedDocumentForRazorDocumentAsync(document, DisposalToken);
Assert.NotNull(generatedDocument);
Assert.Equal($"{s_hintNamePrefix}_File1_razor.g.cs", generatedDocument.HintName);
Assert.Equal($"{s_hintNamePrefix}/File1_razor.g.cs", generatedDocument.HintName);
}

[Theory]
Expand All @@ -70,11 +70,11 @@ public async Task TwoDocumentsWithTheSameBaseFileName(bool generateTargetPath)

var generatedDocument = await doc1.Project.TryGetSourceGeneratedDocumentForRazorDocumentAsync(doc1, DisposalToken);
Assert.NotNull(generatedDocument);
Assert.Equal($"Pages_Index_razor.g.cs", generatedDocument.HintName);
Assert.Equal($"Pages/Index_razor.g.cs", generatedDocument.HintName);

generatedDocument = await doc2.Project.TryGetSourceGeneratedDocumentForRazorDocumentAsync(doc2, DisposalToken);
Assert.NotNull(generatedDocument);
Assert.Equal($"Components_Index_razor.g.cs", generatedDocument.HintName);
Assert.Equal($"Components/Index_razor.g.cs", generatedDocument.HintName);
}

[Theory]
Expand Down Expand Up @@ -102,10 +102,42 @@ public async Task TwoDocumentsWithTheSameBaseFileName_FullPathHintName(bool proj

var generatedDocument = await doc1.Project.TryGetSourceGeneratedDocumentForRazorDocumentAsync(doc1, DisposalToken);
Assert.NotNull(generatedDocument);
Assert.Equal($"{s_hintNamePrefix}_Pages_Index_razor.g.cs", generatedDocument.HintName);
Assert.Equal($"{s_hintNamePrefix}/Pages/Index_razor.g.cs", generatedDocument.HintName);

generatedDocument = await doc2.Project.TryGetSourceGeneratedDocumentForRazorDocumentAsync(doc2, DisposalToken);
Assert.NotNull(generatedDocument);
Assert.Equal($"{s_hintNamePrefix}_Components_Index_razor.g.cs", generatedDocument.HintName);
Assert.Equal($"{s_hintNamePrefix}/Components/Index_razor.g.cs", generatedDocument.HintName);
}

[Theory]
[InlineData(true, false)]
[InlineData(true, true)]
[InlineData(false, false)]
public async Task TwoDocumentsWithTheSameBaseHintName(bool projectPath, bool generateConfigFile)
{
var builder = new RazorProjectBuilder
{
ProjectFilePath = projectPath ? TestProjectData.SomeProject.FilePath : null,
GenerateGlobalConfigFile = generateConfigFile,
GenerateAdditionalDocumentMetadata = false,
GenerateMSBuildProjectDirectory = false
};

var doc1Id = builder.AddAdditionalDocument(FilePath(@"Pages\Index.razor"), SourceText.From(""));
var doc2Id = builder.AddAdditionalDocument(FilePath(@"Pages_Index.razor"), SourceText.From(""));

var solution = LocalWorkspace.CurrentSolution;
solution = builder.Build(solution);

var doc1 = solution.GetAdditionalDocument(doc1Id).AssumeNotNull();
var doc2 = solution.GetAdditionalDocument(doc2Id).AssumeNotNull();

var generatedDocument = await doc1.Project.TryGetSourceGeneratedDocumentForRazorDocumentAsync(doc1, DisposalToken);
Assert.NotNull(generatedDocument);
Assert.Equal($"{s_hintNamePrefix}/Pages/Index_razor.g.cs", generatedDocument.HintName);

generatedDocument = await doc2.Project.TryGetSourceGeneratedDocumentForRazorDocumentAsync(doc2, DisposalToken);
Assert.NotNull(generatedDocument);
Assert.Equal($"{s_hintNamePrefix}/Pages_Index_razor.g.cs", generatedDocument.HintName);
}
}
Loading