Skip to content

Allow for both <scheme>:/<path> and <scheme://<path> style cross-link lookups #504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 14, 2025
Merged

Allow for both <scheme>:/<path> and <scheme://<path> style cross-link lookups #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Elastic.Markdown/CrossLinks/CrossLinkResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public static bool TryResolve(Action<string> errorEmitter, HashSet<string> decla
return false;
}

var lookupPath = crossLinkUri.AbsolutePath.TrimStart('/');
var lookupPath = (crossLinkUri.Host + '/' + crossLinkUri.AbsolutePath.TrimStart('/')).Trim('/');
var path = ToTargetUrlPath(lookupPath);
if (!string.IsNullOrEmpty(crossLinkUri.Fragment))
path += crossLinkUri.Fragment;
Expand All @@ -121,7 +121,7 @@ public static bool TryResolve(Action<string> errorEmitter, HashSet<string> decla
private static bool TryFullyValidate(Action<string> errorEmitter, LinkReference linkReference, Uri crossLinkUri, [NotNullWhen(true)] out Uri? resolvedUri)
{
resolvedUri = null;
var lookupPath = crossLinkUri.AbsolutePath.TrimStart('/');
var lookupPath = (crossLinkUri.Host + '/' + crossLinkUri.AbsolutePath.TrimStart('/')).Trim('/');
if (string.IsNullOrEmpty(lookupPath) && crossLinkUri.Host.EndsWith(".md"))
lookupPath = crossLinkUri.Host;

Expand Down
44 changes: 44 additions & 0 deletions tests/authoring/Inline/CrossLinks.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,47 @@ type ``link to repository that does not resolve yet`` () =

[<Fact>]
let ``has no warning`` () = markdown |> hasNoWarnings

type ``Using double forward slashes`` () =

static let markdown = Setup.Markdown """
[APM Server binary](docs-content://solutions/observability/apps/apm-server-binary.md#apm-deb)
"""

[<Fact>]
let ``validate HTML`` () =
markdown |> convertsToHtml """
<p><a
href="https://docs-v3-preview.elastic.dev/elastic/docs-content/tree/main/solutions/observability/apps/apm-server-binary#apm-deb">
APM Server binary
</a>
</p>
"""

[<Fact>]
let ``has no errors`` () = markdown |> hasNoErrors

[<Fact>]
let ``has no warning`` () = markdown |> hasNoWarnings

type ``link to repository that does not resolve yet using double slashes`` () =

static let markdown = Setup.Markdown """
[Elasticsearch Documentation](elasticsearch://index.md)
"""

[<Fact>]
let ``validate HTML`` () =
markdown |> convertsToHtml """
<p><a
href="https://docs-v3-preview.elastic.dev/elastic/elasticsearch/tree/main/">
Elasticsearch Documentation
</a>
</p>
"""

[<Fact>]
let ``has no errors`` () = markdown |> hasNoErrors

[<Fact>]
let ``has no warning`` () = markdown |> hasNoWarnings
Loading