Skip to content

Commit

Permalink
Keep existing ignoring behavior
Browse files Browse the repository at this point in the history
  • Loading branch information
@RKushnir
RKushnir committed Apr 23, 2024
1 parent 38f6b99 commit 5d78a70
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 45 deletions.
76 changes: 33 additions & 43 deletions lib/excoveralls/ignore.ex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,144 +61,134 @@ defmodule ExCoveralls.Ignore do
}
end

defp process_regular_line(coverage_line, _index, state = %{ignore_mode: :ignore_line}) do
ignored_coverage = Enum.map([coverage_line | state.coverage_buffer], fn _ -> nil end)

defp process_regular_line(_coverage_line, _index, state = %{ignore_mode: :ignore_line}) do
%{
state
| ignore_mode: :no_ignore,
coverage: [ignored_coverage | state.coverage],
coverage_buffer: []
coverage: [nil | state.coverage]
}
end

defp process_regular_line(coverage_line, _index, state = %{ignore_mode: :ignore_block}) do
defp process_regular_line(_coverage_line, _index, state = %{ignore_mode: :ignore_block}) do
%{
state
| coverage_buffer: [coverage_line | state.coverage_buffer]
| coverage: [nil | state.coverage]
}
end

defp process_start_marker(
coverage_line,
_coverage_line,
index,
state = %{ignore_mode: :no_ignore, coverage_buffer: []}
state = %{ignore_mode: :no_ignore}
) do
%{
state
| ignore_mode: :ignore_block,
coverage_buffer: [coverage_line],
coverage: [nil | state.coverage],
last_marker_index: index
}
end

defp process_start_marker(coverage_line, index, state = %{ignore_mode: :ignore_block}) do
defp process_start_marker(_coverage_line, index, state = %{ignore_mode: :ignore_block}) do
warning = {index, "unexpected ignore-start or missing previous ignore-stop"}

%{
state
| coverage: [state.coverage_buffer | state.coverage],
coverage_buffer: [coverage_line],
| coverage: [nil | state.coverage],
warnings: [warning | state.warnings],
last_marker_index: index
}
end

defp process_start_marker(coverage_line, index, state = %{ignore_mode: :ignore_line}) do
defp process_start_marker(_coverage_line, index, state = %{ignore_mode: :ignore_line}) do
warning = {state.last_marker_index, "redundant ignore-next-line right before an ignore-start"}

%{
state
| ignore_mode: :ignore_block,
coverage: [state.coverage_buffer | state.coverage],
coverage_buffer: [coverage_line],
coverage: [nil | state.coverage],
warnings: [warning | state.warnings],
last_marker_index: index
}
end

defp process_stop_marker(coverage_line, index, state = %{ignore_mode: :ignore_block}) do
ignored_coverage = Enum.map([coverage_line | state.coverage_buffer], fn _ -> nil end)

defp process_stop_marker(_coverage_line, index, state = %{ignore_mode: :ignore_block}) do
%{
state
| ignore_mode: :no_ignore,
coverage: [ignored_coverage | state.coverage],
coverage_buffer: [],
coverage: [nil | state.coverage],
last_marker_index: index
}
end

defp process_stop_marker(coverage_line, index, state) do
defp process_stop_marker(_coverage_line, index, state) do
warning = {index, "unexpected ignore-stop or missing previous ignore-start"}

%{
state
| ignore_mode: :no_ignore,
coverage: [coverage_line, state.coverage_buffer | state.coverage],
coverage_buffer: [],
coverage: [nil | state.coverage],
warnings: [warning | state.warnings],
last_marker_index: index
}
end

defp process_next_line_marker(
coverage_line,
_coverage_line,
index,
state = %{ignore_mode: :no_ignore, coverage_buffer: []}
state = %{ignore_mode: :no_ignore}
) do
%{
state
| ignore_mode: :ignore_line,
coverage_buffer: [coverage_line],
coverage: [nil | state.coverage],
last_marker_index: index
}
end

defp process_next_line_marker(coverage_line, index, state = %{ignore_mode: :ignore_block}) do
defp process_next_line_marker(
_coverage_line,
index,
state = %{ignore_mode: :ignore_block}
) do
warning = {index, "redundant ignore-next-line inside ignore block"}

%{
state
| coverage_buffer: [coverage_line | state.coverage_buffer],
| coverage: [nil | state.coverage],
warnings: [warning | state.warnings]
}
end

defp process_next_line_marker(coverage_line, index, state = %{ignore_mode: :ignore_line}) do
defp process_next_line_marker(
_coverage_line,
index,
state = %{ignore_mode: :ignore_line}
) do
warning = {index, "duplicated ignore-next-line"}

%{
state
| coverage: [state.coverage_buffer | state.coverage],
coverage_buffer: [coverage_line],
| coverage: [nil | state.coverage],
warnings: [warning | state.warnings],
last_marker_index: index
}
end

defp process_end_of_file(state = %{ignore_mode: :no_ignore, coverage_buffer: []}) do
defp process_end_of_file(state = %{ignore_mode: :no_ignore}) do
state
end

defp process_end_of_file(state = %{ignore_mode: :ignore_line}) do
warning = {state.last_marker_index, "redundant ignore-next-line at the end of file"}

%{
state
| coverage: [state.coverage_buffer | state.coverage],
warnings: [warning | state.warnings]
}
%{state | warnings: [warning | state.warnings]}
end

defp process_end_of_file(state = %{ignore_mode: :ignore_block}) do
warning =
{state.last_marker_index, "ignore-start without a corresponding ignore-stop"}

%{
state
| coverage: [state.coverage_buffer | state.coverage],
warnings: [warning | state.warnings]
}
%{state | warnings: [warning | state.warnings]}
end
end
4 changes: 2 additions & 2 deletions test/ignore_test.exs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ defmodule ExCoveralls.IgnoreTest do
test "start marker without a stop marker is discarded with a warning" do
info = Ignore.filter(@source_info) |> Enum.at(0)
assert(info[:source] == @content)
assert(info[:coverage] == [0, 0, 0, nil, nil, nil, nil, 0, 0, nil, 0, 0, 0, 0])
assert(info[:coverage] == [0, 0, 0, nil, nil, nil, nil, 0, 0, nil, nil, nil, nil, nil])
assert(info[:warnings] == [{9, "ignore-start without a corresponding ignore-stop"}])
end

Expand All @@ -125,7 +125,7 @@ defmodule ExCoveralls.IgnoreTest do
test "start marker followed by another start marker is discarded with a warning" do
info = Ignore.filter(@source_info) |> Enum.at(0)
assert(info[:source] == @content)
assert(info[:coverage] == [0, 0, 0, nil, 0, 0, nil, nil, nil, nil, 0, 0])
assert(info[:coverage] == [0, 0, 0, nil, nil, nil, nil, nil, nil, nil, 0, 0])
assert(info[:warnings] == [{6, "unexpected ignore-start or missing previous ignore-stop"}])
end
end

0 comments on commit 5d78a70

Please # to comment.