Skip to content

Commit 2f3b26c

Browse files
reakaleekreakaleek
committed
fixes
1 parent c313647 commit 2f3b26c

File tree

6 files changed

+21
-18
lines changed

6 files changed

+21
-18
lines changed

‎src/Elastic.Markdown/Myst/InlineParsers/DiagnosticLinkInlineParser.cs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,11 +239,14 @@ private static void UpdateLinkUrl(LinkInline link, string url, ParserContext con
239239
{
240240
var newUrl = url;
241241
var urlPathPrefix = context.Build.UrlPathPrefix ?? string.Empty;
242-
if (url.EndsWith(".md"))
243-
newUrl = Path.ChangeExtension(newUrl, ".html");
244242

245-
if (!url.StartsWith('/'))
243+
if (!url.StartsWith('/') && !string.IsNullOrEmpty(url))
244+
{
246245
newUrl = GetRootRelativePath(context, file);
246+
}
247+
248+
if (url.EndsWith(".md"))
249+
newUrl = Path.ChangeExtension(newUrl, ".html");
247250

248251
if (!string.IsNullOrWhiteSpace(urlPathPrefix))
249252
newUrl = $"{urlPathPrefix.TrimEnd('/')}{newUrl}";

‎tests/Elastic.Markdown.Tests/Inline/AnchorLinkTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ [Sub Requirements](testing/req.md#sub-requirements)
7676
public void GeneratesHtml() =>
7777
// language=html
7878
Html.Should().Contain(
79-
"""<p><a href="testing/req.html#sub-requirements">Sub Requirements</a></p>"""
79+
"""<p><a href="/testing/req.html#sub-requirements">Sub Requirements</a></p>"""
8080
);
8181

8282
[Fact]
@@ -94,7 +94,7 @@ [Sub Requirements](testing/req.md#new-reqs)
9494
public void GeneratesHtml() =>
9595
// language=html
9696
Html.Should().Contain(
97-
"""<p><a href="testing/req.html#new-reqs">Sub Requirements</a></p>"""
97+
"""<p><a href="/testing/req.html#new-reqs">Sub Requirements</a></p>"""
9898
);
9999

100100
[Fact]
@@ -111,7 +111,7 @@ public class ExternalPageAnchorAutoTitleTests(ITestOutputHelper output) : Anchor
111111
public void GeneratesHtml() =>
112112
// language=html
113113
Html.Should().Contain(
114-
"""<p><a href="testing/req.html#sub-requirements">Special Requirements &gt; Sub Requirements</a></p>"""
114+
"""<p><a href="/testing/req.html#sub-requirements">Special Requirements &gt; Sub Requirements</a></p>"""
115115
);
116116

117117
[Fact]
@@ -147,7 +147,7 @@ [Sub Requirements](testing/req.md#sub-requirements2)
147147
public void GeneratesHtml() =>
148148
// language=html
149149
Html.Should().Contain(
150-
"""<p><a href="testing/req.html#sub-requirements2">Sub Requirements</a></p>"""
150+
"""<p><a href="/testing/req.html#sub-requirements2">Sub Requirements</a></p>"""
151151
);
152152

153153
[Fact]
@@ -166,7 +166,7 @@ [Heading inside dropdown](testing/req.md#heading-inside-dropdown)
166166
public void GeneratesHtml() =>
167167
// language=html
168168
Html.Should().Contain(
169-
"""<a href="/testing/req#heading-inside-dropdown">Heading inside dropdown</a>"""
169+
"""<a href="/testing/req.html#heading-inside-dropdown">Heading inside dropdown</a>"""
170170
);
171171
[Fact]
172172
public void HasError() => Collector.Diagnostics.Should().HaveCount(0);

‎tests/Elastic.Markdown.Tests/Inline/DirectiveBlockLinkTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ [Sub Requirements](testing/req.md#hint_ref)
6767
public void GeneratesHtml() =>
6868
// language=html
6969
Html.Should().Contain(
70-
"""<p><a href="testing/req.html#hint_ref">Sub Requirements</a></p>"""
70+
"""<p><a href="/testing/req.html#hint_ref">Sub Requirements</a></p>"""
7171
);
7272

7373
[Fact]

‎tests/Elastic.Markdown.Tests/Inline/InlineAnchorTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ [Sub Requirements](testing/req.md#custom-anchor)
203203
public void GeneratesHtml() =>
204204
// language=html
205205
Html.Should().Contain(
206-
"""<p><a href="testing/req.html#custom-anchor">Sub Requirements</a></p>"""
206+
"""<p><a href="/testing/req.html#custom-anchor">Sub Requirements</a></p>"""
207207
);
208208

209209
[Fact]

‎tests/Elastic.Markdown.Tests/Inline/InlineLinkTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class LinkToPageTests(ITestOutputHelper output) : LinkTestBase(output,
5858
public void GeneratesHtml() =>
5959
// language=html
6060
Html.Should().Contain(
61-
"""<p><a href="/testing/req">Requirements</a></p>"""
61+
"""<p><a href="/testing/req.html">Requirements</a></p>"""
6262
);
6363

6464
[Fact]
@@ -81,7 +81,7 @@ public class InsertPageTitleTests(ITestOutputHelper output) : LinkTestBase(outpu
8181
public void GeneratesHtml() =>
8282
// language=html
8383
Html.Should().Contain(
84-
"""<p><a href="/testing/req">Special Requirements</a></p>"""
84+
"""<p><a href="/testing/req.html">Special Requirements</a></p>"""
8585
);
8686

8787
[Fact]
@@ -106,7 +106,7 @@ public class LinkReferenceTest(ITestOutputHelper output) : LinkTestBase(output,
106106
public void GeneratesHtml() =>
107107
// language=html
108108
Html.Should().Contain(
109-
"""<p><a href="/testing/req">test</a></p>"""
109+
"""<p><a href="/testing/req.html">test</a></p>"""
110110
);
111111

112112
[Fact]

‎tests/authoring/Inline/InlineImages.fs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ type ``relative path to image`` () =
2626
[<Fact>]
2727
let ``validate HTML: preserves relative path`` () =
2828
markdown |> convertsToHtml """
29-
<p><img src="_static/img/observability.png" alt="Elasticsearch" /></p>
29+
<p><img src="/_static/img/observability.png" alt="Elasticsearch" /></p>
3030
"""
3131

3232
type ``supplying a tittle`` () =
@@ -37,7 +37,7 @@ type ``supplying a tittle`` () =
3737
[<Fact>]
3838
let ``validate HTML: includes title`` () =
3939
markdown |> convertsToHtml """
40-
<p><img src="_static/img/observability.png" alt="Elasticsearch" title="Hello world" /></p>
40+
<p><img src="/_static/img/observability.png" alt="Elasticsearch" title="Hello world" /></p>
4141
"""
4242

4343
type ``supplying a tittle with width and height`` () =
@@ -48,7 +48,7 @@ type ``supplying a tittle with width and height`` () =
4848
[<Fact>]
4949
let ``validate HTML: does not include width and height in title`` () =
5050
markdown |> convertsToHtml """
51-
<p><img src="obs.png" width="250px" height="400px" alt="o" title="Title"/></p>
51+
<p><img src="/obs.png" width="250px" height="400px" alt="o" title="Title"/></p>
5252
"""
5353

5454
type ``supplying a tittle with width and height in percentage`` () =
@@ -59,7 +59,7 @@ type ``supplying a tittle with width and height in percentage`` () =
5959
[<Fact>]
6060
let ``validate HTML: does not include width and height in title`` () =
6161
markdown |> convertsToHtml """
62-
<p><img src="obs.png" width="50%" height="40%" alt="o" title="Title"/></p>
62+
<p><img src="/obs.png" width="50%" height="40%" alt="o" title="Title"/></p>
6363
"""
6464
type ``supplying a tittle with width only`` () =
6565
static let markdown = Setup.Markdown """
@@ -69,5 +69,5 @@ type ``supplying a tittle with width only`` () =
6969
[<Fact>]
7070
let ``validate HTML: sets height to width if not supplied`` () =
7171
markdown |> convertsToHtml """
72-
<p><img src="obs.png" width="30%" height="30%" alt="o" title="Title"/></p>
72+
<p><img src="/obs.png" width="30%" height="30%" alt="o" title="Title"/></p>
7373
"""

0 commit comments

Comments
 (0)