Merge branch 'master' of github.com:ocaml/ocaml-lsp into polarity_search

Author: PizieDust

CHANGES.md

@@ -3,10 +3,14 @@
 - Add custom
   [`ocamllsp/typeSearch`](/ocaml-lsp-server/docs/ocamllsp/typeSearch-spec.md) request (#1369)
 
+- Make MerlinJump code action configurable (#1376)
+
 ## Fixes
 
 - Fix fd leak in running external processes for preprocessing (#1349)
 - Fix prefix parsing for completion of object methods (#1363, fixes #1358)
+- Remove some duplicates in the `selectionRange` answers (#1368)
+
 
 # 1.19.0
 

dune-project

@@ -69,7 +69,7 @@ possible and does not make any assumptions about IO.
   (csexp (>= 1.5))
   (ocamlformat-rpc-lib (>= 0.21.0))
   (odoc :with-doc)
-  (merlin-lib (and (>= 5.0) (< 6.0)))))
+  (merlin-lib (and (>= 5.2) (< 6.0)))))
 
 (package
  (name jsonrpc)

flake.nix

@@ -72,7 +72,13 @@
               uutf
             ];
             checkInputs = let p = pkgs.ocamlPackages;
-            in [ p.stdune p.cinaps p.ppx_expect p.ppx_yojson_conv (ocamlformat pkgs) ];
+            in [
+              p.stdune
+              p.cinaps
+              p.ppx_expect
+              p.ppx_yojson_conv
+              (ocamlformat pkgs)
+            ];
           });
 
           ocaml-lsp = with pkgs.ocamlPackages;
@@ -140,15 +146,15 @@
         devShell = localPackages: nixpkgs:
           nixpkgs.mkShell {
             buildInputs = [ nixpkgs.ocamlPackages.utop ];
-            inputsFrom = builtins.map (x: x.overrideAttrs(p: n: { doCheck = true; }))
+            inputsFrom =
+              builtins.map (x: x.overrideAttrs (p: n: { doCheck = true; }))
               (builtins.attrValues localPackages);
           };
       in {
-        packages =
-          (localPackages_5_2 // {
-            default = localPackages_5_2.ocaml-lsp;
-            ocaml_5_1 = localPackages_5_1;
-          });
+        packages = (localPackages_5_2 // {
+          default = localPackages_5_2.ocaml-lsp;
+          ocaml_5_1 = localPackages_5_1;
+        });
 
         devShells = {
           default = devShell localPackages_5_2 pkgs_5_2;

lsp/src/uri0.ml

@@ -14,9 +14,11 @@ type t = Uri_lexer.t =
   ; authority : string
   ; path : string
   ; query : string option
+  ; fragment : string option
   }
 
 let query t = t.query
+let fragment t = t.fragment
 
 let backslash_to_slash =
   String.map ~f:(function
@@ -35,7 +37,7 @@ let of_path path =
   Uri_lexer.of_path path
 ;;
 
-let to_path { path; authority; scheme; query } =
+let to_path { path; authority; scheme; query; _ } =
   let path =
     let len = String.length path in
     if len = 0
@@ -104,7 +106,7 @@ let encode ?(allow_slash = false) s =
   Buffer.contents buf
 ;;
 
-let to_string { scheme; authority; path; query } =
+let to_string { scheme; authority; path; query; fragment } =
   let buff = Buffer.create 64 in
   if not (String.is_empty scheme)
   then (
@@ -147,6 +149,11 @@ let to_string { scheme; authority; path; query } =
    | Some q ->
      Buffer.add_char buff '?';
      Buffer.add_string buff (encode q));
+  (match fragment with
+   | None -> ()
+   | Some f ->
+     Buffer.add_char buff '#';
+     Buffer.add_string buff (encode f));
   Buffer.contents buff
 ;;
 

lsp/src/uri0.mli

@@ -10,7 +10,9 @@ val hash : t -> int
 val to_path : t -> string
 val of_path : string -> t
 val to_string : t -> string
+val of_string : string -> t
 val query : t -> string option
+val fragment : t -> string option
 
 module Private : sig
   val win32 : bool ref

lsp/src/uri_lexer.mli

@@ -3,6 +3,7 @@ type t =
   ; authority : string
   ; path : string
   ; query : string option
+  ; fragment : string option
   }
 
 val of_string : string -> t

lsp/src/uri_lexer.mll

@@ -7,6 +7,7 @@ type t =
   ; authority : string
   ; path : string
   ; query: string option
+  ; fragment: string option
   }
 
 let int_of_hex_char c =
@@ -84,7 +85,8 @@ and uri = parse
 ([^':' '/' '?' '#']+ as scheme ':') ?
 ("//" ([^ '/' '?' '#']* as authority)) ?
 ([^ '?' '#']* as path)
-(('?' ([^ '#']* as raw_query) '#'?)) ?
+('?' ([^ '#']* as raw_query)) ?
+('#' (_ * as fragment)) ?
 {
   let scheme = scheme |> Option.value ~default:"file" in
   let authority =
@@ -102,15 +104,15 @@ and uri = parse
     | None -> None
     | Some c -> Some (query (Buffer.create (String.length c)) (Lexing.from_string c))
   in
-  { scheme; authority; path; query }
+  { scheme; authority; path; query; fragment }
 }
 
 and path = parse
-| "" { { scheme = "file"; authority = ""; path = "/"; query = None } }
-| "//" ([^ '/']* as authority) (['/']_* as path) { { scheme = "file"; authority; path ; query = None } }
-| "//" ([^ '/']* as authority) { { scheme = "file"; authority; path = "/" ; query = None } }
-| ("/" _* as path) { { scheme = "file"; authority = ""; path ; query = None } }
-| (_* as path) { { scheme = "file"; authority = ""; path = "/" ^ path ; query = None } }
+| "" { { scheme = "file"; authority = ""; path = "/"; query = None; fragment = None } }
+| "//" ([^ '/']* as authority) (['/']_* as path) { { scheme = "file"; authority; path ; query = None ; fragment = None } }
+| "//" ([^ '/']* as authority) { { scheme = "file"; authority; path = "/" ; query = None ; fragment = None } }
+| ("/" _* as path) { { scheme = "file"; authority = ""; path ; query = None ; fragment = None } }
+| (_* as path) { { scheme = "file"; authority = ""; path = "/" ^ path ; query = None ; fragment = None } }
 
 {
   let of_string s =

lsp/test/uri_tests.ml

@@ -255,7 +255,7 @@ let%expect_test "of_string -> to_string" =
   [%expect
     {|
     Unix:
-    file://shares/pröjects/c%23/#l12 -> file://shares/pr%C3%B6jects/c%23/
+    file://shares/pröjects/c%23/#l12 -> file://shares/pr%C3%B6jects/c%23/#l12
     file://sh%c3%a4res/path -> file://sh%C3%A4res/path
     untitled:c:/Users/jrieken/Code/abc.txt -> untitled:c%3A/Users/jrieken/Code/abc.txt
     untitled:C:/Users/jrieken/Code/abc.txt -> untitled:c%3A/Users/jrieken/Code/abc.txt
@@ -267,7 +267,7 @@ let%expect_test "of_string -> to_string" =
     file:///pro%2Fjects/ -> file:///pro/jects/
     vscode://mount/test.ml -> vscode://mount/test.ml
     Windows:
-    file://shares/pröjects/c%23/#l12 -> file://shares/pr%C3%B6jects/c%23/
+    file://shares/pröjects/c%23/#l12 -> file://shares/pr%C3%B6jects/c%23/#l12
     file://sh%c3%a4res/path -> file://sh%C3%A4res/path
     untitled:c:/Users/jrieken/Code/abc.txt -> untitled:c%3A/Users/jrieken/Code/abc.txt
     untitled:C:/Users/jrieken/Code/abc.txt -> untitled:c%3A/Users/jrieken/Code/abc.txt

ocaml-lsp-server.opam

@@ -45,7 +45,7 @@ depends: [
   "csexp" {>= "1.5"}
   "ocamlformat-rpc-lib" {>= "0.21.0"}
   "odoc" {with-doc}
-  "merlin-lib" {>= "5.0" & < "6.0"}
+  "merlin-lib" {>= "5.2" & < "6.0"}
 ]
 dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git"
 build: [

ocaml-lsp-server/docs/ocamllsp/config.md

@@ -42,5 +42,12 @@ interface config {
   * @since 1.18
   */
   syntaxDocumentation: { enable : boolean }
+
+  /**
+  * Enable/Disable Merlin Jump code actions
+  * @default true
+  * @since 1.19
+  */
+  merlinJumpCodeActions: { enable : boolean }
 }
 ```