Merge pull request #4243 from jrose-apple/swift-3-where-oh-where-has-my-composition-gone

[Parse] Fix fix-it for old-style 'where' clauses. (#4198)

Author: tkremenek

lib/Parse/ParseGeneric.cpp

@@ -183,17 +183,7 @@ Parser::diagnoseWhereClauseInGenericParamList(const GenericParamList *
   // as written all the way to the right angle bracket (">")
   auto LastGenericParam = GenericParams->getParams().back();
   auto EndOfLastGenericParam =
-  Lexer::getLocForEndOfToken(SourceMgr,
-                             LastGenericParam->getLoc());
-
-  // If the generic parameter list has inherited requirements attached
-  // directly to the parameters themselves, leave them in place.
-  auto InheritedGenericConstraints = LastGenericParam->getInherited();
-  if (!InheritedGenericConstraints.empty()) {
-    EndOfLastGenericParam =
-    Lexer::getLocForEndOfToken(SourceMgr,
-                               InheritedGenericConstraints.back().getLoc());
-  }
+      Lexer::getLocForEndOfToken(SourceMgr, LastGenericParam->getEndLoc());
 
   CharSourceRange RemoveWhereRange { SourceMgr,
     EndOfLastGenericParam,
@@ -218,17 +208,14 @@ Parser::diagnoseWhereClauseInGenericParamList(const GenericParamList *
 
   auto Diag = diagnose(WhereRangeInsideBrackets.Start,
                        diag::where_inside_brackets);
+  Diag.fixItRemoveChars(RemoveWhereRange.getStart(),
+                        RemoveWhereRange.getEnd());
 
   if (Tok.is(tok::kw_where)) {
-    Diag.fixItRemoveChars(RemoveWhereRange.getStart(),
-                          RemoveWhereRange.getEnd())
-      .fixItReplace(Tok.getLoc(),
-                    WhereClauseText.str());
+    Diag.fixItReplace(Tok.getLoc(), WhereClauseText.str());
   } else {
-    Diag.fixItRemoveChars(RemoveWhereRange.getStart(),
-                          RemoveWhereRange.getEnd())
-      .fixItInsert(Lexer::getLocForEndOfToken(SourceMgr, PreviousLoc),
-                   WhereClauseText.str());
+    Diag.fixItInsert(Lexer::getLocForEndOfToken(SourceMgr, PreviousLoc),
+                     WhereClauseText.str());
   }
 }
 

test/Parse/deprecated_where.swift

@@ -64,3 +64,16 @@ struct S23<T where T: Comparable> where T: Equatable {} // expected-warning {{'w
 // 1,2,3
 struct S123<T: Hashable where T: Comparable> where T: Equatable {} // expected-warning {{'where' clause next to generic parameters is deprecated and will be removed in the future version of Swift}} {{24-44=}} {{46-51=where T: Comparable,}}
 
+
+protocol ProtoA {}
+protocol ProtoB {}
+protocol ProtoC {}
+protocol ProtoD {}
+func testCombinedConstraints<T: ProtoA & ProtoB where T: ProtoC>(x: T) {} // expected-warning {{'where' clause next to generic parameters is deprecated and will be removed in the future version of Swift}} {{48-64=}} {{71-71= where T: ProtoC}}
+func testCombinedConstraints<T: ProtoA & ProtoB where T: ProtoC>(x: T) where T: ProtoD {} // expected-warning {{'where' clause next to generic parameters is deprecated and will be removed in the future version of Swift}} {{48-64=}} {{72-77=where T: ProtoC,}}
+
+func testCombinedConstraintsOld<T: protocol<ProtoA, ProtoB> where T: ProtoC>(x: T) {} // expected-warning {{'where' clause next to generic parameters is deprecated and will be removed in the future version of Swift}} {{60-76=}} {{83-83= where T: ProtoC}}
+// expected-warning@-1 {{'protocol<...>' composition syntax is deprecated}}
+func testCombinedConstraintsOld<T: protocol<ProtoA, ProtoB> where T: ProtoC>(x: T) where T: ProtoD {} // expected-warning {{'where' clause next to generic parameters is deprecated and will be removed in the future version of Swift}} {{60-76=}} {{84-89=where T: ProtoC,}}
+// expected-warning@-1 {{'protocol<...>' composition syntax is deprecated}}
+