Merge pull request #4237 from benlangmuir/fixits-swift3

[fixcode] Enable ( as AnyObject) and protocol<...> fixits

Author: tkremenek

lib/FrontendTool/FrontendTool.cpp

@@ -635,7 +635,11 @@ class JSONFixitWriter : public DiagnosticConsumer {
         Info.ID == diag::selector_construction_suggest.ID ||
         Info.ID == diag::selector_literal_deprecated_suggest.ID ||
         Info.ID == diag::attr_noescape_deprecated.ID ||
-        Info.ID == diag::attr_autoclosure_escaping_deprecated.ID)
+        Info.ID == diag::attr_autoclosure_escaping_deprecated.ID ||
+        Info.ID == diag::any_as_anyobject_fixit.ID ||
+        Info.ID == diag::deprecated_protocol_composition.ID ||
+        Info.ID == diag::deprecated_protocol_composition_single.ID ||
+        Info.ID == diag::deprecated_any_composition.ID)
       return true;
 
     return false;

test/FixCode/fixits-apply.swift

@@ -226,3 +226,13 @@ enum E {
   case abc
 }
 func testEnumRename() { _ = E.Abc }
+
+func testAnyToAnyObject(x: Any) {
+  x.instMeth(p: 1)
+}
+
+func testProtocolCompositionSyntax() {
+  var _: protocol<>
+  var _: protocol<Prot1>
+  var _: protocol<Prot1, Prot2>
+}

test/FixCode/fixits-apply.swift.result

@@ -229,3 +229,13 @@ enum E {
   case abc
 }
 func testEnumRename() { _ = E.Abc }
+
+func testAnyToAnyObject(x: Any) {
+  (x as AnyObject).instMeth(p: 1)
+}
+
+func testProtocolCompositionSyntax() {
+  var _: Any
+  var _: Prot1
+  var _: Prot1 & Prot2
+}