Add a fix-it and rephrase some warning messages.

Author: dingobye

include/swift/AST/DiagnosticsParse.def

@@ -1328,19 +1328,19 @@ ERROR(attr_availability_expected_equal,none,
 ERROR(attr_availability_expected_version,none,
       "expected version number in '%0' attribute", (StringRef))
 
-WARNING(attr_availability_swift_platform_expected_option,none,
-      "expected '%0' option with a version number for swift platform, "
-      "such as 'introduced', 'deprecated', or 'obsoleted'", (StringRef))
-WARNING(attr_availability_swift_platform_deprecated,none,
-      "'deprecated' must have a version number for swift platform in '%0' "
-      "attribute", (StringRef))
-WARNING(attr_availability_swift_platform_infeasible,none,
-      "argument '%0' is infeasible for swift platform in '%1' attribute",
+WARNING(attr_availability_swift_expected_option,none,
+      "expected 'introduced', 'deprecated', or 'obsoleted' in '%0' attribute "
+      "for platform 'swift'", (StringRef))
+WARNING(attr_availability_swift_expected_deprecated_version,none,
+      "expected version number with 'deprecated' in '%0' attribute for "
+      "platform 'swift'", (StringRef))
+WARNING(attr_availability_swift_infeasible_option,none,
+      "'%0' cannot be used in '%1' attribute for platform 'swift'",
       (StringRef, StringRef))
 
 WARNING(attr_availability_nonspecific_platform_unexpected_version,none,
-      "unexpected version number for non-specific platform '*' in '%0' "
-      "attribute", (StringRef))
+      "unexpected version number in '%0' attribute for non-specific platform "
+      "'*'", (StringRef))
 
 // autoclosure
 ERROR(attr_autoclosure_expected_r_paren,PointsToFirstBadToken,

lib/Parse/ParseDecl.cpp

@@ -315,11 +315,19 @@ ParserResult<AvailableAttr> Parser::parseExtendedAvailabilitySpecList(
     return true;
   };
 
+  struct VersionArg {
+    llvm::VersionTuple Version;
+    SourceRange Range;
+    SourceLoc DelimiterLoc;
+    bool empty() const {
+      return Version.empty();
+    }
+  };
+
   StringRef Platform = Tok.getText();
 
   StringRef Message, Renamed;
-  llvm::VersionTuple Introduced, Deprecated, Obsoleted;
-  SourceRange IntroducedRange, DeprecatedRange, ObsoletedRange;
+  VersionArg Introduced, Deprecated, Obsoleted;
   auto PlatformAgnostic = PlatformAgnosticAvailabilityKind::None;
 
   SyntaxParsingContext AvailabilitySpecContext(
@@ -443,7 +451,9 @@ ParserResult<AvailableAttr> Parser::parseExtendedAvailabilitySpecList(
     case IsIntroduced:
     case IsObsoleted: {
       // Items with version arguments.
+      SourceLoc DelimiterLoc;
       if (findAttrValueDelimiter()) {
+        DelimiterLoc = Tok.getLoc();
         consumeToken();
       } else {
         diagnose(Tok, diag::attr_availability_expected_equal, AttrName,
@@ -454,24 +464,19 @@ ParserResult<AvailableAttr> Parser::parseExtendedAvailabilitySpecList(
         break;
       }
 
-      auto &VersionArg =
+      auto &VerArg =
           (ArgumentKind == IsIntroduced)
               ? Introduced
               : (ArgumentKind == IsDeprecated) ? Deprecated : Obsoleted;
 
-      auto &VersionRange = (ArgumentKind == IsIntroduced)
-                               ? IntroducedRange
-                               : (ArgumentKind == IsDeprecated)
-                                     ? DeprecatedRange
-                                     : ObsoletedRange;
-
       if (parseVersionTuple(
-              VersionArg, VersionRange,
+              VerArg.Version, VerArg.Range,
               Diagnostic(diag::attr_availability_expected_version, AttrName))) {
         AnyArgumentInvalid = true;
         if (peekToken().isAny(tok::r_paren, tok::comma))
           consumeToken();
       }
+      VerArg.DelimiterLoc = DelimiterLoc;
 
       SyntaxContext->createNodeInPlace(SyntaxKind::AvailabilityLabeledArgument);
 
@@ -514,22 +519,19 @@ ParserResult<AvailableAttr> Parser::parseExtendedAvailabilitySpecList(
   if (!PlatformKind.hasValue() && Platform == "swift") {
     if (PlatformAgnostic == PlatformAgnosticAvailabilityKind::Deprecated) {
       diagnose(AttrLoc,
-               diag::attr_availability_swift_platform_deprecated,
+               diag::attr_availability_swift_expected_deprecated_version,
                AttrName);
       return nullptr;
     }
     if (PlatformAgnostic == PlatformAgnosticAvailabilityKind::Unavailable) {
-      diagnose(AttrLoc,
-               diag::attr_availability_swift_platform_infeasible,
-               "unavailable",
-               AttrName);
+      diagnose(AttrLoc, diag::attr_availability_swift_infeasible_option,
+               "unavailable", AttrName);
       return nullptr;
     }
     assert(PlatformAgnostic == PlatformAgnosticAvailabilityKind::None);
 
     if (!SomeVersion) {
-      diagnose(AttrLoc,
-               diag::attr_availability_swift_platform_expected_option,
+      diagnose(AttrLoc, diag::attr_availability_swift_expected_option,
                AttrName);
       return nullptr;
     }
@@ -547,21 +549,30 @@ ParserResult<AvailableAttr> Parser::parseExtendedAvailabilitySpecList(
     return nullptr;
   }
 
-  // Warn if any version is specified for non-specific '*' platforms.
+  // Warn if any version is specified for non-specific platform '*'.
   if (Platform == "*" && SomeVersion) {
-    diagnose(AttrLoc,
-             diag::attr_availability_nonspecific_platform_unexpected_version,
-             AttrName);
+    auto diag = diagnose(AttrLoc,
+        diag::attr_availability_nonspecific_platform_unexpected_version,
+        AttrName);
+    if (!Introduced.empty())
+      diag.fixItRemove(SourceRange(Introduced.DelimiterLoc,
+                                   Introduced.Range.End));
+    if (!Deprecated.empty())
+      diag.fixItRemove(SourceRange(Deprecated.DelimiterLoc,
+                                   Deprecated.Range.End));
+    if (!Obsoleted.empty())
+      diag.fixItRemove(SourceRange(Obsoleted.DelimiterLoc,
+                                   Obsoleted.Range.End));
     return nullptr;
   }
 
   auto Attr = new (Context)
   AvailableAttr(AtLoc, SourceRange(AttrLoc, Tok.getLoc()),
                 PlatformKind.getValue(),
                 Message, Renamed,
-                Introduced, IntroducedRange,
-                Deprecated, DeprecatedRange,
-                Obsoleted, ObsoletedRange,
+                Introduced.Version, Introduced.Range,
+                Deprecated.Version, Deprecated.Range,
+                Obsoleted.Version, Obsoleted.Range,
                 PlatformAgnostic,
                 /*Implicit=*/false);
   return makeParserResult(Attr);

test/Parse/diagnose_availability.swift

@@ -31,30 +31,34 @@ func twoShorthandsFollowedByDeprecated() {}
 // SR-8598: Missing/wrong warning message for '*' or 'swift' platform.
 
 @available(*, deprecated: 4.2)
-// expected-warning@-1 {{unexpected version number for non-specific platform '*' in 'available' attribute}}
+// expected-warning@-1 {{unexpected version number in 'available' attribute for non-specific platform '*'}} {{25-30=}}
 func allPlatformsDeprecatedVersion() {}
 
 @available(*, deprecated, obsoleted: 4.2)
-// expected-warning@-1 {{unexpected version number for non-specific platform '*' in 'available' attribute}}
+// expected-warning@-1 {{unexpected version number in 'available' attribute for non-specific platform '*'}} {{36-41=}}
 func allPlatformsDeprecatedAndObsoleted() {}
 
+@available(*, introduced: 4.0, deprecated: 4.1, obsoleted: 4.2)
+// expected-warning@-1 {{unexpected version number in 'available' attribute for non-specific platform '*'}} {{25-30=}} {{42-47=}} {{58-63=}}
+func allPlatformsDeprecatedAndObsoleted2() {}
+
 @available(swift, unavailable)
-// expected-warning@-1 {{argument 'unavailable' is infeasible for swift platform in 'available' attribute}}
+// expected-warning@-1 {{'unavailable' cannot be used in 'available' attribute for platform 'swift'}}
 func swiftUnavailable() {}
 
 @available(swift, unavailable, introduced: 4.2)
-// expected-warning@-1 {{argument 'unavailable' is infeasible for swift platform in 'available' attribute}}
+// expected-warning@-1 {{'unavailable' cannot be used in 'available' attribute for platform 'swift'}}
 func swiftUnavailableIntroduced() {}
 
 @available(swift, deprecated)
-// expected-warning@-1 {{'deprecated' must have a version number for swift platform in 'available' attribute}}
+// expected-warning@-1 {{expected version number with 'deprecated' in 'available' attribute for platform 'swift'}}
 func swiftDeprecated() {}
 
 @available(swift, deprecated, obsoleted: 4.2)
-// expected-warning@-1 {{'deprecated' must have a version number for swift platform in 'available' attribute}}
+// expected-warning@-1 {{expected version number with 'deprecated' in 'available' attribute for platform 'swift'}}
 func swiftDeprecatedObsoleted() {}
 
 @available(swift, message: "missing valid option")
-// expected-warning@-1 {{expected 'available' option with a version number for swift platform, such as 'introduced', 'deprecated', or 'obsoleted'}}
+// expected-warning@-1 {{expected 'introduced', 'deprecated', or 'obsoleted' in 'available' attribute for platform 'swift'}}
 func swiftMessage() {}