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
8 changes: 4 additions & 4 deletions lib/makeup/lexers/elixir_lexer.ex
Original file line number Diff line number Diff line change
Expand Up @@ -511,14 +511,14 @@ defmodule Makeup.Lexers.ElixirLexer do
|> List.wrap()
|> List.to_string()

lexer = Map.get(get_sigil_lexers(), sigil)
{lexer, options} = Map.get(get_sigil_lexers(), sigil, {nil, []})

if lexer do
["~", _sigil, separator | content_with_end_separator] = content
end_separator = Enum.at(content_with_end_separator, -1)
content = Enum.slice(content_with_end_separator, 0..-2//1) |> List.to_string()

inner_tokens = lexer.lex(content)
inner_tokens = lexer.lex(content, options)

List.flatten([
{:string_sigil, attrs, "~#{sigil}#{separator}"},
Expand Down Expand Up @@ -659,9 +659,9 @@ defmodule Makeup.Lexers.ElixirLexer do
> Makeup.Lexers.ElixirLexer.register_sigil_lexer("H", Makeup.Lexers.HEExLexer)

"""
def register_sigil_lexer(sigil, lexer) do
def register_sigil_lexer(sigil, lexer, options \\ []) do
lexers = get_sigil_lexers()
Application.put_env(:makeup_elixir, :sigil_lexers, Map.put(lexers, sigil, lexer))
Application.put_env(:makeup_elixir, :sigil_lexers, Map.put(lexers, sigil, {lexer, options}))
end

defp get_sigil_lexers() do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ defmodule ElixirLexerSigilLexerTest do
describe "custom lexers for sigils" do
test "can register a custom lexer" do
defmodule MyCustomLexer do
def lex(input) do
[{:keyword, %{}, input}]
def lex(input, opts) do
[{:keyword, %{opts: opts}, input}]
end
end

Makeup.Lexers.ElixirLexer.register_sigil_lexer("H", MyCustomLexer)
Makeup.Lexers.ElixirLexer.register_sigil_lexer("H", MyCustomLexer, foo: :bar)

assert lex("~H|Hello, world!|") == [
{:string_sigil, %{}, "~H|"},
{:keyword, %{}, "Hello, world!"},
{:keyword, %{opts: [foo: :bar]}, "Hello, world!"},
{:string_sigil, %{}, "|"}
]
after
Expand Down