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

[incrParse] Allow whitespaces to be reparsed in test

Browse Source 
This greatly improves the ergonomics of writing tests and outweighs the
ability to test which whitespaces get parsed since their parsing
overhead should be minimal.
This commit is contained in:
Alex Hoppen
2018-05-08 09:44:13 -07:00
parent 9bdc54a29c
commit c31a880a47
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/incrParse/simple.swift
View File

@@ -10,9 +10,9 @@
// RUN: %incparse-test %s --test-case MULTI_EDIT_SAME_LINE
func foo() {
}<reparse REPLACE>
}
_ = <<REPLACE<6|||7>>></reparse REPLACE>
<reparse REPLACE>_ = <<REPLACE<6|||7>>></reparse REPLACE>
_ = <<REPLACE_BY_LONGER<6|||"Hello World">>>
_ = <<REPLACE_BY_SHORTER<"Hello again"|||"a">>>
<<INSERT<|||foo()>>>

12
tools/swift-syntax-test/swift-syntax-test.cpp
View File

@@ -509,9 +509,19 @@ bool verifyReusedRegions(ByteBasedSourceRangeSet ExpectedReparseRegions,
bool NoUnexpectedParse = true;
for (auto ReparseRegion : UnexpectedReparseRegions.Ranges) {
NoUnexpectedParse = false;
auto ReparseRange = ReparseRegion.toSourceRange(SourceMgr, BufferID);
// To improve the ergonomics when writing tests we do not want to complain
// about reparsed whitespaces.
auto RangeStr =
CharSourceRange(SourceMgr, ReparseRange.Start, ReparseRange.End).str();
llvm::Regex WhitespaceOnlyRegex("^\\s*$", llvm::Regex::Newline);
if (WhitespaceOnlyRegex.match(RangeStr)) {
continue;
}
NoUnexpectedParse = false;
llvm::errs() << "\nERROR: Unexpectedly reparsed following region:\n";
ReparseRange.print(llvm::errs(), SourceMgr);
}