Experimental ReScript Language Server in OCaml

.github/workflows/ci.yml

@@ -68,15 +68,13 @@ jobs:
             exe-suffix: ".exe"
             dune-profile: release
 
+          # Disable for now. eio and eio_main require ocaml >= 5.2.0
           # Verify that the compiler still builds with the oldest OCaml version we support.
-          # Steps comparing OCaml and Rust rewatch are skipped on this job; the
-          # first linux-x64 job runs them. OCaml 5.0 does not build with GCC 15
-          # (C23 by default), so this job stays on Ubuntu 24.04.
-          - os: ubuntu-24.04
-            ocaml_compiler: ocaml-variants.5.0.0+options,ocaml-option-static
-            node-target: linux-x64
-            rust-target: x86_64-unknown-linux-musl
-            dune-profile: static
+          # - os: ubuntu-24.04
+          #   ocaml_compiler: ocaml-variants.5.0.0+options,ocaml-option-static
+          #   node-target: linux-x64
+          #   rust-target: x86_64-unknown-linux-musl
+          #   dune-profile: static
 
     runs-on: ${{matrix.os}}
 
@@ -109,6 +107,56 @@ jobs:
           exe-suffix: ${{ matrix.exe-suffix }}
           run-quality-checks: "true"
 
+      # The static OCaml switch uses musl-gcc. linux-libc-dev installs Linux
+      # headers under /usr/include, but musl-gcc searches the musl include dir.
+      # Link the Linux headers into musl's include path so packages with C stubs
+      # such as uring can include <linux/...> headers.
+      - name: Make Linux headers visible to musl-gcc
+        if: runner.os == 'Linux'
+        run: |
+          set -eux
+
+          # Get the GNU multiarch triplet for the current machine.
+          # Examples:
+          #   x86_64-linux-gnu
+          #   aarch64-linux-gnu
+          GNU_MULTIARCH="$(gcc -print-multiarch)"
+
+          # Convert the GNU triplet into the musl include directory name.
+          # Examples:
+          #   x86_64-linux-gnu  -> x86_64-linux-musl
+          #   aarch64-linux-gnu -> aarch64-linux-musl
+          MUSL_MULTIARCH="${GNU_MULTIARCH%-gnu}-musl"
+
+          # musl-gcc searches this include directory.
+          MUSL_INCLUDE="/usr/include/${MUSL_MULTIARCH}"
+
+          # Linux arch-specific asm headers are installed here by linux-libc-dev.
+          GNU_ASM="/usr/include/${GNU_MULTIARCH}/asm"
+
+          # Ensure the musl include directory exists.
+          sudo mkdir -p "$MUSL_INCLUDE"
+
+          # Remove old paths first.
+          # This avoids silently keeping broken/stale symlinks from previous runs.
+          sudo rm -rf "$MUSL_INCLUDE/linux"
+          sudo rm -rf "$MUSL_INCLUDE/asm"
+          sudo rm -rf "$MUSL_INCLUDE/asm-generic"
+
+          # Expose Linux UAPI headers to musl-gcc.
+          # This fixes packages that include headers like <linux/swab.h>.
+          sudo ln -s /usr/include/linux "$MUSL_INCLUDE/linux"
+
+          # Expose architecture-specific asm headers to musl-gcc.
+          sudo ln -s "$GNU_ASM" "$MUSL_INCLUDE/asm"
+
+          # Expose generic asm headers used by many Linux headers.
+          sudo ln -s /usr/include/asm-generic "$MUSL_INCLUDE/asm-generic"
+
+          # Smoke test: fail early if musl-gcc still cannot find Linux headers.
+          echo '#include <linux/swab.h>' > /tmp/test.c
+          musl-gcc -c /tmp/test.c -o /tmp/test.o
+
       - name: Setup OCaml ${{ matrix.ocaml_compiler }}
         id: setup_ocaml
         uses: ./.github/actions/setup-ocaml
@@ -212,6 +260,11 @@ jobs:
         if: runner.os != 'Windows'
         run: make -C tests/gentype_tests/typescript-react-example clean test
 
+      # The Makefile skip some tests on Windows because OCaml Eio process operations is not supported on Windows yet
+      # Eio.Stdenv.process_mgr raise a error, see https://github.com/ocaml-multicore/eio/blob/37d6e67f7e25b43e4a66574ed98838c79f1a21b4/lib_eio_windows/eio_windows.ml#L36
+      - name: Run LSP tests
+        run: opam exec -- make test-lsp
+
       # On Windows, after running setup-ocaml (if it wasn't cached yet or the cache couldn't be restored),
       # Cygwin bash is used instead of Git Bash for Windows, breaking the rewatch tests.
       # So we need to adjust the path to bring back Git Bash for Windows.
@@ -525,7 +578,7 @@ jobs:
         uses: actions/checkout@v7
       - name: Run make in dev container
         uses: devcontainers/ci@v0.3
-        with:    
+        with:
           push: never
           runCmd: make
 

Makefile

@@ -103,7 +103,7 @@ clean-rewatch:
 
 # Compiler
 
-COMPILER_SOURCE_DIRS := compiler tests analysis tools rewatch-ocaml
+COMPILER_SOURCE_DIRS := compiler tests analysis tools rewatch-ocaml lsp
 COMPILER_SOURCES = $(shell find $(COMPILER_SOURCE_DIRS) -type f \( -name '*.ml' -o -name '*.mli' -o -name '*.c' -o -name '*.h' -o -name '*.dune' -o -name dune -o -name dune-project \))
 COMPILER_BIN_NAMES := bsc rescript-editor-analysis rescript-tools rescript
 COMPILER_EXES := $(addsuffix .exe,$(addprefix $(BIN_DIR)/,$(COMPILER_BIN_NAMES)))
@@ -188,10 +188,10 @@ test-gentype: lib
 test-rewatch: lib
 	./rewatch/tests/suite.sh $(RESCRIPT_EXE)
 
-test-rewatch-rust: lib rewatch
-	./rewatch/tests/suite.sh $(RESCRIPT_RUST_EXE)
+test-lsp: lib
+	@dune runtest tests/lsp_tests
 
-test-all: test test-gentype test-analysis test-tools test-rewatch
+test-all: test test-gentype test-analysis test-tools test-rewatch test-lsp
 
 # Playground
 

analysis/src/code_actions.ml

@@ -2,7 +2,7 @@
 
 let make ~title ~kind ~uri ~new_text ~range =
   let text_document =
-    Lsp.Types.OptionalVersionedTextDocumentIdentifier.create
+    Lsp.Types.OptionalVersionedTextDocumentIdentifier.create ~version:0
       ~uri:(Uri.from_string uri) ()
   in
   let edit =

analysis/src/diagnostics.ml

@@ -16,7 +16,7 @@ let document_syntax ~source ~kind_file =
             ~end_:
               (Lsp.Types.Position.create ~line:(endline - 1) ~character:endcol)
         in
-        Lsp.Types.Diagnostic.create ~range
+        Lsp.Types.Diagnostic.create ~range ~source:"ReScript"
           ~message:(`String (Res_diagnostics.explain diagnostic))
           ~severity:Lsp.Types.DiagnosticSeverity.Error ())
   in

analysis/src/markdown.ml

@@ -4,13 +4,9 @@ let divider = "\n---\n"
 
 type link = {start_pos: Lsp.Types.Position.t; file: string; label: string}
 
-let link_to_command_args link =
-  Printf.sprintf "[\"%s\",%i,%i]" link.file link.start_pos.line
-    link.start_pos.character
-
 let make_goto_command link =
-  Printf.sprintf "[%s](command:rescript-vscode.go_to_location?%s)" link.label
-    (Uri.encode_uri_component (link_to_command_args link))
+  Printf.sprintf "[%s](%s#L%d,%d)" link.label link.file (link.start_pos.line + 1)
+    (link.start_pos.character + 1)
 
 let go_to_definition_text ~env ~pos =
   let start_line, start_col = Pos.of_lexing pos in

analysis/src/module_resolution.ml

@@ -1,18 +1,51 @@
 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.get_path ())
+let package_path name =
+  let scope = Filename.dirname name in
+  let name = Filename.basename name in
+  match scope.[0] with
+  | '@' -> scope /+ name
+  | _ -> name
+
+let resolve_deno_pnpm ~start_path name =
+  let create_path folder =
+    start_path /+ "node_modules" /+ folder /+ "node_modules"
+    /+ package_path name
+  in
+  let deno = create_path ".deno" in
+  let pnpm = create_path ".pnpm" in
+  match (Files.if_exists deno, Files.if_exists pnpm) with
+  | Some deno, None -> Some deno
+  | None, Some pnpm -> Some pnpm
+  | Some deno, Some pnpm ->
+    failwith
+      (Printf.sprintf
+         "Failed to resolve path for %s. Conflict: two directories found. one \
+          for Deno (%s) and one for pnpm (%s)."
+         name deno pnpm)
+  | _ -> None
+
+let rec resolve_from_node_modules ~start_path name =
+  let path = start_path /+ "node_modules" /+ package_path name in
+  if Files.exists path then Some path
   else
-    let scope = Filename.dirname name in
-    let name = Filename.basename name in
-    let name =
-      match scope.[0] with
-      | '@' -> scope /+ name
-      | _ -> name
-    in
-    let path = start_path /+ "node_modules" /+ name in
-    if Files.exists path then Some path
-    else if Filename.dirname start_path = start_path then None
-    else resolve_node_module_path ~start_path:(Filename.dirname start_path) name
+    match resolve_deno_pnpm ~start_path name with
+    | Some p -> Some p
+    | None ->
+      if Filename.dirname start_path = start_path then None
+      else
+        resolve_from_node_modules ~start_path:(Filename.dirname start_path) name
+
+let resolve_node_module_path ?(fallback_to_runtime_package = true) ~start_path
+    name =
+  match resolve_from_node_modules ~start_path name with
+  | Some path -> Some path
+  | None
+    when fallback_to_runtime_package
+         && name = Runtime_package.name
+         && Files.exists (Runtime_package.get_path ()) ->
+    (* Compiler-local fallback for development builds where the runtime package
+       is not installed in the target workspace. Real project installs must win
+       so LSP definition locations point at the workspace's node_modules. *)
+    Some (Runtime_package.get_path ())
+  | None -> None

analysis/src/shared_types.ml

@@ -979,3 +979,108 @@ let extract_exp_apply_args ~args =
     | [] -> List.rev acc
   in
   args |> process_args ~acc:[]
+
+let state_to_yojson (state : state) =
+  let option_to_yojson f = function
+    | None -> `Null
+    | Some value -> f value
+  in
+
+  let string_set_to_yojson set =
+    `List (set |> File_set.elements |> List.map (fun value -> `String value))
+  in
+
+  let path_to_yojson path = `List (List.map (fun item -> `String item) path) in
+
+  let paths_to_yojson = function
+    | Impl {cmt; res} ->
+      `Assoc
+        [("kind", `String "Impl"); ("cmt", `String cmt); ("res", `String res)]
+    | Namespace {cmt} ->
+      `Assoc [("kind", `String "Namespace"); ("cmt", `String cmt)]
+    | IntfAndImpl {cmti; resi; cmt; res} ->
+      `Assoc
+        [
+          ("kind", `String "IntfAndImpl");
+          ("cmti", `String cmti);
+          ("resi", `String resi);
+          ("cmt", `String cmt);
+          ("res", `String res);
+        ]
+  in
+
+  let paths_for_module_to_yojson paths_for_module =
+    paths_for_module |> Hashtbl.to_seq
+    |> Seq.map (fun (file, paths) -> (file, paths_to_yojson paths))
+    |> List.of_seq
+    |> fun fields -> `Assoc fields
+  in
+
+  let autocomplete_to_yojson autocomplete =
+    autocomplete |> Misc.String_map.bindings
+    |> List.map (fun (name, files) ->
+        (name, `List (List.map (fun file -> `String file) files)))
+    |> fun fields -> `Assoc fields
+  in
+
+  let package_to_yojson (package : package) =
+    let major, minor = package.rescript_version in
+    `Assoc
+      [
+        ( "generic_jsx_module",
+          option_to_yojson
+            (fun value -> `String value)
+            package.generic_jsx_module );
+        ("suffix", `String package.suffix);
+        ("root_path", `String package.root_path);
+        ("project_files", string_set_to_yojson package.project_files);
+        ( "dependencies",
+          `List (package.dependencies |> List.map (fun x -> `String x)) );
+        ("dependencies_files", string_set_to_yojson package.dependencies_files);
+        ("paths_for_module", paths_for_module_to_yojson package.paths_for_module);
+        ( "namespace",
+          option_to_yojson (fun value -> `String value) package.namespace );
+        ("opens", `List (List.map path_to_yojson package.opens));
+        ( "rescript_version",
+          `Assoc [("major", `Int major); ("minor", `Int minor)] );
+        ("autocomplete", autocomplete_to_yojson package.autocomplete);
+      ]
+  in
+
+  let file_to_yojson (file : File.t) =
+    `Assoc
+      [
+        ("uri", `String (file.uri |> Lsp.Uri.to_string));
+        ("module_name", `String file.module_name);
+        ("stamps_count", `Int (List.length (Stamps.get_entries file.stamps)));
+        ("structure_name", `String file.structure.name);
+        ( "structure_docstring",
+          `List (List.map (fun value -> `String value) file.structure.docstring)
+        );
+        ("structure_items_count", `Int (List.length file.structure.items));
+      ]
+  in
+
+  let cmt_cache =
+    state.cmt_cache |> Hashtbl.to_seq
+    |> Seq.map (fun (file_path, file) -> (file_path, file_to_yojson file))
+    |> List.of_seq
+  in
+
+  let root_for_uri =
+    state.root_for_uri |> Hashtbl.to_seq |> List.of_seq
+    |> List.map (fun (uri, str) -> [(Lsp.Uri.to_string uri, `String str)])
+    |> List.flatten
+  in
+
+  let packages_by_root =
+    state.packages_by_root |> Hashtbl.to_seq |> List.of_seq
+    |> List.map (fun (root, package) -> (root, package_to_yojson package))
+  in
+
+  `Assoc
+    [
+      ("cmt_cache", `Assoc cmt_cache);
+      ("root_for_uri", `Assoc root_for_uri);
+      ("packages_by_root", `Assoc packages_by_root);
+    ]

analysis/src/uri.ml

@@ -24,37 +24,3 @@ let to_top_level_loc (uri : Lsp.Uri.t) =
 let to_string t =
   if !strip_path then Filename.basename (Lsp.Uri.to_path t)
   else Lsp.Uri.to_string t
-
-(* Light weight, hopefully-enough-for-the-purpose fn to encode URI components.
-   Built to handle the reserved characters listed in
-   https://en.wikipedia.org/wiki/Percent-encoding. Note that this function is not
-   general purpose, rather it's currently only for URL encoding the argument list
-   passed to command links in markdown. *)
-let encode_uri_component text =
-  let ln = String.length text in
-  let buf = Buffer.create ln in
-  let rec loop i =
-    if i < ln then (
-      (match text.[i] with
-      | '"' -> Buffer.add_string buf "%22"
-      | '\'' -> Buffer.add_string buf "%22"
-      | ':' -> Buffer.add_string buf "%3A"
-      | ';' -> Buffer.add_string buf "%3B"
-      | '/' -> Buffer.add_string buf "%2F"
-      | '\\' -> Buffer.add_string buf "%5C"
-      | ',' -> Buffer.add_string buf "%2C"
-      | '&' -> Buffer.add_string buf "%26"
-      | '[' -> Buffer.add_string buf "%5B"
-      | ']' -> Buffer.add_string buf "%5D"
-      | '#' -> Buffer.add_string buf "%23"
-      | '$' -> Buffer.add_string buf "%24"
-      | '+' -> Buffer.add_string buf "%2B"
-      | '=' -> Buffer.add_string buf "%3D"
-      | '?' -> Buffer.add_string buf "%3F"
-      | '@' -> Buffer.add_string buf "%40"
-      | '%' -> Buffer.add_string buf "%25"
-      | c -> Buffer.add_char buf c);
-      loop (i + 1))
-  in
-  loop 0;
-  Buffer.contents buf

analysis/src/uri.mli

@@ -0,0 +1,9 @@
+type t = Lsp.Uri.t
+
+val from_path : string -> t
+val from_string : string -> t
+val is_interface : t -> bool
+val strip_path : bool ref
+val to_path : t -> string
+val to_string : t -> string
+val to_top_level_loc : t -> Location.t

changes/opam-ppx-expect.internal.md

@@ -0,0 +1 @@
+- Update ppx_expect to v0.17.3 to resolve test dependencies with ppxlib 0.38 and OCaml 5.5.

dune

@@ -1,4 +1,4 @@
-(dirs compiler tests analysis tools rewatch-ocaml)
+(dirs compiler tests analysis tools rewatch-ocaml lsp)
 
 ; All warnings are enabled, except:
 ; - 4 (fragile-match): wildcard cases are used deliberately.