Skip to content

Commit f208886

Browse files
committed
[Experiment] Drop null input type check
1 parent 1beb755 commit f208886

File tree

1 file changed

+11
-19
lines changed

1 file changed

+11
-19
lines changed

tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1461,26 +1461,18 @@ class PlaceholderExpansionScanner {
14611461
bool walkToTypeReprPre(TypeRepr *T) override {
14621462
if (auto *FTR = dyn_cast<FunctionTypeRepr>(T)) {
14631463
FoundFunctionTypeRepr = true;
1464-
if (auto *TTR = FTR->getArgsTypeRepr()) {
1465-
for (auto &ArgElt : TTR->getElements()) {
1466-
CharSourceRange NR;
1467-
CharSourceRange TR;
1468-
auto name = ArgElt.Name;
1469-
if (!name.empty()) {
1470-
NR = CharSourceRange(ArgElt.NameLoc,
1471-
name.getLength());
1472-
}
1473-
SourceLoc SRE = Lexer::getLocForEndOfToken(SM,
1474-
ArgElt.Type->getEndLoc());
1475-
TR = CharSourceRange(SM, ArgElt.Type->getStartLoc(), SRE);
1476-
Info.Params.emplace_back(NR, TR);
1477-
}
1478-
} else if (FTR->getArgsTypeRepr()) {
1464+
for (auto &ArgElt : FTR->getArgsTypeRepr()->getElements()) {
1465+
CharSourceRange NR;
14791466
CharSourceRange TR;
1480-
TR = CharSourceRange(SM, FTR->getArgsTypeRepr()->getStartLoc(),
1481-
Lexer::getLocForEndOfToken(SM,
1482-
FTR->getArgsTypeRepr()->getEndLoc()));
1483-
Info.Params.emplace_back(CharSourceRange(), TR);
1467+
auto name = ArgElt.Name;
1468+
if (!name.empty()) {
1469+
NR = CharSourceRange(ArgElt.NameLoc,
1470+
name.getLength());
1471+
}
1472+
SourceLoc SRE = Lexer::getLocForEndOfToken(SM,
1473+
ArgElt.Type->getEndLoc());
1474+
TR = CharSourceRange(SM, ArgElt.Type->getStartLoc(), SRE);
1475+
Info.Params.emplace_back(NR, TR);
14841476
}
14851477
if (auto *RTR = FTR->getResultTypeRepr()) {
14861478
SourceLoc SRE = Lexer::getLocForEndOfToken(SM, RTR->getEndLoc());

0 commit comments

Comments
 (0)