Skip to content

Commit 372ef9b

Browse files
committed
Apply upstream fix for elixir-lang/elixir#12969
Fixes #992
1 parent 2ba0f8a commit 372ef9b

File tree

1 file changed

+9
-2
lines changed
  • apps/language_server/lib/language_server/mix_tasks

1 file changed

+9
-2
lines changed

apps/language_server/lib/language_server/mix_tasks/format.ex

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -608,8 +608,15 @@ defmodule Mix.Tasks.ElixirLSFormat do
608608

609609
defp recur_formatter_opts_for_file(file, {formatter_opts, subs}) do
610610
Enum.find_value(subs, formatter_opts, fn {sub, formatter_opts_and_subs} ->
611-
if String.starts_with?(file, sub) do
612-
recur_formatter_opts_for_file(file, formatter_opts_and_subs)
611+
size = byte_size(sub)
612+
613+
case file do
614+
<<prefix::binary-size(size), dir_separator, _::binary>>
615+
when prefix == sub and dir_separator in [?\\, ?/] ->
616+
recur_formatter_opts_for_file(file, formatter_opts_and_subs)
617+
618+
_ ->
619+
nil
613620
end
614621
end)
615622
end

0 commit comments

Comments
 (0)