Merge pull request #43163 from dibarbet/update_lsp_version

Update lsp package versions.
dotnet · Apr 9, 2020 · 34fad56 · 34fad56
2 parents ed485ab + 72bc6f2
commit 34fad56
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -33,7 +33,7 @@
     <CodeStyleAnalyzerVersion>3.6.0-2.20157.5</CodeStyleAnalyzerVersion>
     <VisualStudioEditorPackagesVersion>16.4.248</VisualStudioEditorPackagesVersion>
     <ILToolsPackageVersion>5.0.0-alpha1.19409.1</ILToolsPackageVersion>
-    <MicrosoftVisualStudioLanguageServerPackagesVersion>16.6.14</MicrosoftVisualStudioLanguageServerPackagesVersion>
+    <MicrosoftVisualStudioLanguageServerPackagesVersion>16.6.34</MicrosoftVisualStudioLanguageServerPackagesVersion>
   </PropertyGroup>
   <!--
     Dependency versions

diff --git a/src/VisualStudio/Core/Test.Next/Services/LanguageServiceTests.cs b/src/VisualStudio/Core/Test.Next/Services/LanguageServiceTests.cs
@@ -96,7 +96,7 @@ private async Task<ImmutableArray<SymbolInformation>> GetVsSearchResultsAsync(Te
             {
                 symbolResultsBuilder.AddRange(symbols);
             }, threadingContext.JoinableTaskFactory);
-            workspaceSymbolParams.Progress = awaitableProgress;
+            workspaceSymbolParams.PartialResultToken = awaitableProgress;
 
             using (var jsonRpc = JsonRpc.Attach(await client.RequestServiceAsync(server)))
             {

diff --git a/src/Workspaces/Remote/ServiceHub/Services/LanguageServer.cs b/src/Workspaces/Remote/ServiceHub/Services/LanguageServer.cs
@@ -95,7 +95,7 @@ public Task<SymbolInformation[]> WorkspaceSymbolAsync(WorkspaceSymbolParams args
 
         private async Task<ImmutableArray<SymbolInformation>> SearchAsync(Solution solution, WorkspaceSymbolParams args, CancellationToken cancellationToken)
         {
-            Contract.ThrowIfNull(args.Progress);
+            Contract.ThrowIfNull(args.PartialResultToken);
 
             var tasks = solution.Projects.SelectMany(p => p.Documents).Select(d => SearchDocumentAndReportSymbolsAsync(d, args, cancellationToken));
             await Task.WhenAll(tasks).ConfigureAwait(false);
@@ -122,7 +122,7 @@ private static async Task<ImmutableArray<SymbolInformation>> SearchDocumentAsync
         private static async Task SearchDocumentAndReportSymbolsAsync(Document document, WorkspaceSymbolParams args, CancellationToken cancellationToken)
         {
             var convertedResults = await SearchDocumentAsync(document, args.Query, cancellationToken).ConfigureAwait(false);
-            args.Progress.Report(convertedResults.ToArray());
+            args.PartialResultToken.Report(convertedResults.ToArray());
         }
 
         private static async Task<ImmutableArray<SymbolInformation>> ConvertAsync(