Fix

dotnet · Feb 4, 2022 · a7b9674 · a7b9674
1 parent 0d9f071
commit a7b9674
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/EditorFeatures/CSharpTest/Completion/CompletionServiceTests.cs b/src/EditorFeatures/CSharpTest/Completion/CompletionServiceTests.cs
@@ -79,7 +79,7 @@ private sealed class ThirdPartyOption : IOption
         /// Ensure that 3rd party can set options on solution and access them from within a custom completion provider.
         /// </summary>
         [Fact, Trait(Traits.Feature, Traits.Features.Completion)]
-        public async Task PassthroughOptions1()
+        public async Task PassThroughOptions1()
         {
             using var workspace = new TestWorkspace(composition: FeaturesTestCompositions.Features.AddParts(typeof(ThirdPartyCompletionProvider)));
 
@@ -102,7 +102,7 @@ public async Task PassthroughOptions1()
         /// Ensure that 3rd party can set options on solution and access them from within a custom completion provider.
         /// </summary>
         [Fact, Trait(Traits.Feature, Traits.Features.Completion)]
-        public async Task PassthroughOptions2()
+        public async Task PassThroughOptions2()
         {
             using var workspace = new TestWorkspace(composition: EditorTestCompositions.EditorFeatures.AddParts(typeof(ThirdPartyCompletionProvider)));
 

diff --git a/src/Features/Core/Portable/Completion/CompletionContext.cs b/src/Features/Core/Portable/Completion/CompletionContext.cs
@@ -117,7 +117,9 @@ public CompletionContext(
                    CompletionOptions.Default,
                    cancellationToken)
         {
+#pragma warning disable RS0030 // Do not used banned APIs
             Options = options ?? OptionValueSet.Empty;
+#pragma warning restore
         }
 
         /// <summary>
@@ -139,8 +141,11 @@ internal CompletionContext(
             Trigger = trigger;
             CompletionOptions = options;
             CancellationToken = cancellationToken;
-            Options = OptionValueSet.Empty;
             _items = new List<CompletionItem>();
+
+#pragma warning disable RS0030 // Do not used banned APIs
+            Options = OptionValueSet.Empty;
+#pragma warning restore
         }
 
         internal IReadOnlyList<CompletionItem> Items => _items;

diff --git a/src/Features/Core/Portable/Completion/CompletionServiceWithProviders.cs b/src/Features/Core/Portable/Completion/CompletionServiceWithProviders.cs
@@ -216,7 +216,9 @@ public sealed override bool ShouldTriggerCompletion(SourceText text, int caretPo
 
             // Publicly available options do not affect this API.
             var completionOptions = CompletionOptions.Default;
-            return ShouldTriggerCompletion(document?.Project, languageServices, text, caretPosition, trigger, completionOptions, options ?? OptionValueSet.Empty, roles);
+            var passThroughOptions = options ?? document?.Project.Solution.Options ?? OptionValueSet.Empty;
+
+            return ShouldTriggerCompletion(document?.Project, languageServices, text, caretPosition, trigger, completionOptions, passThroughOptions, roles);
         }
 
         internal sealed override bool ShouldTriggerCompletion(