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
20 changes: 7 additions & 13 deletions lib/mix/lib/mix/compilers/erlang.ex
Original file line number Diff line number Diff line change
Expand Up @@ -271,18 +271,7 @@ defmodule Mix.Compilers.Erlang do
defp to_diagnostics(warnings_or_errors, severity) do
for {file, issues} <- warnings_or_errors,
{line, module, data} <- issues do
position =
case line do
# TODO: remove when we require OTP 24
line when is_integer(line) and line >= 1 ->
line

{line, _column} when is_integer(line) and line >= 1 ->
line

_ ->
nil
end
position = line(line)

%Mix.Task.Compiler.Diagnostic{
file: Path.absname(file),
Expand All @@ -299,7 +288,12 @@ defmodule Mix.Compilers.Erlang do
for {_, warnings} <- entries,
{file, issues} <- warnings,
{line, module, message} <- issues do
IO.puts("#{file}:#{line}: Warning: #{module.format_error(message)}")
IO.puts("#{file}:#{line(line)}: Warning: #{module.format_error(message)}")
end
end

defp line({line, _column}) when is_integer(line) and line >= 1, do: line
# TODO: remove when we require OTP 24
defp line(line) when is_integer(line) and line >= 1, do: line
defp line(_), do: nil
end
4 changes: 3 additions & 1 deletion lib/mix/test/mix/tasks/compile.yecc_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@ defmodule Mix.Tasks.Compile.YeccTest do
assert %Mix.Task.Compiler.Diagnostic{
compiler_name: "yecc",
file: ^file,
message: "syntax error before: '.'",
message: message,
position: 1,
severity: :error
} = diagnostic

assert message =~ "syntax error before: "
end)

assert File.regular?("src/test_ok.erl")
Expand Down