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

DustinCampbell · 2024-07-30T19:14:31Z

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

 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.VisualStudio.LanguageServer.Protocol;
-using AliasedVSCommitCharacters = Microsoft.VisualStudio.LanguageServer.Protocol.SumType<string[], Microsoft.VisualStudio.LanguageServer.Protocol.VSInternalCommitCharacter[]>;
+using AliasedVSCommitCharacters = RLSP::Roslyn.LanguageServer.Protocol.SumType<string[], RLSP::Roslyn.LanguageServer.Protocol.VSInternalCommitCharacter[]>;


Is it possible to add a special namespace alias in GlobalUsings.cs to avoid needing the RLSP extern alias? I'm imagining that global using RoslynLsp = RSLP::Roslyn.LanguageServer.Protocol could be declared in GlobalUsings.cs and then you can write using AliasedVSCommitCharacters = RoslynLsp.SumType<string[], RoslynLsp.VSInternalCommitCharacter[]>;

Note: I suspect that might not be possible, but I wanted to check. 😄

Cyrus suggested a similar thing originally, and I tried to just have global using Roslyn = RLSP::Roslyn;, so that we wouldn't need a global using and also not need extern alias in every .cs file, but sadly it doesn't work in using directives. Not the first time the "alias any type" feature has not lived up to its name 😛

It does work outside of using directives, but there are exactly 0 use cases of that in this PR.

Yeah, I suspected that might not work. It's not a common scenario, and I imagine it might even have enough nuance to elevate it to a separate feature. The way that "global using" directives were implemented is that it's as if all global usings are pasted at the top of the user's file. They don't create a new scope, which would probably be necessary for this to work.

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/src/Microsoft.AspNetCore.Razor.LanguageServer/AutoInsert/IOnAutoInsertProvider.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/AutoInsert/PreferHtmlInAttributeValuesDocumentPositionStrategy.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/AddUsingsCodeActionProviderHelper.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Razor/AddUsingsCodeActionResolver.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Razor/GenerateMethodCodeActionResolver.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ColorPresentation/ColorPresentationEndpoint.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultDocumentPositionInfoStrategy.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Definition/DefinitionEndpoint.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentColor/DocumentColorEndpoint.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentColor/DocumentColorService.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentColor/IDocumentColorService.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/DocumentFormattingEndpoint.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/DocumentRangeFormattingEndpoint.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/FormattingContentValidationPass.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/FormattingOptionsExtensions.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/FormattingPassBase.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/FormattingResult.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/IRazorFormattingService.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/RazorFormattingService.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/IDocumentPositionInfoStrategy.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/InlayHints/IInlayHintService.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/InlayHints/InlayHintService.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/PreferAttributeNameDocumentPositionInfoStrategy.cs # src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/SpellCheck/DocumentSpellCheckEndpoint.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/AutoInsert/AutoClosingTagOnAutoInsertProvider.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/AutoInsert/CloseTextTagOnAutoInsertProvider.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/LspExtensions_SyntaxNode.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/LspFactory.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/RoslynLspExtensions_SourceText.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/RoslynLspFactory.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/CSharpFormatter.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/CSharpFormattingPassBase.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/CSharpOnTypeFormattingPass.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/FormattingDiagnosticValidationPass.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/RazorFormattingPass.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/VersionedDocumentContext.cs # src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Protocol/SemanticTokens/ProvideSemanticTokensRangesParams.cs # src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Debugging/IRazorBreakpointResolver.cs # src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostSignatureHelpEndpoint.cs # src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Debugging/DefaultLSPBreakpointSpanProvider.cs # src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Debugging/DefaultLSPProximityExpressionsProvider.cs # src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Debugging/DefaultRazorBreakpointResolver.cs # src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Debugging/DefaultRazorProximityExpressionResolver.cs # src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Debugging/LSPBreakpointSpanProvider.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/AutoInsert/OnAutoInsertEndpointTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/AutoInsert/RazorOnAutoInsertProviderTestBase.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CSharp/DefaultCSharpCodeActionResolverTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CodeActionEndpointTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Html/DefaultHtmlCodeActionProviderTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Debugging/RazorBreakpointSpanEndpointTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Debugging/RazorProximityExpressionsEndpointTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Definition/DefinitionEndpointDelegationTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Definition/DefinitionEndpointTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentPresentation/TextDocumentTextPresentationEndpointTests.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentPresentation/TextDocumentUriPresentationEndpointTests.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/DocumentOnTypeFormattingEndpointTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/FormattingContentValidationPassTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/FormattingDiagnosticValidationPassTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/FormattingLanguageServerClient.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/FormattingLanguageServerTestBase.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/RazorFormattingServiceTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Hover/HoverServiceTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Mapping/RazorMapToDocumentRangesEndpointTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Microsoft.AspNetCore.Razor.LanguageServer.Test.csproj # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Refactoring/RenameEndpointTest.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/SingleServerDelegatingEndpointTestBase.TestLanguageServer.cs # src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/WrapWithTag/WrapWithTagEndpointTests.cs # src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/LanguageClient/Debugging/RazorBreakpointResolverTest.cs # src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/LanguageClient/Debugging/TestLSPBreakpointSpanProvider.cs # src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/RazorLanguageService_IVsLanguageDebugInfoTest.cs

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

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 added 2 commits September 17, 2024 16:54

Fixes after merge

dd43a04

davidwengier mentioned this pull request Sep 17, 2024

Cohost diagnostics support #10882

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 Jul 30, 2024 •

edited

Loading

davidwengier Jul 31, 2024

DustinCampbell Jul 31, 2024

DustinCampbell left a comment

DustinCampbell commented Sep 13, 2024

davidwengier commented Sep 13, 2024

vzarytovskii commented Sep 13, 2024

Use Roslyn LSP library instead of Visual Studio #10682

Are you sure you want to change the base?

Use Roslyn LSP library instead of Visual Studio #10682

Conversation

davidwengier commented Jul 30, 2024 • edited Loading

DustinCampbell Jul 30, 2024 • edited Loading

Choose a reason for hiding this comment

davidwengier Jul 31, 2024

Choose a reason for hiding this comment

DustinCampbell Jul 31, 2024

Choose a reason for hiding this comment

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

davidwengier commented Jul 30, 2024 •

edited

Loading

DustinCampbell Jul 30, 2024 •

edited

Loading