Merge pull request #2434 from milseman/coregraphics

[CoreGraphics Renaming] Overhaul CG apinotes

Author: milseman

apinotes/CoreGraphics.apinotes

@@ -89,7 +89,7 @@ IAMOptions IAMOptions::getDefault() { return {}; }
 // As append, but skip a repeated word at the boundary. First-letter-case
 // insensitive.
 // Example: appendUniq("FooBar", "barBaz") ==> "FooBarBaz"
-void appendUniq(NameBuffer &src, StringRef toAppend) {
+static void appendUniq(NameBuffer &src, StringRef toAppend) {
   if (src.empty()) {
     src = toAppend;
     return;
@@ -103,7 +103,7 @@ void appendUniq(NameBuffer &src, StringRef toAppend) {
   src.append(wI.getRestOfStr());
 }
 
-StringRef skipLeadingUnderscores(StringRef str) {
+static StringRef skipLeadingUnderscores(StringRef str) {
   while (!str.empty() && str.startswith("_"))
     str = str.drop_front(1);
   return str;
@@ -221,14 +221,31 @@ class IAMInference {
                                 EffectiveClangContext effectiveDC) {
     ++SuccessImportAsConstructor;
     NameBuffer buf;
+    StringRef prefix = buf;
     if (name != initSpecifier) {
       assert(name.size() > initSpecifier.size() &&
              "should have more words in it");
-      auto didDrop = dropWordUniq(name, initSpecifier, buf);
+      bool didDrop = dropWordUniq(name, initSpecifier, buf);
       (void)didDrop;
+      prefix = buf;
+
+      // Skip "with"
+      auto prefixWords = camel_case::getWords(prefix);
+      if (prefixWords.begin() != prefixWords.end() &&
+          (*prefixWords.begin() == "With" || *prefixWords.begin() == "with")) {
+        prefix = prefix.drop_front(4);
+      }
+
+      // Skip "CF" or "NS"
+      prefixWords = camel_case::getWords(prefix);
+      if (prefixWords.begin() != prefixWords.end() &&
+          (*prefixWords.begin() == "CF" || *prefixWords.begin() == "NS")) {
+        prefix = prefix.drop_front(2);
+      }
+
       assert(didDrop != 0 && "specifier not present?");
     }
-    return {formDeclName("init", params, buf), effectiveDC};
+    return {formDeclName("init", params, prefix), effectiveDC};
   }
 
   // Instance computed property

lib/ClangImporter/IAMInference.cpp

@@ -83,7 +83,7 @@ let mine = IAMStruct1()
 // PRINT-NEXT:  }
 // PRINT-NEXT:  extension IAMMutableStruct1 {
 // PRINT-NEXT:    init(with withIAMStruct1: IAMStruct1)
-// PRINT-NEXT:    init(withURL url: UnsafePointer<Int8>!)
+// PRINT-NEXT:    init(url url: UnsafePointer<Int8>!)
 // PRINT-NEXT:    func doSomething()
 // PRINT-NEXT:  }
 //
@@ -93,7 +93,7 @@ let mine = IAMStruct1()
 // PRINT-NEXT:    init(x x: Double)
 // PRINT-NEXT:  }
 // PRINT-NEXT:  extension TDStruct {
-// PRINT-NEXT:    init(with Float: Float)
+// PRINT-NEXT:    init(float Float: Float)
 // PRINT-NEXT:  }
 //
 // PRINT-LABEL: /// Class

test/IDE/infer_import_as_member.swift

@@ -22,10 +22,10 @@ func hangCanary(_ o: AnyObject) {
 
 class FooLayer: CALayer {
   var black: CGColor
-  var white: CGColor = CGColor.constantColorForName(CGColor.white)!
+  var white: CGColor = CGColor.constantColor(for: CGColor.white)!
 
   override init() {
-    black = CGColor.constantColorForName(CGColor.black)!
+    black = CGColor.constantColor(for: CGColor.black)!
     super.init()
     hangCanary(self)
   }

test/Interpreter/SDK/CALayer.swift

@@ -7,11 +7,11 @@ import CoreGraphics
 
 class Colors {
 	// TODO: when issue is fixed, migrate these to CGColor class properties
-	static var black = CGColor.constantColorForName(CGColor.black)!
-	static var white = CGColor.constantColorForName(CGColor.white)!
+	static var black = CGColor.constantColor(for: CGColor.black)!
+	static var white = CGColor.constantColor(for: CGColor.white)!
 
 	// FIXME: this triggers an assert in SILVerifier
-	static var clear = CGColor.constantColorForName(CGColor.clear)!
+	static var clear = CGColor.constantColor(for: CGColor.clear)!
 
 	class func printColors() {
 		print("Colors") // CHECK: Colors

test/Interpreter/SDK/CGImportAsMember.swift

@@ -23,7 +23,7 @@ typealias XXColor = UIColor
 //
 
 let rgb = CGColorSpaceCreateDeviceRGB()
-let cgRed = CGColor(withColorSpace: rgb, components: [1.0, 0.0, 0.0, 1.0])!
+let cgRed = CGColor(colorSpace: rgb, components: [1.0, 0.0, 0.0, 1.0])!
 
 let nsRed = XXColor(cgColor: cgRed)
 

test/Interpreter/SDK/c_pointers.swift

@@ -22,7 +22,7 @@ extension CGColorSpace {
 extension CGColor {
   class func create(colorSpace colorSpace: CGColorSpace, components: [CGFloat])
       -> CGColor {
-    return CGColor(withColorSpace: colorSpace, components: components)!
+    return CGColor(colorSpace: colorSpace, components: components)!
   }
 
   var r: CGFloat { return components![0] }

test/Interpreter/SDK/cf_extensions.swift

@@ -11,7 +11,7 @@ import UIKit
 #endif
 
 let foo: [CGColor] =
-  [CGColor(withColorSpace: CGColorSpaceCreateDeviceRGB(),
+  [CGColor(colorSpace: CGColorSpaceCreateDeviceRGB(),
 	         components: [1.0, 0.0, 0.0, 1.0])!]
 
 let bar = foo as NSArray