Adding cohost completion handler #11048

alexgav · 2024-10-20T06:53:46Z

Summary of the changes

Moving most of the completion code to the common (Workspaces) layer
Adding cohost handler for completion

I tried making each commit small and serving a single purpose, so looking commit-by-commit could be helpful, though returned data in each individual commit is not going to be correct, especially in the first few commits. A lot of merging, filtering and ordering was added in the last few commits to ensure correct final completion list is returned.

One unfortunate thing here is conversion between VS and Roslyn LSP types that we have to do until we move to Roslyn LSP types everywhere in our code. Completion code uses LSP types throughout most of the common code much more so than other requests, and while we need common code for non-cohost LSP endpoint, most of it has to use VS LSP types for now.

Fixes: #11100

…mmon code

…letionItemProvider to common layer.

…ded by RemoteCompletionService

Switch passed in and returned types from Roslyn to VS Platform LSP types since that's what all of the common completion code in the Workspaces layer uses. We will need to convert returned Roslyn completion items to VS platform LSP completion items.

…et used in cohosting

…e workspaces layer (to be used in cohosting later)

…g HTML completion item labels to RazorCompletionListProvider

…r and minor cleanup

… layer and use it in cohost completion request

Also simplifying parameters passed to the response re-writers to only what's needed.

…hooked up and we are getting VSInternalCompletionContext in CompletionParams

…ng them They all already checked (or should've checked) for language and were operating on either C# or HTML, never on both. HTML re-writer will get called from the client and can be much simpler. In cohosting it doesn't make sense to have them all in one list since C# will get called in OOP and HTML on the client (in VS).

… it up in cohosting

Renamed some fields and variables dealing with "add snippets" options and added comments. We currently have two options that mean "add snippets" - one for the delegated completion, and one for Razor completion. The values of those don't correlate. The Razor one is always true in LSP and Cohost, always false for legacy editor. The delegation one actually depends on the position.

… cohost

Also adding a snippet completion provider test and markup transition test

This should probably move to the common test project eventually, but not in this PR. Moving this to the workspaces layer caused many changes in unrelated test files and changed test project references. Per PR feedback leaving this in the LanguageServer.Test project for now. We can refactor later as appropriate.

I noticed some painful NuGet analyzer package upgrades in PR #11048 and decided to take a look at the issue. I've made the following changes: - `Roslyn.Diagnostics.Analyzers` is now versioned separately from `Microsoft.CodeAnalysis.Analyzers`, as they are in [`dotnet/roslyn`](https://github.com/dotnet/roslyn/blob/08243d3826b8ebbc38350d0d74796bb8176f55b1/eng/Directory.Packages.props#L4). - I've removed direct references to `MS.CA.BannedApiAnalyzers` since that reference should flow from `Roslyn.Diagnostics.Analyzers`. - I've updated the versions of `Microsoft.CodeAnalysis.Analyzers` and `Roslyn.Diagnostics.Analyzers`

Hardcoding true for now until we plumb this through Initialize. Fixes osolete API build break

alexgav · 2024-10-27T06:20:03Z

Thanks!

In reply to: 2380188950

…n set more obvious

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

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Completion/CompletionTriggerCharacters.cs

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

src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Completion/RemoteCompletionService.cs

...isualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostDocumentCompletionEndpoint.cs

...soft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentCompletionEndpointTest.cs

…pletionEndpoint

Instead of passing client capabilities with each call to RemoteCompletionService we can now use remote IClientCapabilitiesService that's initialized with client capabilities on initial connection.

davidwengier

Approving as requested, though somewhat reluctantly.

I hope to see follow up PRs soon, and I would love to see a little more care and attention in them. Try running Format Document on things before committing, try planning ahead if you want to do smaller PRs, etc. etc.

...c/Microsoft.CodeAnalysis.Razor.Workspaces/Completion/Delegation/DelegatedCompletionHelper.cs

src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Completion/RemoteCompletionService.cs

...soft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentCompletionEndpointTest.cs

alexgav added 30 commits September 16, 2024 21:10

Basic infrastructure and HTML completion

a53d3a6

Moving CompletionListCache into common code

627c7e7

Moved RazorCompletionListProvider and supporting infrustructure to co…

ecd74a4

…mmon code

Adding OOPRazorCompletionFactsService and moving MarkupTransitionComp…

ba4b5ec

…letionItemProvider to common layer.

Moving LspTagHelperCompletionService to common layer

d9220c8

Move RazorCompletionListProvider to the Workspaces layer

018b57d

Add OOP MEF exports for completion services from Workspaces layer nee…

909c3aa

…ded by RemoteCompletionService

Bump Roslyn version to get new CSharp completion APIs

f120c08

Hooking up C# completion API

74fc3c6

Common code for completion trigger characters and correct character s…

5cc1400

…et used in cohosting

Respect AutoShowCompletion setting in cohosting

198b404

Move IsValidTrigger method to CompletionTriggerCharacters class in th…

6265966

…e workspaces layer (to be used in cohosting later)

Call HTML completion only if we are in HTML and pass a set of existin…

cf7a94a

…g HTML completion item labels to RazorCompletionListProvider

Pass C# existing completion item labels to RazorCompletionListProvide…

f2f7e9c

…r and minor cleanup

Final completion list merge logic

311973b

Merge with main

d17c36d

Move delegated completion helper RewriteContext method into Workspace…

bcf2080

… layer and use it in cohost completion request

Provisional completion support

598686b

Moving delegated response rewriters to the common layer

62ced4e

Consuming delegated completion response re-writers in C#

3070b26

Also simplifying parameters passed to the response re-writers to only what's needed.

Switch to Roslyn CompletionParams as request input so converters are …

15be771

…hooked up and we are getting VSInternalCompletionContext in CompletionParams

Moving ShouldIncludeSnippets helper into the common layer and hooking…

605b8b0

… it up in cohosting

Adding snippets completion support to cohosting

252d4ac

Second part of completion options clean-up - fixing options values in…

f5c7633

… cohost

First set of tests

95f9410

Adding directives completion provider and test to cohost

9505241

Adding directive and directive attribute completion providers and tests

a0514fa

Also adding a snippet completion provider test and markup transition test

alexgav added 3 commits October 23, 2024 22:17

Switching to hardcoded directive list in tests per PR feedback

f05e730

Cleanup per PR feedback

32bb9f5

alexgav added 3 commits October 25, 2024 07:39

Merge with main

46ff4ce

Fixing build post-merge

2d09a20

Pass argument for supportsVsExtensions in RemoteDocumentSymbolService

9377f9c

Hardcoding true for now until we plumb this through Initialize. Fixes osolete API build break

Add Debug.Fail to make the intent of returning null vs empy completio…

46facea

…n set more obvious

davidwengier reviewed Oct 27, 2024

View reviewed changes

alexgav added 3 commits October 27, 2024 21:59

Cleanup and comments per PR feedback

2b09ee4

One more comment per PR feedback

64f0ea2

Don't avertise Resolve until we provide it

7c0cfa6

davidwengier reviewed Oct 30, 2024

View reviewed changes

...soft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentCompletionEndpointTest.cs Show resolved Hide resolved

alexgav added 6 commits October 31, 2024 14:13

Merge with main and fix-up

bb32ada

Merge with main

b14e4dc

Removing unnecessary async

75061a0

C# override test

a2c3279

Merge remote-tracking branch 'origin/main' into dev/alexgav/CohostCom…

16ca3da

…pletionEndpoint

Use remote IClientCapabilitiesService

62df8df

Instead of passing client capabilities with each call to RemoteCompletionService we can now use remote IClientCapabilitiesService that's initialized with client capabilities on initial connection.

davidwengier approved these changes Nov 5, 2024

View reviewed changes

Misc cleanup per PR feedback

8161ba6

alexgav merged commit d0a5326 into main Nov 5, 2024
12 checks passed

alexgav deleted the dev/alexgav/CohostCompletionEndpoint branch November 5, 2024 10:28

dotnet-policy-service bot added this to the Next milestone Nov 5, 2024

This was referenced Nov 7, 2024

[Automated] PRs inserted in VS build main-35506.54 #11174

Closed

[Automated] PRs inserted in VS build feature.debugger.main-35507.203 #11186

Closed

dotnet-bot mentioned this pull request Nov 19, 2024

[Automated] PRs inserted in VS build feature.debugger.shadowDebug-35518.109 #11227

Closed

jjonescz modified the milestones: Next, 17.13 P2 Nov 25, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adding cohost completion handler #11048

Adding cohost completion handler #11048

alexgav commented Oct 20, 2024 •

edited

Loading

alexgav commented Oct 27, 2024

davidwengier left a comment

Adding cohost completion handler #11048

Adding cohost completion handler #11048

Conversation

alexgav commented Oct 20, 2024 • edited Loading

Summary of the changes

alexgav commented Oct 27, 2024

davidwengier left a comment

Choose a reason for hiding this comment

alexgav commented Oct 20, 2024 •

edited

Loading