Merge pull request swiftlang#17075 from k-enomoto/SR-7844-error-message-for-a-subscript-without-accessors

Fix error message for a subscript without accessors says "computed property"

Author: rintaro

include/swift/AST/DiagnosticsParse.def

@@ -248,7 +248,7 @@ ERROR(static_var_decl_global_scope,none,
       "%select{%error|static properties|class properties}0 may only be declared on a type",
       (StaticSpellingKind))
 ERROR(computed_property_no_accessors, none,
-      "computed property must have accessors specified", ())
+      "%select{computed property|subscript}0 must have accessors specified", (bool))
 ERROR(expected_getset_in_protocol,none,
       "expected get or set in a protocol property", ())
 ERROR(computed_property_missing_type,none,

lib/Parse/ParseDecl.cpp

@@ -4158,7 +4158,7 @@ bool Parser::parseGetSetImpl(ParseDeclOptions Flags,
     // Give syntax node an empty statement list.
     SyntaxParsingContext StmtListContext(SyntaxContext,
                                          SyntaxKind::CodeBlockItemList);
-    diagnose(Tok, diag::computed_property_no_accessors);
+    diagnose(Tok, diag::computed_property_no_accessors, /*subscript*/Indices != nullptr);
     return true;
   }
 

test/decl/subscript/subscripting.swift

@@ -172,7 +172,7 @@ struct RetOverloadedSubscript {
 
 struct MissingGetterSubscript1 {
   subscript (i : Int) -> Int {
-  } // expected-error {{computed property must have accessors specified}}
+  } // expected-error {{subscript must have accessors specified}}
 }
 struct MissingGetterSubscript2 {
   subscript (i : Int, j : Int) -> Int { // expected-error{{subscript declarations must have a getter}}