averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

ASTScope: Fix SourceFileScope source range

Browse Source 
A SourceFile might contain TopLevelCodeDecls with guard statements,
which introduce names until the end of the file, so plumb that
through.
This commit is contained in:
Slava Pestov
2020-10-06 00:55:12 -04:00
parent dac68ca047
commit b8cccb1ef8
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/AST/ASTScopeCreation.cpp
View File

@@ -994,10 +994,8 @@ ASTSourceFileScope::expandAScopeThatCreatesANewInsertionPoint(
ScopeCreator &scopeCreator) {
ASTScopeAssert(SF, "Must already have a SourceFile.");
ArrayRef<Decl *> decls = SF->getTopLevelDecls();
// Assume that decls are only added at the end, in source order
Optional<SourceLoc> endLoc = None;
if (!decls.empty())
endLoc = decls.back()->getEndLoc();
SourceLoc endLoc = getSourceRangeOfThisASTNode().End;
std::vector<ASTNode> newNodes(decls.begin(), decls.end());
insertionPoint =