🚀🚀🚀 (#8185)

* fix: return LinkType.External if host name is not removed (#8182) * Update default document url in language server (#8183) Co-authored-by: Ying Hua <[email protected]>
dotnet · Sep 23, 2022 · 9f62922 · 9f62922
1 parent 4900a54
commit 9f62922
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/docs/specs/lsp.yml b/docs/specs/lsp.yml
@@ -36,7 +36,7 @@ languageServer:
       a.md: "[Test](non-existed.md)"
   - expectDiagnostics:
       a.md: []
-      docfx.yml: [{ "code": "yaml-syntax-error" }]
+      docfx.yml: [{ "code": "yaml-syntax-error", "codeDescription": { "href": "https://review.learn.microsoft.com/en-us/help/contribute/validation-ref/doc-not-available?branch=main" } }]
   - editFiles:
       docfx.yml:
   - expectDiagnostics:

diff --git a/src/docfx/build/link/LinkResolver.cs b/src/docfx/build/link/LinkResolver.cs
@@ -162,7 +162,7 @@ public LinkResolver(
                 resolvedHref = UrlUtility.RemoveLeadingHostName(resolvedHref, _config.AlternativeHostName);
             }
 
-            return (errors, resolvedHref, fragment, LinkType.AbsolutePath, null, false);
+            return (errors, resolvedHref, fragment, resolvedHref != href ? LinkType.AbsolutePath : LinkType.External, null, false);
         }
 
         // Cannot resolve the file, leave href as is

diff --git a/src/docfx/serve/LanguageServerBuilder.cs b/src/docfx/serve/LanguageServerBuilder.cs
@@ -148,7 +148,7 @@ private void PublishDiagnosticsParams(ErrorList errors, IEnumerable<PathString>
 
     private static Diagnostic ConvertToDiagnostics(Error error, SourceInfo source)
     {
-        var documentUrl = error.DocumentUrl ?? "https://review.docs.microsoft.com/en-us/help/contribute/validation-ref/doc-not-available?branch=main";
+        var documentUrl = error.DocumentUrl ?? "https://review.learn.microsoft.com/en-us/help/contribute/validation-ref/doc-not-available?branch=main";
         return new Diagnostic
         {
             Range = new(

diff --git a/test/docfx.Test/lib/UrlUtilityTest.cs b/test/docfx.Test/lib/UrlUtilityTest.cs
@@ -212,6 +212,10 @@ public static void StandardizeBookmarks(string uid, string expectedBookmark)
     [InlineData("https://docs.com/c", "docs.com", false, "/c")]
     [InlineData("https://docs.com/en-us/c", "docs1.com", true, "https://docs.com/en-us/c")]
     [InlineData("https://docs.com/", "docs.com", true, "/")]
+    [InlineData("https://docs.com/#bookmark", "docs.com", true, "/#bookmark")]
+    [InlineData("https://docs.com/?query=value", "docs1.com", true, "https://docs.com/?query=value")]
+    [InlineData("https://docs.com/c#bookmark", "docs1.com", true, "https://docs.com/c#bookmark")]
+    [InlineData("https://docs.com/c?query=value", "docs.com", true, "/c?query=value")]
     public static void RemoveHostName(string url, string hostName, bool removeLocale, string expected)
     {
         var result = UrlUtility.RemoveLeadingHostName(url, hostName, removeLocale);