Mbrowse.select_leaf: correctly ignore merlin.hide

ocaml · Aug 6, 2021 · 6047d1f · 6047d1f
1 parent 9961a1d
commit 6047d1f
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/src/kernel/mbrowse.ml b/src/kernel/mbrowse.ml
@@ -88,7 +88,10 @@ let select_leafs pos root =
   let branches = ref [] in
   let rec select_child branch env node has_selected =
     let loc = node_merlin_loc node in
-    if Location_aux.compare_pos pos loc = 0 then
+    let attrs = Browse_raw.node_attributes node in
+    if Location_aux.compare_pos pos loc = 0 &&
+       not (has_attr "merlin.hide" attrs)
+    then
       (traverse ((env, node) :: branch); true)
     else
       has_selected

diff --git a/tests/test-dirs/type-enclosing/merlin-hide.t b/tests/test-dirs/type-enclosing/merlin-hide.t
@@ -9,7 +9,32 @@ accessible:
   > end
   > EOF
   {
-    "class": "failure",
-    "value": "hd",
+    "class": "return",
+    "value": [
+      {
+        "start": {
+          "line": 1,
+          "col": 11
+        },
+        "end": {
+          "line": 5,
+          "col": 3
+        },
+        "type": "sig val x : int end",
+        "tail": "no"
+      },
+      {
+        "start": {
+          "line": 1,
+          "col": 0
+        },
+        "end": {
+          "line": 5,
+          "col": 3
+        },
+        "type": "sig val x : int end",
+        "tail": "no"
+      }
+    ],
     "notifications": []
   }