mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-27 17:16:06 +00:00
Code Issues Projects Releases Wiki Activity

Revert "[clangd] Fix a crash in expected types"

Browse Source 
This reverts commit b5135a86e04761577494c70e7c0057136cc90b5b.
Test fails on Windows.
This commit is contained in:
Nico Weber 2019-11-20 14:38:35 -05:00
parent f751a79173
commit 6de45772e0
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang-tools-extra/clangd/ExpectedTypes.cpp
View File

@ -44,10 +44,12 @@ static const Type *toEquivClass(ASTContext &Ctx, QualType T) {
static llvm::Optional<QualType>
typeOfCompletion(const CodeCompletionResult &R) {
const NamedDecl *D = R.Declaration;
if (!D)
return llvm::None;
// Templates do not have a type on their own, look at the templated decl.
if (auto *Template = dyn_cast_or_null<TemplateDecl>(D))
if (auto *Template = dyn_cast<TemplateDecl>(D))
D = Template->getTemplatedDecl();
auto *VD = dyn_cast_or_null<ValueDecl>(D);
auto *VD = dyn_cast<ValueDecl>(D);
if (!VD)
return llvm::None; // We handle only variables and functions below.
auto T = VD->getType();

10
clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp
View File

@ -1030,16 +1030,6 @@ TEST(CompletionTest, DefaultArgs) {
SnippetSuffix("(${1:int A})"))));
}
TEST(CompletionTest, NoCrashWithTemplateParamsAndPreferredTypes) {
auto Completions = completions(R"cpp(
template <template <class> class TT> int foo() {
int a = ^
}
)cpp")
.Completions;
EXPECT_THAT(Completions, Contains(Named("TT")));
}
SignatureHelp signatures(llvm::StringRef Text, Position Point,
std::vector<Symbol> IndexSymbols = {}) {
std::unique_ptr<SymbolIndex> Index;