[clangd] Fixed printTemplateSpecializationArgs not printing partial variable specialization arguments.

[jvikstrom]

Summary

printTemplateSpecializationArgs was not printing partial variable specialization args. This adds an additional If clause where we check if it's a VariableTemplatePartialSpecializationDecl and returns the ArgumentLocs if that's the case.
Also adds tests for printTemplateSpecializationArgs in ASTTests.cpp.

[hokein]

clang-tools-extra/clangd/unittests/ASTTests.cpp

40 ↗

(On Diff #214077)

looks like the related tests are in PrintASTTests.cpp, could you move the test there?

[jvikstrom]

Merged test with PrintASTTest.cpp.

[jvikstrom]

clang-tools-extra/clangd/unittests/ASTTests.cpp

40 ↗

(On Diff #214077)

Oh I didn't see that test file. Seems like a lot of this is already tested, so just removing everything that isn't related to template variables.

clang-tools-extra/trunk/clangd/AST.cpp

getTemplateSpecializationArgLocs(const NamedDecl &ND) {
   if (auto *Func = llvm::dyn_cast<FunctionDecl>(&ND)) {
     if (const ASTTemplateArgumentListInfo *Args =
             Func->getTemplateSpecializationArgsAsWritten())
       return Args->arguments();
   } else if (auto *Cls =
                  llvm::dyn_cast<ClassTemplatePartialSpecializationDecl>(&ND)) {
     if (auto *Args = Cls->getTemplateArgsAsWritten())
       return Args->arguments();
+  } else if (auto *Var =
+                 llvm::dyn_cast<VarTemplatePartialSpecializationDecl>(&ND)) {
+    if (auto *Args = Var->getTemplateArgsAsWritten())
+      return Args->arguments();
   } else if (auto *Var = llvm::dyn_cast<VarTemplateSpecializationDecl>(&ND))
     return Var->getTemplateArgsInfo().arguments();
   // We return None for ClassTemplateSpecializationDecls because it does not
   // contain TemplateArgumentLoc information.
   return llvm::None;
 }
 
 template <class T>

clang-tools-extra/trunk/clangd/unittests/ClangdUnitTests.cpp

EXPECT_THAT(
                         AllOf(DeclNamed("f"), WithTemplateArgs("<bool>")),
                         AllOf(DeclNamed("f"), WithTemplateArgs("<double>")),
                         AllOf(DeclNamed("V"), WithTemplateArgs("")),
                         AllOf(DeclNamed("V"), WithTemplateArgs("<T *>")),
                         AllOf(DeclNamed("V"), WithTemplateArgs("<bool>")),
                         AllOf(DeclNamed("foo"), WithTemplateArgs("")),
                         AllOf(DeclNamed("i"), WithTemplateArgs("")),
                         AllOf(DeclNamed("d"), WithTemplateArgs("")),
-                        AllOf(DeclNamed("foo"), WithTemplateArgs("<>")),
+                        AllOf(DeclNamed("foo"), WithTemplateArgs("<T *>")),
                         AllOf(DeclNamed("foo"), WithTemplateArgs("<bool>"))}));
 }
 
 TEST(ClangdUnitTest, TokensAfterPreamble) {
   TestTU TU;
   TU.AdditionalFiles["foo.h"] = R"(
     int foo();
   )";

clang-tools-extra/trunk/clangd/unittests/PrintASTTests.cpp

INSTANTIATE_TEST_CASE_P(ASTUtilsTests, ASTUtils,
                                   template <> int ^var<int> = 1;)cpp",
                                 {"<int>"}},
                             {
                                 R"cpp(
                                   template <typename T> struct Foo;
                                   struct Bar { friend class Foo<int>; };
                                   template <> struct ^Foo<int> {};)cpp",
                                 {"<int>"}},
+                            {
+                                R"cpp(
+                                  template<class T>
+                                  T S = T(10);
+                                  template <class T>
+                                  int ^S<T*> = 0;
+                                  template <>
+                                  int ^S<double> = 0;)cpp",
+                                {"<T *>", "<double>"}},
                         })),);
 } // namespace
 } // namespace clangd
 } // namespace clang