[tests] Adjusting diagnostic wording

Author: LucianoPAlmeida

include/swift/AST/DiagnosticsSema.def

@@ -72,10 +72,10 @@ ERROR(could_not_find_value_dynamic_member,none,
       "value of type %0 has no dynamic member %2 using key path from root type %1",
       (Type, Type, DeclNameRef))
 ERROR(cannot_infer_contextual_keypath_type_specify_root,none,
-      "cannot infer key path type from context; consider explicitly adding a root type", ())
+      "cannot infer key path type from context; consider explicitly specifying a root type", ())
 ERROR(cannot_infer_keypath_root_anykeypath_context,none,
      "'AnyKeyPath' does not provide enough context for root type to be inferred; "
-     "consider explicitly adding a root type", ())
+     "consider explicitly specifying a root type", ())
 
 ERROR(could_not_find_type_member,none,
       "type %0 has no member %1", (Type, DeclNameRef))

lib/Sema/CSFix.h

@@ -1809,7 +1809,7 @@ class AllowCoercionToForceCast final : public ContextualMismatch {
 ///   bar[keyPath: keyPath]
 /// }
 /// \endcode
-class AllowKeyPathRootTypeMismatch : public ContextualMismatch {
+class AllowKeyPathRootTypeMismatch final : public ContextualMismatch {
 protected:
   AllowKeyPathRootTypeMismatch(ConstraintSystem &cs, Type lhs, Type rhs,
                                ConstraintLocator *locator)
@@ -1827,7 +1827,7 @@ class AllowKeyPathRootTypeMismatch : public ContextualMismatch {
   create(ConstraintSystem &cs, Type lhs, Type rhs, ConstraintLocator *locator);
 };
 
-class SpecifyKeyPathRootType : public ConstraintFix {
+class SpecifyKeyPathRootType final : public ConstraintFix {
     SpecifyKeyPathRootType(ConstraintSystem &cs, ConstraintLocator *locator)
         : ConstraintFix(cs, FixKind::SpecifyKeyPathRootType, locator) {}
 

test/expr/unary/keypath/keypath.swift

@@ -195,9 +195,9 @@ func testKeyPath(sub: Sub, optSub: OptSub,
 
   let _: AnyKeyPath = \A.property
   let _: AnyKeyPath = \C<A>.value
-  let _: AnyKeyPath = \.property // expected-error {{'AnyKeyPath' does not provide enough context for root type to be inferred; consider explicitly adding a root type}} {{24-24=<#Root#>}}
+  let _: AnyKeyPath = \.property // expected-error {{'AnyKeyPath' does not provide enough context for root type to be inferred; consider explicitly specifying a root type}} {{24-24=<#Root#>}}
   let _: AnyKeyPath = \C.value // expected-error{{generic parameter 'T' could not be inferred}}
-  let _: AnyKeyPath = \.value // expected-error {{'AnyKeyPath' does not provide enough context for root type to be inferred; consider explicitly adding a root type}} {{24-24=<#Root#>}}
+  let _: AnyKeyPath = \.value // expected-error {{'AnyKeyPath' does not provide enough context for root type to be inferred; consider explicitly specifying a root type}} {{24-24=<#Root#>}}
 
   let _ = \Prop.[nonHashableSub] // expected-error{{subscript index of type 'NonHashableSub' in a key path must be Hashable}}
   let _ = \Prop.[sub, sub]
@@ -894,12 +894,12 @@ struct SR_12290 {
 }
 
 func testKeyPathHole() {
-  _ = \.x // expected-error {{cannot infer key path type from context; consider explicitly adding a root type}} {{8-8=<#Root#>}}
+  _ = \.x // expected-error {{cannot infer key path type from context; consider explicitly specifying a root type}} {{8-8=<#Root#>}}
   let _ : AnyKeyPath = \.x 
-  // expected-error@-1 {{'AnyKeyPath' does not provide enough context for root type to be inferred; consider explicitly adding a root type}} {{25-25=<#Root#>}}
+  // expected-error@-1 {{'AnyKeyPath' does not provide enough context for root type to be inferred; consider explicitly specifying a root type}} {{25-25=<#Root#>}}
 
   func f(_ i: Int) {}
-  f(\.x) // expected-error {{cannot infer key path type from context; consider explicitly adding a root type}} {{6-6=<#Root#>}}
+  f(\.x) // expected-error {{cannot infer key path type from context; consider explicitly specifying a root type}} {{6-6=<#Root#>}}
 }
 
 func testSyntaxErrors() { // expected-note{{}}