yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13176 from JimMoen/erlfmt-file-name-by-find 

build: run erlfmt with files name by `$(FIND)`
This commit is contained in:
JimMoen 2024-06-05 17:41:19 +08:00 committed by GitHub
parent 3d992e4501 0eac19ef12
commit f0721bdb97
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 101 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.ci/fvt_tests/http_server/src/http_server.app.src
View File

@ -1,18 +1,18 @@
%% -*- mode: erlang -*- %% -*- mode: erlang -*-
{application, http_server, {application, http_server, [
[{description, "An HTTP server application"}, {description, "An HTTP server application"},
{vsn, "0.2.0"}, {vsn, "0.2.0"},
{registered, []}, {registered, []},
% {mod, {http_server_app, []}}, % {mod, {http_server_app, []}},
{modules, []}, {modules, []},
{applications, {applications, [
[kernel, kernel,
stdlib, stdlib,
minirest minirest
]}, ]},
{env,[]}, {env, []},
{modules, []}, {modules, []},
{licenses, ["Apache 2.0"]}, {licenses, ["Apache 2.0"]},
{links, []} {links, []}
]}. ]}.

14
Makefile
View File

@ -317,10 +317,16 @@ $(foreach tt,$(ALL_ELIXIR_TGZS),$(eval $(call gen-elixir-tgz-target,$(tt))))
.PHONY: fmt .PHONY: fmt
fmt: $(REBAR) fmt: $(REBAR)
@$(SCRIPTS)/erlfmt -w 'apps/*/{src,include,priv,test,integration_test}/**/*.{erl,hrl,app.src,eterm}' @$(FIND) . \( -name '*.app.src' -o \
@$(SCRIPTS)/erlfmt -w 'apps/*/rebar.config' 'apps/emqx/rebar.config.script' '.ci/fvt_tests/http_server/rebar.config' -name '*.erl' -o \
@$(SCRIPTS)/erlfmt -w 'rebar.config' 'rebar.config.erl' -name '*.hrl' -o \
@$(SCRIPTS)/erlfmt -w 'scripts/*.escript' 'bin/*.escript' 'bin/nodetool' -name 'rebar.config' -o \
-name '*.eterm' -o \
-name '*.escript' \) -not -path '*/_build/*' -type f \
| xargs $(SCRIPTS)/erlfmt -w
@$(SCRIPTS)/erlfmt -w 'apps/emqx/rebar.config.script'
@$(SCRIPTS)/erlfmt -w 'elvis.config'
@$(SCRIPTS)/erlfmt -w 'bin/nodetool'
@mix format @mix format
.PHONY: clean-test-cluster-config .PHONY: clean-test-cluster-config

131
elvis.config
View File

@ -1,62 +1,77 @@
%% -*- mode: erlang -*- %% -*- mode: erlang -*-
[ [
{ {
elvis, elvis,
[ [
{config, {config, [
[ #{
#{dirs => ["src", "apps/**/src"], dirs => ["src", "apps/**/src"],
filter => "*.erl", filter => "*.erl",
ruleset => erl_files, ruleset => erl_files,
rules => [ rules => [
{elvis_style, macro_names, disable}, {elvis_style, param_pattern_matching, disable},
{elvis_style, function_naming_convention, disable}, {elvis_style, macro_names, disable},
{elvis_style, state_record_and_type, disable}, {elvis_style, function_naming_convention, disable},
{elvis_style, no_common_caveats_call, #{}}, {elvis_style, state_record_and_type, disable},
{elvis_style, no_debug_call, #{ debug_functions => [ {ct, pal} {elvis_style, no_common_caveats_call, #{}},
, {ct, print} {elvis_style, no_debug_call, #{
]}}, debug_functions => [
{elvis_style, operator_spaces, #{rules => [{right, "|"}, {ct, pal},
{left, "|"}, {ct, print}
{right, "||"}, ]
{left, "||"}]}}, }},
{elvis_style, dont_repeat_yourself, #{ min_complexity => 20 }}, {elvis_style, operator_spaces, #{
{elvis_style, god_modules, #{limit => 100}}, rules => [
{elvis_text_style, line_length, #{ limit => 120 % trust erlfmt {right, "|"},
, skip_comments => false {left, "|"},
}} {right, "||"},
] {left, "||"}
}, ]
#{dirs => ["test", "apps/**/test"], }},
filter => "*.erl", {elvis_style, dont_repeat_yourself, #{min_complexity => 20}},
rules => [ {elvis_style, god_modules, #{limit => 100}},
{elvis_text_style, line_length, #{ limit => 120 % trust erlfmt
, skip_comments => false {elvis_text_style, line_length, #{
}}, limit => 120,
{elvis_style, dont_repeat_yourself, #{ min_complexity => 100 }}, skip_comments => false
{elvis_style, nesting_level, #{ level => 6 }} }}
] ]
}, },
#{dirs => ["apps/emqx_rule_engine/src"], #{
filter => "*_rule_funcs.erl", dirs => ["test", "apps/**/test"],
rules => [ filter => "*.erl",
{elvis_style, god_modules, disable} rules => [
] {elvis_text_style, line_length, #{
}, limit => 120,
#{dirs => ["."], skip_comments => false
filter => "Makefile", }},
ruleset => makefiles {elvis_style, dont_repeat_yourself, #{min_complexity => 100}},
}, {elvis_style, nesting_level, #{level => 6}}
#{dirs => ["."], ]
filter => "rebar.config", },
ruleset => rebar_config #{
}, dirs => ["apps/emqx_rule_engine/src"],
#{dirs => ["."], filter => "*_rule_funcs.erl",
filter => "elvis.config", rules => [
ruleset => elvis_config {elvis_style, god_modules, disable}
} ]
] },
#{
dirs => ["."],
filter => "Makefile",
ruleset => makefiles
},
#{
dirs => ["."],
filter => "rebar.config",
ruleset => rebar_config
},
#{
dirs => ["."],
filter => "elvis.config",
ruleset => elvis_config
}
]}
]
} }
]
}
]. ].

2
git-blame-ignore-revs
View File

@ -39,3 +39,5 @@ a4feb3e6e95c18cb531416112e57520c5ba00d40
72eb34658d31fb38130421949cff262efab51139 72eb34658d31fb38130421949cff262efab51139
# erlfmt rebar.config files and bin/nodetool # erlfmt rebar.config files and bin/nodetool
5e100f52b8a530f4a952a4b20125ec37b38e2906 5e100f52b8a530f4a952a4b20125ec37b38e2906
# erlfmt files in `erlang-mode`
336ed1b9223e37adb3336b8edacfd2a9b4238319