From ea87f27470bd9a9f35305eaef5f9834581cfc513 Mon Sep 17 00:00:00 2001 From: Vlad Dumitrescu Date: Sun, 12 Mar 2017 21:05:12 +0100 Subject: [PATCH] small edits --- .../erlide_builder/src/erlide_builder.app.src | 3 +-- .../erlide_builder/src/erlide_builder_app.erl | 1 + common/apps/erlide_common/src/erlide_backend.erl | 8 ++------ .../apps/erlide_common/src/erlide_common.app.src | 3 +-- .../apps/erlide_common/src/erlide_common_app.erl | 1 + common/apps/erlide_common/src/erlide_shell.erl | 12 ++++++------ common/apps/erlide_tools/src/erlide_dialyze.erl | 1 - .../apps/erlide_tools/src/erlide_tools.app.src | 3 +-- .../apps/erlide_tools/src/erlide_tools_app.erl | 1 + ide/apps/erlide_ide/src/erlide_comment.erl | 1 - ide/apps/erlide_ide/src/erlide_ide.app.src | 3 +-- ide/apps/erlide_ide/src/erlide_ide_app.erl | 1 + ide/apps/erlide_ide/test/erlide_indent_tests.erl | 1 - ide/apps/erlide_ide/test/erlide_search_tests.erl | 1 - ide/apps/erlide_server/src/erlide_np_records.erl | 1 - ide/apps/erlide_server/src/erlide_np_util.erl | 1 - ide/apps/erlide_server/src/erlide_server.app.src | 3 +-- ide/apps/erlide_server/src/erlide_server_app.erl | 1 + .../erlide_server/test/erlide_parsing_tests.erl | 1 - .../erlide_server/test/erlide_scan_tests.erl | 1 - .../erlide_server/test/erlide_scanner_tests.erl | 1 - ide/rebar.config | 16 ++++++++-------- 22 files changed, 26 insertions(+), 39 deletions(-) diff --git a/common/apps/erlide_builder/src/erlide_builder.app.src b/common/apps/erlide_builder/src/erlide_builder.app.src index 55abc21..99e2663 100644 --- a/common/apps/erlide_builder/src/erlide_builder.app.src +++ b/common/apps/erlide_builder/src/erlide_builder.app.src @@ -4,7 +4,6 @@ {erlide_context, builder}, {registered, []}, {applications, [kernel, stdlib, erlide_common]}, - {env, []}, - {mod, {erlide_builder_app, []}} + {env, []} ]} . diff --git a/common/apps/erlide_builder/src/erlide_builder_app.erl b/common/apps/erlide_builder/src/erlide_builder_app.erl index b2ad6f9..aecb807 100644 --- a/common/apps/erlide_builder/src/erlide_builder_app.erl +++ b/common/apps/erlide_builder/src/erlide_builder_app.erl @@ -5,6 +5,7 @@ ]). init(MaxParallelBuilds) -> + io:format("Start builder app~n"), spawn(fun()-> erlide_pool:start(erlide_builder, MaxParallelBuilds), ok diff --git a/common/apps/erlide_common/src/erlide_backend.erl b/common/apps/erlide_common/src/erlide_backend.erl index 57368bc..a285ace 100644 --- a/common/apps/erlide_common/src/erlide_backend.erl +++ b/common/apps/erlide_common/src/erlide_backend.erl @@ -30,7 +30,6 @@ compile_string/1, start_tracer/1, - get_system_info/0, get_module_info/1 ]). @@ -44,7 +43,7 @@ parse_term(Str) -> parse_term_raw(Str) -> %% erlide_log:logp(Str), - %% use the OTP erl_scan here! + %% use the OTP erl_scan here! {ok, Tokens, _} = erl_scan:string(Str), %% erlide_log:logp(Tokens), R=erl_parse:parse_term(Tokens), @@ -121,7 +120,7 @@ execute(StrFun, Args) -> catch case parse_string(StrMod) of {ok, Mod} -> {ok, erlide_execute_tmp,Bin} = compile:forms(Mod, [report,binary]), - code:load_binary(erlide_execute_tmp, "erlide_execute_tmp.erl", Bin), + _ = code:load_binary(erlide_execute_tmp, "erlide_execute_tmp.erl", Bin), Res = erlide_execute_tmp:exec(Args), code:delete(erlide_execute_tmp), code:purge(erlide_execute_tmp), @@ -210,6 +209,3 @@ print_opts({K, V}) -> print_opts(X) -> io_lib:format(" ~p~n", [X]). -get_system_info() -> - lists:flatten(io_lib:format("~p~n", [erlide_monitor:get_state()])). - diff --git a/common/apps/erlide_common/src/erlide_common.app.src b/common/apps/erlide_common/src/erlide_common.app.src index 3bcb1e8..5d864f7 100644 --- a/common/apps/erlide_common/src/erlide_common.app.src +++ b/common/apps/erlide_common/src/erlide_common.app.src @@ -4,7 +4,6 @@ {erlide_context, common}, {registered, []}, {applications, [kernel, stdlib]}, - {env, []}, - {mod, {erlide_common_app, []}} + {env, []} ]} . diff --git a/common/apps/erlide_common/src/erlide_common_app.erl b/common/apps/erlide_common/src/erlide_common_app.erl index 73fddd1..316a534 100644 --- a/common/apps/erlide_common/src/erlide_common_app.erl +++ b/common/apps/erlide_common/src/erlide_common_app.erl @@ -5,6 +5,7 @@ ]). init(JRex, Kill, HeapWarnLimit, HeapKillLimit) -> + io:format("Start common app~n"), spawn(fun () -> startup(JRex, Kill, HeapWarnLimit, HeapKillLimit) end). diff --git a/common/apps/erlide_common/src/erlide_shell.erl b/common/apps/erlide_common/src/erlide_shell.erl index cf1b2b3..8b31c5d 100644 --- a/common/apps/erlide_common/src/erlide_shell.erl +++ b/common/apps/erlide_common/src/erlide_shell.erl @@ -113,7 +113,7 @@ handle_input(Client, State, Input) -> {done, Result, []} -> #io_request{from = From, reply_as = ReplyAs} = FirstReq, - io_reply(From, ReplyAs, Result), + _ = io_reply(From, ReplyAs, Result), case length(RestReqs) of 0 -> {ok, idle}; @@ -126,7 +126,7 @@ handle_input(Client, State, Input) -> {done, Result, RestChars} -> #io_request{from = From, reply_as = ReplyAs} = FirstReq, - io_reply(From, ReplyAs, Result), + _ = io_reply(From, ReplyAs, Result), case length(RestReqs) of 0 -> {ok, {pending_input, RestChars}}; @@ -150,7 +150,7 @@ put_chars(From, ReplyAs, State, Encoding, Mod, Fun, Args) -> end, FlatText = string_flatten(Text), send_event(FlatText, From, Encoding), - io_reply(From, ReplyAs, ok), + _ = io_reply(From, ReplyAs, ok), {ok, State}. @@ -181,7 +181,7 @@ get_until(From, ReplyAs, Client, State, _Encoding, Prompt, Mod, Fun, Args) -> put_chars(From, ReplyAs, State, Encoding, Text) -> FlatText = string_flatten(Text), send_event(FlatText, From, Encoding), - io_reply(From, ReplyAs, ok), + _ = io_reply(From, ReplyAs, ok), {ok, State}. @@ -213,13 +213,13 @@ handle_io_request(Client, State, From, ReplyAs, IoRequest) -> handle_io_requests(Client, State, From, ReplyAs, IoReqests); getopts -> - io_reply(From, ReplyAs, [{encoding, latin1}]), + _ = io_reply(From, ReplyAs, [{encoding, latin1}]), {ok, State}; UnexpectedIORequest -> loginfo("~p:handle_io_request: Unexpected IORequest:~p~n", [?MODULE, UnexpectedIORequest]), - io_reply(From, ReplyAs, ok), + _ = io_reply(From, ReplyAs, ok), {ok, State} end. diff --git a/common/apps/erlide_tools/src/erlide_dialyze.erl b/common/apps/erlide_tools/src/erlide_dialyze.erl index dcf1b05..8e22866 100644 --- a/common/apps/erlide_tools/src/erlide_dialyze.erl +++ b/common/apps/erlide_tools/src/erlide_dialyze.erl @@ -1,6 +1,5 @@ %% Author: jakob %% Created: 17 feb 2010 -%% Description: TODO: Add description to erlide_dialyze -module(erlide_dialyze). %% diff --git a/common/apps/erlide_tools/src/erlide_tools.app.src b/common/apps/erlide_tools/src/erlide_tools.app.src index c3b4698..12242f1 100644 --- a/common/apps/erlide_tools/src/erlide_tools.app.src +++ b/common/apps/erlide_tools/src/erlide_tools.app.src @@ -4,7 +4,6 @@ {erlide_context, common}, {registered, []}, {applications, [kernel, stdlib, erlide_common]}, - {env, []}, - {mod, {erlide_tools_app, []}} + {env, []} ]} . diff --git a/common/apps/erlide_tools/src/erlide_tools_app.erl b/common/apps/erlide_tools/src/erlide_tools_app.erl index d609110..0ee321d 100644 --- a/common/apps/erlide_tools/src/erlide_tools_app.erl +++ b/common/apps/erlide_tools/src/erlide_tools_app.erl @@ -5,5 +5,6 @@ ]). init() -> + io:format("Start tools app~n"), ok. diff --git a/ide/apps/erlide_ide/src/erlide_comment.erl b/ide/apps/erlide_ide/src/erlide_comment.erl index af7144b..3c9c05c 100644 --- a/ide/apps/erlide_ide/src/erlide_comment.erl +++ b/ide/apps/erlide_ide/src/erlide_comment.erl @@ -1,6 +1,5 @@ %% Author: jakob %% Created: Mar 23, 2006 -%% Description: TODO: Add description to erlide_comment -module(erlide_comment). diff --git a/ide/apps/erlide_ide/src/erlide_ide.app.src b/ide/apps/erlide_ide/src/erlide_ide.app.src index a296223..b294efc 100644 --- a/ide/apps/erlide_ide/src/erlide_ide.app.src +++ b/ide/apps/erlide_ide/src/erlide_ide.app.src @@ -4,7 +4,6 @@ {erlide_context, ide}, {registered, []}, {applications, [kernel, stdlib, erlide_common, erlide_server]}, - {env, []}, - {mod, {erlide_ide_app, []}} + {env, []} ]} . diff --git a/ide/apps/erlide_ide/src/erlide_ide_app.erl b/ide/apps/erlide_ide/src/erlide_ide_app.erl index c1001a3..3dff159 100644 --- a/ide/apps/erlide_ide/src/erlide_ide_app.erl +++ b/ide/apps/erlide_ide/src/erlide_ide_app.erl @@ -5,5 +5,6 @@ ]). init() -> + io:format("Start ide app~n"), ok. diff --git a/ide/apps/erlide_ide/test/erlide_indent_tests.erl b/ide/apps/erlide_ide/test/erlide_indent_tests.erl index b9656fd..ef3ce21 100644 --- a/ide/apps/erlide_ide/test/erlide_indent_tests.erl +++ b/ide/apps/erlide_ide/test/erlide_indent_tests.erl @@ -1,6 +1,5 @@ %% Author: jakob %% Created: 24 nov 2009 -%% Description: TODO: Add description to erlide_indent_tests -module(erlide_indent_tests). %% diff --git a/ide/apps/erlide_ide/test/erlide_search_tests.erl b/ide/apps/erlide_ide/test/erlide_search_tests.erl index 18df5e2..6de9d6a 100644 --- a/ide/apps/erlide_ide/test/erlide_search_tests.erl +++ b/ide/apps/erlide_ide/test/erlide_search_tests.erl @@ -1,6 +1,5 @@ %% Author: jakob %% Created: 20 dec 2010 -%% Description: TODO: Add description to erlide_search_tests -module(erlide_search_tests). %% diff --git a/ide/apps/erlide_server/src/erlide_np_records.erl b/ide/apps/erlide_server/src/erlide_np_records.erl index a95de9f..0381d15 100644 --- a/ide/apps/erlide_server/src/erlide_np_records.erl +++ b/ide/apps/erlide_server/src/erlide_np_records.erl @@ -1,6 +1,5 @@ %% Author: jakob %% Created: 18 dec 2010 -%% Description: TODO: Add description to erlide_np_records -module(erlide_np_records). %% diff --git a/ide/apps/erlide_server/src/erlide_np_util.erl b/ide/apps/erlide_server/src/erlide_np_util.erl index 2522133..e6d412a 100644 --- a/ide/apps/erlide_server/src/erlide_np_util.erl +++ b/ide/apps/erlide_server/src/erlide_np_util.erl @@ -1,6 +1,5 @@ %% Author: jakob %% Created: 7 nov 2010 -%% Description: TODO: Add description to erlide_np_util -module(erlide_np_util). %% -define(DEBUG, 1). diff --git a/ide/apps/erlide_server/src/erlide_server.app.src b/ide/apps/erlide_server/src/erlide_server.app.src index d9b070b..07a6b81 100644 --- a/ide/apps/erlide_server/src/erlide_server.app.src +++ b/ide/apps/erlide_server/src/erlide_server.app.src @@ -4,7 +4,6 @@ {erlide_context, ide}, {registered, []}, {applications, [kernel, stdlib, erlide_common]}, - {env, []}, - {mod, {erlide_server_app, []}} + {env, []} ]} . diff --git a/ide/apps/erlide_server/src/erlide_server_app.erl b/ide/apps/erlide_server/src/erlide_server_app.erl index 5384925..b8b1a3c 100644 --- a/ide/apps/erlide_server/src/erlide_server_app.erl +++ b/ide/apps/erlide_server/src/erlide_server_app.erl @@ -5,5 +5,6 @@ ]). init() -> + io:format("Start server app~n"), ok. diff --git a/ide/apps/erlide_server/test/erlide_parsing_tests.erl b/ide/apps/erlide_server/test/erlide_parsing_tests.erl index dbd4a57..5bc0019 100644 --- a/ide/apps/erlide_server/test/erlide_parsing_tests.erl +++ b/ide/apps/erlide_server/test/erlide_parsing_tests.erl @@ -1,6 +1,5 @@ %% Author: jakob %% Created: 30 aug 2010 -%% Description: TODO: Add description to erlide_parsing_test -module(erlide_parsing_tests). %% diff --git a/ide/apps/erlide_server/test/erlide_scan_tests.erl b/ide/apps/erlide_server/test/erlide_scan_tests.erl index 0ddff3d..a9cc4e9 100644 --- a/ide/apps/erlide_server/test/erlide_scan_tests.erl +++ b/ide/apps/erlide_server/test/erlide_scan_tests.erl @@ -1,5 +1,4 @@ %% coding: utf-8 -%% Description: TODO: Add description to erlide_scanner_tests -module(erlide_scan_tests). %% diff --git a/ide/apps/erlide_server/test/erlide_scanner_tests.erl b/ide/apps/erlide_server/test/erlide_scanner_tests.erl index 1946423..e0ef104 100644 --- a/ide/apps/erlide_server/test/erlide_scanner_tests.erl +++ b/ide/apps/erlide_server/test/erlide_scanner_tests.erl @@ -1,6 +1,5 @@ %% Author: jakob %% Created: 12 okt 2009 -%% Description: TODO: Add description to erlide_scanner_tests -module(erlide_scanner_tests). %% diff --git a/ide/rebar.config b/ide/rebar.config index d7832c7..9f158f0 100644 --- a/ide/rebar.config +++ b/ide/rebar.config @@ -44,14 +44,14 @@ deprecated_functions ]}. -{dialyzer, - [ - %% Store PLT locally inside the project in .rebar (Default) - %% {plt_location, local}, - %% Store PLT in custom directory - %% {plt_location, "custom_dir"}, - {warnings, [unmatched_returns, error_handling, unknown]} - ]}. +{dialyzer, [ + %% Store PLT locally inside the project in .rebar (Default) + %% {plt_location, local}, + %% Store PLT in custom directory + %% {plt_location, "custom_dir"}, + {warnings, [unmatched_returns, error_handling, unknown]}, + {base_plt_apps, [erts, kernel, stdlib, syntax_tools, tools]} + ]}. {cover_export_enabled, true}. {cover_enabled, true}.