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

[incParse] Make the SytnaxParsingCache operate on the leading trivia's start

Browse Source
This commit is contained in:
Alex Hoppen
2018-05-04 13:58:55 -07:00
parent d9fd523897
commit 8c9e2e07ec
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Parse/SyntaxParsingCache.cpp
View File

@@ -17,13 +17,13 @@ using namespace swift::syntax;
bool SyntaxParsingCache::nodeCanBeReused(const Syntax &Node, size_t Position,
SyntaxKind Kind) const {
if (Node.getAbsolutePosition().getOffset() != Position)
auto NodeStart = Node.getAbsolutePositionWithLeadingTrivia().getOffset();
if (NodeStart != Position)
return false;
if (Node.getKind() != Kind)
return false;
// Check if this node has been edited. If it has, we cannot reuse it.
auto NodeStart = Node.getAbsolutePosition().getOffset();
auto NodeEnd = NodeStart + Node.getTextLength();
for (auto Edit : Edits) {
if (Edit.intersectsOrTouchesRange(NodeStart, NodeEnd)) {
@@ -49,7 +49,7 @@ llvm::Optional<Syntax> SyntaxParsingCache::lookUpFrom(const Syntax &Node,
if (!Child.hasValue()) {
continue;
}
auto ChildStart = Child->getAbsolutePosition().getOffset();
auto ChildStart = Child->getAbsolutePositionWithLeadingTrivia().getOffset();
auto ChildEnd = ChildStart + Child->getTextLength();
if (ChildStart <= Position && Position < ChildEnd) {
return lookUpFrom(Child.getValue(), Position, Kind);
@@ -73,12 +73,8 @@ llvm::Optional<Syntax> SyntaxParsingCache::lookUp(size_t NewPosition,
auto Node = lookUpFrom(OldSyntaxTree, OldPosition, Kind);
if (Node.hasValue()) {
if (RecordReuseInformation) {
auto LeadingTrivia =
Node->getAbsolutePosition().getOffset() -
Node->getAbsolutePositionWithLeadingTrivia().getOffset();
auto Start = NewPosition - LeadingTrivia;
auto End = Start + Node->getTextLength();
ReusedRanges.push_back({Start, End});
ReusedRanges.push_back(
{NewPosition, NewPosition + Node->getTextLength()});
}
}
return Node;