Skip to content

Commit

Permalink
fix regex once more
Browse files Browse the repository at this point in the history
  • Loading branch information
Milán Bór authored and Milán Bór committed Sep 16, 2024
1 parent 61e038c commit 79f53ce
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/elvis_style.erl
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ default(no_common_caveats_call) ->
{timer, send_interval, 3},
{erlang, size, 1}]};
default(atom_naming_convention) ->
#{regex => "^[a-z]+((_?[a-z0-9])*[a-z0-9]+)*(_SUITE)?$", enclosed_atoms => ".*"};
#{regex => "^[a-z](_?[a-z0-9]+)*(_SUITE)?$", enclosed_atoms => ".*"};
%% Not restrictive. Those who want more restrictions can set it like "^[^_]*$"
default(numeric_format) ->
#{regex => ".*",
Expand Down
3 changes: 2 additions & 1 deletion test/examples/fail_atom_naming_convention.erl
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ for_test() ->
'_something', % invalid because it starts with underscore
'42_invalid_because_it_starts_with_a_number',
'42invalid', %% even without underscores
weDontSupportCamelCaseHere.
weDontSupportCamelCaseHere,
not_even_in_a__SUITE.
4 changes: 3 additions & 1 deletion test/examples/pass_atom_naming_convention.erl
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ for_test() ->
non_200,
'_', % used by ets/mnesia/etc.
non200, % valid, even without underscores
valid_200even_if_numb3rs_appear_between_letters.
valid_200even_if_numb3rs_appear_between_letters,
blahblah_SUITE,
x.
4 changes: 2 additions & 2 deletions test/style_SUITE.erl
Original file line number Diff line number Diff line change
Expand Up @@ -1302,7 +1302,7 @@ verify_atom_naming_convention(Config) ->
Group = proplists:get_value(group, Config, erl_files),
Ext = proplists:get_value(test_file_ext, Config, "erl"),

BaseRegex = "^[a-z]+((_?[a-z0-9])*[a-z0-9]+)*$",
BaseRegex = "^[a-z](_?[a-z0-9]+)*(_SUITE)?$",

% pass
PassModule = pass_atom_naming_convention,
Expand Down Expand Up @@ -1337,7 +1337,7 @@ verify_atom_naming_convention(Config) ->
FailModule2 = fail_atom_naming_convention_exception_class,
FailPath2 = atom_to_list(FailModule2) ++ "." ++ Ext,

[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _] =
[_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _] =
elvis_core_apply_rule(Config,
elvis_style,
atom_naming_convention,
Expand Down

0 comments on commit 79f53ce

Please sign in to comment.