fix compilation using Core

Author: gares

hh_json.ml

@@ -35,7 +35,7 @@ Caveats:
  (+) Numbers are just stored as strings
  *)
 
-module List = Core_list
+module List = Core.List
 
 type json =
   | JSON_Object of (string * json) list
@@ -787,4 +787,4 @@ end
 
 module JSet = Set.Make (JsonKey)
 
-module JMap = MyMap.Make (JsonKey)
+module JMap = Map.Make (JsonKey)

hh_json.mli

@@ -191,4 +191,4 @@ module JsonKey : Set.OrderedType with type t = json
 
 module JSet : Set.S with type elt = json
 
-module JMap : MyMap.S with type key = json
+module JMap : Map.S with type key = json

hh_json_helpers.ml

@@ -8,6 +8,8 @@
  **)
 
 open Hh_json
+module Option = Core.Option
+module Core_list = Core.List
 
 (************************************************************************)
 (** Helpers for parsing & printing                                     **)
@@ -117,7 +119,7 @@ module AdhocJsonHelpers = struct
 
   let try_get_val key json =
     let obj = Hh_json.get_object_exn json in
-    Core_list.Assoc.find obj key
+    Core_list.Assoc.find obj key ~equal:String.equal
 
   let get_string_val key ?default json =
     let v = try_get_val key json in

lsp.ml

@@ -40,6 +40,8 @@
  *   entirely.
 *)
 
+module SMap = Map.Make(String)
+
 type lsp_id =
   | NumberId of int
   | StringId of string
@@ -1024,4 +1026,4 @@ module IdKey = struct
 end
 
 module IdSet = Set.Make (IdKey)
-module IdMap = MyMap.Make (IdKey)
+module IdMap = Map.Make (IdKey)

lsp_fmt.ml

@@ -7,10 +7,15 @@
  *
 *)
 
-open Hh_core
+(* open Hh_core *)
 open Lsp
 open Hh_json
 open Hh_json_helpers
+module List = Core.List
+module SMap = struct
+  include Map.Make(String)
+  let elements = bindings
+end
 
 
 (************************************************************************)
@@ -949,7 +954,7 @@ let error_of_exn (e: exn) : Lsp.Error.t =
   | Error.ServerNotInitialized message -> {code= -32002; message; data=None;}
   | Error.Unknown message -> {code= -32001; message; data=None;}
   | Error.RequestCancelled message -> {code= -32800; message; data=None;}
-  | Exit_status.Exit_with code -> {code= -32001; message=Exit_status.to_string code; data=None;}
+(*   | Exit_status.Exit_with code -> {code= -32001; message=Exit_status.to_string code; data=None;} *)
   | _ -> {code= -32001; message=Printexc.to_string e; data=None;}
 
 let print_error (e: Error.t) (stack: string) : json =