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

[Omit needless words] After "by", recognize gerunds more liberally.

Browse Source
This commit is contained in:
Doug Gregor
2016-02-12 16:13:38 -08:00
parent 46b7d549e5
commit bc18e4521b
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Basic/StringExtras.cpp
View File

@@ -508,7 +508,7 @@ static StringRef omitNeedlessWordsFromPrefix(StringRef name,
if (firstWord == "By") {
StringRef nextWord = camel_case::getFirstWord(
newName.substr(firstWord.size()));
if (getPartOfSpeech(nextWord) == PartOfSpeech::Gerund) {
if (nextWord.endswith("ing")) {
return toLowercaseWord(newName.substr(firstWord.size()), scratch);
}
}
@@ -913,6 +913,11 @@ static bool priorWordExtendsPreposition(StringRef preceding,
camel_case::sameWordIgnoreFirstCase(preposition, "matching"))
return true;
// according to
if (camel_case::sameWordIgnoreFirstCase(preceding, "according") &&
camel_case::sameWordIgnoreFirstCase(preposition, "to"))
return true;
return false;
}