diff --git a/docs/syntax/applies.md b/docs/syntax/applies.md index 4eb3fd79f..e5fc267eb 100644 --- a/docs/syntax/applies.md +++ b/docs/syntax/applies.md @@ -52,9 +52,7 @@ Are equivalent, note `all` just means we won't be rendering the version portion ## This section has its own applies annotations [#sections] :::{applies} -:stack: unavailable -:serverless: tech-preview -:cloud: ga +:serverless: unavailable ::: :::{note} diff --git a/src/Elastic.Markdown/Myst/Comments/CommentBlockParser.cs b/src/Elastic.Markdown/Myst/Comments/CommentBlockParser.cs index cdeccf996..67996fa6f 100644 --- a/src/Elastic.Markdown/Myst/Comments/CommentBlockParser.cs +++ b/src/Elastic.Markdown/Myst/Comments/CommentBlockParser.cs @@ -155,7 +155,7 @@ public override bool Close(BlockProcessor processor, Block block) { if (!processor.TrackTrivia) { - var heading = (HeadingBlock)block; + var heading = (CommentBlock)block; heading.Lines.Trim(); } diff --git a/src/Elastic.Markdown/Myst/MarkdownParser.cs b/src/Elastic.Markdown/Myst/MarkdownParser.cs index 1aa89a12c..59dc8cc0e 100644 --- a/src/Elastic.Markdown/Myst/MarkdownParser.cs +++ b/src/Elastic.Markdown/Myst/MarkdownParser.cs @@ -60,7 +60,6 @@ public static MarkdownPipeline Pipeline return _pipeline; var builder = new MarkdownPipelineBuilder() - .EnableTrackTrivia() .UseInlineAnchors() .UsePreciseSourceLocation() .UseDiagnosticLinks() diff --git a/tests/Elastic.Markdown.Tests/Directives/AdmonitionTests.cs b/tests/Elastic.Markdown.Tests/Directives/AdmonitionTests.cs index 0f6871ca0..750cd56e3 100644 --- a/tests/Elastic.Markdown.Tests/Directives/AdmonitionTests.cs +++ b/tests/Elastic.Markdown.Tests/Directives/AdmonitionTests.cs @@ -120,10 +120,10 @@ public class NestedDirectiveWithListTests(ITestOutputHelper output) : DirectiveT { [Fact] public void Render() => Html.Should().Contain(""" -
  • List Item 1 +
  • List Item 1

    Note

    - Hello, World! + Hello, World!
    • """); @@ -149,10 +149,10 @@ public class NestedDirectiveWithListTests2(ITestOutputHelper output) : Directive { [Fact] public void Render() => Html.Should().Contain(""" -
  • List Item 1 +
  • List Item 1

    Note

    - Hello, World! + Hello, World!
    • """); @@ -177,10 +177,10 @@ public class NestedDirectiveWithListTests3(ITestOutputHelper output) : Directive { [Fact] public void Render() => Html.Should().Contain(""" -
  • List Item 1 +
  • List Item 1

    Note

    - Hello, World! + Hello, World!
    • """); @@ -203,10 +203,10 @@ public class DirectiveInList(ITestOutputHelper output) : DirectiveTest Html.Should().Contain(""" -
  • List Item 1 +
  • List Item 1

    Note

    - Hello, World! + Hello, World!
    • """); diff --git a/tests/Elastic.Markdown.Tests/Inline/InlineAnchorTests.cs b/tests/Elastic.Markdown.Tests/Inline/InlineAnchorTests.cs index 8fdde44cf..77591a9ef 100644 --- a/tests/Elastic.Markdown.Tests/Inline/InlineAnchorTests.cs +++ b/tests/Elastic.Markdown.Tests/Inline/InlineAnchorTests.cs @@ -132,7 +132,7 @@ public void GeneratesAttributesInHtml() => // language=html Html.Should().Be( """ -

    Hello world +

    Hello world

    """.TrimEnd() diff --git a/tests/Elastic.Markdown.Tests/Inline/InlineLinkTests.cs b/tests/Elastic.Markdown.Tests/Inline/InlineLinkTests.cs index 33a902b4b..e36a69a08 100644 --- a/tests/Elastic.Markdown.Tests/Inline/InlineLinkTests.cs +++ b/tests/Elastic.Markdown.Tests/Inline/InlineLinkTests.cs @@ -225,10 +225,10 @@ public void GeneratesHtml() => Html.TrimEnd().Should().Be("""

    Links:

    """); diff --git a/tests/authoring/Blocks/Lists.fs b/tests/authoring/Blocks/Lists.fs new file mode 100644 index 000000000..fbb73b663 --- /dev/null +++ b/tests/authoring/Blocks/Lists.fs @@ -0,0 +1,30 @@ +// Licensed to Elasticsearch B.V under one or more agreements. +// Elasticsearch B.V licenses this file to you under the Apache 2.0 License. +// See the LICENSE file in the project root for more information +module ``block elements``.``list elements`` + +open Xunit +open authoring + +type ``supports loose lists`` () = + static let markdown = Setup.Markdown """ +* **Consumption-based billing**: + + You pay for the actual product used, regardless of the application or use case. This is different from subscription-based billing models where customers pay a flat fee restricted by usage quotas, or one-time upfront payment billing models such as those used for on-prem software licenses. + + You can purchase credits for a single or multi-year contract. Consumption is on demand, and every month we deduct from your balance based on your usage and contract terms. This allows you to seamlessly expand your usage to the full extent of your requirements and available budget, without any quotas or restrictions. +""" + + [] + let ``validate HTML: adds paragraphs`` () = + markdown |> convertsToHtml """ +
      +
    • +

      + Consumption-based billing:

      +

      You pay for the actual product used, regardless of the application or use case. This is different from subscription-based billing models where customers pay a flat fee restricted by usage quotas, or one-time upfront payment billing models such as those used for on-prem software licenses.

      +

      You can purchase credits for a single or multi-year contract. Consumption is on demand, and every month we deduct from your balance based on your usage and contract terms. This allows you to seamlessly expand your usage to the full extent of your requirements and available budget, without any quotas or restrictions.

      +
      • +
    + """ + diff --git a/tests/authoring/Container/DefinitionLists.fs b/tests/authoring/Container/DefinitionLists.fs index b593fd83b..3076fe459 100644 --- a/tests/authoring/Container/DefinitionLists.fs +++ b/tests/authoring/Container/DefinitionLists.fs @@ -57,3 +57,34 @@ This is my `definition` """ [] let ``has no errors 2`` () = markdown |> hasNoErrors + + + +type ``preserves paragraphs`` () = + + static let markdown = Setup.Markdown """ +Elastic Consumption Unit (ECU) +: An ECU is a unit of aggregate consumption across multiple resources over time. + + Each type of computing resource (capacity, data transfer, and snapshot) that you consume has its own unit of measure. + + In order to aggregate consumption across different resource types, all resources are priced in ECU. + + Check Using Elastic Consumption Units for billing for more details. +""" + + [] + let ``validate HTML 2`` () = + markdown |> convertsToHtml """ +
    +
    Elastic Consumption Unit (ECU)
    +
    +

    An ECU is a unit of aggregate consumption across multiple resources over time.

    +

    Each type of computing resource (capacity, data transfer, and snapshot) that you consume has its own unit of measure.

    +

    In order to aggregate consumption across different resource types, all resources are priced in ECU.

    +

    Check Using Elastic Consumption Units for billing for more details.

    +
    +
    + """ + [] + let ``has no errors`` () = markdown |> hasNoErrors diff --git a/tests/authoring/authoring.fsproj b/tests/authoring/authoring.fsproj index aa013abd9..8f6afc9f5 100644 --- a/tests/authoring/authoring.fsproj +++ b/tests/authoring/authoring.fsproj @@ -46,6 +46,7 @@ +