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] Drop split preposition if the first parameter is defaulted.

Browse Source
This commit is contained in:
Doug Gregor
2016-02-08 15:45:40 -08:00
parent 891ab087be
commit d03d831e1e
2 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/Basic/StringExtras.cpp
View File

@@ -876,19 +876,35 @@ static bool splitBaseNameAfterLastPreposition(StringRef &baseName,
wordConflictsAfterPreposition(*std::prev(nameWordRevIter), preposition))
return false;
// If the preposition is "with" and the base name starts with a
// verb, assume "with" is a separator and remove it.
if (endOfBaseName > 4 &&
camel_case::sameWordIgnoreFirstCase(preposition, "with") &&
!wordPairsWithWith(*std::next(nameWordRevIter)) &&
getPartOfSpeech(camel_case::getFirstWord(baseName)) == PartOfSpeech::Verb)
endOfBaseName -= 4;
// Determine whether we should drop the preposition.
bool dropPreposition = false;
// If the first parameter has a default, drop the preposition.
if (paramType.hasDefaultArgument()) {
dropPreposition = true;
// If the preposition is "with" and the base name starts with a
// verb, assume "with" is a separator and remove it.
} else if (endOfBaseName > 4 &&
camel_case::sameWordIgnoreFirstCase(preposition, "with") &&
!wordPairsWithWith(*std::next(nameWordRevIter)) &&
getPartOfSpeech(camel_case::getFirstWord(baseName))
== PartOfSpeech::Verb) {
dropPreposition = true;
// If the preposition is "using" and the parameter is a function or
// block, assume "using" is a separator and remove it.
if (endOfBaseName > 5 && paramType.isFunction() &&
camel_case::sameWordIgnoreFirstCase(preposition, "using"))
endOfBaseName -= 5;
} else if (endOfBaseName > 5 && paramType.isFunction() &&
camel_case::sameWordIgnoreFirstCase(preposition, "using")) {
dropPreposition = true;
}
// If we're supposed to drop the preposition, do so.
if (dropPreposition) {
endOfBaseName -= preposition.size();
if (endOfBaseName == 0) return false;
}
// If the base name is vacuous and there are two or fewer words in
// the base name, don't split.