From 29713b7dad5b671ba3fdd24ddc49781918224540 Mon Sep 17 00:00:00 2001
From: Don Stewart <dons@meta.com>
Date: Tue, 3 Dec 2024 19:22:33 -0800
Subject: [PATCH] Move code.search tests under codemarkup/hack

Summary: Looking at Hack now. Start by consolidating the search tests

Reviewed By: simonmar

Differential Revision: D66689693

fbshipit-source-id: 11cdda4d648fd7e700e7fa0416eab5f57dc405d6
---
 .../codemarkup/tests/hack/search/.hhconfig    |   7 +
 .../tests/hack/search/BaseModule.php          |   4 +
 .../codemarkup/tests/hack/search/RefClass.php |  26 +
 .../tests/hack/search/SourceClass.php         |  15 +
 .../tests/hack/search/SourceInterface.php     |  10 +
 .../tests/hack/search/SourceTrait.php         |   8 +
 .../tests/hack/search/SuperClass.php          |  11 +
 .../codemarkup/tests/hack/search/TopLevel.php |  16 +
 .../hack/search/prefix_search_by_name.out     | 472 ++++++++++++++++++
 .../hack/search/prefix_search_by_name.perf    |  20 +
 .../hack/search/prefix_search_by_name.query   |   3 +
 .../prefix_search_function_in_namespace.out   |  13 +
 .../prefix_search_function_in_namespace.perf  |   9 +
 .../prefix_search_function_in_namespace.query |   6 +
 ...prefix_search_globalconst_in_namespace.out |  13 +
 ...refix_search_globalconst_in_namespace.perf |   9 +
 ...efix_search_globalconst_in_namespace.query |   6 +
 .../prefix_search_in_container_or_enum.out    |  59 +++
 .../prefix_search_in_container_or_enum.perf   |  10 +
 .../prefix_search_in_container_or_enum.query  |   5 +
 ...earch_in_container_or_enum_no_property.out |  45 ++
 ...arch_in_container_or_enum_no_property.perf |  10 +
 ...rch_in_container_or_enum_no_property.query |   5 +
 .../search/prefix_search_in_namespace.out     | 105 ++++
 .../search/prefix_search_in_namespace.perf    |  15 +
 .../search/prefix_search_in_namespace.query   |   6 +
 .../prefix_search_type_in_namespace.out       |  77 +++
 .../prefix_search_type_in_namespace.perf      |  12 +
 .../prefix_search_type_in_namespace.query     |   6 +
 .../hack/search/search_by_lowercase_scope.out |   1 +
 .../search/search_by_lowercase_scope.perf     |   5 +
 .../search/search_by_lowercase_scope.query    |   3 +
 .../tests/hack/search/search_by_name.out      |  43 ++
 .../tests/hack/search/search_by_name.perf     |   5 +
 .../tests/hack/search/search_by_name.query    |   3 +
 .../tests/hack/search/search_by_scope.out     |  28 ++
 .../tests/hack/search/search_by_scope.perf    |  10 +
 .../tests/hack/search/search_by_scope.query   |   3 +
 .../search/search_by_scope_class_const.out    |  28 ++
 .../search/search_by_scope_class_const.perf   |  10 +
 .../search/search_by_scope_class_const.query  |   3 +
 .../hack/search/search_by_scope_enum.out      |  26 +
 .../hack/search/search_by_scope_enum.perf     |  10 +
 .../hack/search/search_by_scope_enum.query    |   3 +
 .../hack/search/search_by_scope_interface.out |  30 ++
 .../search/search_by_scope_interface.perf     |  10 +
 .../search/search_by_scope_interface.query    |   3 +
 .../search_by_scope_interface_method.out      |  30 ++
 .../search_by_scope_interface_method.perf     |  10 +
 .../search_by_scope_interface_method.query    |   3 +
 .../hack/search/search_by_scope_method.out    |  28 ++
 .../hack/search/search_by_scope_method.perf   |  10 +
 .../hack/search/search_by_scope_method.query  |   3 +
 .../hack/search/search_by_scope_module.out    |  15 +
 .../hack/search/search_by_scope_module.perf   |   5 +
 .../hack/search/search_by_scope_module.query  |   3 +
 .../hack/search/search_by_scope_property.out  |  28 ++
 .../hack/search/search_by_scope_property.perf |  10 +
 .../search/search_by_scope_property.query     |   3 +
 .../hack/search/search_by_scope_super.out     |  28 ++
 .../hack/search/search_by_scope_super.perf    |  10 +
 .../hack/search/search_by_scope_super.query   |   3 +
 .../hack/search/search_by_scope_trait.out     |  28 ++
 .../hack/search/search_by_scope_trait.perf    |  10 +
 .../hack/search/search_by_scope_trait.query   |   3 +
 .../search/search_by_scope_type_const.out     |  28 ++
 .../search/search_by_scope_type_const.perf    |  10 +
 .../search/search_by_scope_type_const.query   |   3 +
 .../search/search_function_in_namespace.out   |  13 +
 .../search/search_function_in_namespace.perf  |   5 +
 .../search/search_function_in_namespace.query |   3 +
 .../search_globalconst_in_namespace.out       |  13 +
 .../search_globalconst_in_namespace.perf      |   5 +
 .../search_globalconst_in_namespace.query     |   3 +
 .../search/search_in_container_or_enum.out    |  17 +
 .../search/search_in_container_or_enum.perf   |  10 +
 .../search/search_in_container_or_enum.query  |   5 +
 ...earch_in_container_or_enum_no_property.out |  45 ++
 ...arch_in_container_or_enum_no_property.perf |  10 +
 ...rch_in_container_or_enum_no_property.query |   5 +
 .../tests/hack/search/search_in_context.out   |  23 +
 .../tests/hack/search/search_in_context.perf  |  10 +
 .../tests/hack/search/search_in_context.query |   3 +
 .../hack/search/search_in_context_const.out   |  23 +
 .../hack/search/search_in_context_const.perf  |  10 +
 .../hack/search/search_in_context_const.query |   3 +
 .../hack/search/search_in_context_enum.out    |  19 +
 .../hack/search/search_in_context_enum.perf   |  10 +
 .../hack/search/search_in_context_enum.query  |   3 +
 .../search/search_in_context_interface.out    |  23 +
 .../search/search_in_context_interface.perf   |  10 +
 .../search/search_in_context_interface.query  |   3 +
 .../tests/hack/search/search_in_namespace.out |   1 +
 .../hack/search/search_in_namespace.perf      |   5 +
 .../hack/search/search_in_namespace.query     |   6 +
 .../hack/search/search_type_in_namespace.out  |  77 +++
 .../hack/search/search_type_in_namespace.perf |  11 +
 .../search/search_type_in_namespace.query     |   3 +
 98 files changed, 1875 insertions(+)
 create mode 100644 glean/lang/codemarkup/tests/hack/search/.hhconfig
 create mode 100644 glean/lang/codemarkup/tests/hack/search/BaseModule.php
 create mode 100644 glean/lang/codemarkup/tests/hack/search/RefClass.php
 create mode 100644 glean/lang/codemarkup/tests/hack/search/SourceClass.php
 create mode 100644 glean/lang/codemarkup/tests/hack/search/SourceInterface.php
 create mode 100644 glean/lang/codemarkup/tests/hack/search/SourceTrait.php
 create mode 100644 glean/lang/codemarkup/tests/hack/search/SuperClass.php
 create mode 100644 glean/lang/codemarkup/tests/hack/search/TopLevel.php
 create mode 100644 glean/lang/codemarkup/tests/hack/search/prefix_search_by_name.out
 create mode 100644 glean/lang/codemarkup/tests/hack/search/prefix_search_by_name.perf
 create mode 100644 glean/lang/codemarkup/tests/hack/search/prefix_search_by_name.query
 create mode 100644 glean/lang/codemarkup/tests/hack/search/prefix_search_function_in_namespace.out
 create mode 100644 glean/lang/codemarkup/tests/hack/search/prefix_search_function_in_namespace.perf
 create mode 100644 glean/lang/codemarkup/tests/hack/search/prefix_search_function_in_namespace.query
 create mode 100644 glean/lang/codemarkup/tests/hack/search/prefix_search_globalconst_in_namespace.out
 create mode 100644 glean/lang/codemarkup/tests/hack/search/prefix_search_globalconst_in_namespace.perf
 create mode 100644 glean/lang/codemarkup/tests/hack/search/prefix_search_globalconst_in_namespace.query
 create mode 100644 glean/lang/codemarkup/tests/hack/search/prefix_search_in_container_or_enum.out
 create mode 100644 glean/lang/codemarkup/tests/hack/search/prefix_search_in_container_or_enum.perf
 create mode 100644 glean/lang/codemarkup/tests/hack/search/prefix_search_in_container_or_enum.query
 create mode 100644 glean/lang/codemarkup/tests/hack/search/prefix_search_in_container_or_enum_no_property.out
 create mode 100644 glean/lang/codemarkup/tests/hack/search/prefix_search_in_container_or_enum_no_property.perf
 create mode 100644 glean/lang/codemarkup/tests/hack/search/prefix_search_in_container_or_enum_no_property.query
 create mode 100644 glean/lang/codemarkup/tests/hack/search/prefix_search_in_namespace.out
 create mode 100644 glean/lang/codemarkup/tests/hack/search/prefix_search_in_namespace.perf
 create mode 100644 glean/lang/codemarkup/tests/hack/search/prefix_search_in_namespace.query
 create mode 100644 glean/lang/codemarkup/tests/hack/search/prefix_search_type_in_namespace.out
 create mode 100644 glean/lang/codemarkup/tests/hack/search/prefix_search_type_in_namespace.perf
 create mode 100644 glean/lang/codemarkup/tests/hack/search/prefix_search_type_in_namespace.query
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_lowercase_scope.out
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_lowercase_scope.perf
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_lowercase_scope.query
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_name.out
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_name.perf
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_name.query
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope.out
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope.perf
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope.query
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope_class_const.out
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope_class_const.perf
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope_class_const.query
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope_enum.out
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope_enum.perf
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope_enum.query
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope_interface.out
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope_interface.perf
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope_interface.query
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope_interface_method.out
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope_interface_method.perf
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope_interface_method.query
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope_method.out
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope_method.perf
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope_method.query
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope_module.out
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope_module.perf
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope_module.query
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope_property.out
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope_property.perf
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope_property.query
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope_super.out
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope_super.perf
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope_super.query
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope_trait.out
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope_trait.perf
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope_trait.query
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope_type_const.out
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope_type_const.perf
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_by_scope_type_const.query
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_function_in_namespace.out
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_function_in_namespace.perf
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_function_in_namespace.query
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_globalconst_in_namespace.out
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_globalconst_in_namespace.perf
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_globalconst_in_namespace.query
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_in_container_or_enum.out
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_in_container_or_enum.perf
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_in_container_or_enum.query
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_in_container_or_enum_no_property.out
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_in_container_or_enum_no_property.perf
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_in_container_or_enum_no_property.query
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_in_context.out
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_in_context.perf
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_in_context.query
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_in_context_const.out
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_in_context_const.perf
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_in_context_const.query
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_in_context_enum.out
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_in_context_enum.perf
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_in_context_enum.query
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_in_context_interface.out
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_in_context_interface.perf
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_in_context_interface.query
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_in_namespace.out
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_in_namespace.perf
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_in_namespace.query
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_type_in_namespace.out
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_type_in_namespace.perf
 create mode 100644 glean/lang/codemarkup/tests/hack/search/search_type_in_namespace.query

diff --git a/glean/lang/codemarkup/tests/hack/search/.hhconfig b/glean/lang/codemarkup/tests/hack/search/.hhconfig
new file mode 100644
index 000000000..ed1d32994
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/.hhconfig
@@ -0,0 +1,7 @@
+# some comment
+assume_php = false
+
+allowed_fixme_codes_strict = 4110
+allowed_decl_fixme_codes = 4110
+
+auto_namespace_map = {"Herp": "Derp\\Lib\\Herp"}
diff --git a/glean/lang/codemarkup/tests/hack/search/BaseModule.php b/glean/lang/codemarkup/tests/hack/search/BaseModule.php
new file mode 100644
index 000000000..465251b66
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/BaseModule.php
@@ -0,0 +1,4 @@
+<?hh
+// (c) Meta Platforms, Inc. and affiliates. Confidential and proprietary.
+
+new module glean.test { }
diff --git a/glean/lang/codemarkup/tests/hack/search/RefClass.php b/glean/lang/codemarkup/tests/hack/search/RefClass.php
new file mode 100644
index 000000000..af1afdacb
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/RefClass.php
@@ -0,0 +1,26 @@
+<?hh
+// (c) Meta Platforms, Inc. and affiliates. Confidential and proprietary.
+
+class RefClass implements SourceInterface {
+  use SourceTrait;
+
+  const int JAZZ = 39;
+
+  private int $raz = -50;
+
+  public static function foo(): int {
+    return corge() * WALDO;
+  }
+
+  public function bazza (): int {
+    return 5 * corge();
+  }
+
+  public function bar(SourceClass::T $param): int {
+    $source = new SourceClass();
+    $result1 = corge() + SourceClass::BAZ + $source->daz + $this::JAZZ + WALDO;
+    $result2 = $this->quux($result1) + Position::Right + $this::foo();
+    $result3 = $this->raz + $this->bazza() + SourceClass::superAdd(1, $param);
+    return ($result1 + $result2 + $result3 + Position::Center) * corge();
+  }
+}
diff --git a/glean/lang/codemarkup/tests/hack/search/SourceClass.php b/glean/lang/codemarkup/tests/hack/search/SourceClass.php
new file mode 100644
index 000000000..dcbf9ecd4
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/SourceClass.php
@@ -0,0 +1,15 @@
+<?hh
+// (c) Meta Platforms, Inc. and affiliates. Confidential and proprietary.
+
+class SourceClass extends SuperClass {
+
+  const int BAZ = 2;
+
+  const type T = int;
+
+  public int $daz = 99;
+
+  public function bar(int $param): int {
+    return $param * corge();
+  }
+}
diff --git a/glean/lang/codemarkup/tests/hack/search/SourceInterface.php b/glean/lang/codemarkup/tests/hack/search/SourceInterface.php
new file mode 100644
index 000000000..396cf2c66
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/SourceInterface.php
@@ -0,0 +1,10 @@
+<?hh
+// (c) Meta Platforms, Inc. and affiliates. Confidential and proprietary.
+
+interface SourceInterface {
+
+  abstract const int JAZZ;
+
+  public static function foo(): int;
+
+}
diff --git a/glean/lang/codemarkup/tests/hack/search/SourceTrait.php b/glean/lang/codemarkup/tests/hack/search/SourceTrait.php
new file mode 100644
index 000000000..8bf977aff
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/SourceTrait.php
@@ -0,0 +1,8 @@
+<?hh
+// (c) Meta Platforms, Inc. and affiliates. Confidential and proprietary.
+
+trait SourceTrait {
+  public function quux(int $i): int {
+    return $i * 2;
+  }
+}
diff --git a/glean/lang/codemarkup/tests/hack/search/SuperClass.php b/glean/lang/codemarkup/tests/hack/search/SuperClass.php
new file mode 100644
index 000000000..5f4eebbfe
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/SuperClass.php
@@ -0,0 +1,11 @@
+<?hh
+// (c) Meta Platforms, Inc. and affiliates. Confidential and proprietary.
+
+class SuperClass {
+
+  const int BAZ = 999;
+
+  public function superAdd(int $i, int $i): int {
+    return $i + $i + 55;
+  }
+}
diff --git a/glean/lang/codemarkup/tests/hack/search/TopLevel.php b/glean/lang/codemarkup/tests/hack/search/TopLevel.php
new file mode 100644
index 000000000..d9ddfeefb
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/TopLevel.php
@@ -0,0 +1,16 @@
+<?hh
+// (c) Meta Platforms, Inc. and affiliates. Confidential and proprietary.
+
+const int WALDO = -3;
+
+function corge() : int {
+  return 5000 + WALDO;
+}
+
+enum Position: int as int {
+  Top = 0;
+  Bottom = 1;
+  Left = 2;
+  Right = 3;
+  Center = 4;
+}
diff --git a/glean/lang/codemarkup/tests/hack/search/prefix_search_by_name.out b/glean/lang/codemarkup/tests/hack/search/prefix_search_by_name.out
new file mode 100644
index 000000000..35523ccc2
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/prefix_search_by_name.out
@@ -0,0 +1,472 @@
+[
+  "@generated",
+  {
+    "key": {
+      "hack": {
+        "decl": {
+          "classConst": {
+            "key": {
+              "container": {
+                "class_": {
+                  "key": {
+                    "name": { "key": { "name": { "key": "RefClass" } } }
+                  }
+                }
+              },
+              "name": { "key": "JAZZ" }
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "hack": {
+        "decl": {
+          "classConst": {
+            "key": {
+              "container": {
+                "class_": {
+                  "key": {
+                    "name": { "key": { "name": { "key": "SourceClass" } } }
+                  }
+                }
+              },
+              "name": { "key": "BAZ" }
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "hack": {
+        "decl": {
+          "classConst": {
+            "key": {
+              "container": {
+                "class_": {
+                  "key": {
+                    "name": { "key": { "name": { "key": "SuperClass" } } }
+                  }
+                }
+              },
+              "name": { "key": "BAZ" }
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "hack": {
+        "decl": {
+          "classConst": {
+            "key": {
+              "container": {
+                "interface_": {
+                  "key": {
+                    "name": { "key": { "name": { "key": "SourceInterface" } } }
+                  }
+                }
+              },
+              "name": { "key": "JAZZ" }
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "hack": {
+        "decl": {
+          "container": {
+            "class_": {
+              "key": { "name": { "key": { "name": { "key": "RefClass" } } } }
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "hack": {
+        "decl": {
+          "container": {
+            "class_": {
+              "key": { "name": { "key": { "name": { "key": "SourceClass" } } } }
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "hack": {
+        "decl": {
+          "container": {
+            "class_": {
+              "key": { "name": { "key": { "name": { "key": "SuperClass" } } } }
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "hack": {
+        "decl": {
+          "container": {
+            "enum_": {
+              "key": { "name": { "key": { "name": { "key": "Position" } } } }
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "hack": {
+        "decl": {
+          "container": {
+            "interface_": {
+              "key": {
+                "name": { "key": { "name": { "key": "SourceInterface" } } }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "hack": {
+        "decl": {
+          "container": {
+            "trait": {
+              "key": { "name": { "key": { "name": { "key": "SourceTrait" } } } }
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "hack": {
+        "decl": {
+          "enumerator": {
+            "key": {
+              "enumeration": {
+                "key": { "name": { "key": { "name": { "key": "Position" } } } }
+              },
+              "name": { "key": "Bottom" }
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "hack": {
+        "decl": {
+          "enumerator": {
+            "key": {
+              "enumeration": {
+                "key": { "name": { "key": { "name": { "key": "Position" } } } }
+              },
+              "name": { "key": "Center" }
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "hack": {
+        "decl": {
+          "enumerator": {
+            "key": {
+              "enumeration": {
+                "key": { "name": { "key": { "name": { "key": "Position" } } } }
+              },
+              "name": { "key": "Left" }
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "hack": {
+        "decl": {
+          "enumerator": {
+            "key": {
+              "enumeration": {
+                "key": { "name": { "key": { "name": { "key": "Position" } } } }
+              },
+              "name": { "key": "Right" }
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "hack": {
+        "decl": {
+          "enumerator": {
+            "key": {
+              "enumeration": {
+                "key": { "name": { "key": { "name": { "key": "Position" } } } }
+              },
+              "name": { "key": "Top" }
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "hack": {
+        "decl": {
+          "function_": {
+            "key": { "name": { "key": { "name": { "key": "corge" } } } }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "hack": {
+        "decl": {
+          "globalConst": {
+            "key": { "name": { "key": { "name": { "key": "WALDO" } } } }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "hack": {
+        "decl": {
+          "method": {
+            "key": {
+              "container": {
+                "class_": {
+                  "key": {
+                    "name": { "key": { "name": { "key": "RefClass" } } }
+                  }
+                }
+              },
+              "name": { "key": "bar" }
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "hack": {
+        "decl": {
+          "method": {
+            "key": {
+              "container": {
+                "class_": {
+                  "key": {
+                    "name": { "key": { "name": { "key": "RefClass" } } }
+                  }
+                }
+              },
+              "name": { "key": "bazza" }
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "hack": {
+        "decl": {
+          "method": {
+            "key": {
+              "container": {
+                "class_": {
+                  "key": {
+                    "name": { "key": { "name": { "key": "RefClass" } } }
+                  }
+                }
+              },
+              "name": { "key": "foo" }
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "hack": {
+        "decl": {
+          "method": {
+            "key": {
+              "container": {
+                "class_": {
+                  "key": {
+                    "name": { "key": { "name": { "key": "SourceClass" } } }
+                  }
+                }
+              },
+              "name": { "key": "bar" }
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "hack": {
+        "decl": {
+          "method": {
+            "key": {
+              "container": {
+                "class_": {
+                  "key": {
+                    "name": { "key": { "name": { "key": "SuperClass" } } }
+                  }
+                }
+              },
+              "name": { "key": "superAdd" }
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "hack": {
+        "decl": {
+          "method": {
+            "key": {
+              "container": {
+                "interface_": {
+                  "key": {
+                    "name": { "key": { "name": { "key": "SourceInterface" } } }
+                  }
+                }
+              },
+              "name": { "key": "foo" }
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "hack": {
+        "decl": {
+          "method": {
+            "key": {
+              "container": {
+                "trait": {
+                  "key": {
+                    "name": { "key": { "name": { "key": "SourceTrait" } } }
+                  }
+                }
+              },
+              "name": { "key": "quux" }
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "hack": {
+        "decl": { "module": { "key": { "name": { "key": "glean.test" } } } }
+      }
+    }
+  },
+  {
+    "key": {
+      "hack": {
+        "decl": {
+          "property_": {
+            "key": {
+              "container": {
+                "class_": {
+                  "key": {
+                    "name": { "key": { "name": { "key": "RefClass" } } }
+                  }
+                }
+              },
+              "name": { "key": "raz" }
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "hack": {
+        "decl": {
+          "property_": {
+            "key": {
+              "container": {
+                "class_": {
+                  "key": {
+                    "name": { "key": { "name": { "key": "SourceClass" } } }
+                  }
+                }
+              },
+              "name": { "key": "daz" }
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "hack": {
+        "decl": {
+          "typeConst": {
+            "key": {
+              "container": {
+                "class_": {
+                  "key": {
+                    "name": { "key": { "name": { "key": "SourceClass" } } }
+                  }
+                }
+              },
+              "name": { "key": "T" }
+            }
+          }
+        }
+      }
+    }
+  }
+]
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/prefix_search_by_name.perf b/glean/lang/codemarkup/tests/hack/search/prefix_search_by_name.perf
new file mode 100644
index 000000000..62a1022c0
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/prefix_search_by_name.perf
@@ -0,0 +1,20 @@
+{
+  "@generated": null,
+  "facts_searched": {
+    "hack.ClassConstDeclaration.6": 4,
+    "hack.ClassDeclaration.6": 3,
+    "hack.EnumDeclaration.6": 1,
+    "hack.Enumerator.6": 5,
+    "hack.FunctionDeclaration.6": 1,
+    "hack.GlobalConstDeclaration.6": 1,
+    "hack.InterfaceDeclaration.6": 1,
+    "hack.MethodDeclaration.6": 7,
+    "hack.ModuleDeclaration.6": 1,
+    "hack.Name.6": 29,
+    "hack.PropertyDeclaration.6": 2,
+    "hack.QName.6": 8,
+    "hack.TraitDeclaration.6": 1,
+    "hack.TypeConstDeclaration.6": 1
+  },
+  "full_scans": [ ]
+}
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/prefix_search_by_name.query b/glean/lang/codemarkup/tests/hack/search/prefix_search_by_name.query
new file mode 100644
index 000000000..8a98e12e9
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/prefix_search_by_name.query
@@ -0,0 +1,3 @@
+query: D where search.code.SearchByNameAndLanguage { name = "".., entity = D }
+transform: [normord, []]
+perf: true
diff --git a/glean/lang/codemarkup/tests/hack/search/prefix_search_function_in_namespace.out b/glean/lang/codemarkup/tests/hack/search/prefix_search_function_in_namespace.out
new file mode 100644
index 000000000..7c1c671d2
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/prefix_search_function_in_namespace.out
@@ -0,0 +1,13 @@
+[
+  "@generated",
+  {
+    "key": {
+      "tuplefield0": "toplevel",
+      "tuplefield1": {
+        "function_": {
+          "key": { "name": { "key": { "name": { "key": "corge" } } } }
+        }
+      }
+    }
+  }
+]
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/prefix_search_function_in_namespace.perf b/glean/lang/codemarkup/tests/hack/search/prefix_search_function_in_namespace.perf
new file mode 100644
index 000000000..c3bbb786b
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/prefix_search_function_in_namespace.perf
@@ -0,0 +1,9 @@
+{
+  "@generated": null,
+  "facts_searched": {
+    "hack.FunctionDeclaration.6": 1,
+    "hack.Name.6": 2,
+    "hack.QName.6": 1
+  },
+  "full_scans": [ ]
+}
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/prefix_search_function_in_namespace.query b/glean/lang/codemarkup/tests/hack/search/prefix_search_function_in_namespace.query
new file mode 100644
index 000000000..84947edfc
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/prefix_search_function_in_namespace.query
@@ -0,0 +1,6 @@
+query: |
+  {N, D} where
+  (search.hack.SearchFunctionInNamespace { name = "c".., namespace_ = nothing, decl = D }; N = "toplevel") |
+  (search.hack.SearchFunctionInNamespace { name = "c".., namespace_ = { just = { name = "SourceClass", parent = nothing }}, decl = D}; N = "SourceClass" )
+transform: [normord, []]
+perf: true
diff --git a/glean/lang/codemarkup/tests/hack/search/prefix_search_globalconst_in_namespace.out b/glean/lang/codemarkup/tests/hack/search/prefix_search_globalconst_in_namespace.out
new file mode 100644
index 000000000..eaa923429
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/prefix_search_globalconst_in_namespace.out
@@ -0,0 +1,13 @@
+[
+  "@generated",
+  {
+    "key": {
+      "tuplefield0": "toplevel",
+      "tuplefield1": {
+        "globalConst": {
+          "key": { "name": { "key": { "name": { "key": "WALDO" } } } }
+        }
+      }
+    }
+  }
+]
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/prefix_search_globalconst_in_namespace.perf b/glean/lang/codemarkup/tests/hack/search/prefix_search_globalconst_in_namespace.perf
new file mode 100644
index 000000000..6d15bd7ea
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/prefix_search_globalconst_in_namespace.perf
@@ -0,0 +1,9 @@
+{
+  "@generated": null,
+  "facts_searched": {
+    "hack.GlobalConstDeclaration.6": 1,
+    "hack.Name.6": 2,
+    "hack.QName.6": 1
+  },
+  "full_scans": [ ]
+}
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/prefix_search_globalconst_in_namespace.query b/glean/lang/codemarkup/tests/hack/search/prefix_search_globalconst_in_namespace.query
new file mode 100644
index 000000000..86bd16acb
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/prefix_search_globalconst_in_namespace.query
@@ -0,0 +1,6 @@
+query: |
+  {N, D} where
+  (search.hack.SearchGlobalConstInNamespace { name = "W".., namespace_ = nothing, decl = D }; N = "toplevel") |
+  (search.hack.SearchGlobalConstInNamespace { name = "W".., namespace_ = { just = { name = "SourceClass", parent = nothing }}, decl = D}; N = "SourceClass" )
+transform: [normord, []]
+perf: true
diff --git a/glean/lang/codemarkup/tests/hack/search/prefix_search_in_container_or_enum.out b/glean/lang/codemarkup/tests/hack/search/prefix_search_in_container_or_enum.out
new file mode 100644
index 000000000..b3bfd53d1
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/prefix_search_in_container_or_enum.out
@@ -0,0 +1,59 @@
+[
+  "@generated",
+  {
+    "key": {
+      "classConst": {
+        "key": {
+          "container": {
+            "class_": {
+              "key": { "name": { "key": { "name": { "key": "SourceClass" } } } }
+            }
+          },
+          "name": { "key": "BAZ" }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "method": {
+        "key": {
+          "container": {
+            "class_": {
+              "key": { "name": { "key": { "name": { "key": "SourceClass" } } } }
+            }
+          },
+          "name": { "key": "bar" }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "property_": {
+        "key": {
+          "container": {
+            "class_": {
+              "key": { "name": { "key": { "name": { "key": "SourceClass" } } } }
+            }
+          },
+          "name": { "key": "daz" }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "typeConst": {
+        "key": {
+          "container": {
+            "class_": {
+              "key": { "name": { "key": { "name": { "key": "SourceClass" } } } }
+            }
+          },
+          "name": { "key": "T" }
+        }
+      }
+    }
+  }
+]
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/prefix_search_in_container_or_enum.perf b/glean/lang/codemarkup/tests/hack/search/prefix_search_in_container_or_enum.perf
new file mode 100644
index 000000000..0440872cd
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/prefix_search_in_container_or_enum.perf
@@ -0,0 +1,10 @@
+{
+  "@generated": null,
+  "facts_searched": {
+    "hack.ClassDeclaration.6": 1,
+    "hack.ClassDefinition.6": 1,
+    "hack.Name.6": 1,
+    "hack.QName.6": 3
+  },
+  "full_scans": [ "hack.Enumerator.6" ]
+}
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/prefix_search_in_container_or_enum.query b/glean/lang/codemarkup/tests/hack/search/prefix_search_in_container_or_enum.query
new file mode 100644
index 000000000..9efbc2405
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/prefix_search_in_container_or_enum.query
@@ -0,0 +1,5 @@
+query: |
+  D where
+  search.hack.SearchInContainerOrEnum { name = "".., contextName = "SourceClass", contextNamespace = nothing, decl = D }
+transform: [normord, []]
+perf: true
diff --git a/glean/lang/codemarkup/tests/hack/search/prefix_search_in_container_or_enum_no_property.out b/glean/lang/codemarkup/tests/hack/search/prefix_search_in_container_or_enum_no_property.out
new file mode 100644
index 000000000..5b31c49ef
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/prefix_search_in_container_or_enum_no_property.out
@@ -0,0 +1,45 @@
+[
+  "@generated",
+  {
+    "key": {
+      "classConst": {
+        "key": {
+          "container": {
+            "class_": {
+              "key": { "name": { "key": { "name": { "key": "SourceClass" } } } }
+            }
+          },
+          "name": { "key": "BAZ" }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "method": {
+        "key": {
+          "container": {
+            "class_": {
+              "key": { "name": { "key": { "name": { "key": "SourceClass" } } } }
+            }
+          },
+          "name": { "key": "bar" }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "typeConst": {
+        "key": {
+          "container": {
+            "class_": {
+              "key": { "name": { "key": { "name": { "key": "SourceClass" } } } }
+            }
+          },
+          "name": { "key": "T" }
+        }
+      }
+    }
+  }
+]
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/prefix_search_in_container_or_enum_no_property.perf b/glean/lang/codemarkup/tests/hack/search/prefix_search_in_container_or_enum_no_property.perf
new file mode 100644
index 000000000..0440872cd
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/prefix_search_in_container_or_enum_no_property.perf
@@ -0,0 +1,10 @@
+{
+  "@generated": null,
+  "facts_searched": {
+    "hack.ClassDeclaration.6": 1,
+    "hack.ClassDefinition.6": 1,
+    "hack.Name.6": 1,
+    "hack.QName.6": 3
+  },
+  "full_scans": [ "hack.Enumerator.6" ]
+}
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/prefix_search_in_container_or_enum_no_property.query b/glean/lang/codemarkup/tests/hack/search/prefix_search_in_container_or_enum_no_property.query
new file mode 100644
index 000000000..97359adc4
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/prefix_search_in_container_or_enum_no_property.query
@@ -0,0 +1,5 @@
+query: |
+  D where
+  search.hack.SearchInContainerOrEnumNoProperty { name = "".., contextName = "SourceClass", contextNamespace = nothing, decl = D }
+transform: [normord, []]
+perf: true
diff --git a/glean/lang/codemarkup/tests/hack/search/prefix_search_in_namespace.out b/glean/lang/codemarkup/tests/hack/search/prefix_search_in_namespace.out
new file mode 100644
index 000000000..aa492cfb6
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/prefix_search_in_namespace.out
@@ -0,0 +1,105 @@
+[
+  "@generated",
+  {
+    "key": {
+      "tuplefield0": "toplevel",
+      "tuplefield1": {
+        "container": {
+          "class_": {
+            "key": { "name": { "key": { "name": { "key": "RefClass" } } } }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "tuplefield0": "toplevel",
+      "tuplefield1": {
+        "container": {
+          "class_": {
+            "key": { "name": { "key": { "name": { "key": "SourceClass" } } } }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "tuplefield0": "toplevel",
+      "tuplefield1": {
+        "container": {
+          "class_": {
+            "key": { "name": { "key": { "name": { "key": "SuperClass" } } } }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "tuplefield0": "toplevel",
+      "tuplefield1": {
+        "container": {
+          "enum_": {
+            "key": { "name": { "key": { "name": { "key": "Position" } } } }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "tuplefield0": "toplevel",
+      "tuplefield1": {
+        "container": {
+          "interface_": {
+            "key": {
+              "name": { "key": { "name": { "key": "SourceInterface" } } }
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "tuplefield0": "toplevel",
+      "tuplefield1": {
+        "container": {
+          "trait": {
+            "key": { "name": { "key": { "name": { "key": "SourceTrait" } } } }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "tuplefield0": "toplevel",
+      "tuplefield1": {
+        "function_": {
+          "key": { "name": { "key": { "name": { "key": "corge" } } } }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "tuplefield0": "toplevel",
+      "tuplefield1": {
+        "globalConst": {
+          "key": { "name": { "key": { "name": { "key": "WALDO" } } } }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "tuplefield0": "toplevel",
+      "tuplefield1": {
+        "module": { "key": { "name": { "key": "glean.test" } } }
+      }
+    }
+  }
+]
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/prefix_search_in_namespace.perf b/glean/lang/codemarkup/tests/hack/search/prefix_search_in_namespace.perf
new file mode 100644
index 000000000..9fd1802ef
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/prefix_search_in_namespace.perf
@@ -0,0 +1,15 @@
+{
+  "@generated": null,
+  "facts_searched": {
+    "hack.ClassDeclaration.6": 3,
+    "hack.EnumDeclaration.6": 1,
+    "hack.FunctionDeclaration.6": 1,
+    "hack.GlobalConstDeclaration.6": 1,
+    "hack.InterfaceDeclaration.6": 1,
+    "hack.ModuleDeclaration.6": 1,
+    "hack.Name.6": 1,
+    "hack.QName.6": 8,
+    "hack.TraitDeclaration.6": 1
+  },
+  "full_scans": [ "hack.ModuleDeclaration.6", "hack.QName.6", "hack.QName.6" ]
+}
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/prefix_search_in_namespace.query b/glean/lang/codemarkup/tests/hack/search/prefix_search_in_namespace.query
new file mode 100644
index 000000000..abbf022b3
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/prefix_search_in_namespace.query
@@ -0,0 +1,6 @@
+query: |
+  {N, D} where
+  (search.hack.SearchInNamespace { name = "".., namespace_ = nothing, decl = D }; N = "toplevel") |
+  (search.hack.SearchInNamespace { name = "".., namespace_ = { just = { name = "SourceClass", parent = nothing }}, decl = D}; N = "SourceClass" )
+transform: [normord, []]
+perf: true
diff --git a/glean/lang/codemarkup/tests/hack/search/prefix_search_type_in_namespace.out b/glean/lang/codemarkup/tests/hack/search/prefix_search_type_in_namespace.out
new file mode 100644
index 000000000..926fb868f
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/prefix_search_type_in_namespace.out
@@ -0,0 +1,77 @@
+[
+  "@generated",
+  {
+    "key": {
+      "tuplefield0": "toplevel",
+      "tuplefield1": {
+        "container": {
+          "class_": {
+            "key": { "name": { "key": { "name": { "key": "RefClass" } } } }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "tuplefield0": "toplevel",
+      "tuplefield1": {
+        "container": {
+          "class_": {
+            "key": { "name": { "key": { "name": { "key": "SourceClass" } } } }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "tuplefield0": "toplevel",
+      "tuplefield1": {
+        "container": {
+          "class_": {
+            "key": { "name": { "key": { "name": { "key": "SuperClass" } } } }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "tuplefield0": "toplevel",
+      "tuplefield1": {
+        "container": {
+          "enum_": {
+            "key": { "name": { "key": { "name": { "key": "Position" } } } }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "tuplefield0": "toplevel",
+      "tuplefield1": {
+        "container": {
+          "interface_": {
+            "key": {
+              "name": { "key": { "name": { "key": "SourceInterface" } } }
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "tuplefield0": "toplevel",
+      "tuplefield1": {
+        "container": {
+          "trait": {
+            "key": { "name": { "key": { "name": { "key": "SourceTrait" } } } }
+          }
+        }
+      }
+    }
+  }
+]
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/prefix_search_type_in_namespace.perf b/glean/lang/codemarkup/tests/hack/search/prefix_search_type_in_namespace.perf
new file mode 100644
index 000000000..58ba6b4a3
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/prefix_search_type_in_namespace.perf
@@ -0,0 +1,12 @@
+{
+  "@generated": null,
+  "facts_searched": {
+    "hack.ClassDeclaration.6": 3,
+    "hack.EnumDeclaration.6": 1,
+    "hack.InterfaceDeclaration.6": 1,
+    "hack.Name.6": 1,
+    "hack.QName.6": 8,
+    "hack.TraitDeclaration.6": 1
+  },
+  "full_scans": [ "hack.QName.6", "hack.QName.6" ]
+}
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/prefix_search_type_in_namespace.query b/glean/lang/codemarkup/tests/hack/search/prefix_search_type_in_namespace.query
new file mode 100644
index 000000000..e187c9e37
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/prefix_search_type_in_namespace.query
@@ -0,0 +1,6 @@
+query: |
+  {N, D} where
+  (search.hack.SearchTypeInNamespace { name = "".., namespace_ = nothing, decl = D }; N = "toplevel") |
+  (search.hack.SearchTypeInNamespace { name = "".., namespace_ = { just = { name = "SourceClass", parent = nothing }}, decl = D}; N = "SourceClass" )
+transform: [normord, []]
+perf: true
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_lowercase_scope.out b/glean/lang/codemarkup/tests/hack/search/search_by_lowercase_scope.out
new file mode 100644
index 000000000..c7ae735b9
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_lowercase_scope.out
@@ -0,0 +1 @@
+[ "@generated" ]
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_lowercase_scope.perf b/glean/lang/codemarkup/tests/hack/search/search_by_lowercase_scope.perf
new file mode 100644
index 000000000..aff746f34
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_lowercase_scope.perf
@@ -0,0 +1,5 @@
+{
+  "@generated": null,
+  "facts_searched": { "hack.NameLowerCase.6": 1 },
+  "full_scans": [ ]
+}
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_lowercase_scope.query b/glean/lang/codemarkup/tests/hack/search/search_by_lowercase_scope.query
new file mode 100644
index 000000000..6f84c92d1
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_lowercase_scope.query
@@ -0,0 +1,3 @@
+query: search.code.SearchByLowerCaseScope { name = "t", scope = ["SourceClass"] }
+transform: [normord, []]
+perf: true
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_name.out b/glean/lang/codemarkup/tests/hack/search/search_by_name.out
new file mode 100644
index 000000000..8a3106dc1
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_name.out
@@ -0,0 +1,43 @@
+[
+  "@generated",
+  {
+    "key": {
+      "hack": {
+        "decl": {
+          "method": {
+            "key": {
+              "container": {
+                "class_": {
+                  "key": {
+                    "name": { "key": { "name": { "key": "RefClass" } } }
+                  }
+                }
+              },
+              "name": { "key": "foo" }
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "hack": {
+        "decl": {
+          "method": {
+            "key": {
+              "container": {
+                "interface_": {
+                  "key": {
+                    "name": { "key": { "name": { "key": "SourceInterface" } } }
+                  }
+                }
+              },
+              "name": { "key": "foo" }
+            }
+          }
+        }
+      }
+    }
+  }
+]
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_name.perf b/glean/lang/codemarkup/tests/hack/search/search_by_name.perf
new file mode 100644
index 000000000..cf90d2af2
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_name.perf
@@ -0,0 +1,5 @@
+{
+  "@generated": null,
+  "facts_searched": { "hack.MethodDeclaration.6": 2, "hack.Name.6": 1 },
+  "full_scans": [ ]
+}
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_name.query b/glean/lang/codemarkup/tests/hack/search/search_by_name.query
new file mode 100644
index 000000000..f613e539f
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_name.query
@@ -0,0 +1,3 @@
+query: D where search.code.SearchByNameAndLanguage { name = "foo", entity = D }
+transform: [normord, []]
+perf: true
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope.out b/glean/lang/codemarkup/tests/hack/search/search_by_scope.out
new file mode 100644
index 000000000..0a2f99b10
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope.out
@@ -0,0 +1,28 @@
+[
+  "@generated",
+  {
+    "key": {
+      "entity": {
+        "hack": {
+          "decl": {
+            "typeConst": {
+              "key": {
+                "container": {
+                  "class_": {
+                    "key": {
+                      "name": { "key": { "name": { "key": "SourceClass" } } }
+                    }
+                  }
+                },
+                "name": { "key": "T" }
+              }
+            }
+          }
+        }
+      },
+      "language": 5,
+      "name": "T",
+      "scope": [ "SourceClass" ]
+    }
+  }
+]
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope.perf b/glean/lang/codemarkup/tests/hack/search/search_by_scope.perf
new file mode 100644
index 000000000..186cb96c3
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope.perf
@@ -0,0 +1,10 @@
+{
+  "@generated": null,
+  "facts_searched": {
+    "hack.ClassDeclaration.6": 1,
+    "hack.ClassDefinition.6": 1,
+    "hack.Name.6": 2,
+    "hack.QName.6": 3
+  },
+  "full_scans": [ ]
+}
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope.query b/glean/lang/codemarkup/tests/hack/search/search_by_scope.query
new file mode 100644
index 000000000..8c169e40a
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope.query
@@ -0,0 +1,3 @@
+query: search.code.SearchByScope { name = "T", scope = ["SourceClass"] }
+transform: [normord, []]
+perf: true
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope_class_const.out b/glean/lang/codemarkup/tests/hack/search/search_by_scope_class_const.out
new file mode 100644
index 000000000..3f7f052ed
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope_class_const.out
@@ -0,0 +1,28 @@
+[
+  "@generated",
+  {
+    "key": {
+      "entity": {
+        "hack": {
+          "decl": {
+            "classConst": {
+              "key": {
+                "container": {
+                  "class_": {
+                    "key": {
+                      "name": { "key": { "name": { "key": "RefClass" } } }
+                    }
+                  }
+                },
+                "name": { "key": "JAZZ" }
+              }
+            }
+          }
+        }
+      },
+      "language": 5,
+      "name": "JAZZ",
+      "scope": [ "RefClass" ]
+    }
+  }
+]
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope_class_const.perf b/glean/lang/codemarkup/tests/hack/search/search_by_scope_class_const.perf
new file mode 100644
index 000000000..186cb96c3
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope_class_const.perf
@@ -0,0 +1,10 @@
+{
+  "@generated": null,
+  "facts_searched": {
+    "hack.ClassDeclaration.6": 1,
+    "hack.ClassDefinition.6": 1,
+    "hack.Name.6": 2,
+    "hack.QName.6": 3
+  },
+  "full_scans": [ ]
+}
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope_class_const.query b/glean/lang/codemarkup/tests/hack/search/search_by_scope_class_const.query
new file mode 100644
index 000000000..b84a82d2d
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope_class_const.query
@@ -0,0 +1,3 @@
+query: search.code.SearchByScope { name = "JAZZ", scope = ["RefClass"] }
+transform: [normord, []]
+perf: true
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope_enum.out b/glean/lang/codemarkup/tests/hack/search/search_by_scope_enum.out
new file mode 100644
index 000000000..d8b67a168
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope_enum.out
@@ -0,0 +1,26 @@
+[
+  "@generated",
+  {
+    "key": {
+      "entity": {
+        "hack": {
+          "decl": {
+            "enumerator": {
+              "key": {
+                "enumeration": {
+                  "key": {
+                    "name": { "key": { "name": { "key": "Position" } } }
+                  }
+                },
+                "name": { "key": "Top" }
+              }
+            }
+          }
+        }
+      },
+      "language": 5,
+      "name": "Top",
+      "scope": [ "Position" ]
+    }
+  }
+]
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope_enum.perf b/glean/lang/codemarkup/tests/hack/search/search_by_scope_enum.perf
new file mode 100644
index 000000000..7e03b1c21
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope_enum.perf
@@ -0,0 +1,10 @@
+{
+  "@generated": null,
+  "facts_searched": {
+    "hack.EnumDeclaration.6": 1,
+    "hack.Enumerator.6": 1,
+    "hack.Name.6": 2,
+    "hack.QName.6": 3
+  },
+  "full_scans": [ ]
+}
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope_enum.query b/glean/lang/codemarkup/tests/hack/search/search_by_scope_enum.query
new file mode 100644
index 000000000..96bdd09cb
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope_enum.query
@@ -0,0 +1,3 @@
+query: search.code.SearchByScope { name = "Top", scope = ["Position"] }
+transform: [normord, []]
+perf: true
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope_interface.out b/glean/lang/codemarkup/tests/hack/search/search_by_scope_interface.out
new file mode 100644
index 000000000..36cc23132
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope_interface.out
@@ -0,0 +1,30 @@
+[
+  "@generated",
+  {
+    "key": {
+      "entity": {
+        "hack": {
+          "decl": {
+            "classConst": {
+              "key": {
+                "container": {
+                  "interface_": {
+                    "key": {
+                      "name": {
+                        "key": { "name": { "key": "SourceInterface" } }
+                      }
+                    }
+                  }
+                },
+                "name": { "key": "JAZZ" }
+              }
+            }
+          }
+        }
+      },
+      "language": 5,
+      "name": "JAZZ",
+      "scope": [ "SourceInterface" ]
+    }
+  }
+]
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope_interface.perf b/glean/lang/codemarkup/tests/hack/search/search_by_scope_interface.perf
new file mode 100644
index 000000000..b15042643
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope_interface.perf
@@ -0,0 +1,10 @@
+{
+  "@generated": null,
+  "facts_searched": {
+    "hack.InterfaceDeclaration.6": 1,
+    "hack.InterfaceDefinition.6": 1,
+    "hack.Name.6": 2,
+    "hack.QName.6": 3
+  },
+  "full_scans": [ ]
+}
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope_interface.query b/glean/lang/codemarkup/tests/hack/search/search_by_scope_interface.query
new file mode 100644
index 000000000..561f8f0ef
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope_interface.query
@@ -0,0 +1,3 @@
+query: search.code.SearchByScope { name = "JAZZ", scope = ["SourceInterface"] }
+transform: [normord, []]
+perf: true
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope_interface_method.out b/glean/lang/codemarkup/tests/hack/search/search_by_scope_interface_method.out
new file mode 100644
index 000000000..9c3776927
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope_interface_method.out
@@ -0,0 +1,30 @@
+[
+  "@generated",
+  {
+    "key": {
+      "entity": {
+        "hack": {
+          "decl": {
+            "method": {
+              "key": {
+                "container": {
+                  "interface_": {
+                    "key": {
+                      "name": {
+                        "key": { "name": { "key": "SourceInterface" } }
+                      }
+                    }
+                  }
+                },
+                "name": { "key": "foo" }
+              }
+            }
+          }
+        }
+      },
+      "language": 5,
+      "name": "foo",
+      "scope": [ "SourceInterface" ]
+    }
+  }
+]
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope_interface_method.perf b/glean/lang/codemarkup/tests/hack/search/search_by_scope_interface_method.perf
new file mode 100644
index 000000000..b15042643
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope_interface_method.perf
@@ -0,0 +1,10 @@
+{
+  "@generated": null,
+  "facts_searched": {
+    "hack.InterfaceDeclaration.6": 1,
+    "hack.InterfaceDefinition.6": 1,
+    "hack.Name.6": 2,
+    "hack.QName.6": 3
+  },
+  "full_scans": [ ]
+}
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope_interface_method.query b/glean/lang/codemarkup/tests/hack/search/search_by_scope_interface_method.query
new file mode 100644
index 000000000..ed4e737af
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope_interface_method.query
@@ -0,0 +1,3 @@
+query: search.code.SearchByScope { name = "foo", scope = ["SourceInterface"] }
+transform: [normord, []]
+perf: true
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope_method.out b/glean/lang/codemarkup/tests/hack/search/search_by_scope_method.out
new file mode 100644
index 000000000..24bee1a97
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope_method.out
@@ -0,0 +1,28 @@
+[
+  "@generated",
+  {
+    "key": {
+      "entity": {
+        "hack": {
+          "decl": {
+            "method": {
+              "key": {
+                "container": {
+                  "class_": {
+                    "key": {
+                      "name": { "key": { "name": { "key": "RefClass" } } }
+                    }
+                  }
+                },
+                "name": { "key": "bar" }
+              }
+            }
+          }
+        }
+      },
+      "language": 5,
+      "name": "bar",
+      "scope": [ "RefClass" ]
+    }
+  }
+]
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope_method.perf b/glean/lang/codemarkup/tests/hack/search/search_by_scope_method.perf
new file mode 100644
index 000000000..186cb96c3
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope_method.perf
@@ -0,0 +1,10 @@
+{
+  "@generated": null,
+  "facts_searched": {
+    "hack.ClassDeclaration.6": 1,
+    "hack.ClassDefinition.6": 1,
+    "hack.Name.6": 2,
+    "hack.QName.6": 3
+  },
+  "full_scans": [ ]
+}
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope_method.query b/glean/lang/codemarkup/tests/hack/search/search_by_scope_method.query
new file mode 100644
index 000000000..63e75fb0e
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope_method.query
@@ -0,0 +1,3 @@
+query: search.code.SearchByScope { name = "bar", scope = ["RefClass"] }
+transform: [normord, []]
+perf: true
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope_module.out b/glean/lang/codemarkup/tests/hack/search/search_by_scope_module.out
new file mode 100644
index 000000000..8e15a7c1c
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope_module.out
@@ -0,0 +1,15 @@
+[
+  "@generated",
+  {
+    "key": {
+      "entity": {
+        "hack": {
+          "decl": { "module": { "key": { "name": { "key": "glean.test" } } } }
+        }
+      },
+      "language": 5,
+      "name": "glean.test",
+      "scope": [ ]
+    }
+  }
+]
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope_module.perf b/glean/lang/codemarkup/tests/hack/search/search_by_scope_module.perf
new file mode 100644
index 000000000..1e14a0863
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope_module.perf
@@ -0,0 +1,5 @@
+{
+  "@generated": null,
+  "facts_searched": { "hack.ModuleDeclaration.6": 1, "hack.Name.6": 1 },
+  "full_scans": [ ]
+}
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope_module.query b/glean/lang/codemarkup/tests/hack/search/search_by_scope_module.query
new file mode 100644
index 000000000..80831cc0f
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope_module.query
@@ -0,0 +1,3 @@
+query: search.code.SearchByScope { name = "glean.test", scope = [] }
+transform: [normord, []]
+perf: true
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope_property.out b/glean/lang/codemarkup/tests/hack/search/search_by_scope_property.out
new file mode 100644
index 000000000..b1e7480bc
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope_property.out
@@ -0,0 +1,28 @@
+[
+  "@generated",
+  {
+    "key": {
+      "entity": {
+        "hack": {
+          "decl": {
+            "property_": {
+              "key": {
+                "container": {
+                  "class_": {
+                    "key": {
+                      "name": { "key": { "name": { "key": "RefClass" } } }
+                    }
+                  }
+                },
+                "name": { "key": "raz" }
+              }
+            }
+          }
+        }
+      },
+      "language": 5,
+      "name": "raz",
+      "scope": [ "RefClass" ]
+    }
+  }
+]
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope_property.perf b/glean/lang/codemarkup/tests/hack/search/search_by_scope_property.perf
new file mode 100644
index 000000000..186cb96c3
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope_property.perf
@@ -0,0 +1,10 @@
+{
+  "@generated": null,
+  "facts_searched": {
+    "hack.ClassDeclaration.6": 1,
+    "hack.ClassDefinition.6": 1,
+    "hack.Name.6": 2,
+    "hack.QName.6": 3
+  },
+  "full_scans": [ ]
+}
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope_property.query b/glean/lang/codemarkup/tests/hack/search/search_by_scope_property.query
new file mode 100644
index 000000000..00fdf6db7
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope_property.query
@@ -0,0 +1,3 @@
+query: search.code.SearchByScope { name = "raz", scope = ["RefClass"] }
+transform: [normord, []]
+perf: true
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope_super.out b/glean/lang/codemarkup/tests/hack/search/search_by_scope_super.out
new file mode 100644
index 000000000..cbfcf16a5
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope_super.out
@@ -0,0 +1,28 @@
+[
+  "@generated",
+  {
+    "key": {
+      "entity": {
+        "hack": {
+          "decl": {
+            "classConst": {
+              "key": {
+                "container": {
+                  "class_": {
+                    "key": {
+                      "name": { "key": { "name": { "key": "SuperClass" } } }
+                    }
+                  }
+                },
+                "name": { "key": "BAZ" }
+              }
+            }
+          }
+        }
+      },
+      "language": 5,
+      "name": "BAZ",
+      "scope": [ "SuperClass" ]
+    }
+  }
+]
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope_super.perf b/glean/lang/codemarkup/tests/hack/search/search_by_scope_super.perf
new file mode 100644
index 000000000..186cb96c3
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope_super.perf
@@ -0,0 +1,10 @@
+{
+  "@generated": null,
+  "facts_searched": {
+    "hack.ClassDeclaration.6": 1,
+    "hack.ClassDefinition.6": 1,
+    "hack.Name.6": 2,
+    "hack.QName.6": 3
+  },
+  "full_scans": [ ]
+}
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope_super.query b/glean/lang/codemarkup/tests/hack/search/search_by_scope_super.query
new file mode 100644
index 000000000..54d475543
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope_super.query
@@ -0,0 +1,3 @@
+query: search.code.SearchByScope { name = "BAZ", scope = ["SuperClass"] }
+transform: [normord, []]
+perf: true
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope_trait.out b/glean/lang/codemarkup/tests/hack/search/search_by_scope_trait.out
new file mode 100644
index 000000000..b9e3a734d
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope_trait.out
@@ -0,0 +1,28 @@
+[
+  "@generated",
+  {
+    "key": {
+      "entity": {
+        "hack": {
+          "decl": {
+            "method": {
+              "key": {
+                "container": {
+                  "trait": {
+                    "key": {
+                      "name": { "key": { "name": { "key": "SourceTrait" } } }
+                    }
+                  }
+                },
+                "name": { "key": "quux" }
+              }
+            }
+          }
+        }
+      },
+      "language": 5,
+      "name": "quux",
+      "scope": [ "SourceTrait" ]
+    }
+  }
+]
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope_trait.perf b/glean/lang/codemarkup/tests/hack/search/search_by_scope_trait.perf
new file mode 100644
index 000000000..31bceb956
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope_trait.perf
@@ -0,0 +1,10 @@
+{
+  "@generated": null,
+  "facts_searched": {
+    "hack.Name.6": 2,
+    "hack.QName.6": 3,
+    "hack.TraitDeclaration.6": 1,
+    "hack.TraitDefinition.6": 1
+  },
+  "full_scans": [ ]
+}
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope_trait.query b/glean/lang/codemarkup/tests/hack/search/search_by_scope_trait.query
new file mode 100644
index 000000000..826783045
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope_trait.query
@@ -0,0 +1,3 @@
+query: search.code.SearchByScope { name = "quux", scope = ["SourceTrait"] }
+transform: [normord, []]
+perf: true
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope_type_const.out b/glean/lang/codemarkup/tests/hack/search/search_by_scope_type_const.out
new file mode 100644
index 000000000..0a2f99b10
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope_type_const.out
@@ -0,0 +1,28 @@
+[
+  "@generated",
+  {
+    "key": {
+      "entity": {
+        "hack": {
+          "decl": {
+            "typeConst": {
+              "key": {
+                "container": {
+                  "class_": {
+                    "key": {
+                      "name": { "key": { "name": { "key": "SourceClass" } } }
+                    }
+                  }
+                },
+                "name": { "key": "T" }
+              }
+            }
+          }
+        }
+      },
+      "language": 5,
+      "name": "T",
+      "scope": [ "SourceClass" ]
+    }
+  }
+]
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope_type_const.perf b/glean/lang/codemarkup/tests/hack/search/search_by_scope_type_const.perf
new file mode 100644
index 000000000..186cb96c3
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope_type_const.perf
@@ -0,0 +1,10 @@
+{
+  "@generated": null,
+  "facts_searched": {
+    "hack.ClassDeclaration.6": 1,
+    "hack.ClassDefinition.6": 1,
+    "hack.Name.6": 2,
+    "hack.QName.6": 3
+  },
+  "full_scans": [ ]
+}
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_by_scope_type_const.query b/glean/lang/codemarkup/tests/hack/search/search_by_scope_type_const.query
new file mode 100644
index 000000000..8c169e40a
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_by_scope_type_const.query
@@ -0,0 +1,3 @@
+query: search.code.SearchByScope { name = "T", scope = ["SourceClass"] }
+transform: [normord, []]
+perf: true
diff --git a/glean/lang/codemarkup/tests/hack/search/search_function_in_namespace.out b/glean/lang/codemarkup/tests/hack/search/search_function_in_namespace.out
new file mode 100644
index 000000000..741e48539
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_function_in_namespace.out
@@ -0,0 +1,13 @@
+[
+  "@generated",
+  {
+    "key": {
+      "decl": {
+        "function_": {
+          "key": { "name": { "key": { "name": { "key": "corge" } } } }
+        }
+      },
+      "name": { "key": "corge" }
+    }
+  }
+]
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_function_in_namespace.perf b/glean/lang/codemarkup/tests/hack/search/search_function_in_namespace.perf
new file mode 100644
index 000000000..9d5acd86a
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_function_in_namespace.perf
@@ -0,0 +1,5 @@
+{
+  "@generated": null,
+  "facts_searched": { "hack.FunctionDeclaration.6": 1 },
+  "full_scans": [ "hack.FunctionDeclaration.6" ]
+}
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_function_in_namespace.query b/glean/lang/codemarkup/tests/hack/search/search_function_in_namespace.query
new file mode 100644
index 000000000..1a9ea8b59
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_function_in_namespace.query
@@ -0,0 +1,3 @@
+query: search.hack.SearchFunctionInNamespace _
+transform: [normord, []]
+perf: true
diff --git a/glean/lang/codemarkup/tests/hack/search/search_globalconst_in_namespace.out b/glean/lang/codemarkup/tests/hack/search/search_globalconst_in_namespace.out
new file mode 100644
index 000000000..4ebdffd22
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_globalconst_in_namespace.out
@@ -0,0 +1,13 @@
+[
+  "@generated",
+  {
+    "key": {
+      "decl": {
+        "globalConst": {
+          "key": { "name": { "key": { "name": { "key": "WALDO" } } } }
+        }
+      },
+      "name": { "key": "WALDO" }
+    }
+  }
+]
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_globalconst_in_namespace.perf b/glean/lang/codemarkup/tests/hack/search/search_globalconst_in_namespace.perf
new file mode 100644
index 000000000..7e64200cc
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_globalconst_in_namespace.perf
@@ -0,0 +1,5 @@
+{
+  "@generated": null,
+  "facts_searched": { "hack.GlobalConstDeclaration.6": 1 },
+  "full_scans": [ "hack.GlobalConstDeclaration.6" ]
+}
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_globalconst_in_namespace.query b/glean/lang/codemarkup/tests/hack/search/search_globalconst_in_namespace.query
new file mode 100644
index 000000000..77b870332
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_globalconst_in_namespace.query
@@ -0,0 +1,3 @@
+query: search.hack.SearchGlobalConstInNamespace _
+transform: [normord, []]
+perf: true
diff --git a/glean/lang/codemarkup/tests/hack/search/search_in_container_or_enum.out b/glean/lang/codemarkup/tests/hack/search/search_in_container_or_enum.out
new file mode 100644
index 000000000..0430163ca
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_in_container_or_enum.out
@@ -0,0 +1,17 @@
+[
+  "@generated",
+  {
+    "key": {
+      "method": {
+        "key": {
+          "container": {
+            "class_": {
+              "key": { "name": { "key": { "name": { "key": "SourceClass" } } } }
+            }
+          },
+          "name": { "key": "bar" }
+        }
+      }
+    }
+  }
+]
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_in_container_or_enum.perf b/glean/lang/codemarkup/tests/hack/search/search_in_container_or_enum.perf
new file mode 100644
index 000000000..186cb96c3
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_in_container_or_enum.perf
@@ -0,0 +1,10 @@
+{
+  "@generated": null,
+  "facts_searched": {
+    "hack.ClassDeclaration.6": 1,
+    "hack.ClassDefinition.6": 1,
+    "hack.Name.6": 2,
+    "hack.QName.6": 3
+  },
+  "full_scans": [ ]
+}
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_in_container_or_enum.query b/glean/lang/codemarkup/tests/hack/search/search_in_container_or_enum.query
new file mode 100644
index 000000000..c4f4b45bf
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_in_container_or_enum.query
@@ -0,0 +1,5 @@
+query: |
+  D where
+  search.hack.SearchInContainerOrEnum { name = "bar", contextName = "SourceClass", contextNamespace = nothing, decl = D }
+transform: [normord, []]
+perf: true
diff --git a/glean/lang/codemarkup/tests/hack/search/search_in_container_or_enum_no_property.out b/glean/lang/codemarkup/tests/hack/search/search_in_container_or_enum_no_property.out
new file mode 100644
index 000000000..5b31c49ef
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_in_container_or_enum_no_property.out
@@ -0,0 +1,45 @@
+[
+  "@generated",
+  {
+    "key": {
+      "classConst": {
+        "key": {
+          "container": {
+            "class_": {
+              "key": { "name": { "key": { "name": { "key": "SourceClass" } } } }
+            }
+          },
+          "name": { "key": "BAZ" }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "method": {
+        "key": {
+          "container": {
+            "class_": {
+              "key": { "name": { "key": { "name": { "key": "SourceClass" } } } }
+            }
+          },
+          "name": { "key": "bar" }
+        }
+      }
+    }
+  },
+  {
+    "key": {
+      "typeConst": {
+        "key": {
+          "container": {
+            "class_": {
+              "key": { "name": { "key": { "name": { "key": "SourceClass" } } } }
+            }
+          },
+          "name": { "key": "T" }
+        }
+      }
+    }
+  }
+]
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_in_container_or_enum_no_property.perf b/glean/lang/codemarkup/tests/hack/search/search_in_container_or_enum_no_property.perf
new file mode 100644
index 000000000..0440872cd
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_in_container_or_enum_no_property.perf
@@ -0,0 +1,10 @@
+{
+  "@generated": null,
+  "facts_searched": {
+    "hack.ClassDeclaration.6": 1,
+    "hack.ClassDefinition.6": 1,
+    "hack.Name.6": 1,
+    "hack.QName.6": 3
+  },
+  "full_scans": [ "hack.Enumerator.6" ]
+}
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_in_container_or_enum_no_property.query b/glean/lang/codemarkup/tests/hack/search/search_in_container_or_enum_no_property.query
new file mode 100644
index 000000000..e66a24d7e
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_in_container_or_enum_no_property.query
@@ -0,0 +1,5 @@
+query: |
+  D where
+  search.hack.SearchInContainerOrEnumNoProperty { contextName = "SourceClass", contextNamespace = nothing, decl = D }
+transform: [normord, []]
+perf: true
diff --git a/glean/lang/codemarkup/tests/hack/search/search_in_context.out b/glean/lang/codemarkup/tests/hack/search/search_in_context.out
new file mode 100644
index 000000000..e6d93c41c
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_in_context.out
@@ -0,0 +1,23 @@
+[
+  "@generated",
+  {
+    "key": {
+      "contextName": { "key": "SourceClass" },
+      "decl": {
+        "classConst": {
+          "key": {
+            "container": {
+              "class_": {
+                "key": {
+                  "name": { "key": { "name": { "key": "SourceClass" } } }
+                }
+              }
+            },
+            "name": { "key": "BAZ" }
+          }
+        }
+      },
+      "name": { "key": "BAZ" }
+    }
+  }
+]
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_in_context.perf b/glean/lang/codemarkup/tests/hack/search/search_in_context.perf
new file mode 100644
index 000000000..186cb96c3
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_in_context.perf
@@ -0,0 +1,10 @@
+{
+  "@generated": null,
+  "facts_searched": {
+    "hack.ClassDeclaration.6": 1,
+    "hack.ClassDefinition.6": 1,
+    "hack.Name.6": 2,
+    "hack.QName.6": 3
+  },
+  "full_scans": [ ]
+}
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_in_context.query b/glean/lang/codemarkup/tests/hack/search/search_in_context.query
new file mode 100644
index 000000000..8bfe6c6c5
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_in_context.query
@@ -0,0 +1,3 @@
+query: search.hack.SearchInContext { name = "BAZ", contextName = "SourceClass" }
+transform: [normord, []]
+perf: true
diff --git a/glean/lang/codemarkup/tests/hack/search/search_in_context_const.out b/glean/lang/codemarkup/tests/hack/search/search_in_context_const.out
new file mode 100644
index 000000000..e6d93c41c
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_in_context_const.out
@@ -0,0 +1,23 @@
+[
+  "@generated",
+  {
+    "key": {
+      "contextName": { "key": "SourceClass" },
+      "decl": {
+        "classConst": {
+          "key": {
+            "container": {
+              "class_": {
+                "key": {
+                  "name": { "key": { "name": { "key": "SourceClass" } } }
+                }
+              }
+            },
+            "name": { "key": "BAZ" }
+          }
+        }
+      },
+      "name": { "key": "BAZ" }
+    }
+  }
+]
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_in_context_const.perf b/glean/lang/codemarkup/tests/hack/search/search_in_context_const.perf
new file mode 100644
index 000000000..186cb96c3
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_in_context_const.perf
@@ -0,0 +1,10 @@
+{
+  "@generated": null,
+  "facts_searched": {
+    "hack.ClassDeclaration.6": 1,
+    "hack.ClassDefinition.6": 1,
+    "hack.Name.6": 2,
+    "hack.QName.6": 3
+  },
+  "full_scans": [ ]
+}
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_in_context_const.query b/glean/lang/codemarkup/tests/hack/search/search_in_context_const.query
new file mode 100644
index 000000000..8bfe6c6c5
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_in_context_const.query
@@ -0,0 +1,3 @@
+query: search.hack.SearchInContext { name = "BAZ", contextName = "SourceClass" }
+transform: [normord, []]
+perf: true
diff --git a/glean/lang/codemarkup/tests/hack/search/search_in_context_enum.out b/glean/lang/codemarkup/tests/hack/search/search_in_context_enum.out
new file mode 100644
index 000000000..250651d1c
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_in_context_enum.out
@@ -0,0 +1,19 @@
+[
+  "@generated",
+  {
+    "key": {
+      "contextName": { "key": "Position" },
+      "decl": {
+        "enumerator": {
+          "key": {
+            "enumeration": {
+              "key": { "name": { "key": { "name": { "key": "Position" } } } }
+            },
+            "name": { "key": "Right" }
+          }
+        }
+      },
+      "name": { "key": "Right" }
+    }
+  }
+]
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_in_context_enum.perf b/glean/lang/codemarkup/tests/hack/search/search_in_context_enum.perf
new file mode 100644
index 000000000..7e03b1c21
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_in_context_enum.perf
@@ -0,0 +1,10 @@
+{
+  "@generated": null,
+  "facts_searched": {
+    "hack.EnumDeclaration.6": 1,
+    "hack.Enumerator.6": 1,
+    "hack.Name.6": 2,
+    "hack.QName.6": 3
+  },
+  "full_scans": [ ]
+}
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_in_context_enum.query b/glean/lang/codemarkup/tests/hack/search/search_in_context_enum.query
new file mode 100644
index 000000000..0d5bc2de1
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_in_context_enum.query
@@ -0,0 +1,3 @@
+query: search.hack.SearchInContext { name = "Right", contextName = "Position" }
+transform: [normord, []]
+perf: true
diff --git a/glean/lang/codemarkup/tests/hack/search/search_in_context_interface.out b/glean/lang/codemarkup/tests/hack/search/search_in_context_interface.out
new file mode 100644
index 000000000..94599a5eb
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_in_context_interface.out
@@ -0,0 +1,23 @@
+[
+  "@generated",
+  {
+    "key": {
+      "contextName": { "key": "SourceInterface" },
+      "decl": {
+        "method": {
+          "key": {
+            "container": {
+              "interface_": {
+                "key": {
+                  "name": { "key": { "name": { "key": "SourceInterface" } } }
+                }
+              }
+            },
+            "name": { "key": "foo" }
+          }
+        }
+      },
+      "name": { "key": "foo" }
+    }
+  }
+]
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_in_context_interface.perf b/glean/lang/codemarkup/tests/hack/search/search_in_context_interface.perf
new file mode 100644
index 000000000..b15042643
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_in_context_interface.perf
@@ -0,0 +1,10 @@
+{
+  "@generated": null,
+  "facts_searched": {
+    "hack.InterfaceDeclaration.6": 1,
+    "hack.InterfaceDefinition.6": 1,
+    "hack.Name.6": 2,
+    "hack.QName.6": 3
+  },
+  "full_scans": [ ]
+}
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_in_context_interface.query b/glean/lang/codemarkup/tests/hack/search/search_in_context_interface.query
new file mode 100644
index 000000000..f84c0fc3f
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_in_context_interface.query
@@ -0,0 +1,3 @@
+query: search.hack.SearchInContext { name = "foo", contextName = "SourceInterface" }
+transform: [normord, []]
+perf: true
diff --git a/glean/lang/codemarkup/tests/hack/search/search_in_namespace.out b/glean/lang/codemarkup/tests/hack/search/search_in_namespace.out
new file mode 100644
index 000000000..c7ae735b9
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_in_namespace.out
@@ -0,0 +1 @@
+[ "@generated" ]
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_in_namespace.perf b/glean/lang/codemarkup/tests/hack/search/search_in_namespace.perf
new file mode 100644
index 000000000..8b4dd8ef5
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_in_namespace.perf
@@ -0,0 +1,5 @@
+{
+  "@generated": null,
+  "facts_searched": { "hack.Name.6": 3 },
+  "full_scans": [ ]
+}
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_in_namespace.query b/glean/lang/codemarkup/tests/hack/search/search_in_namespace.query
new file mode 100644
index 000000000..913985293
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_in_namespace.query
@@ -0,0 +1,6 @@
+query: |
+  {N, D} where
+  (search.hack.SearchInNamespace { name = "bar", namespace_ = nothing, decl = D }; N = "toplevel") |
+  (search.hack.SearchInNamespace { name = "bar", namespace_ = { just = { name = "SourceClass", parent = nothing }}, decl = D}; N = "SourceClass" )
+transform: [normord, []]
+perf: true
diff --git a/glean/lang/codemarkup/tests/hack/search/search_type_in_namespace.out b/glean/lang/codemarkup/tests/hack/search/search_type_in_namespace.out
new file mode 100644
index 000000000..e8de9a48b
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_type_in_namespace.out
@@ -0,0 +1,77 @@
+[
+  "@generated",
+  {
+    "key": {
+      "decl": {
+        "container": {
+          "class_": {
+            "key": { "name": { "key": { "name": { "key": "RefClass" } } } }
+          }
+        }
+      },
+      "name": { "key": "RefClass" }
+    }
+  },
+  {
+    "key": {
+      "decl": {
+        "container": {
+          "class_": {
+            "key": { "name": { "key": { "name": { "key": "SourceClass" } } } }
+          }
+        }
+      },
+      "name": { "key": "SourceClass" }
+    }
+  },
+  {
+    "key": {
+      "decl": {
+        "container": {
+          "class_": {
+            "key": { "name": { "key": { "name": { "key": "SuperClass" } } } }
+          }
+        }
+      },
+      "name": { "key": "SuperClass" }
+    }
+  },
+  {
+    "key": {
+      "decl": {
+        "container": {
+          "enum_": {
+            "key": { "name": { "key": { "name": { "key": "Position" } } } }
+          }
+        }
+      },
+      "name": { "key": "Position" }
+    }
+  },
+  {
+    "key": {
+      "decl": {
+        "container": {
+          "interface_": {
+            "key": {
+              "name": { "key": { "name": { "key": "SourceInterface" } } }
+            }
+          }
+        }
+      },
+      "name": { "key": "SourceInterface" }
+    }
+  },
+  {
+    "key": {
+      "decl": {
+        "container": {
+          "trait": {
+            "key": { "name": { "key": { "name": { "key": "SourceTrait" } } } }
+          }
+        }
+      },
+      "name": { "key": "SourceTrait" }
+    }
+  }
+]
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_type_in_namespace.perf b/glean/lang/codemarkup/tests/hack/search/search_type_in_namespace.perf
new file mode 100644
index 000000000..8db3de87a
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_type_in_namespace.perf
@@ -0,0 +1,11 @@
+{
+  "@generated": null,
+  "facts_searched": {
+    "hack.ClassDeclaration.6": 3,
+    "hack.EnumDeclaration.6": 1,
+    "hack.InterfaceDeclaration.6": 1,
+    "hack.QName.6": 8,
+    "hack.TraitDeclaration.6": 1
+  },
+  "full_scans": [ "hack.QName.6" ]
+}
\ No newline at end of file
diff --git a/glean/lang/codemarkup/tests/hack/search/search_type_in_namespace.query b/glean/lang/codemarkup/tests/hack/search/search_type_in_namespace.query
new file mode 100644
index 000000000..1ee1dcda4
--- /dev/null
+++ b/glean/lang/codemarkup/tests/hack/search/search_type_in_namespace.query
@@ -0,0 +1,3 @@
+query: search.hack.SearchTypeInNamespace _
+transform: [normord, []]
+perf: true