making improvements requested in code review

Author: dancamarotto

include/swift/AST/DiagnosticsSema.def

@@ -1058,9 +1058,7 @@ NOTE(single_confusable_character,none,
 ERROR(cannot_find_type_in_scope,none,
       "cannot find type %0 in scope", (DeclNameRef))
 ERROR(cannot_find_type_in_cast_expression,none,
-      "type-casting operator expects a type on its right-hand side (got: %0)", (const ValueDecl *))
-NOTE(note_declared_here,none,
-      "declared here",())
+      "type-casting operator expects a type on its right-hand side (got: %kind0)", (const ValueDecl *))
 ERROR(cannot_find_type_in_scope_did_you_mean,none,
       "cannot find type %0 in scope; did you mean to use '%1'?", (DeclNameRef, StringRef))
 NOTE(note_typo_candidate_implicit_member,none,

lib/Sema/TypeCheckType.cpp

@@ -1391,7 +1391,7 @@ static Type diagnoseUnknownType(TypeResolution resolution,
         auto first = lookupResult.front().getValueDecl();
         diags.diagnose(L, diag::cannot_find_type_in_cast_expression, first)
           .highlight(R);
-        diags.diagnose(first->getNameLoc(), diag::note_declared_here);
+        diags.diagnose(first, diag::decl_declared_here, first);
         return ErrorType::get(ctx);
       }
     }

test/Constraints/casts.swift

@@ -746,11 +746,11 @@ do {
 do {
   func x(a: Any) {
     _ = a is a
-    // expected-error@-1 {{type-casting operator expects a type on its right-hand side (got: 'a')}}
-    // expected-note@-3 {{declared here}}
+    // expected-error@-1 {{type-casting operator expects a type on its right-hand side (got: parameter 'a')}}
+    // expected-note@-3 {{'a' declared here}}
     _ = a as a
-    // expected-error@-1 {{type-casting operator expects a type on its right-hand side (got: 'a')}}
-    // expected-note@-6 {{declared here}}
+    // expected-error@-1 {{type-casting operator expects a type on its right-hand side (got: parameter 'a')}}
+    // expected-note@-6 {{'a' declared here}}
     _ = a is Issue68825 // expected-error {{cannot find type 'Issue68825' in scope}}
     _ = a is String // OK
   }

test/Parse/omit_return.swift

@@ -1710,8 +1710,8 @@ class CImplicitIdentityExpr { func gimme() -> CImplicitIdentityExpr { self } }
 class CImplicitDotSelfExpr { func gimme() -> CImplicitDotSelfExpr { self.self } }
 
 func badIs<T>(_ value: Any, anInstanceOf type: T.Type) -> Bool {
-    value is type // expected-error {{type-casting operator expects a type on its right-hand side (got: 'type')}}
-    // expected-note@-2 {{declared here}}
+    value is type // expected-error {{type-casting operator expects a type on its right-hand side (got: parameter 'type')}}
+    // expected-note@-2 {{'type' declared here}}
 }
 
 

test/Parse/omit_return_fail.swift

@@ -1,8 +1,8 @@
 // RUN: %target-swift-frontend %s -typecheck -verify
 
 func badIs<T>(_ value: Any, anInstanceOf type: T.Type) -> Bool {
-    value is type // expected-error {{type-casting operator expects a type on its right-hand side (got: 'type')}}
-    // expected-note@-2 {{declared here}}
+    value is type // expected-error {{type-casting operator expects a type on its right-hand side (got: parameter 'type')}}
+    // expected-note@-2 {{'type' declared here}}
 }
 
 func foo() -> Int {
@@ -11,8 +11,8 @@ func foo() -> Int {
 
 func badIs_ifdecl<T>(_ value: Any, anInstanceOf type: T.Type) -> Bool {
     #if true
-    value is type // expected-error {{type-casting operator expects a type on its right-hand side (got: 'type')}}
-    // expected-note@-3 {{declared here}}
+    value is type // expected-error {{type-casting operator expects a type on its right-hand side (got: parameter 'type')}}
+    // expected-note@-3 {{'type' declared here}}
     #endif
 }
 

test/Parse/omit_return_ifdecl.swift

@@ -2432,8 +2432,8 @@ class CImplicitDotSelfExpr { func gimme() -> CImplicitDotSelfExpr { self.self }
 
 func badIs<T>(_ value: Any, anInstanceOf type: T.Type) -> Bool {
     #if true
-    value is type // expected-error {{type-casting operator expects a type on its right-hand side (got: 'type')}}
-    // expected-note@-3 {{declared here}}
+    value is type // expected-error {{type-casting operator expects a type on its right-hand side (got: parameter 'type')}}
+    // expected-note@-3 {{'type' declared here}}
     #endif
 }