Skip to content

Fix bug where two contiguous ignore-begin blocks results in an error #367

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
michalmuskala merged 1 commit into from
Apr 25, 2025
Merged

Fix bug where two contiguous ignore-begin blocks results in an error #367

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
10 changes: 3 additions & 7 deletions src/erlfmt.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,15 +538,11 @@ parse(Tokens) ->
end.

ignore_state_pre(PreComments, FileName, Acc) ->
case ignore_state(PreComments, FileName, Acc) of
'end' -> false;
Other -> Other
end.
ignore_state(PreComments, FileName, Acc).

ignore_state_post(PostComments, FileName, Acc) ->
case ignore_state(PostComments, FileName, Acc) of
ignore -> false;
'end' -> false;
Other -> Other
end.

Expand All @@ -570,7 +566,7 @@ ignore_state([Line | Lines], FileName, Loc, Rest, Acc0) ->
"erlfmt-ignore-begin" ++ R when ?IS_IGNORE_REASON(R) ->
throw({error, {FileName, Loc, ?MODULE, {invalid_ignore, 'begin', Acc0}}});
"erlfmt-ignore-end" ++ R when ?IS_IGNORE_REASON(R), Acc0 =:= 'begin' ->
'end';
false;
"erlfmt-ignore-end" ++ R when ?IS_IGNORE_REASON(R) ->
throw({error, {FileName, Loc, ?MODULE, {invalid_ignore, 'end', Acc0}}});
% New-style erlfmt:ignore
Expand All @@ -583,7 +579,7 @@ ignore_state([Line | Lines], FileName, Loc, Rest, Acc0) ->
"erlfmt:ignore-begin" ++ R when ?IS_IGNORE_REASON(R) ->
throw({error, {FileName, Loc, ?MODULE, {invalid_ignore, 'begin', Acc0}}});
"erlfmt:ignore-end" ++ R when ?IS_IGNORE_REASON(R), Acc0 =:= 'begin' ->
'end';
false;
"erlfmt:ignore-end" ++ R when ?IS_IGNORE_REASON(R) ->
throw({error, {FileName, Loc, ?MODULE, {invalid_ignore, 'end', Acc0}}});
_ ->
Expand Down
5 changes: 5 additions & 0 deletions test/erlfmt_SUITE_data/ignore_format_many.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ f() -> ok. % this is ok
g() -> ok. % this is also ok
% erlfmt:ignore-end I'm done with this style

% erlfmt:ignore-begin Here we go again...
a1() -> ok. % again
a2() -> ok. % ditto
% erlfmt:ignore-end Now I'm really done

h() -> ok. % blah

%% TODO write emit
Expand Down
5 changes: 5 additions & 0 deletions test/erlfmt_SUITE_data/ignore_format_many.erl.formatted
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ f() -> ok. % this is ok
g() -> ok. % this is also ok
% erlfmt:ignore-end I'm done with this style

% erlfmt:ignore-begin Here we go again...
a1() -> ok. % again
a2() -> ok. % ditto
% erlfmt:ignore-end Now I'm really done

% blah
h() -> ok.

Expand Down
Loading