Update the vendored parser to the latest version. (#745)

* Update the vendored parser to the latest version.

There are a bunch of changes that one needs to look into.

* Backward-compatible check for optional fields.

* Backwards-compatible check for braces attribute.

* The updated parser gives res.namedArgLoc

* One more ns.namedArgLoc

* ns.braces

* Internal attributes are res.

* sync dune file with compiler repo

* Rename res_outcome_printer to res_syntax, like in the compiler.

* format

* More format.

* Dead code.

Author: cristianoc

analysis/reanalyze/src/RunConfig.ml

@@ -30,4 +30,4 @@ let dce () = runConfig.dce <- true
 let exception_ () = runConfig.exception_ <- true
 let termination () = runConfig.termination <- true
 
-let transitive b = runConfig.transitive <- b
+let transitive b = runConfig.transitive <- b

analysis/src/CompletionFrontEnd.ml

@@ -566,7 +566,7 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor ~text =
   in
   let attribute (iterator : Ast_iterator.iterator)
       ((id, payload) : Parsetree.attribute) =
-    (if String.length id.txt >= 3 && String.sub id.txt 0 3 = "ns." then
+    (if String.length id.txt >= 4 && String.sub id.txt 0 4 = "res." then
      (* skip: internal parser attribute *) ()
     else if id.loc.loc_ghost then ()
     else if id.loc |> Loc.hasPos ~pos:posBeforeCursor then

analysis/src/CompletionJsx.ml

@@ -894,7 +894,7 @@ let extractJsxProps ~(compName : Longident.t Location.loc) ~args =
     | ((Labelled s | Optional s), (eProp : Parsetree.expression)) :: rest -> (
       let namedArgLoc =
         eProp.pexp_attributes
-        |> List.find_opt (fun ({Asttypes.txt}, _) -> txt = "ns.namedArgLoc")
+        |> List.find_opt (fun ({Asttypes.txt}, _) -> txt = "res.namedArgLoc")
       in
       match namedArgLoc with
       | Some ({loc}, _) ->
@@ -911,4 +911,4 @@ let extractJsxProps ~(compName : Longident.t Location.loc) ~args =
       | None -> processProps ~acc rest)
     | _ -> thisCaseShouldNotHappen
   in
-  args |> processProps ~acc:[]
+  args |> processProps ~acc:[]

analysis/src/Hint.ml

@@ -1,9 +1,8 @@
 open SharedTypes
 
-type inlayHintKind = Type | Parameter
+type inlayHintKind = Type
 let inlayKindToNumber = function
   | Type -> 1
-  | Parameter -> 2
 
 let locItemToTypeHint ~full:{file; package} locItem =
   match locItem.locType with

analysis/src/Markdown.ml

@@ -20,4 +20,4 @@ let goToDefinitionText ~env ~pos =
         label = "Type definition";
         file = Uri.toString env.SharedTypes.QueryEnv.file.uri;
         startPos = {line = startLine; character = startCol};
-      }
+      }

analysis/src/Protocol.ml

@@ -34,11 +34,10 @@ type signatureHelp = {
 }
 
 (* https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#insertTextFormat *)
-type insertTextFormat = PlainText | Snippet
+type insertTextFormat = Snippet
 
 let insertTextFormatToInt f =
   match f with
-  | PlainText -> 1
   | Snippet -> 2
 
 type completionItem = {

analysis/src/SharedTypes.ml

@@ -354,8 +354,7 @@ module Completion = struct
     detail: string option;
   }
 
-  let create ~kind ~env ?(docstring = []) ?filterText ?insertText ?deprecated
-      ?detail name =
+  let create ~kind ~env ?(docstring = []) ?insertText ?deprecated ?detail name =
     {
       name;
       env;
@@ -365,12 +364,12 @@ module Completion = struct
       sortText = None;
       insertText;
       insertTextFormat = None;
-      filterText;
+      filterText = None;
       detail;
     }
 
   let createWithSnippet ~name ?insertText ~kind ~env ?sortText ?deprecated
-      ?filterText ?(docstring = []) () =
+      ?(docstring = []) () =
     {
       name;
       env;
@@ -380,7 +379,7 @@ module Completion = struct
       sortText;
       insertText;
       insertTextFormat = Some Protocol.Snippet;
-      filterText;
+      filterText = None;
       detail = None;
     }
 
@@ -793,7 +792,7 @@ let extractExpApplyArgs ~args =
       :: rest -> (
       let namedArgLoc =
         e.pexp_attributes
-        |> List.find_opt (fun ({Asttypes.txt}, _) -> txt = "ns.namedArgLoc")
+        |> List.find_opt (fun ({Asttypes.txt}, _) -> txt = "res.namedArgLoc")
       in
       match namedArgLoc with
       | Some ({loc}, _) ->

analysis/src/Utils.ml

@@ -137,22 +137,6 @@ let identifyPpat pat =
   | Ppat_extension _ -> "Ppat_extension"
   | Ppat_open _ -> "Ppat_open"
 
-let identifyType type_desc =
-  match type_desc with
-  | Types.Tvar _ -> "Tvar"
-  | Tarrow _ -> "Tarrow"
-  | Ttuple _ -> "Ttuple"
-  | Tconstr _ -> "Tconstr"
-  | Tobject _ -> "Tobject"
-  | Tfield _ -> "Tfield"
-  | Tnil -> "Tnil"
-  | Tlink _ -> "Tlink"
-  | Tsubst _ -> "Tsubst"
-  | Tvariant _ -> "Tvariant"
-  | Tunivar _ -> "Tunivar"
-  | Tpoly _ -> "Tpoly"
-  | Tpackage _ -> "Tpackage"
-
 let rec skipWhite text i =
   if i < 0 then 0
   else
@@ -161,7 +145,7 @@ let rec skipWhite text i =
     | _ -> i
 
 let hasBraces attributes =
-  attributes |> List.exists (fun (loc, _) -> loc.Location.txt = "ns.braces")
+  attributes |> List.exists (fun (loc, _) -> loc.Location.txt = "res.braces")
 
 let rec unwrapIfOption (t : Types.type_expr) =
   match t.desc with

analysis/src/Xform.ml

@@ -146,7 +146,7 @@ module AddBracesToFn = struct
               };
           }
         in
-        (Location.mkloc "ns.braces" loc, Parsetree.PStr [])
+        (Location.mkloc "res.braces" loc, Parsetree.PStr [])
       in
       let isFunction = function
         | {Parsetree.pexp_desc = Pexp_fun _} -> true

analysis/src/dune

@@ -6,4 +6,4 @@
  (flags
   (-w "+6+26+27+32+33+39"))
  ; Depends on:
- (libraries unix str ext ml jsonlib outcomeprinter reanalyze))
+ (libraries unix str ext ml jsonlib syntax reanalyze))

analysis/vendor/.ocamlformat

@@ -0,0 +1 @@
+disable

analysis/vendor/dune

@@ -1 +1 @@
-(dirs compiler-libs-406 ext ml res_outcome_printer json)
+(dirs ext ml res_syntax json)