[Omit needless words] More broadly recognize collection types

Author: DougGregor

lib/ClangImporter/ImportType.cpp

@@ -1496,9 +1496,9 @@ static bool isObjCMethodResultAudited(const clang::Decl *decl) {
           decl->hasAttr<clang::ObjCReturnsInnerPointerAttr>());
 }
 
-/// Determine whether this is the name of an Objective-C collection
-/// with a single element type.
-static bool isObjCCollectionName(StringRef typeName) {
+/// Determine whether this is the name of a collection with a single
+/// element type.
+static bool isCollectionName(StringRef typeName) {
   auto lastWord = camel_case::getLastWord(typeName);
   return lastWord == "Array" || lastWord == "Set";
 }
@@ -1555,12 +1555,31 @@ OmissionTypeName ClangImporter::Implementation::getClangTypeNameForOmission(
       if (name == "NSInteger" || name == "NSUInteger" || name == "CGFloat")
         return name;
 
+      // If it's a collection name and of pointer type, call it an
+      // array of the pointee type.
+      if (isCollectionName(name)) {
+        if (auto ptrType = type->getAs<clang::PointerType>()) {
+          return OmissionTypeName(
+                   name, None, 
+                 getClangTypeNameForOmission(ctx, ptrType->getPointeeType())
+                   .Name);
+        }
+      }
+
       // Otherwise, desugar one level...
       lastTypedefName = name;
       type = typedefType->getDecl()->getUnderlyingType();
       continue;
     }
 
+    // For array types, convert the element type and treat this an as array.
+    if (auto arrayType = dyn_cast<clang::ArrayType>(typePtr)) {
+      return OmissionTypeName(
+               "Array", None, 
+               getClangTypeNameForOmission(ctx, arrayType->getElementType())
+                 .Name);
+    }
+
     // Look through reference types.
     if (auto refType = dyn_cast<clang::ReferenceType>(typePtr)) {
       type = refType->getPointeeTypeAsWritten();
@@ -1594,9 +1613,18 @@ OmissionTypeName ClangImporter::Implementation::getClangTypeNameForOmission(
     if (objcClass) {
       // If this isn't the name of an Objective-C collection, we're done.
       auto className = objcClass->getName();
-      if (!isObjCCollectionName(className))
+      if (!isCollectionName(className))
         return className;
 
+      // If we don't have type parameters, use the prefix of the type
+      // name as the collection element type.
+      if (objcClass && !objcClass->getTypeParamList()) {
+        unsigned lastWordSize = camel_case::getLastWord(className).size();
+        StringRef elementName =
+          className.substr(0, className.size() - lastWordSize);
+        return OmissionTypeName(className, None, elementName);
+      }
+
       // If we don't have type arguments, the collection element type
       // is "Object".
       auto typeArgs = objcObjectPtr->getTypeArgs();
@@ -1803,7 +1831,8 @@ bool ClangImporter::Implementation::omitNeedlessWordsInFunctionName(
           SwiftContext.getIdentifier(baseName), numParams,
           argumentName, isLastParameter) != DefaultArgumentKind::None;
 
-    paramTypes.push_back(getClangTypeNameForOmission(clangCtx, param->getType())
+    paramTypes.push_back(getClangTypeNameForOmission(clangCtx,
+                                                     param->getOriginalType())
                             .withDefaultArgument(hasDefaultArg));
   }
 

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

@@ -1,5 +1,8 @@
 @import Foundation;
 
+@interface SEGreebieArray : NSObject
+@end
+
 @interface OmitNeedlessWords : NSObject
 -(void)jumpToUrl:(nonnull NSURL *)url;
 -(BOOL)objectIsCompatibleWithObject:(nonnull id)other;
@@ -20,4 +23,7 @@
 -(void)isCompatibleWithString:(nonnull NSString *)string;
 -(void)addObjectValue:(nonnull id)object;
 -(nonnull OmitNeedlessWords *)wordsBySlobbering:(nonnull NSString *)string;
+-(void)drawPolygonWithPoints:(const NSPoint[])points count:(NSInteger)count;
+-(void)drawFilledPolygonWithPoints:(NSPointArray)points count:(NSInteger)count;
+-(void)drawGreebies:(nonnull SEGreebieArray*)greebies;
 @end

test/IDE/print_omit_needless_words.swift

@@ -298,5 +298,14 @@
 
 // CHECK-OMIT-NEEDLESS-WORDS: func slobbering(_: String) -> OmitNeedlessWords
 
+// Elements of C array types
+// CHECK-OMIT-NEEDLESS-WORDS: func drawPolygon(_: UnsafePointer<Point>, count: Int)
+
+// Typedef ending in "Array".
+// CHECK-OMIT-NEEDLESS-WORDS: func drawFilledPolygon(_: PointArray, count: Int)
+
+// Non-parameterized Objective-C class ending in "Array".
+// CHECK-OMIT-NEEDLESS-WORDS: func draw(_: SEGreebieArray)
+
 // Don't drop the 'error'.
 // CHECK-ERRORS: func tryAndReturnError(_: ()) throws

test/Inputs/clang-importer-sdk/usr/include/Foundation.h

@@ -264,7 +264,7 @@ BOOL BOOLtoBOOL(BOOL b);
 typedef CGPoint NSPoint;
 typedef CGSize NSSize;
 typedef CGRect NSRect;
-
+typedef NSPoint *NSPointArray;
 
 @interface BadCollection
 - (id)objectForKeyedSubscript:(id)key;