[Omit needless words] The preposition "of" binds to the word preceding it.

Author: DougGregor

lib/Basic/StringExtras.cpp

@@ -830,10 +830,6 @@ static bool wordConflictsBeforePreposition(StringRef word,
       camel_case::sameWordIgnoreFirstCase(word, "compatible"))
     return true;
 
-  if (camel_case::sameWordIgnoreFirstCase(preposition, "of") &&
-      camel_case::sameWordIgnoreFirstCase(word, "kind"))
-    return true;
-
   return false;
 }
 
@@ -877,6 +873,10 @@ static bool shouldPlacePrepositionOnArgLabel(StringRef beforePreposition,
       afterPreposition == "Z")
     return false;
 
+  // The preposition "of" binds tightly to the left word.
+  if (camel_case::sameWordIgnoreFirstCase(preposition, "of"))
+    return false;
+
   return true;
 }
 

test/IDE/Inputs/custom-modules/OmitNeedlessWords.h

@@ -11,5 +11,7 @@
 -(void)saveToURL:(nonnull NSURL *)url forSaveOperation:(NSInteger)operation;
 -(void)indexWithItemNamed:(nonnull NSString *)name;
 -(void)methodAndReturnError:(NSError **)error;
+-(nullable Class)typeOfString:(nonnull NSString *)string;
+-(nullable Class)typeOfNamedString:(nonnull NSString *)string;
 -(void)appendWithContentsOfString:(nonnull NSString *)string;
 @end

test/IDE/print_omit_needless_words.swift

@@ -35,7 +35,7 @@
 // CHECK-FOUNDATION: func makeObjectsPerform(_: Selector, with: AnyObject?, with: AnyObject?)
 
 // Note: id -> "Object".
-// CHECK-FOUNDATION: func index(of _: AnyObject) -> Int
+// CHECK-FOUNDATION: func indexOf(_: AnyObject) -> Int
 
 // Note: Class -> "Class"
 // CHECK-OBJECTIVEC: func isKindOf(aClass: AnyClass) -> Bool
@@ -277,6 +277,10 @@
 // CHECK-OMIT-NEEDLESS-WORDS: func index(withItemNamed _: String)
 // CHECK-OMIT-NEEDLESS-WORDS: func methodAndReturnError(_: AutoreleasingUnsafeMutablePointer<Error?>)
 
+// "Of" associates left.
+// CHECK-OMIT-NEEDLESS-WORDS: func typeOf(_: String)
+// CHECK-OMIT-NEEDLESS-WORDS: func typeOf(namedString _: String)
+
 // Look for preposition prior to "of".
 // CHECK-OMIT-NEEDLESS-WORDS: func append(contentsOf _: String)