This revision was automatically updated to reflect the committed changes.
Closed by commit rGaf071f03f379: [clangd] Improve ObjC property handling in
SelectionTree. (authored by sammccall).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D72634/new/
https://reviews.llvm.org/D72634
Files:
clang-tools-extra/clangd/Selection.cpp
clang-tools-extra/clangd/unittests/FindTargetTests.cpp
clang-tools-extra/clangd/unittests/SelectionTests.cpp
Index: clang-tools-extra/clangd/unittests/SelectionTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/SelectionTests.cpp
+++ clang-tools-extra/clangd/unittests/SelectionTests.cpp
@@ -323,12 +323,52 @@
Foo x = [[^12_ud]];
)cpp",
"UserDefinedLiteral"},
+
{
R"cpp(
int a;
decltype([[^a]] + a) b;
)cpp",
"DeclRefExpr"},
+
+ // Objective-C OpaqueValueExpr/PseudoObjectExpr has weird ASTs.
+ // Need to traverse the contents of the OpaqueValueExpr to the POE,
+ // and ensure we traverse only the syntactic form of the
PseudoObjectExpr.
+ {
+ R"cpp(
+ @interface I{}
+ @property(retain) I*x;
+ @property(retain) I*y;
+ @end
+ void test(I *f) { [[^f]].x.y = 0; }
+ )cpp",
+ "DeclRefExpr"},
+ {
+ R"cpp(
+ @interface I{}
+ @property(retain) I*x;
+ @property(retain) I*y;
+ @end
+ void test(I *f) { [[f.^x]].y = 0; }
+ )cpp",
+ "ObjCPropertyRefExpr"},
+ // Examples with implicit properties.
+ {
+ R"cpp(
+ @interface I{}
+ -(int)foo;
+ @end
+ int test(I *f) { return 42 + [[^f]].foo; }
+ )cpp",
+ "DeclRefExpr"},
+ {
+ R"cpp(
+ @interface I{}
+ -(int)foo;
+ @end
+ int test(I *f) { return 42 + [[f.^foo]]; }
+ )cpp",
+ "ObjCPropertyRefExpr"},
};
for (const Case &C : Cases) {
Annotations Test(C.Code);
@@ -339,6 +379,7 @@
// FIXME: Auto-completion in a template requires disabling delayed template
// parsing.
TU.ExtraArgs.push_back("-fno-delayed-template-parsing");
+ TU.ExtraArgs.push_back("-xobjective-c++");
auto AST = TU.build();
auto T = makeSelectionTree(C.Code, AST);
Index: clang-tools-extra/clangd/unittests/FindTargetTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/FindTargetTests.cpp
+++ clang-tools-extra/clangd/unittests/FindTargetTests.cpp
@@ -536,7 +536,8 @@
[[f.x]].y = 0;
}
)cpp";
- EXPECT_DECLS("OpaqueValueExpr", "@property(atomic, retain, readwrite) I *x");
+ EXPECT_DECLS("ObjCPropertyRefExpr",
+ "@property(atomic, retain, readwrite) I *x");
Code = R"cpp(
@protocol Foo
Index: clang-tools-extra/clangd/Selection.cpp
===================================================================
--- clang-tools-extra/clangd/Selection.cpp
+++ clang-tools-extra/clangd/Selection.cpp
@@ -462,6 +462,14 @@
TraverseStmt(S->getRangeInit()) && TraverseStmt(S->getBody());
});
}
+ // OpaqueValueExpr blocks traversal, we must explicitly traverse it.
+ bool TraverseOpaqueValueExpr(OpaqueValueExpr *E) {
+ return traverseNode(E, [&] { return TraverseStmt(E->getSourceExpr()); });
+ }
+ // We only want to traverse the *syntactic form* to understand the selection.
+ bool TraversePseudoObjectExpr(PseudoObjectExpr *E) {
+ return traverseNode(E, [&] { return TraverseStmt(E->getSyntacticForm());
});
+ }
private:
using Base = RecursiveASTVisitor<SelectionVisitor>;
Index: clang-tools-extra/clangd/unittests/SelectionTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/SelectionTests.cpp
+++ clang-tools-extra/clangd/unittests/SelectionTests.cpp
@@ -323,12 +323,52 @@
Foo x = [[^12_ud]];
)cpp",
"UserDefinedLiteral"},
+
{
R"cpp(
int a;
decltype([[^a]] + a) b;
)cpp",
"DeclRefExpr"},
+
+ // Objective-C OpaqueValueExpr/PseudoObjectExpr has weird ASTs.
+ // Need to traverse the contents of the OpaqueValueExpr to the POE,
+ // and ensure we traverse only the syntactic form of the PseudoObjectExpr.
+ {
+ R"cpp(
+ @interface I{}
+ @property(retain) I*x;
+ @property(retain) I*y;
+ @end
+ void test(I *f) { [[^f]].x.y = 0; }
+ )cpp",
+ "DeclRefExpr"},
+ {
+ R"cpp(
+ @interface I{}
+ @property(retain) I*x;
+ @property(retain) I*y;
+ @end
+ void test(I *f) { [[f.^x]].y = 0; }
+ )cpp",
+ "ObjCPropertyRefExpr"},
+ // Examples with implicit properties.
+ {
+ R"cpp(
+ @interface I{}
+ -(int)foo;
+ @end
+ int test(I *f) { return 42 + [[^f]].foo; }
+ )cpp",
+ "DeclRefExpr"},
+ {
+ R"cpp(
+ @interface I{}
+ -(int)foo;
+ @end
+ int test(I *f) { return 42 + [[f.^foo]]; }
+ )cpp",
+ "ObjCPropertyRefExpr"},
};
for (const Case &C : Cases) {
Annotations Test(C.Code);
@@ -339,6 +379,7 @@
// FIXME: Auto-completion in a template requires disabling delayed template
// parsing.
TU.ExtraArgs.push_back("-fno-delayed-template-parsing");
+ TU.ExtraArgs.push_back("-xobjective-c++");
auto AST = TU.build();
auto T = makeSelectionTree(C.Code, AST);
Index: clang-tools-extra/clangd/unittests/FindTargetTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/FindTargetTests.cpp
+++ clang-tools-extra/clangd/unittests/FindTargetTests.cpp
@@ -536,7 +536,8 @@
[[f.x]].y = 0;
}
)cpp";
- EXPECT_DECLS("OpaqueValueExpr", "@property(atomic, retain, readwrite) I *x");
+ EXPECT_DECLS("ObjCPropertyRefExpr",
+ "@property(atomic, retain, readwrite) I *x");
Code = R"cpp(
@protocol Foo
Index: clang-tools-extra/clangd/Selection.cpp
===================================================================
--- clang-tools-extra/clangd/Selection.cpp
+++ clang-tools-extra/clangd/Selection.cpp
@@ -462,6 +462,14 @@
TraverseStmt(S->getRangeInit()) && TraverseStmt(S->getBody());
});
}
+ // OpaqueValueExpr blocks traversal, we must explicitly traverse it.
+ bool TraverseOpaqueValueExpr(OpaqueValueExpr *E) {
+ return traverseNode(E, [&] { return TraverseStmt(E->getSourceExpr()); });
+ }
+ // We only want to traverse the *syntactic form* to understand the selection.
+ bool TraversePseudoObjectExpr(PseudoObjectExpr *E) {
+ return traverseNode(E, [&] { return TraverseStmt(E->getSyntacticForm()); });
+ }
private:
using Base = RecursiveASTVisitor<SelectionVisitor>;
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
