[Diagnostics] Tailor using diagnostic to current use-case - default isolation

Author: xedin

include/swift/AST/DiagnosticsParse.def

@@ -2191,8 +2191,8 @@ ERROR(nonisolated_nonsending_repeated,none,
 // MARK: using @<attribute> or using <identifier>
 //------------------------------------------------------------------------------
 ERROR(using_decl_invalid_specifier,PointsToFirstBadToken,
-      "'using' declaration does not support %0 %select{modifier|attribute}1",
-      (Identifier, bool))
+      "default isolation can only be set to '@MainActor' or 'nonisolated'",
+      ())
 
 #define UNDEFINE_DIAGNOSTIC_MACROS
 #include "DefineDiagnosticMacros.h"

lib/Parse/ParseDecl.cpp

@@ -6677,10 +6677,9 @@ ParserResult<UsingDecl> Parser::parseDeclUsing(ParseDeclOptions Flags,
     return makeParserCodeCompletionStatus();
   }
 
-  SourceLoc AtLoc;
   // @<<attribute>>
   if (Tok.is(tok::at_sign))
-    AtLoc = consumeToken();
+    consumeToken();
 
   SourceLoc SpecifierLoc;
   Identifier RawSpecifier;
@@ -6697,8 +6696,7 @@ ParserResult<UsingDecl> Parser::parseDeclUsing(ParseDeclOptions Flags,
           .Default(std::nullopt);
 
   if (!Specifier) {
-    diagnose(SpecifierLoc, diag::using_decl_invalid_specifier, RawSpecifier,
-             AtLoc.isValid());
+    diagnose(SpecifierLoc, diag::using_decl_invalid_specifier);
     return nullptr;
   }
 

test/Parse/using.swift

@@ -8,8 +8,8 @@ using @MainActor
 using nonisolated
 // expected-error@-1 {{invalid redeclaration of file-level default actor isolation}}
 
-using @Test // expected-error {{'using' declaration does not support 'Test' attribute}}
-using test // expected-error {{'using' declaration does not support 'test' modifier}}
+using @Test // expected-error {{default isolation can only be set to '@MainActor' or 'nonisolated'}}
+using test // expected-error {{default isolation can only be set to '@MainActor' or 'nonisolated'}}
 
 do {
   using // expected-warning {{expression of type 'Int' is unused}}