Stop deduplicating all results

Author: liam923

src/frontend/query_commands.ml

@@ -309,18 +309,17 @@ let dispatch pipeline (type a) : a Query_protocol.t -> a = function
        typedtree's nodes and can provide types for modules appearing in paths.
 
        This introduces two possible sources of duplicate results:
-       - Sometimes the typedtree nodes in 1 overlaps and we simply remove these.
        - The last reconstructed enclosing usually overlaps with the first
          typedtree node but the printed types are not always the same (generic /
          specialized types). Because systematically printing these types to
          compare them can be very expensive in the presence of large modules, we
          defer this deduplication to the clients.
+       - Sometimes the typedtree nodes in 1 overlaps. We choose not to dedpulicate because
+         if the types are the same, the client is already responsible for deduplication.
+         If they are different, then they are likely useful to display to the user.
+       So, we choose to not duplicate results and delegate this to the client.
     *)
-    let enclosing_nodes =
-      let cmp (loc1, _, _) (loc2, _, _) = Location_aux.compare loc1 loc2 in
-      (* There might be duplicates in the list: we remove them *)
-      Type_enclosing.from_nodes ~path |> List.dedup_adjacent ~cmp
-    in
+    let enclosing_nodes = Type_enclosing.from_nodes ~path in
 
     (* Enclosings of cursor in given expression *)
     let exprs = Misc_utils.reconstruct_identifier pipeline pos expro in

tests/test-dirs/type-enclosing/function-type-error.t

@@ -185,6 +185,18 @@ type error. The exact output may change slightly -- that's fine.
         "type": "int",
         "tail": "no"
       },
+      {
+        "start": {
+          "line": 1,
+          "col": 8
+        },
+        "end": {
+          "line": 1,
+          "col": 40
+        },
+        "type": "int -> ?z:int -> int -> int",
+        "tail": "no"
+      },
       {
         "start": {
           "line": 1,

tests/test-dirs/type-enclosing/underscore-ids.t

@@ -21,6 +21,18 @@ in the presence of underscores.
       "type": "float",
       "tail": "no"
     },
+    {
+      "start": {
+        "line": 3,
+        "col": 2
+      },
+      "end": {
+        "line": 3,
+        "col": 6
+      },
+      "type": "float",
+      "tail": "no"
+    },
     {
       "start": {
         "line": 3,
@@ -67,6 +79,18 @@ in the presence of underscores.
       "type": "float",
       "tail": "no"
     },
+    {
+      "start": {
+        "line": 3,
+        "col": 2
+      },
+      "end": {
+        "line": 3,
+        "col": 6
+      },
+      "type": "float",
+      "tail": "no"
+    },
     {
       "start": {
         "line": 3,
@@ -114,6 +138,18 @@ We try several places in the identifier to check the result stability
       "type": "float",
       "tail": "no"
     },
+    {
+      "start": {
+        "line": 3,
+        "col": 2
+      },
+      "end": {
+        "line": 3,
+        "col": 9
+      },
+      "type": "float",
+      "tail": "no"
+    },
     {
       "start": {
         "line": 3,
@@ -160,6 +196,18 @@ We try several places in the identifier to check the result stability
       "type": "float",
       "tail": "no"
     },
+    {
+      "start": {
+        "line": 3,
+        "col": 2
+      },
+      "end": {
+        "line": 3,
+        "col": 9
+      },
+      "type": "float",
+      "tail": "no"
+    },
     {
       "start": {
         "line": 3,
@@ -206,6 +254,18 @@ We try several places in the identifier to check the result stability
       "type": "float",
       "tail": "no"
     },
+    {
+      "start": {
+        "line": 3,
+        "col": 2
+      },
+      "end": {
+        "line": 3,
+        "col": 9
+      },
+      "type": "float",
+      "tail": "no"
+    },
     {
       "start": {
         "line": 3,
@@ -253,6 +313,18 @@ We try several places in the identifier to check the result stability
         "type": "float",
         "tail": "no"
       },
+      {
+        "start": {
+          "line": 3,
+          "col": 2
+        },
+        "end": {
+          "line": 3,
+          "col": 9
+        },
+        "type": "float",
+        "tail": "no"
+      },
       {
         "start": {
           "line": 3,
@@ -316,6 +388,18 @@ We try several places in the identifier to check the result stability
         "type": "int option",
         "tail": "no"
       },
+      {
+        "start": {
+          "line": 2,
+          "col": 18
+        },
+        "end": {
+          "line": 5,
+          "col": 17
+        },
+        "type": "int option -> int",
+        "tail": "no"
+      },
       {
         "start": {
           "line": 2,

tests/test-dirs/type-enclosing/variants.t/run.t

@@ -155,8 +155,32 @@
 
 FIXME: Not satisfying, expected core not more
   $ $MERLIN single type-enclosing -position 9:3 -verbosity 0 \
-  > -filename ./variants.ml < ./variants.ml | jq ".value[0:2]"
+  > -filename ./variants.ml < ./variants.ml | jq ".value"
   [
+    {
+      "start": {
+        "line": 9,
+        "col": 2
+      },
+      "end": {
+        "line": 9,
+        "col": 7
+      },
+      "type": "more",
+      "tail": "no"
+    },
+    {
+      "start": {
+        "line": 9,
+        "col": 2
+      },
+      "end": {
+        "line": 9,
+        "col": 7
+      },
+      "type": "more",
+      "tail": "no"
+    },
     {
       "start": {
         "line": 9,
@@ -184,8 +208,32 @@ FIXME: Not satisfying, expected core not more
   ]
 
   $ $MERLIN single type-enclosing -position 9:3 -verbosity 1 \
-  > -filename ./variants.ml < ./variants.ml | jq ".value[0:2]"
+  > -filename ./variants.ml < ./variants.ml | jq ".value"
   [
+    {
+      "start": {
+        "line": 9,
+        "col": 2
+      },
+      "end": {
+        "line": 9,
+        "col": 7
+      },
+      "type": "[ `A | `B | `C ]",
+      "tail": "no"
+    },
+    {
+      "start": {
+        "line": 9,
+        "col": 2
+      },
+      "end": {
+        "line": 9,
+        "col": 7
+      },
+      "type": "[ `A | `B | `C ]",
+      "tail": "no"
+    },
     {
       "start": {
         "line": 9,