Merge pull request #72260 from dibarbet/fix_uri_override

Avoid URI serialization issues in override completion by passing full text document identifier
dotnet · Feb 25, 2024 · 3059a07 · 3059a07
2 parents e8c0381 + b069918
commit 3059a07
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...s/LanguageServer/Protocol/Handler/Completion/DefaultLspCompletionResultCreationService.cs b/...s/LanguageServer/Protocol/Handler/Completion/DefaultLspCompletionResultCreationService.cs
@@ -100,7 +100,7 @@ await GetChangeAndPopulateSimpleTextEditAsync(
                     {
                         CommandIdentifier = CompleteComplexEditCommand,
                         Title = nameof(CompleteComplexEditCommand),
-                        Arguments = [textDocumentIdentifier.Uri, textEdit, isSnippetString, lspOffset]
+                        Arguments = [textDocumentIdentifier, textEdit, isSnippetString, lspOffset]
                     };
                 }
             }

diff --git a/src/Features/LanguageServer/ProtocolUnitTests/Completion/CompletionFeaturesTests.cs b/src/Features/LanguageServer/ProtocolUnitTests/Completion/CompletionFeaturesTests.cs
@@ -294,7 +294,7 @@ class A { }";
 
         Assert.Equal(DefaultLspCompletionResultCreationService.CompleteComplexEditCommand, resolvedItem.Command.CommandIdentifier);
         Assert.Equal(nameof(DefaultLspCompletionResultCreationService.CompleteComplexEditCommand), resolvedItem.Command.Title);
-        Assert.Equal(completionParams.TextDocument.Uri, ProtocolConversions.CreateAbsoluteUri((string)resolvedItem.Command.Arguments[0]));
+        AssertJsonEquals(completionParams.TextDocument, resolvedItem.Command.Arguments[0]);
         AssertJsonEquals(expectedEdit, resolvedItem.Command.Arguments[1]);
         Assert.Equal(false, resolvedItem.Command.Arguments[2]);
         Assert.Equal((long)14, resolvedItem.Command.Arguments[3]);
@@ -855,7 +855,7 @@ public async Task TestHandleExceptionFromGetCompletionChange(bool mutatingLspWor
                 Assert.Equal(nameof(DefaultLspCompletionResultCreationService.CompleteComplexEditCommand), resolvedItem.Command.Title);
                 Assert.Equal(DefaultLspCompletionResultCreationService.CompleteComplexEditCommand, resolvedItem.Command.CommandIdentifier);
 
-                Assert.Equal(completionParams.TextDocument.Uri, ProtocolConversions.CreateAbsoluteUri((string)resolvedItem.Command.Arguments[0]));
+                AssertJsonEquals(completionParams.TextDocument, resolvedItem.Command.Arguments[0]);
 
                 var expectedEdit = new TextEdit { Range = new LSP.Range { Start = new(0, 5), End = new(0, 5) }, NewText = "ComplexItem" };
                 AssertJsonEquals(expectedEdit, resolvedItem.Command.Arguments[1]);
@@ -912,7 +912,7 @@ public class MyClass : BaseClass
         Assert.Equal(nameof(DefaultLspCompletionResultCreationService.CompleteComplexEditCommand), resolvedItem.Command.Title);
         Assert.Equal(DefaultLspCompletionResultCreationService.CompleteComplexEditCommand, resolvedItem.Command.CommandIdentifier);
 
-        Assert.Equal(completionParams.TextDocument.Uri, ProtocolConversions.CreateAbsoluteUri((string)resolvedItem.Command.Arguments[0]));
+        AssertJsonEquals(completionParams.TextDocument, resolvedItem.Command.Arguments[0]);
 
         var expectedEdit = new TextEdit { Range = new LSP.Range { Start = new(7, 4), End = new(7, 13) }, NewText = "public override global::System.Boolean AbstractMethod(global::System.Int32 x)\r\n    {\r\n        throw new System.NotImplementedException();\r\n    }" };
         AssertJsonEquals(expectedEdit, resolvedItem.Command.Arguments[1]);