diff options
| -rw-r--r-- | clang-tools-extra/clangd/ExpectedTypes.cpp | 6 | ||||
| -rw-r--r-- | clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp | 10 |
2 files changed, 4 insertions, 12 deletions
diff --git a/clang-tools-extra/clangd/ExpectedTypes.cpp b/clang-tools-extra/clangd/ExpectedTypes.cpp index a82a64cf14e..3b0779ea66b 100644 --- a/clang-tools-extra/clangd/ExpectedTypes.cpp +++ b/clang-tools-extra/clangd/ExpectedTypes.cpp @@ -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(); diff --git a/clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp b/clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp index e69b2a6205f..5b50b9fe9f8 100644 --- a/clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp +++ b/clang-tools-extra/clangd/unittests/CodeCompleteTests.cpp @@ -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; |
