* stop use dinamic call of rebar3_sheldon

* return map instead of list in diagnostic sheldon

Author: vkatsuba

apps/els_lsp/src/els_diagnostics.erl

@@ -154,7 +154,7 @@ valid(Ids0) ->
 extra([]) ->
   ok;
 extra([<<"sheldon">>|_]) ->
-  {ok, _} = application:ensure_all_started(rebar3_sheldon),
+  {ok, _} = application:ensure_all_started(sheldon),
   ok;
 extra([_|T]) ->
   extra(T).

apps/els_lsp/src/els_lsp.app.src

@@ -15,7 +15,8 @@
         getopt,
         erlfmt,
         els_core,
-        gradualizer
+        gradualizer,
+        rebar3_sheldon
     ]},
     {env, []},
     {modules, []},

apps/els_lsp/src/els_sheldon_diagnostics.erl

@@ -41,8 +41,7 @@ run(Uri) ->
     RelFile ->
       try
         RegEx = "[_@./#&+-=*]",
-        Mod = rebar3_sheldon_ast,
-        Mod:spellcheck([RelFile], RegEx)
+        rebar3_sheldon_ast:spellcheck([RelFile], RegEx)
       of
         [] -> [];
         Problems -> format_diagnostics(Problems)
@@ -70,9 +69,9 @@ format_rules([]) ->
   [];
 format_rules([#{reason := #{misspelled_words := Miss}} = Data | EItems]) ->
   ItemDiags = format_item(Miss, Data),
-  [lists:flatten(ItemDiags) | format_rules(EItems)].
+  [ItemDiags | format_rules(EItems)].
 
--spec format_item([any()], map()) -> [[map()]].
+-spec format_item([map()], map()) -> [map()].
 format_item([#{candidates := [], word := Word} | Items], Data) ->
   #{line := Line, type := Type} = Data,
   Msg = format_text("The word ~p in ~p is unknown.", [Word, Type]),
@@ -88,17 +87,17 @@ format_item([#{candidates := Candidates, word := Word} | Items], Data) ->
 format_item([], _) ->
   [].
 
--spec diagnostic( any(), integer(),  els_diagnostics:severity()) -> [map()].
+-spec diagnostic( any(), integer(),  els_diagnostics:severity()) -> map().
 diagnostic(Msg, Ln, Severity) ->
   Range   = els_protocol:range(#{from => {Ln, 1}, to => {Ln + 1, 1}}),
   Message = els_utils:to_binary(Msg),
-  [#{ range    => Range
+  #{ range    => Range
     , severity => Severity
     , code     => spellcheck
     , source   => source()
     , message  => Message
     , relatedInformation => []
-    }].
+    }.
 
 -spec format_sheldon_candidates([any()], [[[any()] | char()]]) -> list().
 format_sheldon_candidates([], Acc) ->

elvis.config

@@ -34,7 +34,6 @@
                                                                         , els_tcp
                                                                         , els_dap_test_utils
                                                                         , els_test_utils
-                                                                        , els_sheldon_diagnostics
                                                                         ]}}
                       , {elvis_text_style, line_length, #{limit => 80, skip_comments => false}}
                       , {elvis_style, operator_spaces, #{ rules => [ {right, ","}

rebar.config

@@ -17,7 +17,7 @@
        , {tdiff,         "0.1.2"}
        , {uuid,          "2.0.1", {pkg, uuid_erl}}
        , {gradualizer, {git, "https://github.com/josefs/Gradualizer.git", {ref, "e93db1c"}}}
-       , {rebar3_sheldon, "0.4.1"}
+       , {rebar3_sheldon, "0.4.2"}
        ]
 }.
 

rebar.lock

@@ -14,7 +14,7 @@
  {<<"providers">>,{pkg,<<"providers">>,<<"1.8.1">>},1},
  {<<"quickrand">>,{pkg,<<"quickrand">>,<<"2.0.1">>},1},
  {<<"rebar3_format">>,{pkg,<<"rebar3_format">>,<<"0.8.2">>},0},
- {<<"rebar3_sheldon">>,{pkg,<<"rebar3_sheldon">>,<<"0.4.1">>},0},
+ {<<"rebar3_sheldon">>,{pkg,<<"rebar3_sheldon">>,<<"0.4.2">>},0},
  {<<"redbug">>,{pkg,<<"redbug">>,<<"2.0.6">>},0},
  {<<"sheldon">>,{pkg,<<"sheldon">>,<<"0.4.1">>},1},
  {<<"tdiff">>,{pkg,<<"tdiff">>,<<"0.1.2">>},0},
@@ -35,7 +35,7 @@
  {<<"providers">>, <<"70B4197869514344A8A60E2B2A4EF41CA03DEF43CFB1712ECF076A0F3C62F083">>},
  {<<"quickrand">>, <<"6D861FA11E6EB51BB2343A2616EFF704C2681A9997F41ABC78E58FA76DA33981">>},
  {<<"rebar3_format">>, <<"2D64DA61E0B87FCA6C4512ADA6D9CBC2B27ADC9AE6844178561147E7121761BD">>},
- {<<"rebar3_sheldon">>, <<"E2F4535929A25A7F8CFCCFC23E3CF93839BCC7F83C0BFFBBDB3446210D8014D4">>},
+ {<<"rebar3_sheldon">>, <<"DC69F6A5BA5B7AD8A547F656DF25DFE41E030DF2787467F5433A3210AE7FDB0C">>},
  {<<"redbug">>, <<"A764690B012B67C404562F9C6E1BA47A73892EE17DF5C15F670B1A5BF9D2F25A">>},
  {<<"sheldon">>, <<"1413143F9D96D30C6A18DD6746B5183F048B23AC345FF3BB92B399A5A69EBE93">>},
  {<<"tdiff">>, <<"4E1B30321F1B3D600DF65CD60858EDE1235FE4E5EE042110AB5AD90CD6464AC5">>},
@@ -55,7 +55,7 @@
  {<<"providers">>, <<"E45745ADE9C476A9A469EA0840E418AB19360DC44F01A233304E118A44486BA0">>},
  {<<"quickrand">>, <<"14DB67D4AEF6B8815810EC9F3CCEF5E324B73B56CAE3687F99D752B85BDD4C96">>},
  {<<"rebar3_format">>, <<"CA8FF27638C2169593D1449DACBE8895634193ED3334E906B54FC97F081F5213">>},
- {<<"rebar3_sheldon">>, <<"79DAA99B7B58F590B9DBD2641B0C0E0F116D79E587779E861D4246B1D7CD5737">>},
+ {<<"rebar3_sheldon">>, <<"19120875183E6EE7C11EC21FC99B12347A37F59386DB7A4759DBBA55EA621D4C">>},
  {<<"redbug">>, <<"AAD9498671F4AB91EACA5099FE85A61618158A636E6286892C4F7CF4AF171D04">>},
  {<<"sheldon">>, <<"15E24EDDCDB42FE07AA7913DA770DBCE4EE052A37AA76E467748D4C977F463C9">>},
  {<<"tdiff">>, <<"E0C2E168F99252A5889768D5C8F1E6510A184592D4CFA06B22778A18D33D7875">>},