[incrParse] Fix swift-syntax-test not complaining about unexpected reparsed functions

Author: ahoppen

lib/Parse/SyntaxParsingCache.cpp

@@ -116,7 +116,7 @@ llvm::Optional<Syntax> SyntaxParsingCache::lookUp(size_t NewPosition,
   size_t OldPosition = NewPosition;
   for (auto I = Edits.rbegin(), E = Edits.rend(); I != E; ++I) {
     auto Edit = *I;
-    if (Edit.End < OldPosition) {
+    if (Edit.End <= OldPosition) {
       OldPosition =
           OldPosition - Edit.ReplacementLength + Edit.originalLength();
     }

test/incrParse/reuse.swift

@@ -17,8 +17,8 @@ func start() {}
   let g: Int
 <reparse ADD_PROPERTY>}</reparse ADD_PROPERTY>
 
-
-<reparse WRAP_IN_CLASS><<WRAP_IN_CLASS<|||class Foo {>>></reparse WRAP_IN_CLASS>
+// FIXME: The functions inside the class should not need to get reparsed
+<<WRAP_IN_CLASS<|||class Foo {>>>
   func foo1() {
     print("Hello Foo!")
   }
@@ -37,4 +37,4 @@ func start() {}
     print("I can compute Pi as well:")
     bar1()
   }
-}
+}

tools/swift-syntax-test/swift-syntax-test.cpp

@@ -515,7 +515,7 @@ bool verifyReusedRegions(ByteBasedSourceRangeSet ExpectedReparseRegions,
     // about reparsed whitespaces.
     auto RangeStr =
         CharSourceRange(SourceMgr, ReparseRange.Start, ReparseRange.End).str();
-    llvm::Regex WhitespaceOnlyRegex("^\\s*$", llvm::Regex::Newline);
+    llvm::Regex WhitespaceOnlyRegex("^[ \t\r\n]*$");
     if (WhitespaceOnlyRegex.match(RangeStr)) {
       continue;
     }