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

[Omit needless words] "No" conflicts after "With".

Browse Source
This commit is contained in:
Doug Gregor
2016-02-08 16:31:52 -08:00
parent 98a2f24a4f
commit 32b0c8c4a8
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Basic/StringExtras.cpp
View File

@@ -818,9 +818,11 @@ static bool wordConflictsBeforePreposition(StringRef word,
/// splitting.
static bool wordConflictsAfterPreposition(StringRef word,
StringRef preposition) {
if (camel_case::sameWordIgnoreFirstCase(word, "error") &&
camel_case::sameWordIgnoreFirstCase(preposition, "with"))
return true;
if (camel_case::sameWordIgnoreFirstCase(preposition, "with")) {
if (camel_case::sameWordIgnoreFirstCase(word, "error") ||
camel_case::sameWordIgnoreFirstCase(word, "no"))
return true;
}
if (camel_case::sameWordIgnoreFirstCase(word, "visible") &&
camel_case::sameWordIgnoreFirstCase(preposition, "to"))