Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions analysis/src/completion_back_end.ml
Original file line number Diff line number Diff line change
Expand Up @@ -967,16 +967,28 @@ and get_completions_for_context_path ~state ~debug ~full ~opens ~raw_opens ~pos
match context_path with
| CPString ->
if Debug.verbose () then print_endline "[ctx_path]--> CPString";
[Completion.create "dummy" ~env ~kind:(Completion.Value Predef.type_string)]
[
Completion.create "dummy" ~env
~kind:(Completion.Value (Predef.type_string ()));
]
| CPBool ->
if Debug.verbose () then print_endline "[ctx_path]--> CPBool";
[Completion.create "dummy" ~env ~kind:(Completion.Value Predef.type_bool)]
[
Completion.create "dummy" ~env
~kind:(Completion.Value (Predef.type_bool ()));
]
| CPInt ->
if Debug.verbose () then print_endline "[ctx_path]--> CPInt";
[Completion.create "dummy" ~env ~kind:(Completion.Value Predef.type_int)]
[
Completion.create "dummy" ~env
~kind:(Completion.Value (Predef.type_int ()));
]
| CPFloat ->
if Debug.verbose () then print_endline "[ctx_path]--> CPFloat";
[Completion.create "dummy" ~env ~kind:(Completion.Value Predef.type_float)]
[
Completion.create "dummy" ~env
~kind:(Completion.Value (Predef.type_float ()));
]
| CPArray None ->
if Debug.verbose () then print_endline "[ctx_path]--> CPArray (no payload)";
[
Expand Down Expand Up @@ -1984,7 +1996,9 @@ let rec complete_typed_value ?(type_arg_context : type_arg_context option)
if prefix = "" then
[
create "\"\"" ~includes_snippets:true ~insert_text:"\"$0\""
~sort_text:"A" ~kind:(Value Predef.type_string) ~env;
~sort_text:"A"
~kind:(Value (Predef.type_string ()))
~env;
]
else []
| Tfunction {env; typ; args; return_type}
Expand Down
2 changes: 1 addition & 1 deletion analysis/src/module_resolution.ml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ let ( /+ ) = Filename.concat
let rec resolve_node_module_path ~start_path name =
if name = "@rescript/runtime" then
(* Hack: we need a reliable way to resolve modules in monorepos. *)
Some !Runtime_package.path
Some (Runtime_package.get_path ())
else
let scope = Filename.dirname name in
let name = Filename.basename name in
Expand Down
1 change: 1 addition & 0 deletions changes/compiler-request-isolation.internal.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Make compiler requests safe to run repeatedly and in parallel in one process, as a preparation for compiling in-process in the OCaml build system. https://github.com/rescript-lang/rescript/pull/8864
1 change: 1 addition & 0 deletions changes/ppx-temp-file-cleanup.fix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Remove the temporary PPX files when a PPX fails or a build is interrupted. https://github.com/rescript-lang/rescript/pull/8864
11 changes: 10 additions & 1 deletion compiler/bsc/dune
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,19 @@
(flags
(:standard -ccopt -static))))

(library
(name rescript_compiler_driver)
(wrapped false)
(modules rescript_compiler_driver)
(instrumentation
(backend bisect_ppx))
(libraries common core depends flow_parser gentype syntax unix))

(executable
(name rescript_compiler_main)
(modules rescript_compiler_main)
(public_name bsc)
(package rescript)
(instrumentation
(backend bisect_ppx))
(libraries common core depends flow_parser gentype syntax))
(libraries rescript_compiler_driver))
Loading
Loading