DocumentUri adjustments (#237)

* DocumentUri adjustments
* break apart tests for more clarity (ie stop being lazy) and added support for UNC paths

Co-authored-by: David Driscoll <[email protected]>

Author: TylerLeonhardt

src/Protocol/DocumentUri.cs

@@ -23,13 +23,25 @@ public DocumentUri(string url)
             var delimiterIndex = url.IndexOf(SchemeDelimiter, StringComparison.Ordinal);
             if (delimiterIndex == -1)
             {
-                url = Uri.UnescapeDataString(url).Replace('\\', '/');
+                // Unc path
+                if (url.StartsWith("\\\\"))
+                {
+                    var authorityEndIndex = url.IndexOf('\\', 2);
+                    Authority = url.Substring(2, authorityEndIndex - 2);
+                    url = url.Substring(authorityEndIndex);
+                    // Path = Uri.UnescapeDataString(url);
+                }
+                else
+                {
+                    Authority = string.Empty;
+                }
+
+                url = url.Replace('\\', '/');
 
                 Scheme = UriSchemeFile;
-                Authority = string.Empty;
                 Query = string.Empty;
                 Fragment = string.Empty;
-                Path = Uri.UnescapeDataString(url).TrimStart('/');
+                Path = Uri.UnescapeDataString(url.StartsWith("/") ? url : "/" + url);
 
                 return;
             }
@@ -40,6 +52,15 @@ public DocumentUri(string url)
             Authority = url.Substring(delimiterIndex + SchemeDelimiter.Length,
                 authorityIndex - (delimiterIndex + SchemeDelimiter.Length));
 
+            // this is a possible windows path without the proper tripple slash
+            // file://c:/some/path.file.cs
+            // We need deal with this case.
+            if (Authority.IndexOf(':') > -1 || Authority.IndexOf("%3a", StringComparison.OrdinalIgnoreCase) > -1)
+            {
+                Authority = string.Empty;
+                authorityIndex = delimiterIndex + SchemeDelimiter.Length;
+            }
+
             var fragmentIndex = url.IndexOf('#');
             if (fragmentIndex > -1)
             {
@@ -62,8 +83,7 @@ public DocumentUri(string url)
                 queryIndex = fragmentIndex;
             }
 
-            Path = Uri.UnescapeDataString(url.Substring(authorityIndex + 1, queryIndex - (authorityIndex)))
-                .TrimStart('/');
+            Path = Uri.UnescapeDataString(url.Substring(authorityIndex, queryIndex - (authorityIndex) + 1));
         }
 
         /// <summary>
@@ -133,7 +153,7 @@ public Uri ToUri()
         /// <returns></returns>
         /// <remarks>This will not a uri encode asian and cyrillic characters</remarks>
         public override string ToString() =>
-            $"{Scheme}{SchemeDelimiter}{Authority}/{Path}{(string.IsNullOrWhiteSpace(Query) ? "" : "?" + Query)}{(string.IsNullOrWhiteSpace(Fragment) ? "" : "#" + Fragment)}";
+            $"{Scheme}{SchemeDelimiter}{Authority}{Path}{(string.IsNullOrWhiteSpace(Query) ? "" : "?" + Query)}{(string.IsNullOrWhiteSpace(Fragment) ? "" : "#" + Fragment)}";
 
         /// <summary>
         /// Gets the file system path prefixed with / for unix platforms
@@ -143,7 +163,11 @@ public override string ToString() =>
         public string GetFileSystemPath()
         {
             // The language server protocol represents "C:\Foo\Bar" as "file:///c:/foo/bar".
-            return Path.IndexOf(':') == -1 ? "/" + Path : Path.Replace('/', '\\');
+            if (Path.IndexOf(':') == -1 && !(Scheme == UriSchemeFile && !string.IsNullOrWhiteSpace(Authority)))
+                return Path;
+            if (!string.IsNullOrWhiteSpace(Authority))
+                return $"\\\\{Authority}{Path}".Replace('/', '\\');
+            return Path.TrimStart('/').Replace('/', '\\');
         }
 
         /// <inheritdoc />

src/Protocol/Models/DocumentFilter.cs

@@ -78,19 +78,19 @@ public bool IsMatch(TextDocumentAttributes attributes)
         {
             if (HasLanguage && HasPattern && HasScheme)
             {
-                return Language == attributes.LanguageId && Scheme == attributes.Scheme && _minimatcher.IsMatch(attributes.Uri.Path);
+                return Language == attributes.LanguageId && Scheme == attributes.Scheme && _minimatcher.IsMatch(attributes.Uri.ToString());
             }
             if (HasLanguage && HasPattern)
             {
-                return Language == attributes.LanguageId && _minimatcher.IsMatch(attributes.Uri.Path);
+                return Language == attributes.LanguageId && _minimatcher.IsMatch(attributes.Uri.ToString());
             }
             if (HasLanguage && HasScheme)
             {
                 return Language == attributes.LanguageId && Scheme == attributes.Scheme;
             }
             if (HasPattern && HasScheme)
             {
-                return Scheme == attributes.Scheme && _minimatcher.IsMatch(attributes.Uri.Path);
+                return Scheme == attributes.Scheme && _minimatcher.IsMatch(attributes.Uri.ToString());
             }
             if (HasLanguage)
             {
@@ -102,7 +102,7 @@ public bool IsMatch(TextDocumentAttributes attributes)
             }
             if (HasPattern)
             {
-                return _minimatcher.IsMatch(attributes.Uri.Path);
+                return _minimatcher.IsMatch(attributes.Uri.ToString());
             }
 
             return false;

test/Lsp.Tests/AbsoluteUriConverterTests.cs

@@ -17,7 +17,10 @@ public AbsoluteUriConverterTests(ITestOutputHelper testOutputHelper)
         }
 
         [Theory]
-        [ClassData(typeof(DocumentUriTestData.StringUris))]
+        [ClassData(typeof(DocumentUriTests.WindowsPathStringUris))]
+        [ClassData(typeof(DocumentUriTests.WindowsPathAltStringUris))]
+        [ClassData(typeof(DocumentUriTests.UncPathStringUris))]
+        [ClassData(typeof(DocumentUriTests.UnixPathStringUris))]
         public void Should_Deserialize_VSCode_Style_Uris(string uri, DocumentUri expected)
         {
             _testOutputHelper.WriteLine($"Given: {uri}");
@@ -29,7 +32,10 @@ public void Should_Deserialize_VSCode_Style_Uris(string uri, DocumentUri expecte
         }
 
         [Theory]
-        [ClassData(typeof(DocumentUriTestData.StringUris))]
+        [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)
         {
             _testOutputHelper.WriteLine($"Given: {uri}");