Use file:consult/1 for erlang_ls.config

Author: sirikid

apps/els_core/src/els_config.erl

@@ -242,17 +242,30 @@ consult_config([], ReportMissingConfig) ->
   {undefined, #{}};
 consult_config([Path | Paths], ReportMissingConfig) ->
   ?LOG_INFO("Reading config file. path=~p", [Path]),
-  Options = [{map_node_format, map}],
-  try yamerl:decode_file(Path, Options) of
+  try consult_file(Path) of
       [] -> {Path, #{}};
-      [Config] -> {Path, Config}
+      [Config] -> {Path, Config};
+      {ok, Config} -> {Path, maps:from_list(Config)};
+      {error, Reason} ->
+        ?LOG_WARNING( "Could not read config file: path=~p class=~p error=~p"
+                    , [Path, error, Reason]),
+        consult_config(Paths, ReportMissingConfig)
   catch
     Class:Error ->
       ?LOG_WARNING( "Could not read config file: path=~p class=~p error=~p"
                   , [Path, Class, Error]),
       consult_config(Paths, ReportMissingConfig)
   end.
 
+-spec consult_file(path()) -> [map()] | {ok, [term()]} | {error, term()}.
+consult_file(Path) ->
+  case string:find(Path, ".yaml", trailing) of
+    nomatch ->
+      file:consult(Path);
+    ".yaml" ->
+      yamerl:decode_file(Path, [{map_node_format, map}])
+  end.
+
 -spec report_missing_config() -> ok.
 report_missing_config() ->
   Msg =

erlang_ls.config.sample

@@ -1,10 +1,8 @@
-apps_dirs:
-  - "apps/*"
-deps_dirs:
-  - "_build/default/lib/*"
-  - "_build/test/lib/*"
-include_dirs:
-  - "apps"
-  - "apps/*/include"
-  - "_build/*/lib/"
-  - "_build/*/lib/*/include"
+%% -*- mode: erlang; -*-
+
+{"apps_dirs", ["apps/*"]}.
+
+{"deps_dirs", ["_build/default/lib/*", "_build/test/lib/*"]}.
+
+{"include_dirs",
+ ["apps", "apps/*/include", "_build/*/lib", "_build/*/lib/*/include"]}.

erlang_ls.yaml.sample

@@ -0,0 +1,10 @@
+apps_dirs:
+  - "apps/*"
+deps_dirs:
+  - "_build/default/lib/*"
+  - "_build/test/lib/*"
+include_dirs:
+  - "apps"
+  - "apps/*/include"
+  - "_build/*/lib/"
+  - "_build/*/lib/*/include"