Skip to content

Commit 0a94992

Browse files
collect template argument locs ahead of time to null-check
rdar://140592475
1 parent 25f4f0a commit 0a94992

File tree

2 files changed

+34
-1
lines changed

2 files changed

+34
-1
lines changed

clang/lib/ExtractAPI/DeclarationFragments.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1225,6 +1225,10 @@ DeclarationFragments
12251225
DeclarationFragmentsBuilder::getFragmentsForClassTemplateSpecialization(
12261226
const ClassTemplateSpecializationDecl *Decl) {
12271227
DeclarationFragments Fragments;
1228+
std::optional<ArrayRef<TemplateArgumentLoc>> TemplateArgumentLocs = {};
1229+
if (auto *TemplateArgs = Decl->getTemplateArgsAsWritten()) {
1230+
TemplateArgumentLocs = TemplateArgs->arguments();
1231+
}
12281232
return Fragments
12291233
.append("template", DeclarationFragments::FragmentKind::Keyword)
12301234
.appendSpace()
@@ -1237,7 +1241,7 @@ DeclarationFragmentsBuilder::getFragmentsForClassTemplateSpecialization(
12371241
.append("<", DeclarationFragments::FragmentKind::Text)
12381242
.append(getFragmentsForTemplateArguments(
12391243
Decl->getTemplateArgs().asArray(), Decl->getASTContext(),
1240-
Decl->getTemplateArgsAsWritten()->arguments()))
1244+
TemplateArgumentLocs))
12411245
.append(">", DeclarationFragments::FragmentKind::Text)
12421246
.appendSemicolon();
12431247
}
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// Test is line- and column-sensitive. Run lines are below
2+
3+
template <typename T>
4+
class basic_vector {
5+
public:
6+
T x;
7+
T y;
8+
};
9+
10+
using my_vec = basic_vector<int>;
11+
12+
class MyClass {
13+
my_vec myVec;
14+
};
15+
16+
// RUN: c-index-test -single-symbol-sgf-at=%s:13:7 local %s | FileCheck --check-prefix=CHECK-VEC-TYPE %s
17+
// CHECK-VEC-TYPE: "parentContexts":[{"kind":"c++.typealias","name":"my_vec","usr":"c:@my_vec"}]
18+
// CHECK-VEC-TYPE: "declarationFragments":[{"kind":"keyword","spelling":"typedef"},{"kind":"text","spelling":" "},{"kind":"typeIdentifier","preciseIdentifier":"c:@ST>1#T@basic_vector","spelling":"basic_vector"},{"kind":"text","spelling":"<"},{"kind":"typeIdentifier","preciseIdentifier":"c:I","spelling":"int"},{"kind":"text","spelling":"> "},{"kind":"identifier","spelling":"my_vec"},{"kind":"text","spelling":";"}]
19+
// CHECK-VEC-TYPE: "identifier":{"interfaceLanguage":"c++","precise":"c:@my_vec"}
20+
// CHECK-VEC-TYPE: "kind":{"displayName":"Type Alias","identifier":"c++.typealias"}
21+
// CHECK-VEC-TYPE: "title":"my_vec"
22+
// CHECK-VEC-TYPE: "pathComponents":["my_vec"]
23+
24+
// RUN: c-index-test -single-symbol-sgf-at=%s:13:13 local %s | FileCheck --check-prefix=CHECK-MYVEC %s
25+
// CHECK-MYVEC: "parentContexts":[{"kind":"c++.class","name":"MyClass","usr":"c:@S@MyClass"},{"kind":"c++.property","name":"myVec","usr":"c:@S@MyClass@FI@myVec"}]
26+
// CHECK-MYVEC: "identifier":{"interfaceLanguage":"c++","precise":"c:@S@MyClass@FI@myVec"}
27+
// CHECK-MYVEC: "kind":{"displayName":"Instance Property","identifier":"c++.property"}
28+
// CHECK-MYVEC: "title":"myVec"
29+
// CHECK-MYVEC: "pathComponents":["MyClass","myVec"]

0 commit comments

Comments
 (0)