diff --git a/.github/workflows/elixir.yml b/.github/workflows/elixir.yml index c18eab7..c67120d 100644 --- a/.github/workflows/elixir.yml +++ b/.github/workflows/elixir.yml @@ -17,7 +17,7 @@ jobs: include: - elixir: 1.15.x otp: 25 - os: ubuntu-latest + os: ubuntu-24.04 warnings_as_errors: true - elixir: 1.16.x otp: 26 @@ -29,7 +29,7 @@ jobs: warnings_as_errors: true - elixir: 1.18.0-otp-25 otp: 25 - os: ubuntu-latest + os: ubuntu-24.04 warnings_as_errors: true - elixir: 1.18.0-otp-27 otp: 27 diff --git a/lib/earmark_parser/ast/inline.ex b/lib/earmark_parser/ast/inline.ex index 87a8fac..f0c28d3 100644 --- a/lib/earmark_parser/ast/inline.ex +++ b/lib/earmark_parser/ast/inline.ex @@ -277,17 +277,24 @@ defmodule EarmarkParser.Ast.Inline do if match = Regex.run(code, src) do [match, _, content] = match - # Commonmark - content1 = - content - |> String.trim() - |> String.replace(~r{\s+}, " ") + content1 = normalize_code_span(content) out = codespan(content1, lnb) {behead(src, match), lnb, prepend(context, out), use_linky?} end end + defp normalize_code_span(content) do + content = String.replace(content, ~r{\r\n?|\n}, " ") + + if String.starts_with?(content, " ") and String.ends_with?(content, " ") and + String.trim(content, " ") != "" do + content |> String.slice(1, String.length(content) - 2) + else + content + end + end + def converter_for_inline_ial({src, lnb, context, use_linky?}) do inline_ial = ~r<^\s*\{:\s*(.*?)\s*}> diff --git a/test/acceptance/ast/escape_test.exs b/test/acceptance/ast/escape_test.exs index 0999681..79e66da 100644 --- a/test/acceptance/ast/escape_test.exs +++ b/test/acceptance/ast/escape_test.exs @@ -33,7 +33,7 @@ defmodule Acceptance.Ast.EscapeTest do test "less obviously - escpe the escapes" do markdown = "\\\\` code`" - ast = p(["\\", tag("code", "code", [class: "inline"], %{line: 1})]) + ast = p(["\\", tag("code", " code", [class: "inline"], %{line: 1})]) messages = [] assert as_ast(markdown) == {:ok, [ast], messages} diff --git a/test/acceptance/ast/inline_code_test.exs b/test/acceptance/ast/inline_code_test.exs index 2df66ee..e89b701 100644 --- a/test/acceptance/ast/inline_code_test.exs +++ b/test/acceptance/ast/inline_code_test.exs @@ -89,35 +89,35 @@ defmodule Acceptance.Ast.InlineCodeTest do end describe "whitespace treatment" do - test "squashing" do + test "preserves internal spaces" do markdown = "`alpha beta`" - html = "
alpha beta
alpha beta
alpha beta
alpha beta
alpha beta
alpha beta
alpha beta
level =
a * b\n