From 8fe210c0971c29c7023c5df50e6d764146b5669c Mon Sep 17 00:00:00 2001
From: Paul-Elliot <peada@free.fr>
Date: Tue, 6 Feb 2024 15:24:03 +0100
Subject: [PATCH] Split name part of the query by `.` in addition to space.

This allows to find `ListLabels.map` when searching for `List.map`.

Signed-off-by: Paul-Elliot <peada@free.fr>
Co-authored-by: Emile Trotignon <emile.trotignon@laposte.net>
---
 query/query_parser.ml    |   4 +-
 test/cram/cli.t/main.mli |  37 +++++++++-
 test/cram/cli.t/run.t    | 144 ++++++++++++++++++++++++++++++++++++++-
 3 files changed, 179 insertions(+), 6 deletions(-)

diff --git a/query/query_parser.ml b/query/query_parser.ml
index 0283842d..9773497d 100644
--- a/query/query_parser.ml
+++ b/query/query_parser.ml
@@ -19,7 +19,9 @@ let type_of_string str =
   | _ -> `parse_error
 
 let naive_of_string str =
-  List.filter (fun s -> String.length s > 0) (String.split_on_char ' ' str)
+  List.filter
+    (fun s -> String.length s > 0)
+    (str |> String.split_on_char ' ' |> List.map (String.split_on_char '.') |> List.concat)
 
 let guess_type_search str =
   String.length str >= 1
diff --git a/test/cram/cli.t/main.mli b/test/cram/cli.t/main.mli
index 9c483d70..e0c18687 100644
--- a/test/cram/cli.t/main.mli
+++ b/test/cram/cli.t/main.mli
@@ -27,6 +27,38 @@ module List : sig
   val map : ('a -> 'b) -> 'a t -> 'b t
   val map2 : ('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
   val rev_map2_exn : 'a t -> 'b t -> f:('a -> 'b -> 'c) -> 'c t
+
+  module Label : sig
+    type 'a t = 'a list
+
+    val map : f:('a -> 'b) -> 'a t -> 'b t
+    val map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+    val rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
+  end
+end
+
+module Label : sig
+  type 'a t = 'a list
+
+  val map : f:('a -> 'b) -> 'a t -> 'b t
+  val map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
+
+  module List : sig
+    type 'a t = 'a list
+
+    val map : ('a -> 'b) -> 'a t -> 'b t
+    val map2 : ('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+    val rev_map2_exn : 'a t -> 'b t -> f:('a -> 'b -> 'c) -> 'c t
+  end
+end
+
+module ListLabel : sig
+  type 'a t = 'a list
+
+  val map : f:('a -> 'b) -> 'a t -> 'b t
+  val map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
 end
 
 val foo : foo
@@ -65,13 +97,12 @@ val poly_param : 'a boo
 
 type extensible_type = ..
 type extensible_type += MyExtension of moo
-
 type exn_payload
 
 exception Implicit_exn of exn_payload
 exception Explicit_exn : exn_payload -> exn
-type exn += Very_explicit_exn : exn_payload -> exn
 
+type exn += Very_explicit_exn : exn_payload -> exn
 type long_name_type
 
-val long_name_value : long_name_type
\ No newline at end of file
+val long_name_value : long_name_type
diff --git a/test/cram/cli.t/run.t b/test/cram/cli.t/run.t
index 93d2faf3..1b5f4059 100644
--- a/test/cram/cli.t/run.t
+++ b/test/cram/cli.t/run.t
@@ -22,27 +22,71 @@
   type 'a Main.list
   type 'a Main.List.t = 'a list
   mod Main.List
+  type 'a Main.Label.List.t = 'a list
+  type 'a Main.List.Label.t = 'a list
+  mod Main.Label.List
+  mod Main.List.Label
+  type 'a Main.ListLabel.t = 'a list
+  mod Main.ListLabel
   val Main.Map.to_list : foo
   val Main.List.map : ('a -> 'b) -> 'a t -> 'b t
+  val Main.Label.List.map : ('a -> 'b) -> 'a t -> 'b t
+  val Main.List.Label.map : f:('a -> 'b) -> 'a t -> 'b t
+  val Main.ListLabel.map : f:('a -> 'b) -> 'a t -> 'b t
   val Main.List.map2 : ('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
   val Main.List.rev_map2_exn : 'a t -> 'b t -> f:('a -> 'b -> 'c) -> 'c t
+  val Main.List.Label.rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
+  val Main.Label.List.map2 : ('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.Label.List.rev_map2_exn : 'a t -> 'b t -> f:('a -> 'b -> 'c) -> 'c t
+  val Main.List.Label.map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.ListLabel.rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
+  val Main.ListLabel.map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
   val Main.foo : foo
   $ sherlodoc search "map"
   mod Main.Map
   val Main.Map.to_list : foo
   val Main.List.map : ('a -> 'b) -> 'a t -> 'b t
+  val Main.Label.map : f:('a -> 'b) -> 'a t -> 'b t
+  val Main.ListLabel.map : f:('a -> 'b) -> 'a t -> 'b t
+  val Main.Label.List.map : ('a -> 'b) -> 'a t -> 'b t
+  val Main.List.Label.map : f:('a -> 'b) -> 'a t -> 'b t
   val Main.List.map2 : ('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.Label.map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.ListLabel.map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.Label.rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
+  val Main.Label.List.map2 : ('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
   val Main.List.rev_map2_exn : 'a t -> 'b t -> f:('a -> 'b -> 'c) -> 'c t
+  val Main.List.Label.map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.ListLabel.rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
+  val Main.List.Label.rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
+  val Main.Label.List.rev_map2_exn : 'a t -> 'b t -> f:('a -> 'b -> 'c) -> 'c t
   val Main.foo : foo
   $ sherlodoc search "list map"
   val Main.List.map : ('a -> 'b) -> 'a t -> 'b t
+  val Main.Label.List.map : ('a -> 'b) -> 'a t -> 'b t
+  val Main.List.Label.map : f:('a -> 'b) -> 'a t -> 'b t
+  val Main.ListLabel.map : f:('a -> 'b) -> 'a t -> 'b t
   val Main.List.map2 : ('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
   val Main.Map.to_list : foo
+  val Main.Label.List.map2 : ('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
   val Main.List.rev_map2_exn : 'a t -> 'b t -> f:('a -> 'b -> 'c) -> 'c t
+  val Main.List.Label.map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.List.Label.rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
+  val Main.ListLabel.map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.Label.List.rev_map2_exn : 'a t -> 'b t -> f:('a -> 'b -> 'c) -> 'c t
+  val Main.ListLabel.rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
   val Main.foo : foo
   $ sherlodoc search "map2"
   val Main.List.map2 : ('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.Label.map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.ListLabel.map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.Label.List.map2 : ('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.List.Label.map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.Label.rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
   val Main.List.rev_map2_exn : 'a t -> 'b t -> f:('a -> 'b -> 'c) -> 'c t
+  val Main.ListLabel.rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
+  val Main.List.Label.rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
+  val Main.Label.List.rev_map2_exn : 'a t -> 'b t -> f:('a -> 'b -> 'c) -> 'c t
   $ sherlodoc search ":moo"
   val Main.value : moo
   val Main.produce : unit -> moo
@@ -67,7 +111,13 @@
   mod Main.List
   mod Main.Nest
   type 'a Main.list
+  type 'a Main.ListLabel.t = 'a list
+  mod Main.ListLabel
   type Main.MyExtension
+  type 'a Main.Label.List.t = 'a list
+  type 'a Main.List.Label.t = 'a list
+  mod Main.Label.List
+  mod Main.List.Label
   cons Main.MyExtension : moo -> extensible_type
   val Main.consume : moo -> unit
   val Main.Map.to_list : foo
@@ -77,8 +127,8 @@
   val Main.consume_2_other : moo -> t -> unit
   val Main.List.map : ('a -> 'b) -> 'a t -> 'b t
   val Main.foo : foo
-  val Main.List.map2 : ('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
-  val Main.List.rev_map2_exn : 'a t -> 'b t -> f:('a -> 'b -> 'c) -> 'c t
+  val Main.ListLabel.map : f:('a -> 'b) -> 'a t -> 'b t
+  val Main.Label.List.map : ('a -> 'b) -> 'a t -> 'b t
   $ sherlodoc search "qwertyuiopasdfghjklzxcvbnm"
   [No results]
   $ sherlodoc search "hidden"
@@ -91,18 +141,50 @@
   val Main.poly_param : 'a boo
   val Main.poly_1 : 'a -> 'b -> 'c
   val Main.List.map : ('a -> 'b) -> 'a t -> 'b t
+  val Main.Label.map : f:('a -> 'b) -> 'a t -> 'b t
+  val Main.ListLabel.map : f:('a -> 'b) -> 'a t -> 'b t
+  val Main.Label.List.map : ('a -> 'b) -> 'a t -> 'b t
+  val Main.List.Label.map : f:('a -> 'b) -> 'a t -> 'b t
   val Main.poly_2 : 'a -> 'b -> 'c -> 'a -> 'b -> 'c
   val Main.List.map2 : ('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.Label.rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
   val Main.List.rev_map2_exn : 'a t -> 'b t -> f:('a -> 'b -> 'c) -> 'c t
+  val Main.Label.map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.ListLabel.rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
+  val Main.ListLabel.map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.List.Label.rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
+  val Main.Label.List.map2 : ('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.Label.List.rev_map2_exn : 'a t -> 'b t -> f:('a -> 'b -> 'c) -> 'c t
+  val Main.List.Label.map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
   $ sherlodoc search ": 'a -> 'b -> 'c "
   val Main.poly_1 : 'a -> 'b -> 'c
   val Main.poly_2 : 'a -> 'b -> 'c -> 'a -> 'b -> 'c
   val Main.List.map2 : ('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.Label.map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.ListLabel.map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.Label.rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
+  val Main.Label.List.map2 : ('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
   val Main.List.rev_map2_exn : 'a t -> 'b t -> f:('a -> 'b -> 'c) -> 'c t
+  val Main.List.Label.map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.ListLabel.rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
+  val Main.List.Label.rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
+  val Main.Label.List.rev_map2_exn : 'a t -> 'b t -> f:('a -> 'b -> 'c) -> 'c t
   $ sherlodoc search ": ('a -> 'b) -> 'a t -> 'b t"
   val Main.List.map : ('a -> 'b) -> 'a t -> 'b t
+  val Main.Label.map : f:('a -> 'b) -> 'a t -> 'b t
+  val Main.ListLabel.map : f:('a -> 'b) -> 'a t -> 'b t
+  val Main.Label.List.map : ('a -> 'b) -> 'a t -> 'b t
+  val Main.List.Label.map : f:('a -> 'b) -> 'a t -> 'b t
   val Main.List.map2 : ('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.Label.rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
   val Main.List.rev_map2_exn : 'a t -> 'b t -> f:('a -> 'b -> 'c) -> 'c t
+  val Main.Label.map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.ListLabel.rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
+  val Main.ListLabel.map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.List.Label.rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
+  val Main.Label.List.map2 : ('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.Label.List.rev_map2_exn : 'a t -> 'b t -> f:('a -> 'b -> 'c) -> 'c t
+  val Main.List.Label.map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
   $ sherlodoc search ": 'a bo"
   val Main.poly_param : 'a boo
   $ sherlodoc search ":extensible_type"
@@ -122,3 +204,61 @@
   $ sherlodoc search "long_name"
   type Main.long_name_type
   val Main.long_name_value : long_name_type
+
+  $ sherlodoc search "List.Label.map2"
+  val Main.List.Label.map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.List.Label.rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
+  val Main.Label.List.map2 : ('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.ListLabel.map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.Label.List.rev_map2_exn : 'a t -> 'b t -> f:('a -> 'b -> 'c) -> 'c t
+  val Main.ListLabel.rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
+
+  $ sherlodoc search "ListLabel.map2"
+  val Main.ListLabel.map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.ListLabel.rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
+
+  $ sherlodoc search "L.L.L.L.L.map2"
+  val Main.Label.List.map2 : ('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.List.Label.map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.List.Label.rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
+  val Main.Label.List.rev_map2_exn : 'a t -> 'b t -> f:('a -> 'b -> 'c) -> 'c t
+  val Main.ListLabel.map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.List.map2 : ('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.Label.map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.ListLabel.rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
+  val Main.Label.rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
+  val Main.List.rev_map2_exn : 'a t -> 'b t -> f:('a -> 'b -> 'c) -> 'c t
+
+  $ sherlodoc search "Label.List"
+  type 'a Main.Label.List.t = 'a list
+  mod Main.Label.List
+  type 'a Main.List.Label.t = 'a list
+  mod Main.List.Label
+  type 'a Main.ListLabel.t = 'a list
+  mod Main.ListLabel
+  val Main.Label.List.map : ('a -> 'b) -> 'a t -> 'b t
+  val Main.Label.List.map2 : ('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.Label.List.rev_map2_exn : 'a t -> 'b t -> f:('a -> 'b -> 'c) -> 'c t
+  val Main.List.Label.map : f:('a -> 'b) -> 'a t -> 'b t
+  val Main.List.Label.rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
+  val Main.List.Label.map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.ListLabel.map : f:('a -> 'b) -> 'a t -> 'b t
+  val Main.ListLabel.rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
+  val Main.ListLabel.map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+
+  $ sherlodoc search "List.Label"
+  type 'a Main.List.Label.t = 'a list
+  mod Main.List.Label
+  type 'a Main.Label.List.t = 'a list
+  mod Main.Label.List
+  type 'a Main.ListLabel.t = 'a list
+  mod Main.ListLabel
+  val Main.List.Label.map : f:('a -> 'b) -> 'a t -> 'b t
+  val Main.List.Label.rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
+  val Main.List.Label.map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.Label.List.map : ('a -> 'b) -> 'a t -> 'b t
+  val Main.ListLabel.map : f:('a -> 'b) -> 'a t -> 'b t
+  val Main.Label.List.map2 : ('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list
+  val Main.Label.List.rev_map2_exn : 'a t -> 'b t -> f:('a -> 'b -> 'c) -> 'c t
+  val Main.ListLabel.rev_map2_exn : 'a t -> 'b t -> ('a -> 'b -> 'c) -> 'c t
+  val Main.ListLabel.map2 : f:('a -> 'b -> 'c) -> 'a list -> 'b list -> 'c list