Remove extra space before return type declaration in function definit…

…ion (#1966)

* Remove extra space before return type declaration in function definition

fixes #1628

* remove indent setting, not needed

formatTest/typeCheckedTests/expected_output/basics.re

@@ -43,9 +43,9 @@ let argIsUnderscore1 = _ => 34;
 
 let argIsUnderscore2 = _ => 34;
 
-let argIsUnderscore3 = _ : int => 34;
+let argIsUnderscore3 = _: int => 34;
 
-let argIsUnderscore4 = _ : int => 34;
+let argIsUnderscore4 = _: int => 34;
 
 let argIsUnderscore5 = (_: int) => 34;
 

formatTest/typeCheckedTests/expected_output/basics_no_semi.re

@@ -39,9 +39,9 @@ let argIsUnderscore1 = _ => 34;
 
 let argIsUnderscore2 = _ => 34;
 
-let argIsUnderscore3 = _ : int => 34;
+let argIsUnderscore3 = _: int => 34;
 
-let argIsUnderscore4 = _ : int => 34;
+let argIsUnderscore4 = _: int => 34;
 
 let argIsUnderscore5 = (_: int) => 34;
 

formatTest/unit_tests/expected_output/basicStructures.re

@@ -532,20 +532,17 @@ let addValues = (a: int, b: int) => a + b;
 
 let addValues = (a: int, b: int) => a + b;
 
-let myFunction = (a: int, b: int) : int =>
-  a + b;
+let myFunction = (a: int, b: int): int => a + b;
 
 let functionReturnValueType =
-    (i: int, s: string)
-    : (int => int) =>
+    (i: int, s: string): (int => int) =>
   x => x + 1;
 
 let curriedFormOne = (i: int, s: string) =>
   s ++ string_of_int(i);
 
 let curriedFormTwo =
-    (i: int, x: int)
-    : (int, int) => (
+    (i: int, x: int): (int, int) => (
   i,
   x,
 );

formatTest/unit_tests/expected_output/modules.re

@@ -446,7 +446,7 @@ module Example2 = (F: (Type) => Type, X: Type) => {
    *   let iso (a:(Compose Id F X).t): (F X).t => a;
    *
    */
-  let iso = (a: Compose(Id)(F)(X).t) : F(X).t => a;
+  let iso = (a: Compose(Id)(F)(X).t): F(X).t => a;
 };
 
 Printf.printf(

formatTest/unit_tests/expected_output/modules_no_semi.re

@@ -446,7 +446,7 @@ module Example2 = (F: (Type) => Type, X: Type) => {
    *   let iso (a:(Compose Id F X).t): (F X).t => a
    *
    */
-  let iso = (a: Compose(Id)(F)(X).t) : F(X).t => a;
+  let iso = (a: Compose(Id)(F)(X).t): F(X).t => a;
 };
 
 Printf.printf(

formatTest/unit_tests/expected_output/polymorphism.re

@@ -29,8 +29,7 @@ type myType2 =
 /* Confusing because => looks like part
    of the return type signature. */
 let myFunc =
-    (a: int => int, b: int => int)
-    : myType(int) => [
+    (a: int => int, b: int => int): myType(int) => [
   a(20) + b(30),
 ];
 

formatTest/unit_tests/expected_output/syntax.re

@@ -611,9 +611,7 @@ let tupleInsideALetSequence = {
 
 /* We *require* that function return types be wrapped in
    parenthesis. In this example, there's no ambiguity */
-let makeIncrementer =
-    (delta: int)
-    : (int => int) =>
+let makeIncrementer = (delta: int): (int => int) =>
   a => a + delta;
 
 /* We could even force that consistency with let bindings - it's allowed
@@ -635,18 +633,18 @@ class classWithNoArg = {
      end;
    */
 
-let myFunc = (a: int, b: int) : (int, int) => (
+let myFunc = (a: int, b: int): (int, int) => (
   a,
   b,
 );
-let myFunc = (a: int, b: int) : list(int) => [
+let myFunc = (a: int, b: int): list(int) => [
   1,
 ];
-let myFunc = (a: int, b: int) : point => {
+let myFunc = (a: int, b: int): point => {
   x: a,
   y: b,
 };
-let myFunc = (a: int, b: int) : point => {
+let myFunc = (a: int, b: int): point => {
   x: a,
   y: b,
 };

src/reason-parser/reason_layout.ml

@@ -35,7 +35,7 @@ type separator =
   | SepFinal of string * string
 
 (**
- * Module concerning info to correctly interleave whitspace above a layout node.
+ * Module concerning info to correctly interleave whitespace above a layout node.
  *)
 module WhitespaceRegion = struct
   type t = {

src/reason-parser/reason_pprint_ast.ml

@@ -1989,7 +1989,7 @@ let is_punned_labelled_expression e lbl = match e.pexp_desc with
   | _ -> false
 
 let is_punned_labelled_pattern p lbl = match p.ppat_desc with
-  | Ppat_constraint ({ ppat_desc = Ppat_var { txt; _ }; ppat_attributes = _::_ }, _) 
+  | Ppat_constraint ({ ppat_desc = Ppat_var { txt; _ }; ppat_attributes = _::_ }, _)
     -> false
   | Ppat_constraint ({ ppat_desc = Ppat_var { txt; _ }; _ }, _)
   | Ppat_var { txt; _ }
@@ -4675,7 +4675,10 @@ let printer = object(self:'self)
           source_map ~loc:ct.ptyp_loc
             (self#non_arrowed_non_simple_core_type ct)
         in
-        (argsList@[formatJustTheTypeConstraint typeLayout], e)
+        ([makeList
+           ~break:IfNeed
+           ~inline:(true, true)
+           (argsList@[formatJustTheTypeConstraint typeLayout])], e)
       | _ -> (argsList, return)
 
   method normalizeConstructorArgsConstraint argsList return =