Vendor and hook up the outcome printer from the syntax repo.

Fixes #33

- Vendor the ourcome printer from https://github.com/rescript-lang/syntax
- Make monads ppx use 406 AST to compile the vendored code (inline records)
- Pass around / calculate recursion status to correctly print multiple and recursive type definitions.

Author: cristianoc

Changes.md

@@ -5,6 +5,7 @@
 - Remove semicolon in module top level preview.
 - Support syntax highlight in hover fenced blocks.
 - Fix printing of variant arguments.
+- Use outcome printer from the syntax to print type declarations.
 
 ## Release 1.0.0 of rescript-vscode 
 This [commit](https://github.com/rescript-lang/rescript-editor-support/commit/d45f45793a307a3bb87dcac0542fd412669f1b6e) is vendored in [rescript-vscode 1.0.0](https://github.com/rescript-lang/rescript-vscode/releases/tag/1.0.0).

examples/example-project/src/ZZ.res

@@ -37,3 +37,32 @@ type inline =
   | D({x: int, y: string})
   | E({x: int, y: string})
   | F
+
+module MSig
+: {
+  type rec t = | A (list<s>)
+  and s = list<t>
+
+  let x : int
+} 
+= {
+  type rec t = | A (list<s>)
+  and s = list<t>
+
+  let x = 14
+}
+
+module Impl = {
+  type rec t = | A (list<s>)
+  and s = list<t>
+
+  type w = int
+
+  let x = 14
+}
+
+module Impl2 = { include Impl};
+
+module D = MSig
+module E = Impl
+module F = Impl2

src/ppx/Ppx_Monads.re

@@ -48,7 +48,7 @@ the result of the whole thing to be unit, use `let%consume`.
  */
 
 open Migrate_parsetree
-open OCaml_402.Ast
+open OCaml_406.Ast
 
 /***
  * https://ocsigen.org/lwt/dev/api/Ppx_lwt
@@ -154,12 +154,12 @@ let mapper =
         Ast_helper.Exp.attr(
           [%expr [%e front]([%e mapper.expr(mapper, expr)], ~f=([%p pat]) => [%e mapper.expr(mapper, continuation)])],
           ({txt: "ocaml.explanation", loc}, PStr([
-            Ast_helper.Str.eval(Ast_helper.Exp.constant(Const_string(explanation, None)))
+            Ast_helper.Str.eval(Ast_helper.Exp.constant(Pconst_string(explanation, None)))
           ]))
         )
       }
       | _ => Ast_mapper.default_mapper.expr(mapper, expr)
       }
   };
 
-let () = Driver.register(~name="ppx_monads", ~args=[], Versions.ocaml_402, (_config, _cookies) => mapper);
+let () = Driver.register(~name="ppx_monads", ~args=[], Versions.ocaml_406, (_config, _cookies) => mapper);

src/ppx/dune

@@ -3,6 +3,6 @@
   (name Ppx_monads)
   (flags :standard -w -9)
   (libraries compiler-libs ocaml-migrate-parsetree ppx_tools_versioned)
-  (preprocess (pps ppx_tools_versioned.metaquot_402))
+  (preprocess (pps ppx_tools_versioned.metaquot_406))
   (kind ppx_rewriter))
 

src/rescript-editor-support/Hover.re

@@ -30,8 +30,8 @@ let showModuleTopLevel =
     |> List.map(item =>
          switch (item.SharedTypes.item) {
          /*** TODO pretty print module contents */
-         | SharedTypes.MType({decl}) =>
-           "  " ++ (decl |> Shared.declToString(item.name.txt))
+         | SharedTypes.MType({decl}, recStatus) =>
+           "  " ++ (decl |> Shared.declToString(~recStatus, item.name.txt))
          | Module(_) => "  module " ++ item.name.txt
          | MValue(typ) =>
            "  let " ++ item.name.txt ++ ": " ++ (typ |> Shared.typeToString) /* TODO indent */

src/rescript-editor-support/MessageHandlers.re

@@ -721,7 +721,7 @@ let handlers:
           let (item, siblings) =
             switch (item) {
             | MValue(v) => (v |> Shared.variableKind, [])
-            | MType(t) => (t.decl |> Shared.declarationKind, [])
+            | MType(t, _) => (t.decl |> Shared.declarationKind, [])
             | Module(Structure(contents)) => (Module, getItems(contents))
             | Module(Ident(_)) => (Module, [])
             };