From 0b3849f0f32c84034d65950b9999d61c797d2a30 Mon Sep 17 00:00:00 2001 From: Eric Liu Date: Mon, 15 Oct 2018 12:37:23 +0000 Subject: [PATCH] [CodeComplete] Make sure keyword 'template' is added even when code pattern is disabled. Reviewers: sammccall, hokein Subscribers: arphaman, cfe-commits Differential Revision: https://reviews.llvm.org/D53284 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@344509 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaCodeComplete.cpp | 4 ++++ test/Index/complete-template-keywords.cpp | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 test/Index/complete-template-keywords.cpp diff --git a/lib/Sema/SemaCodeComplete.cpp b/lib/Sema/SemaCodeComplete.cpp index 70b43a6329..303d96be7a 100644 --- a/lib/Sema/SemaCodeComplete.cpp +++ b/lib/Sema/SemaCodeComplete.cpp @@ -1731,6 +1731,8 @@ static void AddOrdinaryNameResults(Sema::ParserCompletionContext CCC, Builder.AddChunk(CodeCompletionString::CK_HorizontalSpace); Builder.AddPlaceholderChunk("declaration"); Results.AddResult(Result(Builder.TakeString())); + } else { + Results.AddResult(Result("template", CodeCompletionResult::RK_Keyword)); } } @@ -1805,6 +1807,8 @@ static void AddOrdinaryNameResults(Sema::ParserCompletionContext CCC, Builder.AddPlaceholderChunk("parameters"); Builder.AddChunk(CodeCompletionString::CK_RightAngle); Results.AddResult(Result(Builder.TakeString())); + } else { + Results.AddResult(Result("template", CodeCompletionResult::RK_Keyword)); } AddStorageSpecifiers(CCC, SemaRef.getLangOpts(), Results); diff --git a/test/Index/complete-template-keywords.cpp b/test/Index/complete-template-keywords.cpp new file mode 100644 index 0000000000..1e593330eb --- /dev/null +++ b/test/Index/complete-template-keywords.cpp @@ -0,0 +1,5 @@ +templ +// RUN: env c-index-test -code-completion-at=%s:1:5 %s | FileCheck -check-prefix=CHECK-NO-PATTERN %s +// CHECK-NO-PATTERN: {TypedText template} (1) +// RUN: env CINDEXTEST_CODE_COMPLETE_PATTERNS=1 c-index-test -code-completion-at=%s:1:5 %s | FileCheck -check-prefix=CHECK-PATTERN %s +// CHECK-PATTERN: {TypedText template}{LeftAngle <} -- 2.40.0