Merge pull request #1108 from erlang-ls/1107-do-not-always-expect-params

[#1107] Shutdown request does not include parameters

apps/els_core/src/els_client.erl

@@ -291,8 +291,7 @@ handle_call({shutdown}, From, State) ->
   #state{io_device = IoDevice} = State,
   RequestId = State#state.request_id,
   Method = <<"shutdown">>,
-  Params = #{},
-  Content = els_protocol:request(RequestId, Method, Params),
+  Content = els_protocol:request(RequestId, Method),
   send(IoDevice, Content),
   {noreply, State#state{ request_id = RequestId + 1
                        , pending    = [{RequestId, From} | State#state.pending]

apps/els_core/src/els_protocol.erl

@@ -8,6 +8,7 @@
 %%==============================================================================
 %% Messaging API
 -export([ notification/2
+        , request/2
         , request/3
         , response/2
         , error/2
@@ -34,6 +35,14 @@ notification(Method, Params) ->
              },
   content(jsx:encode(Message)).
 
+-spec request(number(), binary()) -> binary().
+request(RequestId, Method) ->
+  Message = #{ jsonrpc => ?JSONRPC_VSN
+             , method  => Method
+             , id      => RequestId
+             },
+  content(jsx:encode(Message)).
+
 -spec request(number(), binary(), any()) -> binary().
 request(RequestId, Method, Params) ->
   Message = #{ jsonrpc => ?JSONRPC_VSN

apps/els_lsp/src/els_server.erl

@@ -155,7 +155,7 @@ handle_request(#{ <<"method">> := _ReqMethod } = Request
                       , pending = Pending
                       } = State0) ->
   Method = maps:get(<<"method">>, Request),
-  Params = maps:get(<<"params">>, Request),
+  Params = maps:get(<<"params">>, Request, #{}),
   Type = case maps:is_key(<<"id">>, Request) of
            true  -> request;
            false -> notification