Merge pull request swiftlang#1520 from dduan/SR-852

[Parser][Qol] improve diagnostic with missing "self." in init

Author: dduan

include/swift/AST/DiagnosticsParse.def

@@ -346,6 +346,8 @@ ERROR(subscript_static,none,
       "subscript cannot be marked %0", (StaticSpellingKind))
 
 // initializer
+ERROR(invalid_nested_init,none,
+      "missing '%select{super.|self.}0' at initializer invocation", (bool))
 ERROR(initializer_decl_wrong_scope,none,
       "initializers may only be declared within a type", ())
 ERROR(expected_lparen_initializer,PointsToFirstBadToken,

lib/Parse/ParseDecl.cpp

@@ -1741,6 +1741,11 @@ static bool isParenthesizedUnowned(Parser &P) {
 bool Parser::isStartOfDecl() {
   // If this is obviously not the start of a decl, then we're done.
   if (!isKeywordPossibleDeclStart(Tok)) return false;
+
+  // 'init' invocation is not start of a declaration
+  if (Tok.is(tok::kw_init)) {
+    return !isa<ConstructorDecl>(CurDeclContext);
+  }
 
   // The protocol keyword needs more checking to reject "protocol<Int>".
   if (Tok.is(tok::kw_protocol)) {

lib/Parse/ParseStmt.cpp

@@ -410,22 +410,32 @@ ParserStatus Parser::parseBraceItems(SmallVectorImpl<ASTNode> &Entries,
       }
     } else {
       SourceLoc StartLoc = Tok.getLoc();
-      ParserStatus ExprOrStmtStatus = parseExprOrStmt(Result);
-      BraceItemsStatus |= ExprOrStmtStatus;
-      if (ExprOrStmtStatus.isError())
-        NeedParseErrorRecovery = true;
-      diagnoseDiscardedClosure(*this, Result);
-      if (ExprOrStmtStatus.isSuccess() && IsTopLevel) {
-        // If this is a normal library, you can't have expressions or statements
-        // outside at the top level.
-        diagnose(StartLoc,
-                 Result.is<Stmt*>() ? diag::illegal_top_level_stmt
-                                    : diag::illegal_top_level_expr);
-        Result = ASTNode();
-      }
+      if (Tok.is(tok::kw_init)) {
+        if (auto CD = dyn_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.");
+          NeedParseErrorRecovery = true;
+        }
+      } else {
+        ParserStatus ExprOrStmtStatus = parseExprOrStmt(Result);
+        BraceItemsStatus |= ExprOrStmtStatus;
+        if (ExprOrStmtStatus.isError())
+          NeedParseErrorRecovery = true;
+        diagnoseDiscardedClosure(*this, Result);
+        if (ExprOrStmtStatus.isSuccess() && IsTopLevel) {
+          // If this is a normal library, you can't have expressions or
+          // statements outside at the top level.
+          diagnose(StartLoc,
+                   Result.is<Stmt*>() ? diag::illegal_top_level_stmt
+                                      : diag::illegal_top_level_expr);
+          Result = ASTNode();
+        }
 
-      if (!Result.isNull())
-        Entries.push_back(Result);
+        if (!Result.isNull())
+          Entries.push_back(Result);
+      }
     }
 
     if (!NeedParseErrorRecovery && !PreviousHadSemi && Tok.is(tok::semi)) {

test/Parse/init_deinit.swift

@@ -100,3 +100,14 @@ func barFunc() {
   } ()
 }
 
+// SR-852
+class Aaron {
+  init(x: Int) {}
+  convenience init() { init(x: 1) } // expected-error {{missing 'self.' at initializer invocation}}
+}
+
+class Theodosia: Aaron {
+  init() {
+    init(x: 2) // expected-error {{missing 'super.' at initializer invocation}}
+  }
+}