Merge pull request #3823 from BuckleScript/allow_name_diff_string_literal

tentative fix reason language server

Author: bobzhang

jscomp/common/js_config.ml

@@ -107,4 +107,6 @@ let jsx_version = ref (-1)
 
 let refmt = ref None
 
-let is_reason = ref false
+let is_reason = ref false
+
+let js_stdout = ref true

jscomp/common/js_config.mli

@@ -101,4 +101,6 @@ val force_cmj : bool ref
 
 val jsx_version : int ref
 val refmt : string option ref
-val is_reason : bool ref 
+val is_reason : bool ref 
+
+val js_stdout : bool ref 

jscomp/common/ml_binary.ml

@@ -36,7 +36,7 @@ let read_ast (type t ) (kind : t  kind) ic : t  =
     | Mli -> Config.ast_intf_magic_number in 
   let buffer = really_input_string ic (String.length magic) in
   assert(buffer = magic); (* already checked by apply_rewriter *)
-  Location.input_name := input_value ic;
+  Location.set_input_name @@ input_value ic;
   input_value ic 
 
 let write_ast (type t) (kind : t kind) 

jscomp/core/lam_compile_main.ml

@@ -301,7 +301,7 @@ let lambda_as_module
       (if !Js_config.bs_suffix then Literals.suffix_bs_js else Literals.suffix_js) 
   in
   let package_info = Js_packages_state.get_packages_info () in 
-  if Js_packages_info.is_empty package_info  then     
+  if Js_packages_info.is_empty package_info && !Js_config.js_stdout then     
     Js_dump_program.dump_deps_program ~output_prefix NodeJS lambda_output stdout      
   else
     Js_packages_info.iter package_info (fun {module_system; path = _path} -> 

jscomp/main/js_main.ml

@@ -49,7 +49,7 @@ let process_file ppf sourcefile =
      The {!Location.input_name} relies on that we write the binary ast 
      properly
   *)
-  Location.input_name := sourcefile;  
+  Location.set_input_name  sourcefile;  
   let ext = Ext_filename.get_extension_maybe sourcefile in 
   let input = 
     if ext = Literals.suffix_ml  then 
@@ -329,8 +329,10 @@ let buckle_script_flags : (string * Arg.spec * string) list =
     " no code for assert false"
   )  
 
-  :: Ocaml_options.mk_impl impl
-  :: Ocaml_options.mk_intf intf 
+  :: Ocaml_options.mk_impl 
+    (fun file  ->  Js_config.js_stdout := false;  impl file )  
+  :: Ocaml_options.mk_intf 
+    (fun file -> Js_config.js_stdout := false ; intf file)
   :: Ocaml_options.mk__ anonymous
   :: Ocaml_options.ocaml_options
 

jscomp/syntax/ppx_driver.ml

@@ -35,7 +35,7 @@ let apply_lazy ~source ~target
   if magic <> Config.ast_impl_magic_number
   && magic <> Config.ast_intf_magic_number then
     failwith "Bs_ast_mapper: OCaml version mismatch or malformed input";
-  Location.input_name := input_value ic;
+  Location.set_input_name @@ input_value ic;
   let ast = input_value ic in
   close_in ic;
 

lib/4.02.3/bsdep.ml

@@ -2056,6 +2056,7 @@ val symbol_gloc: unit -> t
 val rhs_loc: int -> t
 
 val input_name: string ref
+val set_input_name: string -> unit 
 val input_lexbuf: Lexing.lexbuf option ref
 
 val get_pos_info: Lexing.position -> string * int * int (* file, line, char *)
@@ -2217,7 +2218,8 @@ let rhs_loc n = {
 
 let input_name = ref "_none_"
 let input_lexbuf = ref (None : lexbuf option)
-
+let set_input_name name =
+  if name <> "" then input_name := name
 (* Terminal info *)
 
 let status = ref Terminfo.Uninitialised
@@ -22420,7 +22422,7 @@ let apply_lazy ~source ~target mapper =
   if magic <> Config.ast_impl_magic_number
   && magic <> Config.ast_intf_magic_number then
     failwith "Ast_mapper: OCaml version mismatch or malformed input";
-  Location.input_name := input_value ic;
+  Location.set_input_name @@ input_value ic;
   let ast = input_value ic in
   close_in ic;
 
@@ -22831,7 +22833,7 @@ let read_ast magic fn =
   try
     let buffer = really_input_string ic (String.length magic) in
     assert(buffer = magic); (* already checked by apply_rewriter *)
-    Location.input_name := input_value ic;
+    Location.set_input_name @@ input_value ic;
     let ast = input_value ic in
     close_in ic;
     Misc.remove_file fn;
@@ -22899,11 +22901,11 @@ let file ppf ~tool_name inputfile parse_fun ast_magic =
           (* FIXME make this a proper warning *)
           fprintf ppf "@[Warning: %s@]@."
             "option -unsafe used with a preprocessor returning a syntax tree";
-        Location.input_name := input_value ic;
+        Location.set_input_name @@ input_value ic;
         input_value ic
       end else begin
         seek_in ic 0;
-        Location.input_name := inputfile;
+        Location.set_input_name  inputfile;
         let lexbuf = Lexing.from_channel ic in
         Location.init lexbuf inputfile;
         parse_fun lexbuf
@@ -22930,7 +22932,7 @@ let () =
     )
 
 let parse_all ~tool_name parse_fun magic ppf sourcefile =
-  Location.input_name := sourcefile;
+  Location.set_input_name  sourcefile;
   let inputfile = preprocess sourcefile in
   let ast =
     try file ppf ~tool_name inputfile parse_fun magic
@@ -29740,6 +29742,8 @@ val force_cmj : bool ref
 val jsx_version : int ref
 val refmt : string option ref
 val is_reason : bool ref 
+
+val no_js_stdout : bool ref 
 end = struct
 #1 "js_config.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -29852,6 +29856,8 @@ let jsx_version = ref (-1)
 let refmt = ref None
 
 let is_reason = ref false
+
+let no_js_stdout = ref false
 end
 module Bs_warnings : sig 
 #1 "bs_warnings.mli"

lib/4.02.3/bspp.ml

@@ -1993,6 +1993,7 @@ val symbol_gloc: unit -> t
 val rhs_loc: int -> t
 
 val input_name: string ref
+val set_input_name: string -> unit 
 val input_lexbuf: Lexing.lexbuf option ref
 
 val get_pos_info: Lexing.position -> string * int * int (* file, line, char *)
@@ -2154,7 +2155,8 @@ let rhs_loc n = {
 
 let input_name = ref "_none_"
 let input_lexbuf = ref (None : lexbuf option)
-
+let set_input_name name =
+  if name <> "" then input_name := name
 (* Terminal info *)
 
 let status = ref Terminfo.Uninitialised

lib/4.02.3/bsppx.ml

@@ -1993,6 +1993,7 @@ val symbol_gloc: unit -> t
 val rhs_loc: int -> t
 
 val input_name: string ref
+val set_input_name: string -> unit 
 val input_lexbuf: Lexing.lexbuf option ref
 
 val get_pos_info: Lexing.position -> string * int * int (* file, line, char *)
@@ -2154,7 +2155,8 @@ let rhs_loc n = {
 
 let input_name = ref "_none_"
 let input_lexbuf = ref (None : lexbuf option)
-
+let set_input_name name =
+  if name <> "" then input_name := name
 (* Terminal info *)
 
 let status = ref Terminfo.Uninitialised
@@ -2645,6 +2647,8 @@ val force_cmj : bool ref
 val jsx_version : int ref
 val refmt : string option ref
 val is_reason : bool ref 
+
+val no_js_stdout : bool ref 
 end = struct
 #1 "js_config.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -2757,6 +2761,8 @@ let jsx_version = ref (-1)
 let refmt = ref None
 
 let is_reason = ref false
+
+let no_js_stdout = ref false
 end
 (** Interface as module  *)
 module Asttypes
@@ -3790,7 +3796,7 @@ let apply_lazy ~source ~target
   if magic <> Config.ast_impl_magic_number
   && magic <> Config.ast_intf_magic_number then
     failwith "Bs_ast_mapper: OCaml version mismatch or malformed input";
-  Location.input_name := input_value ic;
+  Location.set_input_name @@ input_value ic;
   let ast = input_value ic in
   close_in ic;
 
@@ -23820,7 +23826,7 @@ let apply_lazy ~source ~target mapper =
   if magic <> Config.ast_impl_magic_number
   && magic <> Config.ast_intf_magic_number then
     failwith "Ast_mapper: OCaml version mismatch or malformed input";
-  Location.input_name := input_value ic;
+  Location.set_input_name @@ input_value ic;
   let ast = input_value ic in
   close_in ic;
 

lib/4.02.3/unstable/all_ounit_tests.ml

@@ -7394,6 +7394,8 @@ val force_cmj : bool ref
 val jsx_version : int ref
 val refmt : string option ref
 val is_reason : bool ref 
+
+val no_js_stdout : bool ref 
 end = struct
 #1 "js_config.ml"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -7506,6 +7508,8 @@ let jsx_version = ref (-1)
 let refmt = ref None
 
 let is_reason = ref false
+
+let no_js_stdout = ref false
 end
 module Ml_binary : sig 
 #1 "ml_binary.mli"
@@ -7584,7 +7588,7 @@ let read_ast (type t ) (kind : t  kind) ic : t  =
     | Mli -> Config.ast_intf_magic_number in 
   let buffer = really_input_string ic (String.length magic) in
   assert(buffer = magic); (* already checked by apply_rewriter *)
-  Location.input_name := input_value ic;
+  Location.set_input_name @@ input_value ic;
   input_value ic 
 
 let write_ast (type t) (kind : t kind)