diff options
| author | Hans Bolinder <[email protected]> | 2016-07-07 08:22:15 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2016-07-07 08:22:15 +0200 |
| commit | ae2f69f3320ce0037d83906cbcee68caeeb2937d (patch) | |
| tree | 93ab31df3685dfae34d6e8fdc60d9f1e609755d6 /lib | |
| parent | a507da8e7a434ceeb60c0ace1b153328f262d493 (diff) | |
| parent | 62ef9f77d94563a03b8f1f5f1e8843f022329393 (diff) | |
| download | otp-ae2f69f3320ce0037d83906cbcee68caeeb2937d.tar.gz otp-ae2f69f3320ce0037d83906cbcee68caeeb2937d.tar.bz2 otp-ae2f69f3320ce0037d83906cbcee68caeeb2937d.zip | |
Merge branch 'maint'
* maint:
syntax_tools: Make erl_tidy work on input file with tilde
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/syntax_tools/src/erl_tidy.erl | 2 | ||||
| -rw-r--r-- | lib/syntax_tools/test/syntax_tools_SUITE.erl | 10 | ||||
| -rw-r--r-- | lib/syntax_tools/test/syntax_tools_SUITE_data/erl_tidy_tilde.erl | 13 |
3 files changed, 22 insertions, 3 deletions
diff --git a/lib/syntax_tools/src/erl_tidy.erl b/lib/syntax_tools/src/erl_tidy.erl index f2de12b410..3a37ca43bd 100644 --- a/lib/syntax_tools/src/erl_tidy.erl +++ b/lib/syntax_tools/src/erl_tidy.erl @@ -414,7 +414,7 @@ write_module(Tree, Name, Opts) -> print_module(Tree, Opts) -> Printer = proplists:get_value(printer, Opts), - io:format(Printer(Tree, Opts)). + io:put_chars(Printer(Tree, Opts)). output(FD, Printer, Tree, Opts) -> io:put_chars(FD, Printer(Tree, Opts)), diff --git a/lib/syntax_tools/test/syntax_tools_SUITE.erl b/lib/syntax_tools/test/syntax_tools_SUITE.erl index b935d42bb7..43c17e9f1f 100644 --- a/lib/syntax_tools/test/syntax_tools_SUITE.erl +++ b/lib/syntax_tools/test/syntax_tools_SUITE.erl @@ -27,14 +27,14 @@ %% Test cases -export([app_test/1,appup_test/1,smoke_test/1,revert/1,revert_map/1, t_abstract_type/1,t_erl_parse_type/1,t_epp_dodger/1, - t_comment_scan/1,t_igor/1]). + t_comment_scan/1,t_igor/1,t_erl_tidy/1]). suite() -> [{ct_hooks,[ts_install_cth]}]. all() -> [app_test,appup_test,smoke_test,revert,revert_map, t_abstract_type,t_erl_parse_type,t_epp_dodger, - t_comment_scan,t_igor]. + t_comment_scan,t_igor,t_erl_tidy]. groups() -> []. @@ -237,6 +237,12 @@ t_igor(Config) when is_list(Config) -> ok. +t_erl_tidy(Config) when is_list(Config) -> + DataDir = ?config(data_dir, Config), + File = filename:join(DataDir,"erl_tidy_tilde.erl"), + ok = erl_tidy:file(File, [{stdout, true}]), + ok. + test_comment_scan([],_) -> ok; test_comment_scan([File|Files],DataDir) -> Filename = filename:join(DataDir,File), diff --git a/lib/syntax_tools/test/syntax_tools_SUITE_data/erl_tidy_tilde.erl b/lib/syntax_tools/test/syntax_tools_SUITE_data/erl_tidy_tilde.erl new file mode 100644 index 0000000000..888264bad6 --- /dev/null +++ b/lib/syntax_tools/test/syntax_tools_SUITE_data/erl_tidy_tilde.erl @@ -0,0 +1,13 @@ +%% +%% File: erl_tidy_tilde.erl +%% Author: Mark Bucciarelli +%% Created: 2016-06-05 +%% + +-module(erl_tidy_tilde). + +-export([start/0]). + +start() -> + io:put_chars("tilde characters ('~')in source were " + "breaking erl_tidy\n"). |