Merge pull request #72550 from fummicc1/diagnostics-init-msg-improvement

[AST] Improve diagnostic message about `constructor` expression

Author: rintaro

include/swift/AST/DiagnosticsSema.def

@@ -4669,7 +4669,7 @@ ERROR(value_of_module_type,none,
       "expected module member name after module name", ())
 
 ERROR(value_of_metatype_type,none,
-      "expected member name or constructor call after type name%select{|; this "
+      "expected member name or initializer call after type name%select{|; this "
       "will be an error in Swift 6}0", (bool))
 
 NOTE(add_parens_to_type,none,
@@ -6516,9 +6516,9 @@ ERROR(dynamic_replacement_replaced_not_objc_dynamic, none,
 ERROR(dynamic_replacement_replacement_not_objc_dynamic, none,
       "%0 is marked @objc dynamic", (DeclName))
 ERROR(dynamic_replacement_replaced_constructor_is_convenience, none,
-      "replaced constructor %0 is marked as convenience", (DeclNameRef))
+      "replaced initializer %0 is marked as convenience", (DeclNameRef))
 ERROR(dynamic_replacement_replaced_constructor_is_not_convenience, none,
-      "replaced constructor %0 is not marked as convenience", (DeclNameRef))
+      "replaced initializer %0 is not marked as convenience", (DeclNameRef))
 
 //------------------------------------------------------------------------------
 // MARK: @_typeEraser()

test/Constraints/dynamic_lookup.swift

@@ -454,11 +454,11 @@ func test_dynamic_subscript_accepts_type_name_argument() {
   }
 
   func test(a: AnyObject, optA: AnyObject?) {
-    let _ = a[A] // expected-warning {{expected member name or constructor call after type name; this will be an error in Swift 6}}
+    let _ = a[A] // expected-warning {{expected member name or initializer call after type name; this will be an error in Swift 6}}
     // expected-note@-1 {{add arguments after the type to construct a value of the type}} {{16-16=()}}
     // expected-note@-2 {{use '.self' to reference the type object}} {{16-16=.self}}
 
-    let _ = optA?[A] // expected-warning {{expected member name or constructor call after type name; this will be an error in Swift 6}}
+    let _ = optA?[A] // expected-warning {{expected member name or initializer call after type name; this will be an error in Swift 6}}
     // expected-note@-1 {{add arguments after the type to construct a value of the type}} {{20-20=()}}
     // expected-note@-2 {{use '.self' to reference the type object}} {{20-20=.self}}
   }

test/Constraints/dynamic_lookup_swift6.swift

@@ -13,11 +13,11 @@ func test_dynamic_subscript_accepts_type_name_argument() {
   }
 
   func test(a: AnyObject, optA: AnyObject?) {
-    let _ = a[A] // expected-error {{expected member name or constructor call after type name}}
+    let _ = a[A] // expected-error {{expected member name or initializer call after type name}}
     // expected-note@-1 {{add arguments after the type to construct a value of the type}} {{16-16=()}}
     // expected-note@-2 {{use '.self' to reference the type object}} {{16-16=.self}}
 
-    let _ = optA?[A] // expected-error {{expected member name or constructor call after type name}}
+    let _ = optA?[A] // expected-error {{expected member name or initializer call after type name}}
     // expected-note@-1 {{add arguments after the type to construct a value of the type}} {{20-20=()}}
     // expected-note@-2 {{use '.self' to reference the type object}} {{20-20=.self}}
   }

test/Constraints/members.swift

@@ -617,7 +617,7 @@ func rdar50679161() {
 
     _ = { () -> Void in
       var foo = S
-      // expected-error@-1 {{expected member name or constructor call after type name}}
+      // expected-error@-1 {{expected member name or initializer call after type name}}
       // expected-note@-2 {{add arguments after the type to construct a value of the type}}
       // expected-note@-3 {{use '.self' to reference the type object}}
       print(foo)

test/Constraints/metatypes.swift

@@ -15,11 +15,11 @@ let test5 : S.Type = S.self
 let test6 : AnyClass = S.self // expected-error {{cannot convert value of type 'S.Type' to specified type 'AnyClass' (aka 'any AnyObject.Type')}}
 
 func acceptMeta<T>(_ meta: T.Type) { }
-acceptMeta(A) // expected-error {{expected member name or constructor call after type name}}
+acceptMeta(A) // expected-error {{expected member name or initializer call after type name}}
 // expected-note@-1 {{add arguments after the type to construct a value of the type}}
 // expected-note@-2 {{use '.self' to reference the type object}}
 
-acceptMeta((A) -> Void) // expected-error {{expected member name or constructor call after type name}}
+acceptMeta((A) -> Void) // expected-error {{expected member name or initializer call after type name}}
 // expected-note@-1 {{use '.self' to reference the type object}}
 
 func id<T>(_ x: T.Type) -> T.Type { x }

test/Constraints/result_builder_diags.swift

@@ -313,9 +313,9 @@ func acceptMetatype<T>(_: T.Type) -> Bool { true }
 
 func syntacticUses<T>(_: T) {
   tuplify(true) { x in
-    if x && acceptMetatype(T) { // expected-error{{expected member name or constructor call after type name}}
+    if x && acceptMetatype(T) { // expected-error{{expected member name or initializer call after type name}}
       // expected-note@-1{{use '.self' to reference the type object}}
-      acceptMetatype(T) // expected-error{{expected member name or constructor call after type name}}
+      acceptMetatype(T) // expected-error{{expected member name or initializer call after type name}}
       // expected-note@-1{{use '.self' to reference the type object}}
     }
   }

test/Constraints/subscript.swift

@@ -229,11 +229,11 @@ func test_subscript_accepts_type_name_argument() {
   }
 
   func test(a: A, optA: A?) {
-    let _ = a[A] // expected-warning {{expected member name or constructor call after type name; this will be an error in Swift 6}}
+    let _ = a[A] // expected-warning {{expected member name or initializer call after type name; this will be an error in Swift 6}}
     // expected-note@-1 {{add arguments after the type to construct a value of the type}} {{16-16=()}}
     // expected-note@-2 {{use '.self' to reference the type object}} {{16-16=.self}}
 
-    let _ = optA?[A] // expected-warning {{expected member name or constructor call after type name; this will be an error in Swift 6}}
+    let _ = optA?[A] // expected-warning {{expected member name or initializer call after type name; this will be an error in Swift 6}}
     // expected-note@-1 {{add arguments after the type to construct a value of the type}} {{20-20=()}}
     // expected-note@-2 {{use '.self' to reference the type object}} {{20-20=.self}}
   }

test/Constraints/subscript_swift6.swift

@@ -7,11 +7,11 @@ func test_subscript_accepts_type_name_argument() {
   }
 
   func test(a: A, optA: A?) {
-    let _ = a[A] // expected-error {{expected member name or constructor call after type name}}
+    let _ = a[A] // expected-error {{expected member name or initializer call after type name}}
     // expected-note@-1 {{add arguments after the type to construct a value of the type}} {{16-16=()}}
     // expected-note@-2 {{use '.self' to reference the type object}} {{16-16=.self}}
 
-    let _ = optA?[A] // expected-error {{expected member name or constructor call after type name}}
+    let _ = optA?[A] // expected-error {{expected member name or initializer call after type name}}
     // expected-note@-1 {{add arguments after the type to construct a value of the type}} {{20-20=()}}
     // expected-note@-2 {{use '.self' to reference the type object}} {{20-20=.self}}
   }