Bump LSP Protocol version

dotnet · Jun 20, 2023 · 4016557 · 4016557
1 parent fd5af75
commit 4016557
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -96,7 +96,7 @@
     <Tooling_MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.22512.1</Tooling_MicrosoftCodeAnalysisTestingVersion>
     <MicrosoftVisualStudioShellPackagesVersion>17.6.35829</MicrosoftVisualStudioShellPackagesVersion>
     <MicrosoftVisualStudioPackagesVersion>17.6.252</MicrosoftVisualStudioPackagesVersion>
-    <VisualStudioLanguageServerProtocolVersion>17.6.22</VisualStudioLanguageServerProtocolVersion>
+    <VisualStudioLanguageServerProtocolVersion>17.7.8-preview-g8c33dc3a76</VisualStudioLanguageServerProtocolVersion>
     <!-- dotnet/runtime packages -->
     <MicrosoftExtensionsPackageVersion>6.0.0</MicrosoftExtensionsPackageVersion>
     <SystemCompositionPackageVersion>7.0.0</SystemCompositionPackageVersion>

diff --git a/....AspNetCore.Razor.LanguageServer/Completion/Delegation/DelegatedCompletionItemResolver.cs b/....AspNetCore.Razor.LanguageServer/Completion/Delegation/DelegatedCompletionItemResolver.cs
@@ -100,12 +100,12 @@ private async Task<VSInternalCompletionItem> PostProcessCompletionItemAsync(
             return resolvedCompletionItem;
         }
 
-        if (resolvedCompletionItem.TextEdit is not null)
+        if (resolvedCompletionItem.TextEdit is { First: var textEdit })
         {
             var formattedTextEdit = await _formattingService.FormatSnippetAsync(
                 documentContext,
                 RazorLanguageKind.CSharp,
-                new[] { resolvedCompletionItem.TextEdit },
+                new[] { textEdit },
                 formattingOptions,
                 cancellationToken).ConfigureAwait(false);
 

diff --git a/...crosoft.AspNetCore.Razor.LanguageServer/Completion/Delegation/TextEditResponseRewriter.cs b/...crosoft.AspNetCore.Razor.LanguageServer/Completion/Delegation/TextEditResponseRewriter.cs
@@ -31,7 +31,7 @@ public override async Task<VSInternalCompletionList> RewriteAsync(
         var hostDocumentPosition = new Position(lineNumber, characterOffset);
         completionList = TranslateTextEdits(hostDocumentPosition, delegatedParameters.ProjectedPosition, completionList);
 
-        if (completionList.ItemDefaults?.EditRange is { } editRange)
+        if (completionList.ItemDefaults?.EditRange is { First: var editRange })
         {
             completionList.ItemDefaults.EditRange = TranslateRange(hostDocumentPosition, delegatedParameters.ProjectedPosition, editRange);
         }
@@ -53,7 +53,7 @@ private static VSInternalCompletionList TranslateTextEdits(
 
         foreach (var item in completionList.Items)
         {
-            if (item.TextEdit is { } textEdit)
+            if (item.TextEdit is { First: var textEdit })
             {
                 var translatedRange = TranslateRange(hostDocumentPosition, projectedPosition, textEdit.Range);
                 textEdit.Range = translatedRange;

diff --git a/...zor/src/Microsoft.VisualStudio.LanguageServerClient.Razor/HtmlCSharp/CompletionHandler.cs b/...zor/src/Microsoft.VisualStudio.LanguageServerClient.Razor/HtmlCSharp/CompletionHandler.cs
@@ -231,9 +231,9 @@ public CompletionHandler(
             var wordRange = wordExtent.HasValue && wordExtent.Value.IsSignificant ? wordExtent?.Span.AsRange() : null;
             completionList = TranslateTextEdits(request.Position, projectedPosition, wordRange, completionList);
 
-            if (completionList.ItemDefaults?.EditRange != null)
+            if (completionList.ItemDefaults?.EditRange is { First: var editRange })
             {
-                completionList.ItemDefaults.EditRange = TranslateRange(request.Position, projectedPosition, completionList.ItemDefaults.EditRange);
+                completionList.ItemDefaults.EditRange = TranslateRange(request.Position, projectedPosition, editRange);
             }
 
             var requestContext = new CompletionRequestContext(documentSnapshot.Uri, projectedDocumentUri, serverKind);
@@ -687,12 +687,12 @@ internal static CompletionList TranslateTextEdits(
 
         static CompletionItem TranslateTextEdits(Position hostDocumentPosition, Position projectedPosition, Range? wordRange, CompletionItem item)
         {
-            if (item.TextEdit != null)
+            if (item.TextEdit is { First: var textEdit })
             {
-                var translatedRange = TranslateRange(hostDocumentPosition, projectedPosition, item.TextEdit.Range);
+                var translatedRange = TranslateRange(hostDocumentPosition, projectedPosition, textEdit.Range);
                 item.TextEdit = new TextEdit
                 {
-                    NewText = item.TextEdit.NewText,
+                    NewText = textEdit.NewText,
                     Range = translatedRange,
                 };
             }

diff --git a/.../Microsoft.VisualStudio.LanguageServerClient.Razor/HtmlCSharp/CompletionResolveHandler.cs b/.../Microsoft.VisualStudio.LanguageServerClient.Razor/HtmlCSharp/CompletionResolveHandler.cs
@@ -154,12 +154,12 @@ private async Task<CompletionItem> PostProcessCompletionItemAsync(
             return resolvedCompletionItem;
         }
 
-        if (resolvedCompletionItem.TextEdit != null)
+        if (resolvedCompletionItem.TextEdit is { First: var textEdit })
         {
             var containsSnippet = resolvedCompletionItem.InsertTextFormat == InsertTextFormat.Snippet;
             var remappedEdits = await _documentMappingProvider.RemapFormattedTextEditsAsync(
                 requestContext.ProjectedDocumentUri,
-                new[] { resolvedCompletionItem.TextEdit },
+                new[] { textEdit },
                 formattingOptions,
                 containsSnippet,
                 cancellationToken).ConfigureAwait(false);

diff --git a/...re.Razor.LanguageServer.Test/Completion/Delegation/DelegatedCompletionItemResolverTest.cs b/...re.Razor.LanguageServer.Test/Completion/Delegation/DelegatedCompletionItemResolverTest.cs
@@ -178,7 +178,7 @@ async Task FooAsync()
         var resolvedItem = await ResolveCompletionItemAsync(input, itemToResolve: "await", DisposalToken);
 
         // Assert
-        var textChange = resolvedItem.TextEdit.AsTextChange(originalSourceText);
+        var textChange = resolvedItem.TextEdit.Value.First.AsTextChange(originalSourceText);
         var actualSourceText = originalSourceText.WithChanges(textChange);
         Assert.True(expectedSourceText.ContentEquals(actualSourceText));
     }

diff --git a/...spNetCore.Razor.LanguageServer.Test/Completion/Delegation/TextEditResponseRewriterTest.cs b/...spNetCore.Razor.LanguageServer.Test/Completion/Delegation/TextEditResponseRewriterTest.cs
@@ -35,7 +35,7 @@ public async Task RewriteAsync_NotCSharp_Noops()
             getCompletionsAt, documentContent, delegatedCompletionList);
 
         // Assert
-        Assert.Equal(textEditRange, rewrittenCompletionList.Items[0].TextEdit.Range);
+        Assert.Equal(textEditRange, rewrittenCompletionList.Items[0].TextEdit.Value.First.Range);
     }
 
     [Fact]
@@ -62,7 +62,7 @@ public async Task RewriteAsync_CSharp_AdjustsItemRange()
             getCompletionsAt, documentContent, delegatedCompletionList);
 
         // Assert
-        Assert.Equal(expectedRange, rewrittenCompletionList.Items[0].TextEdit.Range);
+        Assert.Equal(expectedRange, rewrittenCompletionList.Items[0].TextEdit.Value.First.Range);
     }
 
     [Fact]

diff --git a/...icrosoft.VisualStudio.LanguageServerClient.Razor.Test/HtmlCSharp/CompletionHandlerTest.cs b/...icrosoft.VisualStudio.LanguageServerClient.Razor.Test/HtmlCSharp/CompletionHandlerTest.cs
@@ -1178,7 +1178,7 @@ void M()
         };
 
         var result = CompletionHandler.TranslateTextEdits(razorDocPosition, cSharpDocPosition, wordRange.Span.AsRange(), completionList);
-        var actualRange = result.Items.First().TextEdit.Range;
+        var actualRange = result.Items.First().TextEdit.Value.First.Range;
         Assert.Equal(expectedRange, actualRange);
     }