Skip to content

Commit

Permalink
no_macros now allows for logger default macros (?LOG, `?LOG_...…
Browse files Browse the repository at this point in the history
…` and friends) (#338)

* Update list of epp predefined macros

* Allow for logger macros (?LOG_... and friends) by default
  • Loading branch information
kivra-pauoli authored Feb 28, 2024
1 parent 59861d4 commit c5474ce
Showing 1 changed file with 16 additions and 2 deletions.
18 changes: 16 additions & 2 deletions src/elvis_style.erl
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ check_no_macro_calls(Calls) ->
[elvis_result:item()].
no_macros(ElvisConfig, RuleTarget, RuleConfig) ->
TreeRootNode = get_root(ElvisConfig, RuleTarget, RuleConfig),
AllowedMacros = maps:get(allow, RuleConfig, []) ++ eep_predef_macros(),
AllowedMacros = maps:get(allow, RuleConfig, []) ++ eep_predef_macros() ++ logger_macros(),

MacroNodes =
elvis_code:find(fun is_macro_node/1, TreeRootNode, #{traverse => all, mode => node}),
Expand Down Expand Up @@ -478,10 +478,12 @@ is_begin_node(Node) ->
ktn_code:type(Node) =:= 'begin'.

eep_predef_macros() ->
% From unexported eep:predef_macros/1
% From unexported epp:predef_macros/1
['BASE_MODULE',
'BASE_MODULE_STRING',
'BEAM',
'FEATURE_AVAILABLE',
'FEATURE_ENABLED',
'FILE',
'FUNCTION_ARITY',
'FUNCTION_NAME',
Expand All @@ -491,6 +493,18 @@ eep_predef_macros() ->
'MODULE_STRING',
'OTP_RELEASE'].

logger_macros() ->
% From logger.hrl
['LOG',
'LOG_ALERT',
'LOG_CRITICAL',
'LOG_DEBUG',
'LOG_EMERGENCY',
'LOG_ERROR',
'LOG_INFO',
'LOG_NOTICE',
'LOG_WARNING'].

-type no_space_after_pound_config() :: #{ignore => [ignorable()]}.

-spec no_space_after_pound(elvis_config:config(),
Expand Down

0 comments on commit c5474ce

Please sign in to comment.