Merge pull request #979 from gomoripeti/erlfmt_phase2

Use erlfmt for parsing

apps/els_lsp/priv/code_navigation/src/hover_macro.erl

@@ -5,3 +5,8 @@
 f() ->
   ?LOCAL_MACRO,
   ?INCLUDED_MACRO_A.
+
+-define(WEIRD_MACRO, A when A > 1).
+
+g() ->
+  case foo of ?WEIRD_MACRO -> ok end.

apps/els_lsp/src/els_bound_var_in_pattern_diagnostics.erl

@@ -52,7 +52,7 @@ source() ->
 -spec find_vars(uri()) -> [poi()].
 find_vars(Uri) ->
   {ok, #{text := Text}} = els_utils:lookup_document(Uri),
-  {ok, Forms} = parse_file(Text),
+  {ok, Forms} = els_parser:parse_text(Text),
   lists:flatmap(fun find_vars_in_form/1, Forms).
 
 -spec find_vars_in_form(erl_syntax:forms()) -> [poi()].
@@ -126,13 +126,6 @@ find_vars_in_pattern(Tree, Acc) ->
       Acc
   end.
 
--spec parse_file(binary()) -> {ok, erl_syntax:forms()}.
-parse_file(Text) ->
-  IoDevice = els_io_string:new(Text),
-  {ok, Forms} = els_dodger:parse(IoDevice, {1, 1}),
-  ok = file:close(IoDevice),
-  {ok, Forms}.
-
 -spec variable(tree()) -> poi().
 variable(Tree) ->
   Id = erl_syntax:variable_name(Tree),

apps/els_lsp/src/els_docs.erl

@@ -50,9 +50,14 @@ docs(Uri, #{kind := Kind, id := {F, A}})
   function_docs('local', M, F, A);
 docs(Uri, #{kind := macro, id := Name} = POI) ->
   case els_code_navigation:goto_definition(Uri, POI) of
-    {ok, _DefUri, #{data := [Value|_]}} ->
+    {ok, DefUri, #{data := #{value_range := ValueRange}}} ->
       NameStr = atom_to_list(Name),
-      Line = lists:flatten(["?", NameStr, " = ", erl_prettypr:format(Value)]),
+
+      {ok, #{text := Text}} = els_utils:lookup_document(DefUri),
+      #{from := From, to := To} = ValueRange,
+      ValueText = els_utils:to_list(els_text:range(Text, From, To)),
+
+      Line = lists:flatten(["?", NameStr, " = ", ValueText]),
       [{code_line, Line}];
     _ ->
       []

apps/els_lsp/src/els_lsp.app.src

@@ -13,6 +13,7 @@
         ephemeral,
         uuid,
         getopt,
+        erlfmt,
         els_core
     ]},
     {env, []},