From 761a133938280fa42121448e22fe3f152508fabc Mon Sep 17 00:00:00 2001 From: "Alex Gavrilov (DEV PROD)" Date: Thu, 17 Oct 2024 00:59:45 -0700 Subject: [PATCH] Access services on Solution rather than Workspace so the code works in Razor cohost scenarios --- src/Features/Core/Portable/Completion/CompletionService.cs | 4 ++-- .../Portable/Completion/CompletionService_GetCompletions.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Features/Core/Portable/Completion/CompletionService.cs b/src/Features/Core/Portable/Completion/CompletionService.cs index 6ecbfa300daf4..af9865823b7b9 100644 --- a/src/Features/Core/Portable/Completion/CompletionService.cs +++ b/src/Features/Core/Portable/Completion/CompletionService.cs @@ -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(); + var extensionManager = document.Project.Solution.Services.GetRequiredService(); // 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); @@ -243,7 +243,7 @@ public virtual async Task GetChangeAsync( var provider = GetProvider(item, document.Project); if (provider != null) { - var extensionManager = document.Project.Solution.Workspace.Services.GetRequiredService(); + var extensionManager = document.Project.Solution.Services.GetRequiredService(); // 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); diff --git a/src/Features/Core/Portable/Completion/CompletionService_GetCompletions.cs b/src/Features/Core/Portable/Completion/CompletionService_GetCompletions.cs index c289508ca54d5..f65263b38a224 100644 --- a/src/Features/Core/Portable/Completion/CompletionService_GetCompletions.cs +++ b/src/Features/Core/Portable/Completion/CompletionService_GetCompletions.cs @@ -151,7 +151,7 @@ ImmutableArray GetTriggeredProviders( static async Task> GetAugmentingProvidersAsync( Document document, ImmutableArray triggeredProviders, int caretPosition, CompletionTrigger trigger, CompletionOptions options, CancellationToken cancellationToken) { - var extensionManager = document.Project.Solution.Workspace.Services.GetRequiredService(); + var extensionManager = document.Project.Solution.Services.GetRequiredService(); var additionalAugmentingProviders = ArrayBuilder.GetInstance(triggeredProviders.Length); if (trigger.Kind == CompletionTriggerKind.Insertion) { @@ -327,7 +327,7 @@ private static async Task GetContextAsync( SharedSyntaxContextsWithSpeculativeModel? sharedContext, CancellationToken cancellationToken) { - var extensionManager = document.Project.Solution.Workspace.Services.GetRequiredService(); + var extensionManager = document.Project.Solution.Services.GetRequiredService(); var context = new CompletionContext(provider, document, position, sharedContext, defaultSpan, triggerInfo, options, cancellationToken);