[PATCH] D59354: [clangd] Print arguments in template specializations
This revision was automatically updated to reflect the committed changes.
Closed by commit rC356541: [clangd] Print arguments in template specializations
(authored by kadircet, committed by ).
Changed prior to commit:
https://reviews.llvm.org/D59354?vs=191460=191462#toc
Repository:
rC Clang
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D59354/new/
https://reviews.llvm.org/D59354
Files:
lib/AST/TypePrinter.cpp
Index: lib/AST/TypePrinter.cpp
===
--- lib/AST/TypePrinter.cpp
+++ lib/AST/TypePrinter.cpp
@@ -1632,6 +1632,21 @@
return A.getArgument();
}
+static void printArgument(const TemplateArgument , const PrintingPolicy ,
+ llvm::raw_ostream ) {
+ A.print(PP, OS);
+}
+
+static void printArgument(const TemplateArgumentLoc ,
+ const PrintingPolicy , llvm::raw_ostream ) {
+ const auto = A.getArgument().getKind();
+ assert(Kind != TemplateArgument::Null &&
+ "TemplateArgumentKind can not be null!");
+ if (Kind == TemplateArgument::ArgKind::Type)
+return A.getTypeSourceInfo()->getType().print(OS, PP);
+ return A.getArgument().print(PP, OS);
+}
+
template
static void printTo(raw_ostream , ArrayRef Args,
const PrintingPolicy , bool SkipBrackets) {
@@ -1653,7 +1668,7 @@
} else {
if (!FirstArg)
OS << Comma;
- Argument.print(Policy, ArgOS);
+ printArgument(Arg, Policy, ArgOS);
}
StringRef ArgString = ArgOS.str();
Index: lib/AST/TypePrinter.cpp
===
--- lib/AST/TypePrinter.cpp
+++ lib/AST/TypePrinter.cpp
@@ -1632,6 +1632,21 @@
return A.getArgument();
}
+static void printArgument(const TemplateArgument , const PrintingPolicy ,
+ llvm::raw_ostream ) {
+ A.print(PP, OS);
+}
+
+static void printArgument(const TemplateArgumentLoc ,
+ const PrintingPolicy , llvm::raw_ostream ) {
+ const auto = A.getArgument().getKind();
+ assert(Kind != TemplateArgument::Null &&
+ "TemplateArgumentKind can not be null!");
+ if (Kind == TemplateArgument::ArgKind::Type)
+return A.getTypeSourceInfo()->getType().print(OS, PP);
+ return A.getArgument().print(PP, OS);
+}
+
template
static void printTo(raw_ostream , ArrayRef Args,
const PrintingPolicy , bool SkipBrackets) {
@@ -1653,7 +1668,7 @@
} else {
if (!FirstArg)
OS << Comma;
- Argument.print(Policy, ArgOS);
+ printArgument(Arg, Policy, ArgOS);
}
StringRef ArgString = ArgOS.str();
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D59354: [clangd] Print arguments in template specializations
kadircet updated this revision to Diff 191460.
kadircet marked 2 inline comments as done.
kadircet added a comment.
- Address comments
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D59354/new/
https://reviews.llvm.org/D59354
Files:
clang-tools-extra/clangd/AST.cpp
clang-tools-extra/clangd/index/MemIndex.cpp
clang-tools-extra/clangd/index/dex/Dex.cpp
clang-tools-extra/unittests/clangd/DexTests.cpp
clang-tools-extra/unittests/clangd/IndexTests.cpp
clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp
clang/lib/AST/TypePrinter.cpp
Index: clang/lib/AST/TypePrinter.cpp
===
--- clang/lib/AST/TypePrinter.cpp
+++ clang/lib/AST/TypePrinter.cpp
@@ -1632,6 +1632,21 @@
return A.getArgument();
}
+static void printArgument(const TemplateArgument , const PrintingPolicy ,
+ llvm::raw_ostream ) {
+ A.print(PP, OS);
+}
+
+static void printArgument(const TemplateArgumentLoc ,
+ const PrintingPolicy , llvm::raw_ostream ) {
+ const auto = A.getArgument().getKind();
+ assert(Kind != TemplateArgument::Null &&
+ "TemplateArgumentKind can not be null!");
+ if (Kind == TemplateArgument::ArgKind::Type)
+return A.getTypeSourceInfo()->getType().print(OS, PP);
+ return A.getArgument().print(PP, OS);
+}
+
template
static void printTo(raw_ostream , ArrayRef Args,
const PrintingPolicy , bool SkipBrackets) {
@@ -1653,7 +1668,7 @@
} else {
if (!FirstArg)
OS << Comma;
- Argument.print(Policy, ArgOS);
+ printArgument(Arg, Policy, ArgOS);
}
StringRef ArgString = ArgOS.str();
Index: clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp
===
--- clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp
+++ clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp
@@ -394,23 +394,80 @@
Annotations Header(R"(
// Primary template and explicit specialization are indexed, instantiation
// is not.
-template struct [[Tmpl]] {T $xdecl[[x]] = 0;};
-template <> struct $specdecl[[Tmpl]] {};
-template struct $partspecdecl[[Tmpl]] {};
-extern template struct Tmpl;
-template struct Tmpl;
+template class $barclasstemp[[Bar]] {};
+template class Z, int Q>
+struct [[Tmpl]] { T $xdecl[[x]] = 0; };
+
+// template-template, non-type and type full spec
+template <> struct $specdecl[[Tmpl]] {};
+
+// template-template, non-type and type partial spec
+template struct $partspecdecl[[Tmpl]] {};
+// instantiation
+extern template struct Tmpl;
+// instantiation
+template struct Tmpl;
+
+template class $fooclasstemp[[Foo]] {};
+// parameter-packs full spec
+template<> class $parampack[[Foo]], int, double> {};
+// parameter-packs partial spec
+template class $parampackpartial[[Foo]] {};
+
+template class $bazclasstemp[[Baz]] {};
+// non-type parameter-packs full spec
+template<> class $parampacknontype[[Baz]]<3, 5, 8> {};
+// non-type parameter-packs partial spec
+template class $parampacknontypepartial[[Baz]] {};
+
+template class ...> class $fozclasstemp[[Foz]] {};
+// template-template parameter-packs full spec
+template<> class $parampacktempltempl[[Foz]] {};
+// template-template parameter-packs partial spec
+template class T>
+class $parampacktempltemplpartial[[Foz]] {};
)");
runSymbolCollector(Header.code(), /*Main=*/"");
- EXPECT_THAT(Symbols,
- UnorderedElementsAre(
- AllOf(QName("Tmpl"), DeclRange(Header.range()),
-ForCodeCompletion(true)),
- AllOf(QName("Tmpl"), DeclRange(Header.range("specdecl")),
-ForCodeCompletion(false)),
- AllOf(QName("Tmpl"), DeclRange(Header.range("partspecdecl")),
-ForCodeCompletion(false)),
- AllOf(QName("Tmpl::x"), DeclRange(Header.range("xdecl")),
-ForCodeCompletion(false;
+ EXPECT_THAT(Symbols.size(), 14U);
+ EXPECT_THAT(
+ Symbols,
+ AllOf(
+ Contains(AllOf(QName("Tmpl"), DeclRange(Header.range()),
+ ForCodeCompletion(true))),
+ Contains(AllOf(QName("Bar"), DeclRange(Header.range("barclasstemp")),
+ ForCodeCompletion(true))),
+ Contains(AllOf(QName("Foo"), DeclRange(Header.range("fooclasstemp")),
+ ForCodeCompletion(true))),
+ Contains(AllOf(QName("Baz"), DeclRange(Header.range("bazclasstemp")),
+ ForCodeCompletion(true))),
+ Contains(AllOf(QName("Foz"), DeclRange(Header.range("fozclasstemp")),
+ ForCodeCompletion(true))),
+ Contains(AllOf(QName("Tmpl"),
+
[PATCH] D59354: [clangd] Print arguments in template specializations
ilya-biryukov added inline comments.
Comment at: clang/lib/AST/TypePrinter.cpp:1635
+static void printArgument(const TemplateArgument , const PrintingPolicy ,
+ llvm::raw_ostream ) {
ilya-biryukov wrote:
> NIT: consider also adding a test in the clang code.
> Some developers don't build `tools-extra`.
It seems the amount of test infrastructure for running this in clang might be
overwhelming.
It's just not worth it probably, having a test in clangd is good enough!
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D59354/new/
https://reviews.llvm.org/D59354
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D59354: [clangd] Print arguments in template specializations
ilya-biryukov accepted this revision.
ilya-biryukov added a comment.
This revision is now accepted and ready to land.
LGTM with a few NITs.
Thanks for fixing this!
Comment at: clang-tools-extra/clangd/AST.cpp:86
+auto TL = Cls->getTypeAsWritten()->getTypeLoc();
+if (auto STL = TL.getAs()) {
+ llvm::SmallVector ArgLocs;
NIT: maybe inline `TL`?
```
if (auto STL =
Cls->getTypeAsWritten()->getTypeLoc().getAs()) {
/// ...
}
```
Comment at: clang-tools-extra/clangd/AST.cpp:89
+ ArgLocs.reserve(STL.getNumArgs());
+ for (unsigned I = 0; I < STL.getNumArgs(); I++)
+ArgLocs.push_back(STL.getArgLoc(I));
Tiny NIT: [[ https://llvm.org/docs/CodingStandards.html#prefer-preincrement |
prefer preincrement ]]
Comment at: clang/lib/AST/TypePrinter.cpp:1635
+static void printArgument(const TemplateArgument , const PrintingPolicy ,
+ llvm::raw_ostream ) {
NIT: consider also adding a test in the clang code.
Some developers don't build `tools-extra`.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D59354/new/
https://reviews.llvm.org/D59354
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D59354: [clangd] Print arguments in template specializations
kadircet updated this revision to Diff 190800.
kadircet marked 11 inline comments as done.
kadircet added a comment.
- Add more tests
- Replace switch with if
- Use SmallVector
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D59354/new/
https://reviews.llvm.org/D59354
Files:
clang-tools-extra/clangd/AST.cpp
clang-tools-extra/clangd/index/MemIndex.cpp
clang-tools-extra/clangd/index/dex/Dex.cpp
clang-tools-extra/unittests/clangd/DexTests.cpp
clang-tools-extra/unittests/clangd/IndexTests.cpp
clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp
clang/lib/AST/TypePrinter.cpp
Index: clang/lib/AST/TypePrinter.cpp
===
--- clang/lib/AST/TypePrinter.cpp
+++ clang/lib/AST/TypePrinter.cpp
@@ -1632,6 +1632,21 @@
return A.getArgument();
}
+static void printArgument(const TemplateArgument , const PrintingPolicy ,
+ llvm::raw_ostream ) {
+ A.print(PP, OS);
+}
+
+static void printArgument(const TemplateArgumentLoc ,
+ const PrintingPolicy , llvm::raw_ostream ) {
+ const auto = A.getArgument().getKind();
+ assert(Kind != TemplateArgument::Null &&
+ "TemplateArgumentKind can not be null!");
+ if (Kind == TemplateArgument::ArgKind::Type)
+return A.getTypeSourceInfo()->getType().print(OS, PP);
+ return A.getArgument().print(PP, OS);
+}
+
template
static void printTo(raw_ostream , ArrayRef Args,
const PrintingPolicy , bool SkipBrackets) {
@@ -1653,7 +1668,7 @@
} else {
if (!FirstArg)
OS << Comma;
- Argument.print(Policy, ArgOS);
+ printArgument(Arg, Policy, ArgOS);
}
StringRef ArgString = ArgOS.str();
Index: clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp
===
--- clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp
+++ clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp
@@ -394,23 +394,80 @@
Annotations Header(R"(
// Primary template and explicit specialization are indexed, instantiation
// is not.
-template struct [[Tmpl]] {T $xdecl[[x]] = 0;};
-template <> struct $specdecl[[Tmpl]] {};
-template struct $partspecdecl[[Tmpl]] {};
-extern template struct Tmpl;
-template struct Tmpl;
+template class $barclasstemp[[Bar]] {};
+template class Z, int Q>
+struct [[Tmpl]] { T $xdecl[[x]] = 0; };
+
+// template-template, non-type and type full spec
+template <> struct $specdecl[[Tmpl]] {};
+
+// template-template, non-type and type partial spec
+template struct $partspecdecl[[Tmpl]] {};
+// instantiation
+extern template struct Tmpl;
+// instantiation
+template struct Tmpl;
+
+template class $fooclasstemp[[Foo]] {};
+// parameter-packs full spec
+template<> class $parampack[[Foo]], int, double> {};
+// parameter-packs partial spec
+template class $parampackpartial[[Foo]] {};
+
+template class $bazclasstemp[[Baz]] {};
+// non-type parameter-packs full spec
+template<> class $parampacknontype[[Baz]]<3, 5, 8> {};
+// non-type parameter-packs partial spec
+template class $parampacknontypepartial[[Baz]] {};
+
+template class ...> class $fozclasstemp[[Foz]] {};
+// template-template parameter-packs full spec
+template<> class $parampacktempltempl[[Foz]] {};
+// template-template parameter-packs partial spec
+template class T>
+class $parampacktempltemplpartial[[Foz]] {};
)");
runSymbolCollector(Header.code(), /*Main=*/"");
- EXPECT_THAT(Symbols,
- UnorderedElementsAre(
- AllOf(QName("Tmpl"), DeclRange(Header.range()),
-ForCodeCompletion(true)),
- AllOf(QName("Tmpl"), DeclRange(Header.range("specdecl")),
-ForCodeCompletion(false)),
- AllOf(QName("Tmpl"), DeclRange(Header.range("partspecdecl")),
-ForCodeCompletion(false)),
- AllOf(QName("Tmpl::x"), DeclRange(Header.range("xdecl")),
-ForCodeCompletion(false;
+ EXPECT_THAT(Symbols.size(), 14U);
+ EXPECT_THAT(
+ Symbols,
+ AllOf(
+ Contains(AllOf(QName("Tmpl"), DeclRange(Header.range()),
+ ForCodeCompletion(true))),
+ Contains(AllOf(QName("Bar"), DeclRange(Header.range("barclasstemp")),
+ ForCodeCompletion(true))),
+ Contains(AllOf(QName("Foo"), DeclRange(Header.range("fooclasstemp")),
+ ForCodeCompletion(true))),
+ Contains(AllOf(QName("Baz"), DeclRange(Header.range("bazclasstemp")),
+ ForCodeCompletion(true))),
+ Contains(AllOf(QName("Foz"), DeclRange(Header.range("fozclasstemp")),
+ ForCodeCompletion(true))),
+
[PATCH] D59354: [clangd] Print arguments in template specializations
kadircet added inline comments.
Comment at: clang/lib/AST/TypePrinter.cpp:1655
+ case TemplateArgument::ArgKind::Expression:
+ case TemplateArgument::ArgKind::Pack:
+A.getArgument().print(PP, OS);
ilya-biryukov wrote:
> Now that you mentioned other kinds of parameters, could you add tests for
> other kinds of parameters?
> In particular, I expect we'll definitely need to handle packs here and
> probably all other kinds of arguments too.
> - Non-type and template template parameters.
> ```
> template class TT, template class JJ>
> struct Foo {};
>
> template class UU>
> struct Foo {};
> ```
> - Parameter packs.
> ```
> template
> struct Bar {};
>
> template
> struct Bar {};
>
> template
> struct Baz {};
>
> template
> struct Baz {};
>
> template class...TT>
> struct Qux {};
>
> template class TT>
> struct Qux {};
> ```
I've already had tests for these cases, but adding a few more for partial specs
as well.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D59354/new/
https://reviews.llvm.org/D59354
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D59354: [clangd] Print arguments in template specializations
ilya-biryukov added inline comments.
Comment at: clang/lib/AST/TypePrinter.cpp:1644
+llvm::raw_ostream ) {
+ A.getTypeSourceInfo()->getType().print(OS, PP);
+}
kadircet wrote:
> ilya-biryukov wrote:
> > kadircet wrote:
> > > ilya-biryukov wrote:
> > > > Maybe print the result of `getTypeLoc()` here, if it's available?
> > > > Would produce results closer to the ones written in the code.
> > > unfortunately it is not available.
> > you mean the function to print a type loc or the type loc itself?
> function to print a typeloc
Thanks for the clarification.
Intuitively, I've expected it to be there, but it seems that we can only print
the types.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D59354/new/
https://reviews.llvm.org/D59354
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D59354: [clangd] Print arguments in template specializations
ilya-biryukov added a comment.
The only important comment is about test coverage
Comment at: clang-tools-extra/clangd/AST.cpp:84
+if (auto STL = TL.getAs()) {
+ std::vector ArgLocs;
+ for (unsigned I = 0; I < STL.getNumArgs(); I++)
kadircet wrote:
> ilya-biryukov wrote:
> > NIT: use `SmallVector<8>` or some other small-enough number to avoid most
> > allocs.
> calling reserve beforehand
`SmallVector` is even better because it keeps the elements on the stack and
won't need to do dynamic allocations (most of the time).
My suggestion would be to use it here anyway.
Up to you, though.
Comment at: clang-tools-extra/unittests/clangd/IndexTests.cpp:18
#include "clang/Index/IndexSymbol.h"
+#include "gmock/gmock-generated-matchers.h"
#include "gmock/gmock.h"
kadircet wrote:
> ilya-biryukov wrote:
> > NIT: maybe remove it? clangd keeps adding those, but I don't think we
> > actually want it: `gmock.h` should be enough
> Should we add IWYU pragmas to those files?
> https://github.com/google/googlemock/blob/master/googlemock/include/gmock/gmock-generated-matchers.h
I think we should, but some projects don't like those pragmas in their headers.
Trying to add this won't hurt for sure!
Comment at: clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp:417
+ForCodeCompletion(true)),
+ AllOf(QName("Tmpl"),
+DeclRange(Header.range("specdecl")), ForCodeCompletion(false)),
kadircet wrote:
> ilya-biryukov wrote:
> > Does it mean typing `bool` could potentially match `vector` in
> > `workspaceSymbols` now?
> > If that's the case we might start producing some noise.
> unfortunately yes it does, what do you suggest? it seems like we can perform
> a "isprefix" check for symbols with template specs kind?
Let's land this and see if this creates too much noise.
If it will, we might want to drop the argument lists from the words we match
and only keep them for presentation to the user.
But let's not worry about this too much for now, the current behavior LG unless
proven otherwise :-)
Comment at: clang/lib/AST/TypePrinter.cpp:1646
+break;
+ case TemplateArgument::ArgKind::Type:
+A.getTypeSourceInfo()->getType().print(OS, PP);
kadircet wrote:
> ilya-biryukov wrote:
> > Maybe simplify the switch to:
> > ```
> > if (A.getKind() == TemplateArgument::ArgKind::Type) {
> > A.getTypeSourceInfo()->getType().print(OS, PP);
> > return;
> > }
> > A.getArgument().print(PP, OS);
> > ```
> >
> It was rather to catch any changes in the ArgKind at compile-time, still can
> do if you think this should not cause any problems
I think listing all the cases here does not actually buy us anything since we
call a function that should somehow print the arguments anyway.
But up to you.
Comment at: clang/lib/AST/TypePrinter.cpp:1655
+ case TemplateArgument::ArgKind::Expression:
+ case TemplateArgument::ArgKind::Pack:
+A.getArgument().print(PP, OS);
Now that you mentioned other kinds of parameters, could you add tests for other
kinds of parameters?
In particular, I expect we'll definitely need to handle packs here and probably
all other kinds of arguments too.
- Non-type and template template parameters.
```
template class TT, template class JJ>
struct Foo {};
template class UU>
struct Foo {};
```
- Parameter packs.
```
template
struct Bar {};
template
struct Bar {};
template
struct Baz {};
template
struct Baz {};
template class...TT>
struct Qux {};
template class TT>
struct Qux {};
```
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D59354/new/
https://reviews.llvm.org/D59354
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D59354: [clangd] Print arguments in template specializations
kadircet marked an inline comment as done.
kadircet added inline comments.
Comment at: clang/lib/AST/TypePrinter.cpp:1646
+break;
+ case TemplateArgument::ArgKind::Type:
+A.getTypeSourceInfo()->getType().print(OS, PP);
ilya-biryukov wrote:
> Maybe simplify the switch to:
> ```
> if (A.getKind() == TemplateArgument::ArgKind::Type) {
> A.getTypeSourceInfo()->getType().print(OS, PP);
> return;
> }
> A.getArgument().print(PP, OS);
> ```
>
It was rather to catch any changes in the ArgKind at compile-time, still can do
if you think this should not cause any problems
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D59354/new/
https://reviews.llvm.org/D59354
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D59354: [clangd] Print arguments in template specializations
kadircet marked 7 inline comments as done.
kadircet added inline comments.
Comment at: clang-tools-extra/clangd/AST.cpp:84
+if (auto STL = TL.getAs()) {
+ std::vector ArgLocs;
+ for (unsigned I = 0; I < STL.getNumArgs(); I++)
ilya-biryukov wrote:
> NIT: use `SmallVector<8>` or some other small-enough number to avoid most
> allocs.
calling reserve beforehand
Comment at: clang-tools-extra/unittests/clangd/IndexTests.cpp:18
#include "clang/Index/IndexSymbol.h"
+#include "gmock/gmock-generated-matchers.h"
#include "gmock/gmock.h"
ilya-biryukov wrote:
> NIT: maybe remove it? clangd keeps adding those, but I don't think we
> actually want it: `gmock.h` should be enough
Should we add IWYU pragmas to those files?
https://github.com/google/googlemock/blob/master/googlemock/include/gmock/gmock-generated-matchers.h
Comment at: clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp:417
+ForCodeCompletion(true)),
+ AllOf(QName("Tmpl"),
+DeclRange(Header.range("specdecl")), ForCodeCompletion(false)),
ilya-biryukov wrote:
> Does it mean typing `bool` could potentially match `vector` in
> `workspaceSymbols` now?
> If that's the case we might start producing some noise.
unfortunately yes it does, what do you suggest? it seems like we can perform a
"isprefix" check for symbols with template specs kind?
Comment at: clang/lib/AST/TypePrinter.cpp:1644
+llvm::raw_ostream ) {
+ A.getTypeSourceInfo()->getType().print(OS, PP);
+}
ilya-biryukov wrote:
> kadircet wrote:
> > ilya-biryukov wrote:
> > > Maybe print the result of `getTypeLoc()` here, if it's available?
> > > Would produce results closer to the ones written in the code.
> > unfortunately it is not available.
> you mean the function to print a type loc or the type loc itself?
function to print a typeloc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D59354/new/
https://reviews.llvm.org/D59354
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D59354: [clangd] Print arguments in template specializations
kadircet updated this revision to Diff 190642.
kadircet marked 2 inline comments as done.
kadircet added a comment.
- Address some of the comments
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D59354/new/
https://reviews.llvm.org/D59354
Files:
clang-tools-extra/clangd/AST.cpp
clang-tools-extra/clangd/index/MemIndex.cpp
clang-tools-extra/clangd/index/dex/Dex.cpp
clang-tools-extra/unittests/clangd/DexTests.cpp
clang-tools-extra/unittests/clangd/IndexTests.cpp
clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp
clang/lib/AST/TypePrinter.cpp
Index: clang/lib/AST/TypePrinter.cpp
===
--- clang/lib/AST/TypePrinter.cpp
+++ clang/lib/AST/TypePrinter.cpp
@@ -1632,6 +1632,32 @@
return A.getArgument();
}
+static void printArgument(const TemplateArgument , const PrintingPolicy ,
+ llvm::raw_ostream ) {
+ A.print(PP, OS);
+}
+
+static void printArgument(const TemplateArgumentLoc ,
+ const PrintingPolicy , llvm::raw_ostream ) {
+ switch (A.getArgument().getKind()) {
+ case TemplateArgument::ArgKind::Null:
+assert(false && "TemplateArgumentKind can not be null!");
+break;
+ case TemplateArgument::ArgKind::Type:
+A.getTypeSourceInfo()->getType().print(OS, PP);
+break;
+ case TemplateArgument::ArgKind::Declaration:
+ case TemplateArgument::ArgKind::NullPtr:
+ case TemplateArgument::ArgKind::Integral:
+ case TemplateArgument::ArgKind::Template:
+ case TemplateArgument::ArgKind::TemplateExpansion:
+ case TemplateArgument::ArgKind::Expression:
+ case TemplateArgument::ArgKind::Pack:
+A.getArgument().print(PP, OS);
+break;
+ }
+}
+
template
static void printTo(raw_ostream , ArrayRef Args,
const PrintingPolicy , bool SkipBrackets) {
@@ -1653,7 +1679,7 @@
} else {
if (!FirstArg)
OS << Comma;
- Argument.print(Policy, ArgOS);
+ printArgument(Arg, Policy, ArgOS);
}
StringRef ArgString = ArgOS.str();
Index: clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp
===
--- clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp
+++ clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp
@@ -394,23 +394,36 @@
Annotations Header(R"(
// Primary template and explicit specialization are indexed, instantiation
// is not.
-template struct [[Tmpl]] {T $xdecl[[x]] = 0;};
-template <> struct $specdecl[[Tmpl]] {};
-template struct $partspecdecl[[Tmpl]] {};
-extern template struct Tmpl;
-template struct Tmpl;
+template class $barclasstemp[[Bar]] {};
+template class Z, int Q>
+struct [[Tmpl]] { T $xdecl[[x]] = 0; };
+template <> struct $specdecl[[Tmpl]] {};
+template struct $partspecdecl[[Tmpl]] {};
+extern template struct Tmpl;
+template struct Tmpl;
+template class $fooclasstemp[[Foo]] {};
+template<> class $templtempl[[Foo]], int, double> {};
)");
runSymbolCollector(Header.code(), /*Main=*/"");
- EXPECT_THAT(Symbols,
- UnorderedElementsAre(
- AllOf(QName("Tmpl"), DeclRange(Header.range()),
-ForCodeCompletion(true)),
- AllOf(QName("Tmpl"), DeclRange(Header.range("specdecl")),
-ForCodeCompletion(false)),
- AllOf(QName("Tmpl"), DeclRange(Header.range("partspecdecl")),
-ForCodeCompletion(false)),
- AllOf(QName("Tmpl::x"), DeclRange(Header.range("xdecl")),
-ForCodeCompletion(false;
+ EXPECT_THAT(
+ Symbols,
+ UnorderedElementsAre(
+ AllOf(QName("Tmpl"), DeclRange(Header.range()),
+ForCodeCompletion(true)),
+ AllOf(QName("Bar"), DeclRange(Header.range("barclasstemp")),
+ForCodeCompletion(true)),
+ AllOf(QName("Foo"), DeclRange(Header.range("fooclasstemp")),
+ForCodeCompletion(true)),
+ AllOf(QName("Tmpl"),
+DeclRange(Header.range("specdecl")), ForCodeCompletion(false)),
+ AllOf(QName("Tmpl"),
+DeclRange(Header.range("partspecdecl")),
+ForCodeCompletion(false)),
+ AllOf(QName("Foo, int, double>"),
+DeclRange(Header.range("templtempl")),
+ForCodeCompletion(false)),
+ AllOf(QName("Tmpl::x"), DeclRange(Header.range("xdecl")),
+ForCodeCompletion(false;
}
TEST_F(SymbolCollectorTest, ObjCSymbols) {
Index: clang-tools-extra/unittests/clangd/IndexTests.cpp
===
--- clang-tools-extra/unittests/clangd/IndexTests.cpp
+++ clang-tools-extra/unittests/clangd/IndexTests.cpp
@@ -187,35 +187,30 @@
SymbolSlab::Builder B;
Symbol S = symbol("TempSpec");
-
[PATCH] D59354: [clangd] Print arguments in template specializations
ilya-biryukov added a comment.
Mostly nits, but could you elaborate why can't we print the type-loc when
printing the template argument (see the corresponding comment)?
Comment at: clang-tools-extra/clangd/AST.cpp:66
+return Var->getTemplateArgsInfo().arguments();
+ return llvm::None;
+}
NIT: add a note that we return null for `ClassTemplateSpecializationDecl `
because we can't construct an `ArrayRef` for it
Comment at: clang-tools-extra/clangd/AST.cpp:84
+if (auto STL = TL.getAs()) {
+ std::vector ArgLocs;
+ for (unsigned I = 0; I < STL.getNumArgs(); I++)
NIT: use `SmallVector<8>` or some other small-enough number to avoid most
allocs.
Comment at: clang-tools-extra/unittests/clangd/IndexTests.cpp:18
#include "clang/Index/IndexSymbol.h"
+#include "gmock/gmock-generated-matchers.h"
#include "gmock/gmock.h"
NIT: maybe remove it? clangd keeps adding those, but I don't think we actually
want it: `gmock.h` should be enough
Comment at: clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp:417
+ForCodeCompletion(true)),
+ AllOf(QName("Tmpl"),
+DeclRange(Header.range("specdecl")), ForCodeCompletion(false)),
Does it mean typing `bool` could potentially match `vector` in
`workspaceSymbols` now?
If that's the case we might start producing some noise.
Comment at: clang/lib/AST/TypePrinter.cpp:1644
+llvm::raw_ostream ) {
+ A.getTypeSourceInfo()->getType().print(OS, PP);
+}
kadircet wrote:
> ilya-biryukov wrote:
> > Maybe print the result of `getTypeLoc()` here, if it's available?
> > Would produce results closer to the ones written in the code.
> unfortunately it is not available.
you mean the function to print a type loc or the type loc itself?
Comment at: clang/lib/AST/TypePrinter.cpp:1646
+break;
+ case TemplateArgument::ArgKind::Type:
+A.getTypeSourceInfo()->getType().print(OS, PP);
Maybe simplify the switch to:
```
if (A.getKind() == TemplateArgument::ArgKind::Type) {
A.getTypeSourceInfo()->getType().print(OS, PP);
return;
}
A.getArgument().print(PP, OS);
```
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D59354/new/
https://reviews.llvm.org/D59354
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D59354: [clangd] Print arguments in template specializations
kadircet updated this revision to Diff 190624.
kadircet added a comment.
- Get rid of debug printing
- Update tests
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D59354/new/
https://reviews.llvm.org/D59354
Files:
clang-tools-extra/clangd/AST.cpp
clang-tools-extra/clangd/index/MemIndex.cpp
clang-tools-extra/clangd/index/dex/Dex.cpp
clang-tools-extra/unittests/clangd/DexTests.cpp
clang-tools-extra/unittests/clangd/IndexTests.cpp
clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp
clang/lib/AST/TypePrinter.cpp
Index: clang/lib/AST/TypePrinter.cpp
===
--- clang/lib/AST/TypePrinter.cpp
+++ clang/lib/AST/TypePrinter.cpp
@@ -1632,6 +1632,32 @@
return A.getArgument();
}
+static void printArgument(const TemplateArgument , const PrintingPolicy ,
+ llvm::raw_ostream ) {
+ A.print(PP, OS);
+}
+
+static void printArgument(const TemplateArgumentLoc ,
+ const PrintingPolicy , llvm::raw_ostream ) {
+ switch (A.getArgument().getKind()) {
+ case TemplateArgument::ArgKind::Null:
+assert(false && "TemplateArgumentKind can not be null!");
+break;
+ case TemplateArgument::ArgKind::Type:
+A.getTypeSourceInfo()->getType().print(OS, PP);
+break;
+ case TemplateArgument::ArgKind::Declaration:
+ case TemplateArgument::ArgKind::NullPtr:
+ case TemplateArgument::ArgKind::Integral:
+ case TemplateArgument::ArgKind::Template:
+ case TemplateArgument::ArgKind::TemplateExpansion:
+ case TemplateArgument::ArgKind::Expression:
+ case TemplateArgument::ArgKind::Pack:
+A.getArgument().print(PP, OS);
+break;
+ }
+}
+
template
static void printTo(raw_ostream , ArrayRef Args,
const PrintingPolicy , bool SkipBrackets) {
@@ -1653,7 +1679,7 @@
} else {
if (!FirstArg)
OS << Comma;
- Argument.print(Policy, ArgOS);
+ printArgument(Arg, Policy, ArgOS);
}
StringRef ArgString = ArgOS.str();
Index: clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp
===
--- clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp
+++ clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp
@@ -394,23 +394,36 @@
Annotations Header(R"(
// Primary template and explicit specialization are indexed, instantiation
// is not.
-template struct [[Tmpl]] {T $xdecl[[x]] = 0;};
-template <> struct $specdecl[[Tmpl]] {};
-template struct $partspecdecl[[Tmpl]] {};
-extern template struct Tmpl;
-template struct Tmpl;
+template class $barclasstemp[[Bar]] {};
+template class Z, int Q>
+struct [[Tmpl]] { T $xdecl[[x]] = 0; };
+template <> struct $specdecl[[Tmpl]] {};
+template struct $partspecdecl[[Tmpl]] {};
+extern template struct Tmpl;
+template struct Tmpl;
+template class $fooclasstemp[[Foo]] {};
+template<> class $templtempl[[Foo]], int, double> {};
)");
runSymbolCollector(Header.code(), /*Main=*/"");
- EXPECT_THAT(Symbols,
- UnorderedElementsAre(
- AllOf(QName("Tmpl"), DeclRange(Header.range()),
-ForCodeCompletion(true)),
- AllOf(QName("Tmpl"), DeclRange(Header.range("specdecl")),
-ForCodeCompletion(false)),
- AllOf(QName("Tmpl"), DeclRange(Header.range("partspecdecl")),
-ForCodeCompletion(false)),
- AllOf(QName("Tmpl::x"), DeclRange(Header.range("xdecl")),
-ForCodeCompletion(false;
+ EXPECT_THAT(
+ Symbols,
+ UnorderedElementsAre(
+ AllOf(QName("Tmpl"), DeclRange(Header.range()),
+ForCodeCompletion(true)),
+ AllOf(QName("Bar"), DeclRange(Header.range("barclasstemp")),
+ForCodeCompletion(true)),
+ AllOf(QName("Foo"), DeclRange(Header.range("fooclasstemp")),
+ForCodeCompletion(true)),
+ AllOf(QName("Tmpl"),
+DeclRange(Header.range("specdecl")), ForCodeCompletion(false)),
+ AllOf(QName("Tmpl"),
+DeclRange(Header.range("partspecdecl")),
+ForCodeCompletion(false)),
+ AllOf(QName("Foo, int, double>"),
+DeclRange(Header.range("templtempl")),
+ForCodeCompletion(false)),
+ AllOf(QName("Tmpl::x"), DeclRange(Header.range("xdecl")),
+ForCodeCompletion(false;
}
TEST_F(SymbolCollectorTest, ObjCSymbols) {
Index: clang-tools-extra/unittests/clangd/IndexTests.cpp
===
--- clang-tools-extra/unittests/clangd/IndexTests.cpp
+++ clang-tools-extra/unittests/clangd/IndexTests.cpp
@@ -15,6 +15,7 @@
#include "index/Merge.h"
#include "index/Symbol.h"
#include "clang/Index/IndexSymbol.h"
+#include
[PATCH] D59354: [clangd] Print arguments in template specializations
kadircet added inline comments.
Comment at: clang/lib/AST/TypePrinter.cpp:1644
+llvm::raw_ostream ) {
+ A.getTypeSourceInfo()->getType().print(OS, PP);
+}
ilya-biryukov wrote:
> Maybe print the result of `getTypeLoc()` here, if it's available?
> Would produce results closer to the ones written in the code.
unfortunately it is not available.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D59354/new/
https://reviews.llvm.org/D59354
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D59354: [clangd] Print arguments in template specializations
kadircet updated this revision to Diff 190617.
kadircet marked 3 inline comments as done.
kadircet added a comment.
Herald added a subscriber: jdoerfert.
- Address comments
- Add template specializations to fuzzyFind results
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D59354/new/
https://reviews.llvm.org/D59354
Files:
clang-tools-extra/clangd/AST.cpp
clang-tools-extra/clangd/index/MemIndex.cpp
clang-tools-extra/clangd/index/dex/Dex.cpp
clang-tools-extra/unittests/clangd/DexTests.cpp
clang-tools-extra/unittests/clangd/IndexTests.cpp
clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp
clang/lib/AST/TypePrinter.cpp
Index: clang/lib/AST/TypePrinter.cpp
===
--- clang/lib/AST/TypePrinter.cpp
+++ clang/lib/AST/TypePrinter.cpp
@@ -1632,6 +1632,33 @@
return A.getArgument();
}
+static void printArgument(const TemplateArgument , const PrintingPolicy ,
+ llvm::raw_ostream ) {
+ A.print(PP, OS);
+}
+
+static void printArgument(const TemplateArgumentLoc ,
+ const PrintingPolicy , llvm::raw_ostream ) {
+ llvm::errs() << A.getArgument().getKind() << '\n';
+ switch (A.getArgument().getKind()) {
+ case TemplateArgument::ArgKind::Null:
+assert(false && "TemplateArgumentKind can not be null!");
+break;
+ case TemplateArgument::ArgKind::Type:
+A.getLocInfo().getAsTypeSourceInfo()->getType().print(OS, PP);
+break;
+ case TemplateArgument::ArgKind::Declaration:
+ case TemplateArgument::ArgKind::NullPtr:
+ case TemplateArgument::ArgKind::Integral:
+ case TemplateArgument::ArgKind::Template:
+ case TemplateArgument::ArgKind::TemplateExpansion:
+ case TemplateArgument::ArgKind::Expression:
+ case TemplateArgument::ArgKind::Pack:
+A.getArgument().print(PP, OS);
+break;
+ }
+}
+
template
static void printTo(raw_ostream , ArrayRef Args,
const PrintingPolicy , bool SkipBrackets) {
@@ -1653,7 +1680,7 @@
} else {
if (!FirstArg)
OS << Comma;
- Argument.print(Policy, ArgOS);
+ printArgument(Arg, Policy, ArgOS);
}
StringRef ArgString = ArgOS.str();
Index: clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp
===
--- clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp
+++ clang-tools-extra/unittests/clangd/SymbolCollectorTests.cpp
@@ -394,23 +394,36 @@
Annotations Header(R"(
// Primary template and explicit specialization are indexed, instantiation
// is not.
-template struct [[Tmpl]] {T $xdecl[[x]] = 0;};
-template <> struct $specdecl[[Tmpl]] {};
-template struct $partspecdecl[[Tmpl]] {};
-extern template struct Tmpl;
-template struct Tmpl;
+template class $barclasstemp[[Bar]] {};
+template class Z, int Q>
+struct [[Tmpl]] { T $xdecl[[x]] = 0; };
+template <> struct $specdecl[[Tmpl]] {};
+template struct $partspecdecl[[Tmpl]] {};
+extern template struct Tmpl;
+template struct Tmpl;
+template class $fooclasstemp[[Foo]] {};
+template<> class $templtempl[[Foo]], int, double> {};
)");
runSymbolCollector(Header.code(), /*Main=*/"");
- EXPECT_THAT(Symbols,
- UnorderedElementsAre(
- AllOf(QName("Tmpl"), DeclRange(Header.range()),
-ForCodeCompletion(true)),
- AllOf(QName("Tmpl"), DeclRange(Header.range("specdecl")),
-ForCodeCompletion(false)),
- AllOf(QName("Tmpl"), DeclRange(Header.range("partspecdecl")),
-ForCodeCompletion(false)),
- AllOf(QName("Tmpl::x"), DeclRange(Header.range("xdecl")),
-ForCodeCompletion(false;
+ EXPECT_THAT(
+ Symbols,
+ UnorderedElementsAre(
+ AllOf(QName("Tmpl"), DeclRange(Header.range()),
+ForCodeCompletion(true)),
+ AllOf(QName("Bar"), DeclRange(Header.range("barclasstemp")),
+ForCodeCompletion(true)),
+ AllOf(QName("Foo"), DeclRange(Header.range("fooclasstemp")),
+ForCodeCompletion(true)),
+ AllOf(QName("Tmpl"),
+DeclRange(Header.range("specdecl")), ForCodeCompletion(false)),
+ AllOf(QName("Tmpl"),
+DeclRange(Header.range("partspecdecl")),
+ForCodeCompletion(false)),
+ AllOf(QName("Foo, int, double>"),
+DeclRange(Header.range("templtempl")),
+ForCodeCompletion(false)),
+ AllOf(QName("Tmpl::x"), DeclRange(Header.range("xdecl")),
+ForCodeCompletion(false;
}
TEST_F(SymbolCollectorTest, ObjCSymbols) {
Index: clang-tools-extra/unittests/clangd/IndexTests.cpp
===
---
[PATCH] D59354: [clangd] Print arguments in template specializations
ilya-biryukov added inline comments.
Comment at: clang-tools-extra/clangd/AST.cpp:57
+return Func->getTemplateSpecializationArgsAsWritten()->arguments();
+ if (auto *Cls = llvm::dyn_cast())
+return Cls->getTemplateArgsAsWritten()->arguments();
For `ClassTemplateSpecializationDecl`, could we try extracting the arguments
from the result of `getTypeAsWritten`?
Comment at: clang/lib/AST/TypePrinter.cpp:1636
+static void printArgument(const TemplateArgument ,
+const PrintingPolicy ,
+llvm::raw_ostream ) {
NIT: clang-format the diff
Comment at: clang/lib/AST/TypePrinter.cpp:1644
+llvm::raw_ostream ) {
+ A.getTypeSourceInfo()->getType().print(OS, PP);
+}
Maybe print the result of `getTypeLoc()` here, if it's available?
Would produce results closer to the ones written in the code.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D59354/new/
https://reviews.llvm.org/D59354
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[PATCH] D59354: [clangd] Print arguments in template specializations
kadircet created this revision.
kadircet added a reviewer: ilya-biryukov.
Herald added subscribers: cfe-commits, arphaman, jkorous, MaskRay, ioeric.
Herald added a project: clang.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D59354
Files:
clang-tools-extra/clangd/AST.cpp
clang/lib/AST/TypePrinter.cpp
Index: clang/lib/AST/TypePrinter.cpp
===
--- clang/lib/AST/TypePrinter.cpp
+++ clang/lib/AST/TypePrinter.cpp
@@ -1632,6 +1632,18 @@
return A.getArgument();
}
+static void printArgument(const TemplateArgument ,
+const PrintingPolicy ,
+llvm::raw_ostream ) {
+ A.print(PP, OS);
+}
+
+static void printArgument(const TemplateArgumentLoc ,
+const PrintingPolicy ,
+llvm::raw_ostream ) {
+ A.getTypeSourceInfo()->getType().print(OS, PP);
+}
+
template
static void printTo(raw_ostream , ArrayRef Args,
const PrintingPolicy , bool SkipBrackets) {
@@ -1653,7 +1665,7 @@
} else {
if (!FirstArg)
OS << Comma;
- Argument.print(Policy, ArgOS);
+ printArgument(Arg, Policy, ArgOS);
}
StringRef ArgString = ArgOS.str();
Index: clang-tools-extra/clangd/AST.cpp
===
--- clang-tools-extra/clangd/AST.cpp
+++ clang-tools-extra/clangd/AST.cpp
@@ -50,6 +50,17 @@
return SM.getSpellingLoc(D->getLocation());
}
+static llvm::Optional>
+getTemplateSpecializationArgLocs(const NamedDecl ) {
+ if (auto *Func = llvm::dyn_cast())
+return Func->getTemplateSpecializationArgsAsWritten()->arguments();
+ if (auto *Cls = llvm::dyn_cast())
+return Cls->getTemplateArgsAsWritten()->arguments();
+ if (auto *Var = llvm::dyn_cast())
+return Var->getTemplateArgsInfo().arguments();
+ return llvm::None;
+}
+
std::string printQualifiedName(const NamedDecl ) {
std::string QName;
llvm::raw_string_ostream OS(QName);
@@ -60,6 +71,10 @@
// namespaces to query: the preamble doesn't have a dedicated list.
Policy.SuppressUnwrittenScope = true;
ND.printQualifiedName(OS, Policy);
+ if (auto Args = getTemplateSpecializationArgLocs(ND))
+printTemplateArgumentList(OS, *Args, Policy);
+ else if (auto *Cls = llvm::dyn_cast())
+printTemplateArgumentList(OS, Cls->getTemplateArgs().asArray(), Policy);
OS.flush();
assert(!StringRef(QName).startswith("::"));
return QName;
Index: clang/lib/AST/TypePrinter.cpp
===
--- clang/lib/AST/TypePrinter.cpp
+++ clang/lib/AST/TypePrinter.cpp
@@ -1632,6 +1632,18 @@
return A.getArgument();
}
+static void printArgument(const TemplateArgument ,
+const PrintingPolicy ,
+llvm::raw_ostream ) {
+ A.print(PP, OS);
+}
+
+static void printArgument(const TemplateArgumentLoc ,
+const PrintingPolicy ,
+llvm::raw_ostream ) {
+ A.getTypeSourceInfo()->getType().print(OS, PP);
+}
+
template
static void printTo(raw_ostream , ArrayRef Args,
const PrintingPolicy , bool SkipBrackets) {
@@ -1653,7 +1665,7 @@
} else {
if (!FirstArg)
OS << Comma;
- Argument.print(Policy, ArgOS);
+ printArgument(Arg, Policy, ArgOS);
}
StringRef ArgString = ArgOS.str();
Index: clang-tools-extra/clangd/AST.cpp
===
--- clang-tools-extra/clangd/AST.cpp
+++ clang-tools-extra/clangd/AST.cpp
@@ -50,6 +50,17 @@
return SM.getSpellingLoc(D->getLocation());
}
+static llvm::Optional>
+getTemplateSpecializationArgLocs(const NamedDecl ) {
+ if (auto *Func = llvm::dyn_cast())
+return Func->getTemplateSpecializationArgsAsWritten()->arguments();
+ if (auto *Cls = llvm::dyn_cast())
+return Cls->getTemplateArgsAsWritten()->arguments();
+ if (auto *Var = llvm::dyn_cast())
+return Var->getTemplateArgsInfo().arguments();
+ return llvm::None;
+}
+
std::string printQualifiedName(const NamedDecl ) {
std::string QName;
llvm::raw_string_ostream OS(QName);
@@ -60,6 +71,10 @@
// namespaces to query: the preamble doesn't have a dedicated list.
Policy.SuppressUnwrittenScope = true;
ND.printQualifiedName(OS, Policy);
+ if (auto Args = getTemplateSpecializationArgLocs(ND))
+printTemplateArgumentList(OS, *Args, Policy);
+ else if (auto *Cls = llvm::dyn_cast())
+printTemplateArgumentList(OS, Cls->getTemplateArgs().asArray(), Policy);
OS.flush();
assert(!StringRef(QName).startswith("::"));
return QName;
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
