Skip to content

Commit 4977927

Browse files
kadircetkadircet
committedJun 13, 2019
[clangd] Treat lambdas as functions when preparing hover response
Reviewers: sammccall, ilya-biryukov Subscribers: MaskRay, jkorous, arphaman, cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D62814 llvm-svn: 363237
1 parent a78e025 commit 4977927

File tree

2 files changed

+108
-19
lines changed

2 files changed

+108
-19
lines changed
 

‎clang-tools-extra/clangd/XRefs.cpp

+33-14
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
#include "index/SymbolLocation.h"
2020
#include "clang/AST/ASTContext.h"
2121
#include "clang/AST/Decl.h"
22+
#include "clang/AST/DeclCXX.h"
2223
#include "clang/AST/DeclTemplate.h"
24+
#include "clang/AST/ExprCXX.h"
2325
#include "clang/AST/PrettyPrinter.h"
2426
#include "clang/AST/RecursiveASTVisitor.h"
2527
#include "clang/AST/Type.h"
@@ -620,6 +622,23 @@ static llvm::Optional<Range> getTokenRange(SourceLocation Loc,
620622
CharSourceRange::getCharRange(Loc, End));
621623
}
622624

625+
static const FunctionDecl *getUnderlyingFunction(const Decl *D) {
626+
// Extract lambda from variables.
627+
if (const VarDecl *VD = llvm::dyn_cast<VarDecl>(D)) {
628+
auto QT = VD->getType();
629+
if (!QT.isNull()) {
630+
while (!QT->getPointeeType().isNull())
631+
QT = QT->getPointeeType();
632+
633+
if (const auto *CD = QT->getAsCXXRecordDecl())
634+
return CD->getLambdaCallOperator();
635+
}
636+
}
637+
638+
// Non-lambda functions.
639+
return D->getAsFunction();
640+
}
641+
623642
/// Generate a \p Hover object given the declaration \p D.
624643
static HoverInfo getHoverContents(const Decl *D) {
625644
HoverInfo HI;
@@ -654,27 +673,21 @@ static HoverInfo getHoverContents(const Decl *D) {
654673
}
655674

656675
// Fill in types and params.
657-
if (const FunctionDecl *FD = D->getAsFunction()) {
676+
if (const FunctionDecl *FD = getUnderlyingFunction(D)) {
658677
HI.ReturnType.emplace();
659-
llvm::raw_string_ostream OS(*HI.ReturnType);
660-
FD->getReturnType().print(OS, Policy);
661-
662-
HI.Type.emplace();
663-
llvm::raw_string_ostream TypeOS(*HI.Type);
664-
FD->getReturnType().print(TypeOS, Policy);
665-
TypeOS << '(';
678+
{
679+
llvm::raw_string_ostream OS(*HI.ReturnType);
680+
FD->getReturnType().print(OS, Policy);
681+
}
666682

667683
HI.Parameters.emplace();
668684
for (const ParmVarDecl *PVD : FD->parameters()) {
669-
if (HI.Parameters->size())
670-
TypeOS << ", ";
671685
HI.Parameters->emplace_back();
672686
auto &P = HI.Parameters->back();
673687
if (!PVD->getType().isNull()) {
674688
P.Type.emplace();
675689
llvm::raw_string_ostream OS(*P.Type);
676690
PVD->getType().print(OS, Policy);
677-
PVD->getType().print(TypeOS, Policy);
678691
} else {
679692
std::string Param;
680693
llvm::raw_string_ostream OS(Param);
@@ -690,11 +703,17 @@ static HoverInfo getHoverContents(const Decl *D) {
690703
PVD->getDefaultArg()->printPretty(Out, nullptr, Policy);
691704
}
692705
}
693-
TypeOS << ')';
706+
707+
HI.Type.emplace();
708+
llvm::raw_string_ostream TypeOS(*HI.Type);
709+
// Lambdas
710+
if (const VarDecl *VD = llvm::dyn_cast<VarDecl>(D))
711+
VD->getType().getDesugaredType(D->getASTContext()).print(TypeOS, Policy);
712+
// Functions
713+
else
714+
FD->getType().print(TypeOS, Policy);
694715
// FIXME: handle variadics.
695716
} else if (const auto *VD = dyn_cast<ValueDecl>(D)) {
696-
// FIXME: Currently lambdas are also handled as ValueDecls, they should be
697-
// more similar to functions.
698717
HI.Type.emplace();
699718
llvm::raw_string_ostream OS(*HI.Type);
700719
VD->getType().print(OS, Policy);

‎clang-tools-extra/clangd/unittests/XRefsTests.cpp

+75-5
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "llvm/Support/ScopedPrinter.h"
2323
#include "gmock/gmock.h"
2424
#include "gtest/gtest.h"
25+
#include <string>
2526

2627
namespace clang {
2728
namespace clangd {
@@ -588,7 +589,7 @@ TEST(Hover, Structured) {
588589
HI.Documentation = "Best foo ever.";
589590
HI.Definition = "void foo()";
590591
HI.ReturnType = "void";
591-
HI.Type = "void()";
592+
HI.Type = "void ()";
592593
HI.Parameters.emplace();
593594
}},
594595
// Inside namespace
@@ -605,7 +606,7 @@ TEST(Hover, Structured) {
605606
HI.Documentation = "Best foo ever.";
606607
HI.Definition = "void foo()";
607608
HI.ReturnType = "void";
608-
HI.Type = "void()";
609+
HI.Type = "void ()";
609610
HI.Parameters.emplace();
610611
}},
611612
// Field
@@ -733,7 +734,7 @@ class Foo {})cpp";
733734
bool Q = false, class... Ts>
734735
void foo())cpp";
735736
HI.ReturnType = "void";
736-
HI.Type = "void()";
737+
HI.Type = "void ()";
737738
HI.Parameters.emplace();
738739
HI.TemplateParameters = {
739740
{std::string("template <typename, bool...> class"),
@@ -759,12 +760,76 @@ void foo())cpp";
759760
HI.Kind = SymbolKind::Function;
760761
HI.Definition = "Foo<bool, true, false> foo(int, bool T = false)";
761762
HI.ReturnType = "Foo<bool, true, false>";
762-
HI.Type = "Foo<bool, true, false>(int, bool)";
763+
HI.Type = "Foo<bool, true, false> (int, bool)";
763764
HI.Parameters = {
764765
{std::string("int"), llvm::None, llvm::None},
765766
{std::string("bool"), std::string("T"), std::string("false")},
766767
};
767768
}},
769+
// Pointers to lambdas
770+
{R"cpp(
771+
void foo() {
772+
auto lamb = [](int T, bool B) -> bool { return T && B; };
773+
auto *b = &lamb;
774+
auto *[[^c]] = &b;
775+
}
776+
)cpp",
777+
[](HoverInfo &HI) {
778+
HI.NamespaceScope = "";
779+
HI.LocalScope = "foo::";
780+
HI.Name = "c";
781+
HI.Kind = SymbolKind::Variable;
782+
HI.Definition = "auto *c = &b";
783+
HI.Type = "class (lambda) **";
784+
HI.ReturnType = "bool";
785+
HI.Parameters = {
786+
{std::string("int"), std::string("T"), llvm::None},
787+
{std::string("bool"), std::string("B"), llvm::None},
788+
};
789+
return HI;
790+
}},
791+
// Lambda parameter with decltype reference
792+
{R"cpp(
793+
auto lamb = [](int T, bool B) -> bool { return T && B; };
794+
void foo(decltype(lamb)& bar) {
795+
[[ba^r]](0, false);
796+
}
797+
)cpp",
798+
[](HoverInfo &HI) {
799+
HI.NamespaceScope = "";
800+
HI.LocalScope = "foo::";
801+
HI.Name = "bar";
802+
HI.Kind = SymbolKind::Variable;
803+
HI.Definition = "decltype(lamb) &bar";
804+
HI.Type = "decltype(lamb) &";
805+
HI.ReturnType = "bool";
806+
HI.Parameters = {
807+
{std::string("int"), std::string("T"), llvm::None},
808+
{std::string("bool"), std::string("B"), llvm::None},
809+
};
810+
return HI;
811+
}},
812+
// Lambda parameter with decltype
813+
{R"cpp(
814+
auto lamb = [](int T, bool B) -> bool { return T && B; };
815+
void foo(decltype(lamb) bar) {
816+
[[ba^r]](0, false);
817+
}
818+
)cpp",
819+
[](HoverInfo &HI) {
820+
HI.NamespaceScope = "";
821+
HI.LocalScope = "foo::";
822+
HI.Name = "bar";
823+
HI.Kind = SymbolKind::Variable;
824+
HI.Definition = "decltype(lamb) bar";
825+
HI.Type = "class (lambda)";
826+
HI.ReturnType = "bool";
827+
HI.Parameters = {
828+
{std::string("int"), std::string("T"), llvm::None},
829+
{std::string("bool"), std::string("B"), llvm::None},
830+
};
831+
return HI;
832+
}},
768833
// Lambda variable
769834
{R"cpp(
770835
void foo() {
@@ -779,7 +844,12 @@ void foo())cpp";
779844
HI.Name = "lamb";
780845
HI.Kind = SymbolKind::Variable;
781846
HI.Definition = "auto lamb = [&bar](int T, bool B) -> bool {}";
782-
HI.Type = std::string("class (lambda)");
847+
HI.Type = "class (lambda)";
848+
HI.ReturnType = "bool";
849+
HI.Parameters = {
850+
{std::string("int"), std::string("T"), llvm::None},
851+
{std::string("bool"), std::string("B"), llvm::None},
852+
};
783853
return HI;
784854
}},
785855
// Local variable in lambda

0 commit comments

Comments
 (0)
Please sign in to comment.