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] Re-enable checkSourceRangeBeforeAddingChild

Browse Source 
Update the logic to correctly handle replacement ranges, and re-enable
the assertion. For now, carve out an exception for attributes on
extensions, I'll try and tackle those in a follow-up.
This commit is contained in:
Hamish Knight
2025-03-27 11:31:24 +00:00
parent 801079bd94
commit 1980f7235f
4 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/AST/ASTScopeSourceRange.cpp
View File

@@ -39,16 +39,15 @@ using namespace ast_scope;
static SourceLoc getLocAfterExtendedNominal(const ExtensionDecl *);
/// Retrieve the character-based source range for the given source range.
static SourceRange getCharSourceRange(
SourceManager &sourceMgr, SourceRange range
){
range.End = Lexer::getLocForEndOfToken(sourceMgr, range.End);
return range;
}
void ASTScopeImpl::checkSourceRangeBeforeAddingChild(ASTScopeImpl *child,
const ASTContext &ctx) const {
// Ignore attributes on extensions, currently they exist outside of the
// extension's source range due to the way we've setup the scope for
// extension binding.
// FIXME: We ought to fix the source range for extension scopes.
if (isa<ExtensionScope>(this) && child->isDeclAttribute())
return;
// Ignore debugger bindings - they're a special mix of user code and implicit
// wrapper code that is too difficult to check for consistency.
if (auto d = getDeclIfAny().getPtrOrNull())
@@ -60,14 +59,14 @@ void ASTScopeImpl::checkSourceRangeBeforeAddingChild(ASTScopeImpl *child,
auto range = getCharSourceRangeOfScope(sourceMgr);
std::function<bool(SourceRange)> containedInParent;
containedInParent = [&](SourceRange childCharRange) {
auto containedInParent = [&](SourceRange childCharRange) {
// HACK: For code completion. Handle replaced range.
// Note that the replaced SourceRanges here are already disguised
// CharSourceRanges, we don't need to adjust them. We use `rangeContains`
// since we're only interested in comparing within a single buffer.
for (const auto &pair : sourceMgr.getReplacedRanges()) {
auto originalRange = getCharSourceRange(sourceMgr, pair.first);
auto newRange = getCharSourceRange(sourceMgr, pair.second);
if (sourceMgr.encloses(range, originalRange) &&
sourceMgr.encloses(newRange, childCharRange))
if (sourceMgr.rangeContains(range, pair.first) &&
sourceMgr.rangeContains(pair.second, childCharRange))
return true;
}