Allow indentation of multiple files

dgud · dgud · commit f31cb170bdb7 · 2018-02-06T22:30:32.000+01:00
diff --git a/apps/erlang_ls/src/erlang_ls.erl b/apps/erlang_ls/src/erlang_ls.erl
@@ -6,13 +6,13 @@
 
 main(Args) ->
     case getopt:parse(cli_options(), Args) of
-        {ok, {Opts, _Other}} ->
+        {ok, {Opts, Other}} ->
             Dump = proplists:get_value(dump, Opts),
             Indent = proplists:get_value(indent, Opts),
             if Dump =:= undefined, Indent =:= undefined ->
                     start_server(Opts);
                is_list(Indent) ->
-                    indent(Indent);
+                    indent([Indent|Other], proplists:get_value(verbose, Opts, 0));
                is_list(Dump) ->
                     dump_file(Dump)
             end;
@@ -24,9 +24,9 @@ main(Args) ->
 cli_options() ->
     [
      {dump,    $d,        "dump",     string,      "Dump sourcer db for file"},
-     {indent,  $i,        "indent",   string,      "Indent file and exit"},
      {port,    $p,        "port",    integer,               "LSP server port"},
-     {verbose, $v,        "verbose", integer,               "Verbosity level"}
+     {verbose, $v,        "verbose", integer,               "Verbosity level"},
+     {indent,  $i,        "indent",   string,      "Indent file(s) and exit"}
     ].
 
 start_server(Opts) ->
@@ -64,19 +64,28 @@ dump_file(File) ->
     io:format("Analyze: ~.6wms~n", [AT div 1000]),
     ok.
 
-indent(File) ->
-    case file:read_file(File) of
-        {ok, BinSrc} ->
-            Enc = encoding(BinSrc),
-            Src = unicode:characters_to_list(BinSrc, Enc),
-            {ST,Indented} = timer:tc(fun() -> sourcer_indent:lines(Src) end),
-            ok = file:write_file(File, unicode:characters_to_binary(Indented, utf8, Enc)),
-            io:format("Indent:    ~.6wms~n", [ST div 1000]),
-            ok;
-        {error, Error} ->
-            io:format("Could not read file: ~s\n Reason: ~p~n",[File, Error]),
+indent([File|Files], Verbose) ->
+    try case file:read_file(File) of
+            {ok, BinSrc} ->
+                Enc = encoding(BinSrc),
+                Src = unicode:characters_to_list(BinSrc, Enc),
+                {ST,Indented} = timer:tc(fun() -> sourcer_indent:lines(Src) end),
+                ok = file:write_file(File, unicode:characters_to_binary(Indented, utf8, Enc)),
+                Verbose > 0 andalso io:format("Indent: ~.6wms ~s~n", [ST div 1000, File]),
+                indent(Files, Verbose);
+            {error, Error} ->
+                Str = io_lib:format("Could not read file: ~ts\n Reason: ~p~n", [File, Error]),
+                throw({error,Str})
+        end
+    catch throw:{error, Desc} ->
+            io:format("~ts", [Desc]),
+            erlang:halt(1);
+          error:_What ->
+            io:format("Error could not indent file: ~ts\n", [File]),
             erlang:halt(1)
-    end.
+    end;
+indent([], _) ->
+    ok.
 
 encoding(Bin) ->
     case epp:read_encoding_from_binary(Bin) of
diff --git a/rebar.config b/rebar.config
@@ -47,3 +47,5 @@
 
 {escript_main_app, erlang_ls}.
 {escript_comment, "%% v0.2.0\n"}.
+
+{provider_hooks, [{post, [{compile, escriptize}]}]}.
