From e4169dc107323130a8793a1c7cd2ad09aa8c88ae Mon Sep 17 00:00:00 2001 From: RobertDober Date: Sat, 14 Nov 2026 18:11:45 +0100 Subject: [PATCH] Fix display of IAL in iex if IAL is in a quote block. - removing IALs when removing trailing ws in print_markdown - fixed two warnings in tests --- lib/elixir/lib/io/ansi/docs.ex | 7 ++++- lib/elixir/test/elixir/io/ansi/docs_test.exs | 27 +++++++++++++++++++ lib/elixir/test/elixir/kernel/fn_test.exs | 2 +- .../test/elixir/module/types/expr_test.exs | 2 +- 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/lib/elixir/lib/io/ansi/docs.ex b/lib/elixir/lib/io/ansi/docs.ex index 692892c9335..21436a8360e 100644 --- a/lib/elixir/lib/io/ansi/docs.ex +++ b/lib/elixir/lib/io/ansi/docs.ex @@ -147,7 +147,7 @@ defmodule IO.ANSI.Docs do doc |> String.split(["\r\n", "\n"], trim: false) - |> Enum.map(&String.trim_trailing/1) + |> Enum.map(&remove_ial/1) |> process([], "", options) end @@ -228,6 +228,11 @@ defmodule IO.ANSI.Docs do end end + defp remove_ial(text) do + ial_and_ws = ~r/(?:\s*\{:\s+.+?\})?\s*\z/ + Regex.replace(ial_and_ws, text, "") + end + ### Headings defp write_heading(heading, rest, text, indent, options) do diff --git a/lib/elixir/test/elixir/io/ansi/docs_test.exs b/lib/elixir/test/elixir/io/ansi/docs_test.exs index a467e100397..b686026250d 100644 --- a/lib/elixir/test/elixir/io/ansi/docs_test.exs +++ b/lib/elixir/test/elixir/io/ansi/docs_test.exs @@ -74,6 +74,11 @@ defmodule IO.ANSI.DocsTest do assert result == "\e[33m# wibble\e[0m\n\e[0m\ntext\n\e[0m" end + test "ial of first level heading is removed (non regression)" do + result = format_markdown("# wibble {: .warning}\n\ntext\n") + assert result == "\e[33m# wibble\e[0m\n\e[0m\ntext\n\e[0m" + end + test "second level heading is converted" do result = format_markdown("## wibble\n\ntext\n") assert result == "\e[33m## wibble\e[0m\n\e[0m\ntext\n\e[0m" @@ -181,6 +186,28 @@ defmodule IO.ANSI.DocsTest do """ end + test "ial removed from multi-line quote block's headline (use case from String.split_at's)" do + result = + format_markdown(""" + > #### Linear Access {: .warning} + > + > This function splits on graphemes and for such it has to linearly traverse + > the string. + > If you want to split a string or a binary based on the number of bytes, + > use `Kernel.binary_part/3` instead. + """) + + assert result == + """ + \e[90m> \e[0m#### Linear Access + \e[90m> \e[0m + \e[90m> \e[0mThis function splits on graphemes and for such it has to linearly traverse + \e[90m> \e[0mthe string. If you want to split a string or a binary based on the number of + \e[90m> \e[0mbytes, use \e[36mKernel.binary_part/3\e[0m instead. + \e[0m\ + """ + end + test "code block is converted" do result = format_markdown("line\n\n code\n code2\n\nline2\n") assert result == "line\n\e[0m\n\e[36m code\n code2\e[0m\n\e[0m\nline2\n\e[0m" diff --git a/lib/elixir/test/elixir/kernel/fn_test.exs b/lib/elixir/test/elixir/kernel/fn_test.exs index 7a2ea93c815..65b7c4703f5 100644 --- a/lib/elixir/test/elixir/kernel/fn_test.exs +++ b/lib/elixir/test/elixir/kernel/fn_test.exs @@ -101,7 +101,7 @@ defmodule Kernel.FnTest do test "capture with assignment in module" do mod = :outer - assert (&(mod = List).flatten(&1)).([1, [2], 3]) == [1, 2, 3] + assert (&(_mod = List).flatten(&1)).([1, [2], 3]) == [1, 2, 3] assert mod == :outer end diff --git a/lib/elixir/test/elixir/module/types/expr_test.exs b/lib/elixir/test/elixir/module/types/expr_test.exs index 0390c86447a..55baec2f8c2 100644 --- a/lib/elixir/test/elixir/module/types/expr_test.exs +++ b/lib/elixir/test/elixir/module/types/expr_test.exs @@ -4018,7 +4018,7 @@ defmodule Module.Types.ExprTest do %{limit: l} -> is_map_key(x, :a) and case "" do - <<_::size(l)>> -> true + <<_::size(^l)>> -> true _ -> false end