Fix bug in search record/namespace term builder for depth 2

Summary: oops typo. And no specific test for that case. Reviewed By: pepeiborra Differential Revision: D68191642 fbshipit-source-id: 640a83835c49a9f8644f37a7dd8e25c60ef2ed78
facebookincubator · Jan 15, 2025 · d8b11e3 · d8b11e3
1 parent f0e0aa0
commit d8b11e3
Show file tree

Hide file tree

Showing 3 changed files with 105 additions and 3 deletions.
diff --git a/...codemarkup/tests/clang/xrefs/namespace-nesting/search_by_scope_nesting_fun_in_rec_rec.out b/...codemarkup/tests/clang/xrefs/namespace-nesting/search_by_scope_nesting_fun_in_rec_rec.out
@@ -1 +1,97 @@
-[ "@generated" ]
+[
+  "@generated",
+  {
+    "key": {
+      "searchcase": 0,
+      "name": "fooCInBinB",
+      "scope": [ "classBinNSB", "classCinNSB" ],
+      "entity": {
+        "cxx": {
+          "defn": {
+            "function_": {
+              "key": {
+                "declaration": {
+                  "key": {
+                    "name": {
+                      "key": {
+                        "name": { "key": { "name": { "key": "fooCInBinB" } } },
+                        "scope": {
+                          "recordWithAccess": {
+                            "record": {
+                              "key": {
+                                "name": { "key": "classCinNSB" },
+                                "scope": {
+                                  "recordWithAccess": {
+                                    "record": {
+                                      "key": {
+                                        "name": { "key": "classBinNSB" },
+                                        "scope": {
+                                          "namespace_": {
+                                            "key": {
+                                              "name": { "key": "NsB" },
+                                              "parent": {
+                                                "key": {
+                                                  "name": { "key": "NsA" }
+                                                }
+                                              }
+                                            }
+                                          }
+                                        }
+                                      }
+                                    },
+                                    "access": 2
+                                  }
+                                }
+                              }
+                            },
+                            "access": 2
+                          }
+                        }
+                      }
+                    },
+                    "signature": {
+                      "key": { "returns": { "key": "int" }, "parameters": [ ] }
+                    },
+                    "method": {
+                      "isVirtual": false,
+                      "isConst": false,
+                      "isVolatile": false,
+                      "refQualifier": 0
+                    },
+                    "source": {
+                      "file": { "key": "test.cpp" },
+                      "lineBegin": 21,
+                      "columnBegin": 9,
+                      "lineEnd": 21,
+                      "columnEnd": 39
+                    }
+                  }
+                },
+                "isInline": false
+              }
+            }
+          }
+        }
+      },
+      "location": {
+        "name": "fooCInBinB",
+        "file": { "key": "test.cpp" },
+        "location": {
+          "range": {
+            "file": { "key": "test.cpp" },
+            "lineBegin": 21,
+            "columnBegin": 9,
+            "lineEnd": 21,
+            "columnEnd": 39
+          }
+        },
+        "destination": {
+          "file": { "key": "test.cpp" },
+          "span": { "start": 427, "length": 10 }
+        }
+      },
+      "kind": 13,
+      "language": 0
+    }
+  }
+]
diff --git a/...odemarkup/tests/clang/xrefs/namespace-nesting/search_by_scope_nesting_fun_in_rec_rec.perf b/...odemarkup/tests/clang/xrefs/namespace-nesting/search_by_scope_nesting_fun_in_rec_rec.perf
@@ -1,5 +1,11 @@
 {
   "@generated": null,
-  "facts_searched": { "cxx1.Name.5": 5, "cxx1.QName.5": 1 },
+  "facts_searched": {
+    "cxx1.DeclarationNameSpan.5": 1,
+    "cxx1.FunctionDeclarationByNameScope.5": 1,
+    "cxx1.FunctionDefinition.5": 1,
+    "cxx1.Name.5": 5,
+    "cxx1.QName.5": 1
+  },
   "full_scans": [ ]
 }
diff --git a/glean/schema/source/search.cxx.angle b/glean/schema/source/search.cxx.angle
@@ -82,7 +82,7 @@ predicate QueryToQNameCase:
         { name = AName, scope =
           { namespace_ = { name = { just = BNameNS } } } }
       ) | (
-        CxxRecordCase { Case, A, BNameR };
+        CxxRecordCase { Case, B, BNameR };
         { name = AName, scope =
           { recordWithAccess = { record = { name = BNameR } } } }
       )