Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/elixir.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
17 changes: 12 additions & 5 deletions lib/earmark_parser/ast/inline.ex
Original file line number Diff line number Diff line change
Expand Up @@ -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*}>

Expand Down
2 changes: 1 addition & 1 deletion test/acceptance/ast/escape_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
37 changes: 29 additions & 8 deletions test/acceptance/ast/inline_code_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -89,42 +89,63 @@ defmodule Acceptance.Ast.InlineCodeTest do
end

describe "whitespace treatment" do
test "squashing" do
test "preserves internal spaces" do
markdown = "`alpha beta`"
html = "<p><code class=\"inline\">alpha beta</code></p>\n"
html = "<p><code class=\"inline\">alpha beta</code></p>\n"
ast = parse_html(html)
messages = []

assert as_ast(markdown) == {:ok, ast, messages}
end

test "remove at start" do
test "preserves one-sided leading space" do
markdown = "` alpha beta`"
html = "<p><code class=\"inline\">alpha beta</code></p>\n"
html = "<p><code class=\"inline\"> alpha beta</code></p>\n"
ast = parse_html(html)
messages = []

assert as_ast(markdown) == {:ok, ast, messages}
end

test "remove and squash" do
test "removes one space from both ends" do
markdown = "` alpha beta `"
html = "<p><code class=\"inline\">alpha beta</code></p>\n"
html = "<p><code class=\"inline\"> alpha beta</code></p>\n"
ast = parse_html(html)
messages = []

assert as_ast(markdown) == {:ok, ast, messages}
end

test "remove and squash newlines too" do
markdown = "`\n alpha \n\n beta `"
test "converts line endings to spaces" do
markdown = "`alpha\nbeta`"
html = "<p><code class=\"inline\">alpha beta</code></p>\n"
ast = parse_html(html)
messages = []

assert as_ast(markdown) == {:ok, ast, messages}
end

test "preserves one-sided trailing space" do
markdown = "`level = `"
html = "<p><code class=\"inline\">level = </code></p>\n"
ast = parse_html(html)
messages = []

assert as_ast(markdown) == {:ok, ast, messages}
end

test "preserves spaces-only content" do
markdown = "` `"

ast = [
{"p", [], [{"code", [{"class", "inline"}], [" "], %{line: 1}}], %{}}
]

messages = []

assert as_ast(markdown) == {:ok, ast, messages}
end

test "inline code inside lists (was regtest #48)" do
markdown = " * `a\n * b`"
html = ~s[<ul>\n<li><code class="inline">a * b</code>\n</li>\n</ul>\n]
Expand Down
4 changes: 2 additions & 2 deletions test/acceptance/ast/lists/spaced_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ defmodule Acceptance.Ast.Lists.SpacedPendingTest do
ul(
li([
p("Item 1"),
p(["This is ", inline_code("pending", [], %{line: 3})])
p(["This is ", inline_code(" pending", [], %{line: 3})])
])
)
]
Expand All @@ -33,7 +33,7 @@ defmodule Acceptance.Ast.Lists.SpacedPendingTest do
ul(
li([
p("Item 1"),
p(["This is ", inline_code("pending", [], %{line: 3})])
p(["This is ", inline_code(" pending", [], %{line: 3})])
])
)
]
Expand Down
Loading