using ast_type_traits::DynTypedNode;
// Measure the fraction of selections that were enabled by recovery AST.
-void recordMetrics(const SelectionTree &S) {
+void recordMetrics(const SelectionTree &S, const LangOptions &Lang) {
+ if (!trace::enabled())
+ return;
+ const char *LanguageLabel = Lang.CPlusPlus ? "C++" : Lang.ObjC ? "ObjC" : "C";
static constexpr trace::Metric SelectionUsedRecovery(
- "selection_recovery", trace::Metric::Distribution);
- static constexpr trace::Metric RecoveryType("selection_recovery_type",
- trace::Metric::Distribution);
+ "selection_recovery", trace::Metric::Distribution, "language");
+ static constexpr trace::Metric RecoveryType(
+ "selection_recovery_type", trace::Metric::Distribution, "language");
const auto *Common = S.commonAncestor();
for (const auto *N = Common; N; N = N->Parent) {
if (const auto *RE = N->ASTNode.get<RecoveryExpr>()) {
- SelectionUsedRecovery.record(1); // used recovery ast.
- RecoveryType.record(RE->isTypeDependent() ? 0 : 1);
+ SelectionUsedRecovery.record(1, LanguageLabel); // used recovery ast.
+ RecoveryType.record(RE->isTypeDependent() ? 0 : 1, LanguageLabel);
return;
}
}
if (Common)
- SelectionUsedRecovery.record(0); // unused.
+ SelectionUsedRecovery.record(0, LanguageLabel); // unused.
}
// An IntervalSet maintains a set of disjoint subranges of an array.
.printToString(SM));
Nodes = SelectionVisitor::collect(AST, Tokens, PrintPolicy, Begin, End, FID);
Root = Nodes.empty() ? nullptr : &Nodes.front();
- recordMetrics(*this);
+ recordMetrics(*this, AST.getLangOpts());
dlog("Built selection tree\n{0}", *this);
}
namespace clang {
namespace clangd {
namespace {
+using ::testing::ElementsAreArray;
using ::testing::UnorderedElementsAreArray;
// Create a selection tree corresponding to a point or pair of points.
if (Test.ranges().empty()) {
// If no [[range]] is marked in the example, there should be no selection.
EXPECT_FALSE(T.commonAncestor()) << C.Code << "\n" << T;
- EXPECT_THAT(Tracer.takeMetric("selection_recovery"), testing::IsEmpty());
+ EXPECT_THAT(Tracer.takeMetric("selection_recovery", "C++"),
+ testing::IsEmpty());
} else {
// If there is an expected selection, common ancestor should exist
// with the appropriate node type.
// and no nodes outside it are selected.
EXPECT_TRUE(verifyCommonAncestor(T.root(), T.commonAncestor(), C.Code))
<< C.Code;
- EXPECT_THAT(Tracer.takeMetric("selection_recovery"),
- testing::ElementsAreArray({0}));
+ EXPECT_THAT(Tracer.takeMetric("selection_recovery", "C++"),
+ ElementsAreArray({0}));
}
}
}
auto AST = TestTU::withCode(Annotations(Code).code()).build();
trace::TestTracer Tracer;
auto T = makeSelectionTree(Code, AST);
- EXPECT_THAT(Tracer.takeMetric("selection_recovery"),
- testing::ElementsAreArray({1}));
- EXPECT_THAT(Tracer.takeMetric("selection_recovery_type"),
- testing::ElementsAreArray({1}));
+ EXPECT_THAT(Tracer.takeMetric("selection_recovery", "C++"),
+ ElementsAreArray({1}));
+ EXPECT_THAT(Tracer.takeMetric("selection_recovery_type", "C++"),
+ ElementsAreArray({1}));
}
// FIXME: Doesn't select the binary operator node in