waserver: number, integer, float fixes

Summary:
- the next version of eqwalizer (D108936049) distinguishes `integer()` and `float()` (`number() :: integer() | float()`),
- because we previously did not have such distinction during type-checking, many specs/types did not pay much attention to proper numeric types
- this diff contains type and spec fixes (with minimal code changes - fixing guards in a few obvious places) that remove type errors related to `integer()` and `float()` being different types.
- it reduces the number of type error (wrt new eqwalizer) ~800 -> ~100.

Reviewed By: michalmuskala

Differential Revision: D109170364

fbshipit-source-id: a2577db6dccb72eaf228372fb1fe264a5b39add0

Author: ilya-klyuchnikov

apps/edb/src/edb_dap.erl

@@ -158,7 +158,7 @@ decode_frames(Data, Messages) ->
 %%% Basic Types (used by requests and responses)
 %%%---------------------------------------------------------------------------------
 
--type thread_id() :: number().
+-type thread_id() :: integer().
 
 %%% https://microsoft.github.io/debug-adapter-protocol/specification#Types_Source
 -type source() :: #{

apps/edb/src/edb_dap_request_disconnect.erl

@@ -106,8 +106,8 @@ handle(State, Args) ->
     none
     | #{
         node := node(),
-        process_id := number(),
-        shell_process_id => number(),
+        process_id := integer(),
+        shell_process_id => integer(),
         port => port() | none
     }.
 
@@ -195,15 +195,15 @@ kill_node(Node) ->
     ok.
 
 -spec kill_os_process(ProcessId, force | dont_force) -> ok when
-    ProcessId :: number().
+    ProcessId :: integer().
 kill_os_process(ProcessId, ForceOrNot) ->
     case os:type() of
         {unix, _} -> kill_unix_process(ProcessId, ForceOrNot);
         {win32, _} -> kill_win_process(ProcessId, ForceOrNot)
     end.
 
 -spec kill_unix_process(ProcessId, ForceOrNot) -> ok when
-    ProcessId :: number(),
+    ProcessId :: integer(),
     ForceOrNot :: force | dont_force.
 kill_unix_process(ProcessId, force) ->
     os:cmd("kill -9 " ++ integer_to_list(ProcessId)),
@@ -213,7 +213,7 @@ kill_unix_process(ProcessId, dont_force) ->
     ok.
 
 -spec kill_win_process(ProcessId, ForceOrNot) -> ok when
-    ProcessId :: number(),
+    ProcessId :: integer(),
     ForceOrNot :: force | dont_force.
 kill_win_process(ProcessId, force) ->
     os:cmd("taskkill /F /PID " ++ integer_to_list(ProcessId)),

apps/edb/src/edb_dap_request_evaluate.erl

@@ -40,19 +40,19 @@ evaluate requests: https://microsoft.github.io/debug-adapter-protocol/specificat
 
     % Evaluate the expression in the scope of this stack frame. If not specified,
     % the expression is evaluated in the global scope.
-    frameId => number(),
+    frameId => integer(),
 
     % The contextual line where the expression should be evaluated. In the
     % 'hover' context, this should be set to the start of the expression being
     % hovered.
-    line => number(),
+    line => integer(),
 
     % The contextual column where the expression should be evaluated. This may be
     % provided if `line` is also provided.
     %
     % It is measured in UTF-16 code units and the client capability
     % `columnsStartAt1` determines whether it is 0- or 1-based.
-    column => number(),
+    column => integer(),
 
     % The contextual source in which the `line` is found. This must be provided
     % if `line` is provided.
@@ -95,19 +95,19 @@ evaluate requests: https://microsoft.github.io/debug-adapter-protocol/specificat
     % children can be retrieved by passing `variablesReference` to the
     % `variables` request as long as execution remains suspended. See 'Lifetime
     % of Object References' in the Overview section for details.
-    variablesReference := number(),
+    variablesReference := integer(),
 
     % The number of named child variables.
     % The client can use this information to present the variables in a paged
     % UI and fetch them in chunks.
     % The value should be less than or equal to 2147483647 (2^31-1).
-    namedVariables => number(),
+    namedVariables => integer(),
 
     % The number of indexed child variables.
     % The client can use this information to present the variables in a paged
     % UI and fetch them in chunks.
     % The value should be less than or equal to 2147483647 (2^31-1).
-    indexedVariables => number(),
+    indexedVariables => integer(),
 
     % A memory reference to a location appropriate for this result.
     % For pointer type eval results, this is generally a reference to the
@@ -124,7 +124,7 @@ evaluate requests: https://microsoft.github.io/debug-adapter-protocol/specificat
     %
     % This reference shares the same lifetime as the `variablesReference`. See
     % 'Lifetime of Object References' in the Overview section for details.
-    valueLocationReference => number()
+    valueLocationReference => integer()
 }.
 
 -export_type([arguments/0, response_body/0]).

apps/edb/src/edb_dap_request_scopes.erl

@@ -38,7 +38,7 @@ scopes requests: https://microsoft.github.io/debug-adapter-protocol/specificatio
 -type arguments() :: #{
     % Retrieve the scopes for the stack frame identified by `frameId`. The
     % `frameId` must have been obtained in the current suspended state.
-    frameId := number()
+    frameId := integer()
 }.
 
 -type response_body() ::
@@ -65,7 +65,7 @@ scopes requests: https://microsoft.github.io/debug-adapter-protocol/specificatio
     % The variables of this scope can be retrieved by passing the value of
     % `variablesReference` to the `variables` request as long as execution
     % remains suspended.
-    variablesReference := number(),
+    variablesReference := integer(),
     % The number of named variables in this scope.
     % The client can use this information to present the variables in a paged UI
     % and fetch them in chunks.

apps/edb/src/edb_dap_request_set_breakpoints.erl

@@ -112,12 +112,12 @@ setBreakpoints requests: https://microsoft.github.io/debug-adapter-protocol/spec
 %%% https://microsoft.github.io/debug-adapter-protocol/specification#Types_SourceBreakpoint
 -type sourceBreakpoint() :: #{
     %% The source line of the breakpoint or logpoint.
-    line := number(),
+    line := integer(),
 
     %% Start position within source line of the breakpoint or logpoint. It is
     %% measured in UTF-16 code units and the client capability `columnsStartAt1`
     %% determines whether it is 0- or 1-based.
-    column => number(),
+    column => integer(),
 
     %% The expression for conditional breakpoints.
     %% It is only honored by a debug adapter if the corresponding capability

apps/edb/src/edb_dap_request_stack_trace.erl

@@ -88,25 +88,25 @@ stackTrace requests: https://microsoft.github.io/debug-adapter-protocol/specific
     % An identifier for the stack frame. It must be unique across all threads.
     % This id can be used to retrieve the scopes of the frame with the `scopes`
     % request or to restart the execution of a stack frame.
-    id := number(),
+    id := integer(),
     % The name of the stack frame, typically a method name.
     name := binary(),
     % The source of the frame.
     source => edb_dap:source(),
     % The line within the source of the frame. If the source attribute is missing
     % or doesn't exist, `line` is 0 and should be ignored by the client.
-    line := number(),
+    line := integer(),
     % Start position of the range covered by the stack frame. It is measured in
     % UTF-16 code units and the client capability `columnsStartAt1` determines
     % whether it is 0- or 1-based. If attribute `source` is missing or doesn't
     % exist, `column` is 0 and should be ignored by the client.
-    column := number(),
+    column := integer(),
     % The end line of the range covered by the stack frame.
-    endLine => number(),
+    endLine => integer(),
     % End position of the range covered by the stack frame. It is measured in
     % UTF-16 code units and the client capability `columnsStartAt1` determines
     % whether it is 0- or 1-based.
-    endColumn => number(),
+    endColumn => integer(),
     % Indicates whether this frame can be restarted with the `restartFrame`
     % request. Clients should only use this if the debug adapter supports the
     % `restart` request and the corresponding capability `supportsRestartFrame`

apps/edb/src/edb_dap_request_variables.erl

@@ -37,7 +37,7 @@ variables requests: https://microsoft.github.io/debug-adapter-protocol/specifica
 %% Types
 %% ------------------------------------------------------------------
 
--type variables_reference() :: number().
+-type variables_reference() :: integer().
 
 %%% https://microsoft.github.io/debug-adapter-protocol/specification#Requests_Variables
 -type arguments() :: #{
@@ -51,12 +51,12 @@ variables requests: https://microsoft.github.io/debug-adapter-protocol/specifica
     % The index of the first variable to return; if omitted children start at 0.
     % The attribute is only honored by a debug adapter if the corresponding
     % capability `supportsVariablePaging` is true.
-    start => number(),
+    start => integer(),
     % The number of variables to return. If count is missing or 0, all variables
     % are returned.
     % The attribute is only honored by a debug adapter if the corresponding
     % capability `supportsVariablePaging` is true.
-    count => number(),
+    count => integer(),
     % Specifies details on how to format the Variable values.
     % The attribute is only honored by a debug adapter if the corresponding
     % capability `supportsValueFormattingOptions` is true.

apps/edb/src/edb_dap_server.erl

@@ -51,12 +51,12 @@ For details see https://microsoft.github.io/debug-adapter-protocol/specification
 -type attach_type() ::
     #{
         request := attach,
-        process_id := number()
+        process_id := integer()
     }
     | #{
         request := launch,
-        process_id := number(),
-        shell_process_id => number()
+        process_id := integer(),
+        shell_process_id => integer()
     }.
 
 -type state() ::
@@ -74,7 +74,7 @@ For details see https://microsoft.github.io/debug-adapter-protocol/specification
         state := launching,
         client_info := client_info(),
         port := port() | none,
-        shell_process_id => number(),
+        shell_process_id => integer(),
         reverse_attach_ref := reference(),
         cwd := binary(),
         subscription := edb:event_subscription()

apps/edb/test/edb_dap_evaluate_SUITE.erl

@@ -380,7 +380,7 @@ test_evaluate_without_frame_id(Config) ->
 
 -spec evaluate_expression(Client, FrameId, Expression, Context) -> Result when
     Client :: edb_dap_test_support:client(),
-    FrameId :: number(),
+    FrameId :: integer(),
     Expression :: binary(),
     Context :: atom(),
     Result :: #{success := boolean(), body := edb_dap_request_evaluate:response_body()}.

apps/edb/test/edb_dap_scopes_SUITE.erl

@@ -831,7 +831,7 @@ inspect(Inspector, Module, Fun, Args) ->
 % -----------------------------------------------------------------------------
 -spec get_variables_page(Client, VarRef, Window) -> [edb_dap_request_variables:variable()] when
     Client :: edb_dap_test_support:client(),
-    VarRef :: number(),
+    VarRef :: integer(),
     Window :: #{start => non_neg_integer(), count => non_neg_integer()}.
 get_variables_page(Client, VarRef, Window) ->
     Args0 = #{variablesReference => VarRef},
@@ -858,15 +858,15 @@ get_variables_page(Client, VarRef, Window) ->
 
 -spec assertEvaluateNameIsCorrect(Client, FrameId, edb_dap_request_variables:variable(), binary()) -> ok when
     Client :: edb_dap_test_support:client(),
-    FrameId :: number().
+    FrameId :: integer().
 assertEvaluateNameIsCorrect(Client, FrameId, EvalName, Expected) ->
     assertEvaluateNameIsCorrect(Client, FrameId, EvalName, Expected, fun(X) -> X end).
 
 -spec assertEvaluateNameIsCorrect(Client, FrameId, edb_dap_request_variables:variable(), binary(), Comparator) ->
     ok
 when
     Client :: edb_dap_test_support:client(),
-    FrameId :: number(),
+    FrameId :: integer(),
     Comparator :: fun((binary()) -> binary() | dynamic()).
 assertEvaluateNameIsCorrect(Client, FrameId, #{evaluateName := EvalName}, Expected, Comparator) ->
     Response = edb_dap_test_client:evaluate(Client, #{
@@ -881,7 +881,7 @@ assertEvaluateNameIsCorrect(Client, FrameId, #{evaluateName := EvalName}, Expect
 
 -spec get_process_vars(Client, FrameId) -> #{binary() => edb_dap_request_variables:variable()} when
     Client :: edb_dap_test_support:client(),
-    FrameId :: number().
+    FrameId :: integer().
 get_process_vars(Client, FrameId) ->
     Scopes = edb_dap_test_support:get_scopes(Client, FrameId),
     ProcessScopeVarsRef = maps:get(variablesReference, maps:get(~"Process", Scopes)),