Merge pull request #3741 from rintaro/sr-2080-fixit-initializer-delegation

[SR-2080][Parse] Improve fix-it for initializer delegation

Author: DougGregor

lib/Parse/ParseStmt.cpp

@@ -412,9 +412,9 @@ ParserStatus Parser::parseBraceItems(SmallVectorImpl<ASTNode> &Entries,
       SourceLoc StartLoc = Tok.getLoc();
       auto CD = cast<ConstructorDecl>(CurDeclContext);
       // Hint at missing 'self.' or 'super.' then skip this statement.
-      bool isConvenient = CD->isConvenienceInit();
-      diagnose(StartLoc, diag::invalid_nested_init, isConvenient)
-        .fixItInsert(StartLoc, isConvenient ? "self." : "super.");
+      bool isSelf = !CD->isDesignatedInit() || !isa<ClassDecl>(CD->getParent());
+      diagnose(StartLoc, diag::invalid_nested_init, isSelf)
+        .fixItInsert(StartLoc, isSelf ? "self." : "super.");
       NeedParseErrorRecovery = true;
     } else {
       ParserStatus ExprOrStmtStatus = parseExprOrStmt(Result);

test/Parse/init_deinit.swift

@@ -103,11 +103,21 @@ func barFunc() {
 // SR-852
 class Aaron {
   init(x: Int) {}
-  convenience init() { init(x: 1) } // expected-error {{missing 'self.' at initializer invocation}}
+  convenience init() { init(x: 1) } // expected-error {{missing 'self.' at initializer invocation}} {{24-24=self.}}
 }
 
 class Theodosia: Aaron {
   init() {
-    init(x: 2) // expected-error {{missing 'super.' at initializer invocation}}
+    init(x: 2) // expected-error {{missing 'super.' at initializer invocation}} {{5-5=super.}}
   }
 }
+
+struct AaronStruct {
+  init(x: Int) {}
+  init() { init(x: 1) } // expected-error {{missing 'self.' at initializer invocation}} {{12-12=self.}}
+}
+
+enum AaronEnum: Int {
+  case A = 1
+  init(x: Int) { init(rawValue: x)! } // expected-error {{missing 'self.' at initializer invocation}} {{18-18=self.}}
+}