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
2 changes: 1 addition & 1 deletion lib/makeup/lexer.ex
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ defmodule Makeup.Lexer do
"""
@spec merge(list(T.token())) :: list(T.token())
def merge([{tag, meta, value1}, {tag, meta, value2} | rest]),
do: merge [{tag, meta, value1 <> value2} | rest]
do: merge [{tag, meta, [value1 | value2]} | rest]
def merge([token | rest]),
do: [token | merge(rest)]
def merge([]),
Expand Down
28 changes: 28 additions & 0 deletions test/lexer_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,34 @@ defmodule MakeupTest.LexerTest do
end
end

describe "merge" do
test "merges adjacent tokens of the same type and attributes" do
tokens = [{:a, %{}, "ab"}, {:a, %{}, "cd"}, {:b, %{}, "ef"}]

assert [{:a, %{}, value}, {:b, %{}, "ef"}] = Lexer.merge(tokens)
assert IO.iodata_to_binary(value) == "abcd"
end

test "does not merge tokens with different attributes" do
tokens = [{:a, %{x: 1}, "ab"}, {:a, %{x: 2}, "cd"}]

assert Lexer.merge(tokens) == tokens
end

test "merges iodata token values" do
tokens = [{:a, %{}, ["a", "b"]}, {:a, %{}, "cd"}]

assert [{:a, %{}, value}] = Lexer.merge(tokens)
assert IO.iodata_to_binary(value) == "abcd"
end

test "merging preserves the unlexed string" do
tokens = [{:a, %{}, ["a", "b"]}, {:a, %{}, ["c", ["d"]]}, {:b, %{}, "e"}]

assert tokens |> Lexer.merge() |> Lexer.unlex() == "abcde"
end
end

describe "split into lines" do
test "after splitting, token values contain no newline characters" do
check all tokens <- Gen.tokens() do
Expand Down
Loading