Use Roslyn LSP library instead of Visual Studio #10682

davidwengier · 2024-07-30T04:35:53Z

Needs dotnet/roslyn#74597 before this will compile, and needs Web Tools work to be done and inserted before it can be tested, so this isn't going anywhere soon, but I thought I'd put it up a bit early because:

a) I'm keen if anyone has any issues with the global using approach? I'm just trying to avoid extern alias in every .cs file
b) This will need lots more commits to keep up with changes in main, so right now is the neatest this will ever be, and hence the easiest to review.

Reviewing commit-at-a-time is thoroughly recommended, as each commit is a standalone change, and the initial few are mostly mechanical.

TODO:

Run integration tests
Manual testing
More global usings in Workspaces layer? See Cohost diagnostics support #10882 (comment)
Remove compromise in Cohost Signature Help test accessor
Remove https://github.com/dotnet/razor/blob/main/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Rename/RemoteRenameService.cs#L73
Remove https://github.com/dotnet/razor/pull/10728/files#diff-2128ee4b61389bd2316a90477a7c3552d378880154c937559dd1f52ba7f9a022R44
Remove https://github.com/dotnet/razor/pull/10882/files#diff-66ddc96ee184c657224b95f9a3d7febf84d74f6b3c2c26f20a464c10e5f2cab8R142-R154

TODO in subsequent PRs due to complexity/desire for manual testing

Unify Inlay Hints cohost logic: Cohost inlay hint support #10672 (comment)

I'm assuming the Vs versions of these are more complete than the Roslyn ones

This commit done entirely via Replace In Files

This is to make things easier in future, as we'll be getting a global using for all protocol types

Not a mechanical commit, but my word is it doing a good job cosplaying as one

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Protocol/DelegatedTypes.cs

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/CompletionListOptimizer.cs

DustinCampbell

Love this change! Looking forward to seeing it merged once all the dependencies are updated.

DustinCampbell · 2024-09-13T15:59:50Z

Hey @davidwengier, any word on Web Tools? I'm still excited to see this go in someday. 😄

davidwengier · 2024-09-13T22:12:14Z

@vzarytovskii is web tools moving to STJ still scheduled for this sprint? Or did I miss it and it's already gone in?

vzarytovskii · 2024-09-13T22:13:16Z

@abonie is working on it currently

# Conflicts: # src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorSemanticTokensScrollingBenchmark.cs # src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks.csproj # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/CodeActionEndpoint.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/CodeActionResolveEndpoint.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Html/DefaultHtmlCodeActionResolver.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Models/CodeActionResolveParams.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Razor/ExtractToCodeBehindCodeActionResolver.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/Delegation/DelegatedCompletionItemResolver.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/Delegation/DelegatedCompletionListProvider.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/Delegation/DelegatedCompletionResponseRewriter.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/Delegation/SnippetResponseRewriter.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/RazorCompletionResolveEndpoint.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Definition/DefinitionEndpoint.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Diagnostics/DocumentPullDiagnosticsEndpoint.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentContextFactory.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Hover/HoverEndpoint.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Hover/HoverService.TestAccessor.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Hover/HoverService.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Hover/IHoverService.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Implementation/ImplementationEndpoint.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Semantic/SemanticTokensRangeEndpoint.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Tooltip/LSPTagHelperTooltipFactory.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Tooltip/VSLSPTagHelperTooltipFactory.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CSharp/CSharpCodeActionResolver.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CSharp/TypeAccessibilityCodeActionProvider.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CSharp/UnformattedRemappingCSharpCodeActionResolver.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Html/HtmlCodeActionProvider.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Models/CodeActionExtensions.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/AddUsingsCodeActionResolver.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/GenerateMethodCodeActionResolver.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/IRazorCodeActionResolver.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/RazorCodeActionFactory.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Completion/AggregateCompletionItemResolver.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Completion/CompletionItemResolver.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Completion/CompletionListMerger.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Completion/Delegation/HtmlCommitCharacterResponseRewriter.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Completion/Delegation/TextEditResponseRewriter.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Completion/RazorCompletionItemResolver.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Completion/VSInternalCompletionItemExtensions.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Diagnostics/RazorDiagnosticConverter.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Diagnostics/RazorTranslateDiagnosticsService.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/IEditMappingService.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/LspExtensions_SourceText.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/RoslynLspExtensions_SourceText.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Microsoft.CodeAnalysis.Razor.Workspaces.csproj # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Tooltip/ClassifiedTagHelperTooltipFactory.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Tooltip/MarkupTagHelperTooltipFactory.cs # src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostInlayHintEndpoint.cs # src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostInlayHintResolveEndpoint.cs # src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/DocumentMapping/DefaultLSPDocumentMappingProvider.cs # src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/DocumentMapping/LSPDocumentMappingProvider.cs # src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_MapCode.cs # src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_SemanticTokens.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/AutoInsert/RazorOnAutoInsertProviderTestBase.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/AddUsingsCodeActionResolverTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CSharp/CSharpCodeActionProviderTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CSharp/CSharpCodeActionResolverTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CSharp/TypeAccessibilityCodeActionProviderTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CodeActionEndToEndTest.NetFx.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CodeActionResolutionEndpointTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Html/HtmlCodeActionProviderTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ComponentAccessibilityCodeActionProviderTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/CreateComponentCodeActionResolverTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/DefaultVSLSPTagHelperTooltipFactoryTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/Delegation/DelegatedCompletionListProviderTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/Delegation/ResponseRewriterTestBase.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/Delegation/TextEditResponseRewriterTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/RazorCompletionItemResolverTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/RazorCompletionResolveEndpointTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Diagnostics/DocumentPullDiagnosticsEndpointTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/FindReferences/FindAllReferencesEndpointTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/DocumentOnTypeFormattingEndpointTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/FormattingTestBase.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Microsoft.AspNetCore.Razor.LanguageServer.Test.csproj # src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/LanguageServer/LanguageServerTestBase.cs # src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/Microsoft.AspNetCore.Razor.Test.Common.Tooling.csproj # src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Completion/DirectiveVerifier.cs # src/Razor/test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/Tooltip/MarkupTagHelperTooltipFactoryTest.cs # src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/LanguageClient/DocumentMapping/LSPDocumentMappingProviderTest.cs # src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/LanguageClient/RazorLSPSpanMappingServiceTest.cs

Response to dotnet/roslyn#74597 to pave the way for #10682 once Web Tools inserts. The break from the Roslyn change is not binary breaking, so no need for dual insertion, and since this change doesn't break anything, we can get this in now, and whenever we happen to bump Roslyn next, there should be no build issues.

…istent

abonie · 2025-02-25T13:09:12Z

@vzarytovskii is web tools moving to STJ still scheduled for this sprint? Or did I miss it and it's already gone in?

FYI the change has been inserted already

davidwengier · 2025-02-25T21:15:35Z

I have local changes that push this branch to latest and seem to work okay in manual testing. The review is not going to be fun though, given this is 6 months old, so I'm considering rebasing and opening a new one.

# Conflicts: # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Diagnostics/RazorTranslateDiagnosticsService.cs # src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostDocumentPullDiagnosticsEndpoint.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/AutoInsert/RazorOnAutoInsertProviderTestBase.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CSharp/CSharpCodeActionProviderTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CSharp/TypeAccessibilityCodeActionProviderTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Html/HtmlCodeActionProviderTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ComponentAccessibilityCodeActionProviderTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Debugging/RazorBreakpointSpanEndpointTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Diagnostics/RazorDiagnosticsPublisherTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/FormattingTestBase.cs # src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/LanguageServer/LanguageServerTestBase.cs

davidwengier · 2025-02-27T06:21:08Z

I can only apologise for the size and un-review-ability of this PR, but the integration tests passed, so I've pushed the latest updates. @dotnet/razor-tooling let me know if you would prefer a new PR with cleaner commits.

Val build is running: https://dev.azure.com/dnceng/internal/_build/results?buildId=2651760&view=results

UPDATE: Oh I just realized this will fail because of symbol check. Maybe it does RPS etc. anyway?

davidwengier · 2025-02-28T05:52:02Z

Override completion seems to be broken.... Investigating

davidwengier · 2025-03-04T21:21:14Z

This got way more complicated over time, so I'm going to close this and try a different approach, through smaller PRs. Thanks for the memories :)

Tracking the work at #11588

davidwengier added 15 commits July 30, 2024 11:26

Rename VsLsp files to just Lsp

95c37af

I'm assuming the Vs versions of these are more complete than the Roslyn ones

Remote RoslynLsp files

a9ab067

Rename VsLsp* and RoslynLsp* to just Lsp*

b0dcedb

This commit done entirely via Replace In Files

Change all Range aliases to LspRange aliases

27c038c

This is to make things easier in future, as we'll be getting a global using for all protocol types

Reference Roslyn protocol library, and deal with the extern alias bits

4c649b2

Remove unused usings

eb3565c

Not a mechanical commit, but my word is it doing a good job cosplaying as one

More Range -> LspRange

9792de5

Introduce extern alias where necessary to reference Roslyn types

8d45e98

Move Lsp helpers into the right namespace

bbb5adb

Adjust namespaces and factory method names

e4537e0

Adjust visibility on a couple of things

6067779

Fix issues with ContainedLanguage being dependent on VS types

be5f735

Roslyn types are immutable

a21fd27

Cohost signature help now only has to return a single type

8725bba

Project file tweaks

bd720ba

davidwengier requested a review from a team as a code owner July 30, 2024 04:35

DustinCampbell mentioned this pull request Jul 30, 2024

Select range feature #10621

Merged

DustinCampbell reviewed Jul 30, 2024

View reviewed changes

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Protocol/DelegatedTypes.cs Outdated Show resolved Hide resolved

DustinCampbell reviewed Jul 30, 2024

View reviewed changes

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/CompletionListOptimizer.cs Outdated Show resolved Hide resolved

DustinCampbell approved these changes Jul 30, 2024

View reviewed changes

davidwengier added 6 commits July 31, 2024 12:03

PR feedback

7caf726

Use extension method as extension method

ccd76da

Move test code back to the test where it belongs

f505e9c

Merge remote-tracking branch 'upstream/main' into LspTypes

1d5a102

Fixes after merge

e572122

Merge remote-tracking branch 'upstream/main' into LspTypes

4ca0fbe

DustinCampbell mentioned this pull request Aug 22, 2024

Cohosting OnAutoInsert endpoint #10776

Merged

davidwengier mentioned this pull request Sep 17, 2024

Cohost diagnostics support #10882

Merged

davidwengier mentioned this pull request Feb 17, 2025

Prevent warnings from new IVTs from Roslyn #11504

Merged

davidwengier added 15 commits February 20, 2025 10:11

Fixes after merge

8d0f638

Remove unnecessary conversions to/from VS LSP types

4e7d2eb

Address build warnings

7ad79e1

Fix failing tooling unit tests

2336193

Remove redundant "Roslyn" prefixes

ce2b746

Missed one!

b059ef3

fixup: remove roslyn prefix

d0f375e

Remove Newtonsoft use where possible

33c208a

Tick off some of the TODO items int eh PR description

3045a9d

Merge remote-tracking branch 'upstream/main' into LspTypes

fd7cb66

Bump to a real Roslyn version (and fix a couple of merge things)

b096574

Random cleanups

4c39a87

Fix random warnings that appeared in my error list

0196d1b

Make some more global usings for common types, and make them all cons…

23d8fee

…istent

Update Version.Details.xml

4aeffdc

davidwengier requested a review from a team as a code owner February 27, 2025 06:16

Minor cleanups I found going through the PR

aa018fb

davidwengier mentioned this pull request Mar 4, 2025

Fully move to System.Text.Json and Roslyn LSP protocol DLL #11588

Closed

davidwengier closed this Mar 4, 2025

davidwengier mentioned this pull request Mar 5, 2025

Remove some Newtonsoft.Json references and conversions #11593

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use Roslyn LSP library instead of Visual Studio #10682

Use Roslyn LSP library instead of Visual Studio #10682

davidwengier commented Jul 30, 2024 •

edited

Loading

DustinCampbell left a comment

DustinCampbell commented Sep 13, 2024

davidwengier commented Sep 13, 2024

vzarytovskii commented Sep 13, 2024

abonie commented Feb 25, 2025

davidwengier commented Feb 25, 2025

davidwengier commented Feb 27, 2025 •

edited

Loading

davidwengier commented Feb 28, 2025

davidwengier commented Mar 4, 2025

Use Roslyn LSP library instead of Visual Studio #10682

Use Roslyn LSP library instead of Visual Studio #10682

Conversation

davidwengier commented Jul 30, 2024 • edited Loading

DustinCampbell left a comment

Choose a reason for hiding this comment

DustinCampbell commented Sep 13, 2024

davidwengier commented Sep 13, 2024

vzarytovskii commented Sep 13, 2024

abonie commented Feb 25, 2025

davidwengier commented Feb 25, 2025

davidwengier commented Feb 27, 2025 • edited Loading

davidwengier commented Feb 28, 2025

davidwengier commented Mar 4, 2025

davidwengier commented Jul 30, 2024 •

edited

Loading

davidwengier commented Feb 27, 2025 •

edited

Loading