Skip to content

Commit 43ca318

Browse files
committed
Force complete completion results in Completion tests
1 parent 07ebf47 commit 43ca318

4 files changed

Lines changed: 15 additions & 5 deletions

File tree

build/Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<MicrosoftTestPackageVersion>17.0.0</MicrosoftTestPackageVersion>
88
<MSBuildPackageVersion>17.0.0</MSBuildPackageVersion>
99
<NuGetPackageVersion>6.0.0</NuGetPackageVersion>
10-
<RoslynPackageVersion>4.2.0-2.22124.7</RoslynPackageVersion>
10+
<RoslynPackageVersion>4.2.0-3.22157.8</RoslynPackageVersion>
1111
<XunitPackageVersion>2.4.1</XunitPackageVersion>
1212
</PropertyGroup>
1313

src/OmniSharp.Roslyn.CSharp/Services/Completion/CompletionService.cs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,12 @@ public CompletionService(OmniSharpWorkspace workspace, FormattingOptions formatt
5252
_omniSharpOptions = omniSharpOptions;
5353
}
5454

55-
public async Task<CompletionResponse> Handle(CompletionRequest request)
55+
public Task<CompletionResponse> Handle(CompletionRequest request)
56+
{
57+
return Handle(request, forceExpandedCompletionIndexCreation: false);
58+
}
59+
60+
public async Task<CompletionResponse> Handle(CompletionRequest request, bool forceExpandedCompletionIndexCreation)
5661
{
5762
_logger.LogTrace("Completions requested");
5863

@@ -76,7 +81,9 @@ public async Task<CompletionResponse> Handle(CompletionRequest request)
7681
_ => CompletionTrigger.Invoke,
7782
};
7883

79-
var options = new OmniSharpCompletionOptions(ShowItemsFromUnimportedNamespaces: _omniSharpOptions.RoslynExtensionsOptions.EnableImportCompletion);
84+
var options = new OmniSharpCompletionOptions(
85+
ShowItemsFromUnimportedNamespaces: _omniSharpOptions.RoslynExtensionsOptions.EnableImportCompletion,
86+
ForceExpandedCompletionIndexCreation: forceExpandedCompletionIndexCreation);
8087

8188
if (request.CompletionTrigger == CompletionTriggerKind.TriggerCharacter &&
8289
!await OmniSharpCompletionService.ShouldTriggerCompletionAsync(completionService, document, position, trigger, roles: null, options, CancellationToken.None))

src/OmniSharp.Roslyn.CSharp/Services/Intellisense/IntellisenseService.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ public async Task<IEnumerable<AutoCompleteResponse>> Handle(AutoCompleteRequest
4848
var sourceText = await document.GetTextAsync();
4949
var position = sourceText.GetTextPosition(request);
5050
var service = CompletionService.GetService(document);
51-
var options = new OmniSharpCompletionOptions(ShowItemsFromUnimportedNamespaces: _omniSharpOptions.RoslynExtensionsOptions.EnableImportCompletion);
51+
var options = new OmniSharpCompletionOptions(
52+
ShowItemsFromUnimportedNamespaces: _omniSharpOptions.RoslynExtensionsOptions.EnableImportCompletion,
53+
ForceExpandedCompletionIndexCreation: false);
5254
var completionList = await OmniSharpCompletionService.GetCompletionsAsync(service, document, position, trigger: default, roles: null, options, CancellationToken.None);
5355

5456
if (completionList != null)

tests/OmniSharp.Roslyn.CSharp.Tests/CompletionFacts.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2278,7 +2278,8 @@ protected async Task<CompletionResponse> FindCompletionsAsync(string filename, s
22782278

22792279
var requestHandler = GetCompletionService(testHost);
22802280

2281-
return await requestHandler.Handle(request);
2281+
// Force the completion handler to return a complete set of results.
2282+
return await requestHandler.Handle(request, forceExpandedCompletionIndexCreation: true);
22822283
}
22832284

22842285
private async Task<CompletionResponse> FindCompletionsWithImportedAsync(string filename, string source, OmniSharpTestHost host)

0 commit comments

Comments
 (0)