dgoldman updated this revision to Diff 323141.
dgoldman marked 7 inline comments as done.
dgoldman added a comment.
- Address review comments
Will move over to AST.cpp in next update
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D68590/new/
https://reviews.llvm.org/D68590
Files:
clang-tools-extra/clangd/Hover.cpp
clang-tools-extra/clangd/unittests/HoverTests.cpp
Index: clang-tools-extra/clangd/unittests/HoverTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/HoverTests.cpp
+++ clang-tools-extra/clangd/unittests/HoverTests.cpp
@@ -2167,7 +2167,8 @@
HI.Name = "data";
HI.Type = "char";
HI.Kind = index::SymbolKind::Field;
- HI.NamespaceScope = "ObjC::"; // FIXME: fix it
+ HI.LocalScope = "ObjC::";
+ HI.NamespaceScope = "";
HI.Definition = "char data";
}},
{
@@ -2260,6 +2261,86 @@
HI.Name = "this";
HI.Definition = "const Foo<int, F> *";
}},
+ {
+ R"cpp(
+ @interface MYObject
+ @end
+ @interface MYObject (Private)
+ @property(nonatomic, assign) int privateField;
+ @end
+
+ int someFunction() {
+ MYObject *obj = [MYObject sharedInstance];
+ return obj.[[private^Field]];
+ }
+ )cpp",
+ [](HoverInfo &HI) {
+ HI.Name = "privateField";
+ HI.Kind = index::SymbolKind::InstanceProperty;
+ HI.LocalScope = "MYObject(Private)::";
+ HI.NamespaceScope = "";
+ HI.Definition = "@property(nonatomic, assign, unsafe_unretained, "
+ "readwrite) int privateField;";
+ }},
+ {
+ R"cpp(
+ @protocol MYProtocol
+ @property(nonatomic, assign) int prop1;
+ @end
+
+ int someFunction() {
+ id<MYProtocol> obj = 0;
+ return obj.[[pro^p1]];
+ }
+ )cpp",
+ [](HoverInfo &HI) {
+ HI.Name = "prop1";
+ HI.Kind = index::SymbolKind::InstanceProperty;
+ HI.LocalScope = "MYProtocol::";
+ HI.NamespaceScope = "";
+ HI.Definition = "@property(nonatomic, assign, unsafe_unretained, "
+ "readwrite) int prop1;";
+ }},
+ {R"objc(
+ @interface Foo
+ @end
+
+ @implementation Foo(Private)
+ + (int)somePrivateMethod {
+ int [[res^ult]] = 2;
+ return result;
+ }
+ @end
+ )objc",
+ [](HoverInfo &HI) {
+ HI.Name = "result";
+ HI.Definition = "int result = 2";
+ HI.Kind = index::SymbolKind::Variable;
+ HI.Type = "int";
+ HI.LocalScope = "+[Foo(Private) somePrivateMethod]::";
+ HI.NamespaceScope = "";
+ HI.Value = "2";
+ }},
+ {R"objc(
+ @interface Foo
+ @end
+
+ @implementation Foo
+ - (int)variadicArgMethod:(id)first, ... {
+ int [[res^ult]] = 0;
+ return result;
+ }
+ @end
+ )objc",
+ [](HoverInfo &HI) {
+ HI.Name = "result";
+ HI.Definition = "int result = 0";
+ HI.Kind = index::SymbolKind::Variable;
+ HI.Type = "int";
+ HI.LocalScope = "-[Foo variadicArgMethod:, ...]::";
+ HI.NamespaceScope = "";
+ HI.Value = "0";
+ }},
};
// Create a tiny index, so tests above can verify documentation is fetched.
Index: clang-tools-extra/clangd/Hover.cpp
===================================================================
--- clang-tools-extra/clangd/Hover.cpp
+++ clang-tools-extra/clangd/Hover.cpp
@@ -22,6 +22,7 @@
#include "clang/AST/Decl.h"
#include "clang/AST/DeclBase.h"
#include "clang/AST/DeclCXX.h"
+#include "clang/AST/DeclObjC.h"
#include "clang/AST/DeclTemplate.h"
#include "clang/AST/Expr.h"
#include "clang/AST/ExprCXX.h"
@@ -58,12 +59,66 @@
return Base;
}
+static llvm::StringRef getNameForObjCInterface(const ObjCInterfaceDecl *ID) {
+ return ID ? ID->getName() : "<<error-type>>";
+}
+
+static std::string objcMethodLocalScope(const ObjCMethodDecl *Method) {
+ std::string Name;
+ llvm::raw_string_ostream OS(Name);
+ const ObjCInterfaceDecl *Class = Method->getClassInterface();
+
+ OS << (Method->isInstanceMethod() ? '-' : '+') << '['
+ << getNameForObjCInterface(Class);
+
+ if (const ObjCCategoryImplDecl *CID =
+ dyn_cast<ObjCCategoryImplDecl>(Method->getDeclContext()))
+ OS << '(' << CID->getName() << ')';
+
+ Method->getSelector().print(OS << ' ');
+ if (Method->isVariadic())
+ OS << ", ...";
+
+ OS << ']';
+ OS.flush();
+ return Name;
+}
+
+static std::string objcContainerLocalScope(const ObjCContainerDecl *C) {
+ if (const ObjCCategoryDecl *Category = dyn_cast<ObjCCategoryDecl>(C)) {
+ std::string Name;
+ llvm::raw_string_ostream OS(Name);
+ const ObjCInterfaceDecl *Class = Category->getClassInterface();
+ OS << getNameForObjCInterface(Class) << '(' << Category->getName() << ')';
+ OS.flush();
+ return Name;
+ }
+ if (const ObjCCategoryImplDecl *CID = dyn_cast<ObjCCategoryImplDecl>(C)) {
+ std::string Name;
+ llvm::raw_string_ostream OS(Name);
+ const ObjCInterfaceDecl *Class = CID->getClassInterface();
+ OS << getNameForObjCInterface(Class) << '(' << CID->getName() << ')';
+ OS.flush();
+ return Name;
+ }
+ return C->getNameAsString();
+}
+
/// Given a declaration \p D, return a human-readable string representing the
/// local scope in which it is declared, i.e. class(es) and method name. Returns
/// an empty string if it is not local.
std::string getLocalScope(const Decl *D) {
std::vector<std::string> Scopes;
const DeclContext *DC = D->getDeclContext();
+
+ // ObjC scopes won't have multiple components for us to join, instead:
+ // - Methods: "-[Class methodParam1:methodParam2]"
+ // - Classes, categories, and protocols: "MyClass(Category)"
+ if (const ObjCMethodDecl *MD = dyn_cast<ObjCMethodDecl>(DC))
+ return objcMethodLocalScope(MD);
+ else if (const ObjCContainerDecl *CD = dyn_cast<ObjCContainerDecl>(DC))
+ return objcContainerLocalScope(CD);
+
auto GetName = [](const TypeDecl *D) {
if (!D->getDeclName().isEmpty()) {
PrintingPolicy Policy = D->getASTContext().getPrintingPolicy();
@@ -90,6 +145,11 @@
std::string getNamespaceScope(const Decl *D) {
const DeclContext *DC = D->getDeclContext();
+ // ObjC does not have the concept of namespaces, so instead we support
+ // local scopes.
+ if (isa<ObjCMethodDecl, ObjCContainerDecl>(DC))
+ return "";
+
if (const TagDecl *TD = dyn_cast<TagDecl>(DC))
return getNamespaceScope(TD);
if (const FunctionDecl *FD = dyn_cast<FunctionDecl>(DC))
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
