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

[syntax-coloring|test] Update test cases for new behaviour and address review comments

Browse Source
This commit is contained in:
Nathan Hawes
2017-07-11 12:10:53 -07:00
parent f64a19bbbe
commit c0ee62be93
3 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp
View File

@@ -287,7 +287,7 @@ struct SwiftSyntaxToken {
struct SwiftSyntaxMap {
std::vector<SwiftSyntaxToken> Tokens;
SwiftSyntaxMap(unsigned Capacity = 0) {
explicit SwiftSyntaxMap(unsigned Capacity = 0) {
if (Capacity)
Tokens.reserve(Capacity);
}
@@ -304,6 +304,7 @@ struct SwiftSyntaxMap {
return;
}
auto &LastTok = Tokens.back();
assert(LastTok.Offset <= Token.Offset);
mergeSplitRanges(LastTok.Offset, LastTok.Length, Token.Offset, Token.Length,
[&](unsigned BeforeOff, unsigned BeforeLen,
unsigned AfterOff, unsigned AfterLen) {
@@ -346,13 +347,22 @@ struct SwiftSyntaxMap {
++Token;
}
// Completely after - shift
while (Token != Tokens.end()) {
Token->Offset += NewLen - Len; // Completely after - shift
if (NewLen >= Len) {
Token->Offset += NewLen - Len;
} else {
Token->Offset -= Len - NewLen;
}
++Token;
}
// Adjust the AffectedEnd to its position in the NewText
AffectedEnd += NewLen - Len;
if (NewLen >= Len) {
AffectedEnd += NewLen - Len;
} else {
AffectedEnd -= Len - NewLen;
}
// Return the Affected range in NewText
return {AffectedStart, AffectedEnd - AffectedStart};
@@ -366,13 +376,13 @@ struct SwiftSyntaxMap {
}
}
/// Finds the delta between the given SwiftSyntaxMap, Prev, and this one.
/// It passes each token not in Prev to the given EditorConsumer and also
/// expands the given Affected range (if needed) to include all non-matching
/// tokens in the two lists.
/// Finds the delta between the given SwiftSyntaxMap, \p Prev, and this one.
/// It passes each token not in \p Prev to the given EditorConsumer and also
/// expands the given \p Affected range (if needed) to include all
/// non-matching tokens in the two lists.
///
/// Returns true if this SwiftSyntaxMap is different to Prev.
bool forEachChanged(SwiftSyntaxMap &Prev,
/// Returns true if this SwiftSyntaxMap is different to \p Prev.
bool forEachChanged(const SwiftSyntaxMap &Prev,
SwiftEditorCharRange &Affected,
EditorConsumer &Consumer) const {
unsigned AffectedStart = Affected.Offset, AffectedEnd = Affected.endOffset();