Support Generate Method code action in Razor and C# editors by davidwengier · Pull Request #12960 · dotnet/razor

davidwengier · 2026-03-27T05:37:45Z

Reviewing commit and a time thoroughly recommended. It's a big PR, but each commit should be easy enough to understand and review. Also, for the commits that are just moving methods around files, there aren't any changes to the methods themselves.

This includes #12956 which I closed because CI wasn't starting and GitHub was missing a commit in that PR anyway. Sorry!

Tests are all passing locally, but some are skipped in this PR because we need a Roslyn bump for them to pass, to something containing dotnet/roslyn#82973. I want to get this PR in first though, so that when Roslyn starts offering Generate Method in Razor files, we're ready to handle it. In the meantime, the RazorEditServiceTests provide good coverage of the important parts of the new code, as well as all of the existing tests for all of the code moves.

…ngs around everywhere

… in OOP

…from ClientSettings

…mplify the service

…lled previously This deliberately moves the call up higher in the C# on type formatting pass, because in future when we handle more language features we'll need the formatting to happen on those edits. The using directive work that is being now is simple enough that its okay to go at the end, because we just assume no indentation etc.

I could have easily gone the other way and moved the edit mapping method to document mapping service, and gotten rid of the edit mapping service. I genuinely am 50/50 on which way is better.

… the way The skipped edits will come in handy soon, I promise

…cessing skipped edits This will also help when some new methods are mappable, and some aren't

Also moved AddCSharpLanguageFeatureChanges out to the main edit service file, and renamed the CSharpLanguageFeatures file. I originally thought that would be a good place to put support for all language features, but it would have just been way too big.

Yes, the formatting is wrong, that will be part of a subsequent commit

Yes, this uses hardcoded formatting options. Will hook that up for real next

...or/src/Microsoft.VisualStudioCode.RazorExtension/Services/VSCodeRemoteServicesInitializer.cs

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/RazorServices.cs

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CodeActionResolveService.cs

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Settings/ClientSettings.cs

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/RazorEditService.cs

davidwengier · 2026-03-29T23:49:43Z

If I didn't reply to a comment, it's just because I made the code change suggested without issue. And even if I did, I don't think there was anything I didn't change anyway :)

...azor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/RazorEditService_Methods.cs

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/RazorEditService.cs

...azor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/RazorEditService_Methods.cs

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/RazorEditService.cs

ToddGrun · 2026-03-30T01:10:09Z

This looks great, optimistically approving. Thanks!

ToddGrun

ToddGrun · 2026-03-30T02:31:51Z

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/RazorEditService.cs

+                        Start = hostEndIndex,
+                        Length = 0
+                    },
+                    NewText = " " + Environment.NewLine + indent + newText


" "

Is the space necessary if we know there is a newline immediately after it?

Good question. I didn't really look at the contents of this method much, just moved it, but I'll see if we have test coverage and what this is doing.

So none of our current tests hit this line, and I can't seem to construct one that will. However since the generate methods tests are currently skipped, I'm leaning towards leaving it in place until they can be unskipped, and then checking again. If the code is dead, then an extra string literal that doesn't get hit doesn't matter, and if not, then we'll find out soon enough. I'll make a note to follow up.

Okay, I dug into an old branch and none of this code is ever hit (ie, the whole if (!mappedStart && !mappedEnd.. branch), and the scenario that it is exclusively written for is still working. I'm going to remove it in an upcoming cleanup PR, like I talked about this morning.

davidwengier · 2026-03-30T06:59:40Z

Crap, hit merge and then realised I hadn't pushed the last few commits of follow up. Opened #12972

Follow ups to #12960 I spent so long trying to construct a test for #12960 (comment) that I ended up just replying to the comment, and then clicking merge.... before committing the last few commits of PR feedback 🤦‍♂️

Alternative to #82973 Part of dotnet/razor#6159 and dotnet/razor#4539 Razor is adding support for Generate Method (dotnet/razor#12960) but to do that we need Roslyn to offer the code action, so that's what this does. ###### Microsoft Reviewers: [Open in CodeFlow](https://microsoft.github.io/open-pr/?codeflow=https://github.com/dotnet/roslyn/pull/83028)

davidwengier requested a review from a team as a code owner March 27, 2026 05:37

davidwengier added 20 commits March 27, 2026 20:35

Create remote settings service so we don't have to keep passing setti…

435f002

…ngs around everywhere

Don't send client settings over each remote service call, just use DI…

1e1507f

… in OOP

Stop creating RazorFormattingPass instances manually, rather convert …

14acfc6

…from ClientSettings

Convert RazorEditHelper into a proper service

fdfde78

Actually use DI for things, now that we can

4876549

Copy TryGetMappedSpan into the one place that it's called from, to si…

3ff1faa

…mplify the service

Call GetRazorDocumentEdits instead of doing our own mapping

055d3c3

Rename property to better represent the new code

edbd83d

Move GetRazorDocumentEdits to the edit mapping service where it is used

0af7cb9

I could have easily gone the other way and moved the edit mapping method to document mapping service, and gotten rid of the edit mapping service. I genuinely am 50/50 on which way is better.

Simplify two loops into one, and capture edits that are skipped along…

d3b55a5

… the way The skipped edits will come in handy soon, I promise

Simplify the work done in AddCSharpLanguageFeatureChanges by only pro…

8448b8b

…cessing skipped edits This will also help when some new methods are mappable, and some aren't

Add tests to simulate code actions originating from Roslyn

c389052

Yes, the formatting is wrong, that will be part of a subsequent commit

Fix indentation of the method we insert so everything looks perfect

6918a0b

Yes, this uses hardcoded formatting options. Will hook that up for real next

Use the real indentation options instead of hardcoding, and add tests

e7b55e4

Minor cleanup

0914d57

Honour CodeBlockBraceOnNextLine and update tests

986594e

Skip tests that are waiting for a Roslyn bump before they start passing

f505d31

Fix benchmark after changes

b3a67f8

davidwengier force-pushed the GenerateMethodToo branch from 1198089 to b3a67f8 Compare March 27, 2026 09:58

davidwengier mentioned this pull request Mar 28, 2026

Allow Generate Method to run on Razor documents dotnet/roslyn#82973

Closed