[clangd][WIP] Add new code completion signals to improve MRR by 3%.

[usaxena95]

Summary

Adds two more signals.

• NumNameInContext: Strength of match of name with context.
• SemaPriority: Priority of a sema completion as given by sema.

This will potentially increase the MRR further by 3%.

---

Decision Forest (new model)

FilterLength = 0, #Measurement = 1631, MRR@10 = 0.370242, Cumulative MRR*@10 = 0.370242, latency = 338.000000
FilterLength = 1, #Measurement = 1884, MRR@10 = 0.644216, Cumulative MRR*@10 = 0.506301, latency = 324.000000
FilterLength = 2, #Measurement = 3135, MRR@10 = 0.742025, Cumulative MRR*@10 = 0.603561, latency = 319.000000
FilterLength = 3, #Measurement = 2599, MRR@10 = 0.740866, Cumulative MRR*@10 = 0.634729, latency = 320.000000
FilterLength = 4, #Measurement = 2196, MRR@10 = 0.744670, Cumulative MRR*@10 = 0.650374, latency = 320.000000
FilterLength = 5, #Measurement = 1825, MRR@10 = 0.757791, Cumulative MRR*@10 = 0.660153, latency = 321.000000
FilterLength = 6, #Measurement = 1728, MRR@10 = 0.784074, Cumulative MRR*@10 = 0.668842, latency = 323.000000
FilterLength = 7, #Measurement = 1530, MRR@10 = 0.806627, Cumulative MRR*@10 = 0.675677, latency = 324.000000
FilterLength = 8, #Measurement = 1386, MRR@10 = 0.823548, Cumulative MRR*@10 = 0.681109, latency = 326.000000
FilterLength = 9, #Measurement = 1265, MRR@10 = 0.831186, Cumulative MRR*@10 = 0.685249, latency = 327.000000
FilterLength = 10, #Measurement = 1160, MRR@10 = 0.854102, Cumulative MRR*@10 = 0.688832, latency = 328.000000
FilterLength = 11, #Measurement = 132, MRR@10 = 0.977273, Cumulative MRR*@10 = 0.689676, latency = 328.000000
FilterLength = 12, #Measurement = 102, MRR@10 = 0.960784, Cumulative MRR*@10 = 0.690196, latency = 328.000000
FilterLength = 13, #Measurement = 88, MRR@10 = 0.994318, Cumulative MRR*@10 = 0.690622, latency = 328.000000
FilterLength = 14, #Measurement = 82, MRR@10 = 0.987805, Cumulative MRR*@10 = 0.690953, latency = 328.000000
FilterLength = 15, #Measurement = 63, MRR@10 = 0.960847, Cumulative MRR*@10 = 0.691148, latency = 328.000000
FilterLength = 16, #Measurement = 72, MRR@10 = 0.986111, Cumulative MRR*@10 = 0.691356, latency = 327.000000
FilterLength = 17, #Measurement = 51, MRR@10 = 0.985294, Cumulative MRR*@10 = 0.691480, latency = 328.000000
FilterLength = 18, #Measurement = 45, MRR@10 = 0.946296, Cumulative MRR*@10 = 0.691561, latency = 328.000000
FilterLength = 19, #Measurement = 70, MRR@10 = 0.981429, Cumulative MRR*@10 = 0.691683, latency = 328.000000
FilterLength = 20, #Measurement = 58, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.691774, latency = 328.000000
FilterLength = 21, #Measurement = 53, MRR@10 = 0.990566, Cumulative MRR*@10 = 0.691842, latency = 328.000000
FilterLength = 22, #Measurement = 27, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.691873, latency = 328.000000
FilterLength = 23, #Measurement = 38, MRR@10 = 0.978070, Cumulative MRR*@10 = 0.691907, latency = 328.000000
FilterLength = 24, #Measurement = 30, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.691932, latency = 328.000000
FilterLength = 25, #Measurement = 27, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.691950, latency = 328.000000
FilterLength = 26, #Measurement = 13, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.691958, latency = 328.000000
FilterLength = 27, #Measurement = 11, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.691964, latency = 328.000000
FilterLength = 28, #Measurement = 12, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.691969, latency = 328.000000
FilterLength = 29, #Measurement = 12, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.691973, latency = 328.000000
FilterLength = 30, #Measurement = 8, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.691976, latency = 328.000000
FilterLength = 31, #Measurement = 13, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.691979, latency = 328.000000
FilterLength = 32, #Measurement = 11, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.691981, latency = 328.000000
FilterLength = 33, #Measurement = 6, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.691983, latency = 328.000000
FilterLength = 34, #Measurement = 4, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.691983, latency = 328.000000
FilterLength = 35, #Measurement = 4, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.691984, latency = 328.000000
FilterLength = 36, #Measurement = 1, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.691984, latency = 328.000000
FilterLength = 37, #Measurement = 1, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.691984, latency = 328.000000
FilterLength = 38, #Measurement = 2, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.691984, latency = 328.000000
FilterLength = 39, #Measurement = 4, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.691985, latency = 328.000000
FilterLength = 40, #Measurement = 1, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.691985, latency = 328.000000
FilterLength = 42, #Measurement = 2, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.691985, latency = 328.000000
FilterLength = 47, #Measurement = 1, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.691985, latency = 328.000000
FilterLength = 49, #Measurement = 1, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.691985, latency = 328.000000
FilterLength = 52, #Measurement = 1, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.691985, latency = 328.000000
FilterLength = 59, #Measurement = 1, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.691985, latency = 328.000000

---

Decision Forest (old model)

FilterLength = 0, #Measurement = 1714, MRR@10 = 0.332864, Cumulative MRR*@10 = 0.332864, latency = 324.000000
FilterLength = 1, #Measurement = 1990, MRR@10 = 0.605603, Cumulative MRR*@10 = 0.468640, latency = 310.000000
FilterLength = 2, #Measurement = 3323, MRR@10 = 0.722304, Cumulative MRR*@10 = 0.573685, latency = 304.000000
FilterLength = 3, #Measurement = 2748, MRR@10 = 0.741893, Cumulative MRR*@10 = 0.611898, latency = 303.000000
FilterLength = 4, #Measurement = 2324, MRR@10 = 0.743346, Cumulative MRR*@10 = 0.630628, latency = 303.000000
FilterLength = 5, #Measurement = 1929, MRR@10 = 0.748339, Cumulative MRR*@10 = 0.641345, latency = 304.000000
FilterLength = 6, #Measurement = 1825, MRR@10 = 0.781728, Cumulative MRR*@10 = 0.651176, latency = 305.000000
FilterLength = 7, #Measurement = 1620, MRR@10 = 0.806379, Cumulative MRR*@10 = 0.658894, latency = 306.000000
FilterLength = 8, #Measurement = 1465, MRR@10 = 0.822252, Cumulative MRR*@10 = 0.664891, latency = 308.000000
FilterLength = 9, #Measurement = 1340, MRR@10 = 0.834192, Cumulative MRR*@10 = 0.669566, latency = 308.000000
FilterLength = 10, #Measurement = 1233, MRR@10 = 0.850234, Cumulative MRR*@10 = 0.673411, latency = 309.000000
FilterLength = 11, #Measurement = 142, MRR@10 = 0.963615, Cumulative MRR*@10 = 0.674275, latency = 309.000000
FilterLength = 12, #Measurement = 108, MRR@10 = 0.975309, Cumulative MRR*@10 = 0.674853, latency = 309.000000
FilterLength = 13, #Measurement = 98, MRR@10 = 0.989796, Cumulative MRR*@10 = 0.675319, latency = 309.000000
FilterLength = 14, #Measurement = 84, MRR@10 = 0.982143, Cumulative MRR*@10 = 0.675650, latency = 309.000000
FilterLength = 15, #Measurement = 67, MRR@10 = 0.948259, Cumulative MRR*@10 = 0.675848, latency = 309.000000
FilterLength = 16, #Measurement = 77, MRR@10 = 0.987013, Cumulative MRR*@10 = 0.676070, latency = 309.000000
FilterLength = 17, #Measurement = 55, MRR@10 = 0.990909, Cumulative MRR*@10 = 0.676206, latency = 309.000000
FilterLength = 18, #Measurement = 48, MRR@10 = 0.949653, Cumulative MRR*@10 = 0.676294, latency = 309.000000
FilterLength = 19, #Measurement = 76, MRR@10 = 0.981908, Cumulative MRR*@10 = 0.676425, latency = 309.000000
FilterLength = 20, #Measurement = 61, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.676521, latency = 309.000000
FilterLength = 21, #Measurement = 54, MRR@10 = 0.986111, Cumulative MRR*@10 = 0.676589, latency = 309.000000
FilterLength = 22, #Measurement = 28, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.676621, latency = 309.000000
FilterLength = 23, #Measurement = 40, MRR@10 = 0.979167, Cumulative MRR*@10 = 0.676656, latency = 309.000000
FilterLength = 24, #Measurement = 30, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.676681, latency = 309.000000
FilterLength = 25, #Measurement = 28, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.676700, latency = 309.000000
FilterLength = 26, #Measurement = 15, MRR@10 = 0.966667, Cumulative MRR*@10 = 0.676708, latency = 309.000000
FilterLength = 27, #Measurement = 13, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.676714, latency = 309.000000
FilterLength = 28, #Measurement = 16, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.676721, latency = 309.000000
FilterLength = 29, #Measurement = 12, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.676726, latency = 309.000000
FilterLength = 30, #Measurement = 8, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.676728, latency = 309.000000
FilterLength = 31, #Measurement = 13, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.676731, latency = 309.000000
FilterLength = 32, #Measurement = 12, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.676734, latency = 309.000000
FilterLength = 33, #Measurement = 7, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.676735, latency = 309.000000
FilterLength = 34, #Measurement = 5, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.676736, latency = 309.000000
FilterLength = 35, #Measurement = 6, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.676737, latency = 309.000000
FilterLength = 36, #Measurement = 1, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.676737, latency = 309.000000
FilterLength = 37, #Measurement = 1, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.676737, latency = 309.000000
FilterLength = 38, #Measurement = 3, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.676737, latency = 309.000000
FilterLength = 39, #Measurement = 5, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.676738, latency = 309.000000
FilterLength = 40, #Measurement = 1, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.676738, latency = 309.000000
FilterLength = 42, #Measurement = 2, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.676738, latency = 309.000000
FilterLength = 47, #Measurement = 1, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.676738, latency = 309.000000
FilterLength = 49, #Measurement = 1, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.676738, latency = 309.000000
FilterLength = 52, #Measurement = 1, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.676738, latency = 309.000000
FilterLength = 59, #Measurement = 1, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.676738, latency = 309.000000

---

Heuristics

FilterLength = 0, #Measurement = 1496, MRR@10 = 0.304413, Cumulative MRR*@10 = 0.304413, latency = 293.000000
FilterLength = 1, #Measurement = 1726, MRR@10 = 0.549745, Cumulative MRR*@10 = 0.426184, latency = 281.000000
FilterLength = 2, #Measurement = 2847, MRR@10 = 0.681133, Cumulative MRR*@10 = 0.530801, latency = 279.000000
FilterLength = 3, #Measurement = 2346, MRR@10 = 0.699284, Cumulative MRR*@10 = 0.568705, latency = 279.000000
FilterLength = 4, #Measurement = 1978, MRR@10 = 0.708885, Cumulative MRR*@10 = 0.588489, latency = 280.000000
FilterLength = 5, #Measurement = 1630, MRR@10 = 0.728093, Cumulative MRR*@10 = 0.600983, latency = 282.000000
FilterLength = 6, #Measurement = 1542, MRR@10 = 0.753404, Cumulative MRR*@10 = 0.611495, latency = 285.000000
FilterLength = 7, #Measurement = 1364, MRR@10 = 0.775966, Cumulative MRR*@10 = 0.619526, latency = 286.000000
FilterLength = 8, #Measurement = 1236, MRR@10 = 0.795765, Cumulative MRR*@10 = 0.625893, latency = 287.000000
FilterLength = 9, #Measurement = 1135, MRR@10 = 0.816032, Cumulative MRR*@10 = 0.631097, latency = 287.000000
FilterLength = 10, #Measurement = 1039, MRR@10 = 0.836946, Cumulative MRR*@10 = 0.635425, latency = 288.000000
FilterLength = 11, #Measurement = 113, MRR@10 = 0.954067, Cumulative MRR*@10 = 0.636306, latency = 288.000000
FilterLength = 12, #Measurement = 90, MRR@10 = 0.950000, Cumulative MRR*@10 = 0.636892, latency = 288.000000
FilterLength = 13, #Measurement = 80, MRR@10 = 0.969792, Cumulative MRR*@10 = 0.637362, latency = 288.000000
FilterLength = 14, #Measurement = 77, MRR@10 = 0.954545, Cumulative MRR*@10 = 0.637727, latency = 288.000000
FilterLength = 15, #Measurement = 60, MRR@10 = 0.947222, Cumulative MRR*@10 = 0.637963, latency = 288.000000
FilterLength = 16, #Measurement = 66, MRR@10 = 0.969697, Cumulative MRR*@10 = 0.638200, latency = 288.000000
FilterLength = 17, #Measurement = 42, MRR@10 = 0.976191, Cumulative MRR*@10 = 0.638330, latency = 288.000000
FilterLength = 18, #Measurement = 33, MRR@10 = 0.984848, Cumulative MRR*@10 = 0.638419, latency = 288.000000
FilterLength = 19, #Measurement = 65, MRR@10 = 0.956044, Cumulative MRR*@10 = 0.638556, latency = 288.000000
FilterLength = 20, #Measurement = 51, MRR@10 = 0.990196, Cumulative MRR*@10 = 0.638657, latency = 288.000000
FilterLength = 21, #Measurement = 52, MRR@10 = 0.990385, Cumulative MRR*@10 = 0.638744, latency = 288.000000
FilterLength = 22, #Measurement = 25, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.638781, latency = 288.000000
FilterLength = 23, #Measurement = 33, MRR@10 = 0.974747, Cumulative MRR*@10 = 0.638819, latency = 288.000000
FilterLength = 24, #Measurement = 29, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.638850, latency = 288.000000
FilterLength = 25, #Measurement = 22, MRR@10 = 0.963636, Cumulative MRR*@10 = 0.638868, latency = 288.000000
FilterLength = 26, #Measurement = 13, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.638878, latency = 288.000000
FilterLength = 27, #Measurement = 11, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.638885, latency = 288.000000
FilterLength = 28, #Measurement = 9, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.638890, latency = 288.000000
FilterLength = 29, #Measurement = 10, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.638895, latency = 288.000000
FilterLength = 30, #Measurement = 8, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.638898, latency = 288.000000
FilterLength = 31, #Measurement = 13, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.638902, latency = 288.000000
FilterLength = 32, #Measurement = 10, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.638905, latency = 288.000000
FilterLength = 33, #Measurement = 3, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.638906, latency = 288.000000
FilterLength = 34, #Measurement = 4, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.638907, latency = 288.000000
FilterLength = 35, #Measurement = 4, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.638907, latency = 288.000000
FilterLength = 36, #Measurement = 1, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.638908, latency = 288.000000
FilterLength = 37, #Measurement = 1, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.638908, latency = 288.000000
FilterLength = 38, #Measurement = 2, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.638908, latency = 288.000000
FilterLength = 39, #Measurement = 3, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.638908, latency = 287.000000
FilterLength = 40, #Measurement = 1, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.638908, latency = 287.000000
FilterLength = 42, #Measurement = 2, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.638909, latency = 287.000000
FilterLength = 47, #Measurement = 1, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.638909, latency = 287.000000
FilterLength = 49, #Measurement = 1, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.638909, latency = 287.000000
FilterLength = 59, #Measurement = 1, MRR@10 = 1.000000, Cumulative MRR*@10 = 0.638909, latency = 287.000000

[usaxena95]

Updated the references to old signals.

clang-tools-extra/clangd/Quality.h

struct SymbolRelevanceSignals {
   bool HadSymbolType = false;
   // Whether the item matches the type expected in the completion context.
   bool TypeMatchesPreferred = false;
 
   /// Length of the unqualified partial name of Symbol typed in
   /// CompletionPrefix.
   unsigned FilterLength = 0;
 
+  /// Priority of the completion item as computed by Sema.
+  unsigned SemaPriority = 0;
+
   /// Set of derived signals computed by calculateDerivedSignals(). Must not be
   /// set explicitly.
   struct DerivedSignals {
-    /// Whether Name contains some word from context.
-    bool NameMatchesContext = false;
+    /// Number of words in Context that matches Name.
+    unsigned NumNameInContext = 0;
     /// Min distance between SymbolURI and all the headers included by the TU.
     unsigned FileProximityDistance = FileDistance::Unreachable;
     /// Min distance between SymbolScope and all the available scopes.
     unsigned ScopeProximityDistance = FileDistance::Unreachable;
   };
 
   DerivedSignals calculateDerivedSignals() const;
 

clang-tools-extra/clangd/Quality.cpp

void SymbolRelevanceSignals::merge(const Symbol &IndexResult) {
   }
 }
 
 void SymbolRelevanceSignals::merge(const CodeCompletionResult &SemaCCResult) {
   if (SemaCCResult.Availability == CXAvailability_NotAvailable ||
       SemaCCResult.Availability == CXAvailability_NotAccessible)
     Forbidden = true;
 
+  SemaPriority = SemaCCResult.Priority;
+
   if (SemaCCResult.Declaration) {
     SemaSaysInScope = true;
     // We boost things that have decls in the main file. We give a fixed score
     // for all other declarations in sema as they are already included in the
     // translation unit.
     float DeclProximity = (hasDeclInMainFile(*SemaCCResult.Declaration) ||
                            hasUsingDeclInMainFile(SemaCCResult))
                               ? 1.0
for (const auto &Word : ContextWords->keys())
       if (Name.contains_lower(Word))
         return Word;
   return llvm::None;
 }
 
 SymbolRelevanceSignals::DerivedSignals
 SymbolRelevanceSignals::calculateDerivedSignals() const {
   DerivedSignals Derived;
-  Derived.NameMatchesContext = wordMatching(Name, ContextWords).hasValue();
+  int NumNameInContext = 0;
+  if (ContextWords)
+    for (const auto &Word : ContextWords->keys())
+      if (Name.contains_lower(Word))
+        NumNameInContext++;
+  Derived.NumNameInContext = NumNameInContext;
   Derived.FileProximityDistance = !FileProximityMatch || SymbolURI.empty()
                                       ? FileDistance::Unreachable
                                       : FileProximityMatch->distance(SymbolURI);
   if (ScopeProximityMatch) {
     // For global symbol, the distance is 0.
     Derived.ScopeProximityDistance =
         SymbolScope ? ScopeProximityMatch->distance(*SymbolScope) : 0;
   }
if (ScopeProximityMatch)
     // Use a constant scope boost for sema results, as scopes of sema results
     // can be tricky (e.g. class/function scope). Set to the max boost as we
     // don't load top-level symbols from the preamble and sema results are
     // always in the accessible scope.
     Score *= SemaSaysInScope
                  ? 2.0
                  : scopeProximityScore(Derived.ScopeProximityDistance);
 
-  if (Derived.NameMatchesContext)
+  if (Derived.NumNameInContext > 0)
     Score *= 1.5;
 
   // Symbols like local variables may only be referenced within their scope.
   // Conversely if we're in that scope, it's likely we'll reference them.
   if (Query == CodeComplete) {
     // The narrower the scope where a symbol is visible, the more likely it is
     // to be relevant when it is available.
     switch (Scope) {
float evaluateDecisionForest(const SymbolQualitySignals &Quality,
   E.setIsDeprecated(Quality.Deprecated);
   E.setIsReservedName(Quality.ReservedName);
   E.setIsImplementationDetail(Quality.ImplementationDetail);
   E.setNumReferences(Quality.References);
   E.setSymbolCategory(Quality.Category);
 
   SymbolRelevanceSignals::DerivedSignals Derived =
       Relevance.calculateDerivedSignals();
-  E.setIsNameInContext(Derived.NameMatchesContext);
+  E.setNumNameInContext(Derived.NumNameInContext);
   E.setIsForbidden(Relevance.Forbidden);
   E.setIsInBaseClass(Relevance.InBaseClass);
   E.setFileProximityDistance(Derived.FileProximityDistance);
   E.setSemaFileProximityScore(Relevance.SemaFileProximityScore);
   E.setSymbolScopeDistance(Derived.ScopeProximityDistance);
   E.setSemaSaysInScope(Relevance.SemaSaysInScope);
   E.setScope(Relevance.Scope);
   E.setContextKind(Relevance.Context);
   E.setIsInstanceMember(Relevance.IsInstanceMember);
   E.setHadContextType(Relevance.HadContextType);
   E.setHadSymbolType(Relevance.HadSymbolType);
   E.setTypeMatchesPreferred(Relevance.TypeMatchesPreferred);
   E.setFilterLength(Relevance.FilterLength);
+  E.setSemaPriority(Relevance.SemaPriority);
   return Evaluate(E);
 }
 
 // Produces an integer that sorts in the same order as F.
 // That is: a < b <==> encodeFloat(a) < encodeFloat(b).
 static uint32_t encodeFloat(float F) {
   static_assert(std::numeric_limits<float>::is_iec559, "");
   constexpr uint32_t TopBit = ~(~uint32_t{0} >> 1);

clang-tools-extra/clangd/benchmarks/CompletionModel/DecisionForestBenchmark.cpp

std::vector<Example> generateRandomDataset(int NumExamples) {
   for (int I = 0; I < NumExamples; ++I) {
     Example E;
     E.setIsDeprecated(FlipCoin(0.1));           // Boolean.
     E.setIsReservedName(FlipCoin(0.1));         // Boolean.
     E.setIsImplementationDetail(FlipCoin(0.3)); // Boolean.
     E.setNumReferences(RandInt(10000));         // Can be large integer.
     E.setSymbolCategory(RandInt(10));           // 10 Symbol Category.
 
-    E.setIsNameInContext(FlipCoin(0.5)); // Boolean.
+    E.setNumNameInContext(RandInt(5));   // Boolean.
     E.setIsForbidden(FlipCoin(0.1));     // Boolean.
     E.setIsInBaseClass(FlipCoin(0.3));   // Boolean.
     E.setFileProximityDistance(
         FlipCoin(0.1) ? 999999 // Sometimes file distance is not available.
                       : RandInt(20));
     E.setSemaFileProximityScore(RandFloat(1)); // Float in range [0,1].
     E.setSymbolScopeDistance(
         FlipCoin(0.1) ? 999999 // Sometimes scope distance is not available.
                       : RandInt(20));
     E.setSemaSaysInScope(FlipCoin(0.5));      // Boolean.
     E.setScope(RandInt(4));                   // 4 Scopes.
     E.setContextKind(RandInt(32));            // 32 Context kinds.
     E.setIsInstanceMember(FlipCoin(0.5));     // Boolean.
     E.setHadContextType(FlipCoin(0.6));       // Boolean.
     E.setHadSymbolType(FlipCoin(0.6));        // Boolean.
     E.setTypeMatchesPreferred(FlipCoin(0.5)); // Boolean.
     E.setFilterLength(RandInt(15));
+    E.setSemaPriority(RandInt(100));
     Examples.push_back(E);
   }
   return Examples;
 }
 
 void runDecisionForestPrediciton(const std::vector<Example> Examples) {
   for (const Example &E : Examples)
     Evaluate(E);

clang-tools-extra/clangd/quality/model/features.json

[
         "name": "IsImplementationDetail",
         "kind": "NUMBER"
     },
     {
         "name": "NumReferences",
         "kind": "NUMBER"
     },
     {
-        "name": "IsNameInContext",
+        "name": "NumNameInContext",
         "kind": "NUMBER"
     },
     {
         "name": "IsForbidden",
         "kind": "NUMBER"
     },
     {
         "name": "IsInBaseClass",
[
         "name": "HadSymbolType",
         "kind": "NUMBER"
     },
     {
         "name": "TypeMatchesPreferred",
         "kind": "NUMBER"
     },
     {
+        "name": "SemaPriority",
+        "kind": "NUMBER"
+    },
+    {
         "name": "SymbolCategory",
         "kind": "ENUM",
         "type": "clang::clangd::SymbolQualitySignals::SymbolCategory",
         "header": "Quality.h"
     },
     {
         "name": "ContextKind",
         "kind": "ENUM",
         "type": "clang::CodeCompletionContext::Kind",
         "header": "clang/Sema/CodeCompleteConsumer.h"
     },
     {
         "name": "Scope",
         "kind": "ENUM",
         "type": "clang::clangd::SymbolRelevanceSignals::AccessibleScope",
         "header": "Quality.h"
     }
-]
+]