Skip to content

Handle newlines inside an IEx prompt #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
josevalim merged 1 commit into from
Mar 9, 2025
Merged

Handle newlines inside an IEx prompt #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions lib/makeup/lexers/elixir_lexer.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,17 @@ defmodule Makeup.Lexers.ElixirLexer do
[first, second | extra_tokens ++ [end_sigil | postprocess_helper(rest)]]
end

# When parsing a ...> from a string we need to ensure that the newline is still selectable
defp postprocess_helper([
{:generic_prompt, %{language: :elixir} = meta, ["\n..." | rest_text]}
| rest
]) do
newline = {:generic_prompt, %{language: :elixir, selectable: true}, ["\n"]}
# Remove the \n from the ...> prompt
first = {:generic_prompt, meta, ["..." | rest_text]}
[newline, first | postprocess_helper(rest)]
end

defp postprocess_helper([{:string_sigil, attrs, content} | tokens]) do
# content is a list of the format ["~", sigil_char, separator, ... sigil_content ..., end_separator]
sigil =
Expand Down
24 changes: 18 additions & 6 deletions test/makeup/lexers/elixir_lexer/elixir_lexer_tokenizer_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,13 +553,17 @@ defmodule ElixirLexerTokenizerTestSnippet do
{:operator, %{}, "="},
{:whitespace, %{}, " "},
{:string, %{}, "\""},
{:generic_prompt, %{selectable: false}, "\n...> "},
{:generic_prompt, %{selectable: true}, "\n"},
{:generic_prompt, %{selectable: false}, "...> "},
{:string, %{}, "ine1"},
{:generic_prompt, %{selectable: false}, "\n...> "},
{:generic_prompt, %{selectable: true}, "\n"},
{:generic_prompt, %{selectable: false}, "...> "},
{:string, %{}, "line2"},
{:generic_prompt, %{selectable: false}, "\n...> "},
{:generic_prompt, %{selectable: true}, "\n"},
{:generic_prompt, %{selectable: false}, "...> "},
{:string, %{}, "ilne3"},
{:generic_prompt, %{selectable: false}, "\n...> "},
{:generic_prompt, %{selectable: true}, "\n"},
{:generic_prompt, %{selectable: false}, "...> "},
{:string, %{}, "\""},
{:whitespace, %{}, "\n"}
]
Expand All @@ -578,7 +582,7 @@ defmodule ElixirLexerTokenizerTestSnippet do
'''

first_prompt = "iex#{prompt_number}> "
other_prompt = "\n...#{prompt_number}> "
other_prompt = "...#{prompt_number}> "

assert [
{:generic_prompt, %{selectable: false}, ^first_prompt},
Expand All @@ -587,12 +591,16 @@ defmodule ElixirLexerTokenizerTestSnippet do
{:operator, %{}, "="},
{:whitespace, %{}, " "},
{ttype, %{}, ^ldelim},
{:generic_prompt, %{selectable: true}, "\n"},
{:generic_prompt, %{selectable: false}, ^other_prompt},
{ttype, %{}, "line1"},
{:generic_prompt, %{selectable: true}, "\n"},
{:generic_prompt, %{selectable: false}, ^other_prompt},
{ttype, %{}, "line2"},
{:generic_prompt, %{selectable: true}, "\n"},
{:generic_prompt, %{selectable: false}, ^other_prompt},
{ttype, %{}, "line3"},
{:generic_prompt, %{selectable: true}, "\n"},
{:generic_prompt, %{selectable: false}, ^other_prompt},
{ttype, %{}, ^rdelim},
{:whitespace, %{}, "\n"}
Expand All @@ -618,7 +626,7 @@ defmodule ElixirLexerTokenizerTestSnippet do
'''

first_prompt = "iex#{prompt_number}> "
other_prompt = "\n...#{prompt_number}> "
other_prompt = "...#{prompt_number}> "

sigil_start = sigil_prefix <> ldelim

Expand All @@ -629,12 +637,16 @@ defmodule ElixirLexerTokenizerTestSnippet do
{:operator, %{}, "="},
{:whitespace, %{}, " "},
{ttype, %{}, ^sigil_start},
{:generic_prompt, %{selectable: true}, "\n"},
{:generic_prompt, %{selectable: false}, ^other_prompt},
{ttype, %{}, "line1"},
{:generic_prompt, %{selectable: true}, "\n"},
{:generic_prompt, %{selectable: false}, ^other_prompt},
{ttype, %{}, "line2"},
{:generic_prompt, %{selectable: true}, "\n"},
{:generic_prompt, %{selectable: false}, ^other_prompt},
{ttype, %{}, "line3"},
{:generic_prompt, %{selectable: true}, "\n"},
{:generic_prompt, %{selectable: false}, ^other_prompt},
{ttype, %{}, ^rdelim},
{:whitespace, %{}, "\n"}
Expand Down
Loading