Skip to content
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

Access services on Solution rather than workspace in Razor cohost (Roslyn OOP) scenarios #75545

Merged
merged 2 commits into from
Oct 18, 2024
Merged

Access services on Solution rather than workspace in Razor cohost (Roslyn OOP) scenarios #75545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
761a133
Access services on Solution rather than Workspace so the code works i…
alexgav Oct 17, 2024
8cb765f
Merge pull request #1 from alexgav/dev/alexgav/FixExternalRazorComple…
alexgav Oct 17, 2024
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: 2 additions & 2 deletions src/Features/Core/Portable/Completion/CompletionService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ public virtual TextSpan GetDefaultCompletionListSpan(SourceText text, int caretP
if (provider is null)
return CompletionDescription.Empty;

var extensionManager = document.Project.Solution.Workspace.Services.GetRequiredService<IExtensionManager>();
var extensionManager = document.Project.Solution.Services.GetRequiredService<IExtensionManager>();

// We don't need SemanticModel here, just want to make sure it won't get GC'd before CompletionProviders are able to get it.
(document, var semanticModel) = await GetDocumentWithFrozenPartialSemanticsAsync(document, cancellationToken).ConfigureAwait(false);
Expand Down Expand Up @@ -243,7 +243,7 @@ public virtual async Task<CompletionChange> GetChangeAsync(
var provider = GetProvider(item, document.Project);
if (provider != null)
{
var extensionManager = document.Project.Solution.Workspace.Services.GetRequiredService<IExtensionManager>();
var extensionManager = document.Project.Solution.Services.GetRequiredService<IExtensionManager>();

// We don't need SemanticModel here, just want to make sure it won't get GC'd before CompletionProviders are able to get it.
(document, var semanticModel) = await GetDocumentWithFrozenPartialSemanticsAsync(document, cancellationToken).ConfigureAwait(false);
Expand Down
4 changes: 2 additions & 2 deletions src/Features/Core/Portable/Completion/CompletionService_GetCompletions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ ImmutableArray<CompletionProvider> GetTriggeredProviders(
static async Task<ImmutableArray<CompletionProvider>> GetAugmentingProvidersAsync(
Document document, ImmutableArray<CompletionProvider> triggeredProviders, int caretPosition, CompletionTrigger trigger, CompletionOptions options, CancellationToken cancellationToken)
{
var extensionManager = document.Project.Solution.Workspace.Services.GetRequiredService<IExtensionManager>();
var extensionManager = document.Project.Solution.Services.GetRequiredService<IExtensionManager>();
var additionalAugmentingProviders = ArrayBuilder<CompletionProvider>.GetInstance(triggeredProviders.Length);
if (trigger.Kind == CompletionTriggerKind.Insertion)
{
Expand Down Expand Up @@ -327,7 +327,7 @@ private static async Task<CompletionContext> GetContextAsync(
SharedSyntaxContextsWithSpeculativeModel? sharedContext,
CancellationToken cancellationToken)
{
var extensionManager = document.Project.Solution.Workspace.Services.GetRequiredService<IExtensionManager>();
var extensionManager = document.Project.Solution.Services.GetRequiredService<IExtensionManager>();

var context = new CompletionContext(provider, document, position, sharedContext, defaultSpan, triggerInfo, options, cancellationToken);

Expand Down
Loading