DocumentUri Version 2! (#245)

* Document UI v2 porting in the uri from vscode with a patch to handle the windows paths

Co-authored-by: Tyler James Leonhardt <[email protected]>

Author: david-driscoll

src/Protocol/CharCode.cs

@@ -0,0 +1,11 @@
+namespace OmniSharp.Extensions.LanguageServer.Protocol
+{
+    public struct DocumentUriComponents
+    {
+        public string Scheme { get; set; }
+        public string Authority { get; set; }
+        public string Path { get; set; }
+        public string Query { get; set; }
+        public string Fragment { get; set; }
+    }
+}

src/Protocol/DocumentUri.Internal.cs

@@ -38,7 +38,7 @@ public ClientTests(ITestOutputHelper testOutput)
         /// <summary>
         ///     Get an absolute document path for use in tests.
         /// </summary>
-        string AbsoluteDocumentPath => IsWindows ? @"C:\Foo.txt" : "/Foo.txt";
+        string AbsoluteDocumentPath => IsWindows ? @"c:\Foo.txt" : "/Foo.txt";
 
         /// <summary>
         ///     The <see cref="LanguageClient"/> under test.

src/Protocol/DocumentUri.cs

@@ -21,29 +21,29 @@ public AbsoluteUriConverterTests(ITestOutputHelper testOutputHelper)
         [ClassData(typeof(DocumentUriTests.WindowsPathAltStringUris))]
         [ClassData(typeof(DocumentUriTests.UncPathStringUris))]
         [ClassData(typeof(DocumentUriTests.UnixPathStringUris))]
-        public void Should_Deserialize_VSCode_Style_Uris(string uri, DocumentUri expected)
+        public void Should_Deserialize_VSCode_Style_Uris(string uri, string expected)
         {
             _testOutputHelper.WriteLine($"Given: {uri}");
             _testOutputHelper.WriteLine($"Expected: {expected}");
             var serializer = new JsonSerializerSettings() {
                 Converters = {new DocumentUriConverter()}
             };
-            JsonConvert.DeserializeObject<DocumentUri>($"\"{uri}\"", serializer).Should().Be(expected);
+            JsonConvert.DeserializeObject<DocumentUri>($"\"{uri}\"", serializer).ToString().Should().Be(expected);
         }
 
         [Theory]
         [ClassData(typeof(DocumentUriTests.WindowsPathStringUris))]
         [ClassData(typeof(DocumentUriTests.WindowsPathAltStringUris))]
         [ClassData(typeof(DocumentUriTests.UncPathStringUris))]
         [ClassData(typeof(DocumentUriTests.UnixPathStringUris))]
-        public void Should_Serialize_VSCode_Style_Uris(string uri, DocumentUri expected)
+        public void Should_Serialize_VSCode_Style_Uris(string uri, string expected)
         {
             _testOutputHelper.WriteLine($"Given: {uri}");
             _testOutputHelper.WriteLine($"Expected: {expected}");
             var serializer = new JsonSerializerSettings() {
                 Converters = {new DocumentUriConverter()}
             };
-            JsonConvert.SerializeObject(new DocumentUri(uri), serializer).Trim('"').Should().Be(expected.ToString());
+            JsonConvert.SerializeObject(DocumentUri.Parse(uri), serializer).Trim('"').Should().Be(expected);
         }
     }
 }

src/Protocol/DocumentUriComponents.cs

@@ -47,7 +47,7 @@ public void NonStandardCharactersTest(string expected)
                     }
                 },
                 TextDocument = new VersionedTextDocumentIdentifier() {
-                    Uri = DocumentUri.FromFileSystemPath("C:\\abc\\Mörkö.cs")
+                    Uri = DocumentUri.FromFileSystemPath("c:\\abc\\Mörkö.cs")
                 }
             };
             var result = Fixture.SerializeObject(model);

test/Client.Tests/ClientTests.cs

@@ -1,7 +1,7 @@
 {
     "textDocument": {
         "version": 0,
-        "uri": "file:///C:/abc/M%C3%B6rk%C3%B6.cs"
+        "uri": "file:///c:/abc/M%C3%B6rk%C3%B6.cs"
     },
     "contentChanges": [
         {

test/Lsp.Tests/AbsoluteUriConverterTests.cs

@@ -31,7 +31,7 @@ public void Should_Deserialize_For_Example_Value()
                 ""uri"":""file:///Users/tyler/Code/PowerShell/vscode/PowerShellEditorServices/test/PowerShellEditorServices.Test.E2E/bin/Debug/netcoreapp3.1/0b0jnxg2.kgh.ps1""
             }");
 
-            result.Uri.Should().Be(new DocumentUri("file:///Users/tyler/Code/PowerShell/vscode/PowerShellEditorServices/test/PowerShellEditorServices.Test.E2E/bin/Debug/netcoreapp3.1/0b0jnxg2.kgh.ps1"));
+            result.Uri.Should().Be(DocumentUri.Parse("file:///Users/tyler/Code/PowerShell/vscode/PowerShellEditorServices/test/PowerShellEditorServices.Test.E2E/bin/Debug/netcoreapp3.1/0b0jnxg2.kgh.ps1"));
         }
     }
 }