Merge pull request #32606 from nathawes/prefer-macOS-to-OSX-spelling-when-printing-platform

[AST] Prefer the 'macOS' spelling over 'OSX' when printing the platform kind.

Author: Nathan Hawes

include/swift/AST/PlatformKinds.def

@@ -25,11 +25,11 @@
 AVAILABILITY_PLATFORM(iOS, "iOS")
 AVAILABILITY_PLATFORM(tvOS, "tvOS")
 AVAILABILITY_PLATFORM(watchOS, "watchOS")
-AVAILABILITY_PLATFORM(OSX, "macOS")
+AVAILABILITY_PLATFORM(macOS, "macOS")
 AVAILABILITY_PLATFORM(iOSApplicationExtension, "application extensions for iOS")
 AVAILABILITY_PLATFORM(tvOSApplicationExtension, "application extensions for tvOS")
 AVAILABILITY_PLATFORM(watchOSApplicationExtension, "application extensions for watchOS")
-AVAILABILITY_PLATFORM(OSXApplicationExtension, "application extensions for macOS")
+AVAILABILITY_PLATFORM(macOSApplicationExtension, "application extensions for macOS")
 AVAILABILITY_PLATFORM(macCatalyst, "Mac Catalyst")
 AVAILABILITY_PLATFORM(macCatalystApplicationExtension, "application extensions for Mac Catalyst")
 

lib/AST/Availability.cpp

@@ -358,7 +358,7 @@ AvailabilityContext ASTContext::getSwift53Availability() {
       return AvailabilityContext::alwaysAvailable();
 
     llvm::VersionTuple macOVersion53(10, 16, 0);
-    macOVersion53 = canonicalizePlatformVersion(PlatformKind::OSX, macOVersion53);
+    macOVersion53 = canonicalizePlatformVersion(PlatformKind::macOS, macOVersion53);
     return AvailabilityContext(
         VersionRange::allGTE(macOVersion53));
   } else if (target.isiOS()) {

lib/AST/PlatformKind.cpp

@@ -53,8 +53,8 @@ Optional<PlatformKind> swift::platformFromString(StringRef Name) {
   return llvm::StringSwitch<Optional<PlatformKind>>(Name)
 #define AVAILABILITY_PLATFORM(X, PrettyName) .Case(#X, PlatformKind::X)
 #include "swift/AST/PlatformKinds.def"
-      .Case("macOS", PlatformKind::OSX)
-      .Case("macOSApplicationExtension", PlatformKind::OSXApplicationExtension)
+      .Case("OSX", PlatformKind::macOS)
+      .Case("OSXApplicationExtension", PlatformKind::macOSApplicationExtension)
       .Default(Optional<PlatformKind>());
 }
 
@@ -64,16 +64,16 @@ static bool isPlatformActiveForTarget(PlatformKind Platform,
   if (Platform == PlatformKind::none)
     return true;
 
-  if (Platform == PlatformKind::OSXApplicationExtension ||
+  if (Platform == PlatformKind::macOSApplicationExtension ||
       Platform == PlatformKind::iOSApplicationExtension ||
       Platform == PlatformKind::macCatalystApplicationExtension)
     if (!EnableAppExtensionRestrictions)
       return false;
 
   // FIXME: This is an awful way to get the current OS.
   switch (Platform) {
-    case PlatformKind::OSX:
-    case PlatformKind::OSXApplicationExtension:
+    case PlatformKind::macOS:
+    case PlatformKind::macOSApplicationExtension:
       return Target.isMacOSX();
     case PlatformKind::iOS:
     case PlatformKind::iOSApplicationExtension:
@@ -109,8 +109,8 @@ bool swift::isPlatformActive(PlatformKind Platform, const LangOptions &LangOpts,
 PlatformKind swift::targetPlatform(const LangOptions &LangOpts) {
   if (LangOpts.Target.isMacOSX()) {
     return (LangOpts.EnableAppExtensionRestrictions
-                ? PlatformKind::OSXApplicationExtension
-                : PlatformKind::OSX);
+                ? PlatformKind::macOSApplicationExtension
+                : PlatformKind::macOS);
   }
 
   if (LangOpts.Target.isTvOS()) {
@@ -162,8 +162,8 @@ llvm::VersionTuple swift::canonicalizePlatformVersion(
 
   // Canonicalize macOS version for macOS Big Sur to treat
   // 10.16 as 11.0.
-  if (platform == PlatformKind::OSX ||
-      platform == PlatformKind::OSXApplicationExtension) {
+  if (platform == PlatformKind::macOS ||
+      platform == PlatformKind::macOSApplicationExtension) {
     return llvm::Triple::getCanonicalVersionForOS(llvm::Triple::MacOSX,
                                                   version);
   }

lib/ClangImporter/ClangImporter.cpp

@@ -1903,8 +1903,8 @@ PlatformAvailability::PlatformAvailability(const LangOptions &langOpts)
     deprecatedAsUnavailableMessage = "";
     break;
 
-  case PlatformKind::OSX:
-  case PlatformKind::OSXApplicationExtension:
+  case PlatformKind::macOS:
+  case PlatformKind::macOSApplicationExtension:
     deprecatedAsUnavailableMessage =
         "APIs deprecated as of macOS 10.9 and earlier are unavailable in Swift";
     break;
@@ -1916,9 +1916,9 @@ PlatformAvailability::PlatformAvailability(const LangOptions &langOpts)
 
 bool PlatformAvailability::isPlatformRelevant(StringRef name) const {
   switch (platformKind) {
-  case PlatformKind::OSX:
+  case PlatformKind::macOS:
     return name == "macos";
-  case PlatformKind::OSXApplicationExtension:
+  case PlatformKind::macOSApplicationExtension:
     return name == "macos" || name == "macos_app_extension";
 
   case PlatformKind::iOS:
@@ -1958,8 +1958,8 @@ bool PlatformAvailability::treatDeprecatedAsUnavailable(
   case PlatformKind::none:
     llvm_unreachable("version but no platform?");
 
-  case PlatformKind::OSX:
-  case PlatformKind::OSXApplicationExtension:
+  case PlatformKind::macOS:
+  case PlatformKind::macOSApplicationExtension:
     // Anything deprecated in OSX 10.9.x and earlier is unavailable in Swift.
     return major < 10 ||
            (major == 10 && (!minor.hasValue() || minor.getValue() <= 9));

lib/ClangImporter/ImportDecl.cpp

@@ -7613,12 +7613,12 @@ void ClangImporter::Implementation::importAttributes(
       auto platformK =
         llvm::StringSwitch<Optional<PlatformKind>>(Platform)
           .Case("ios", PlatformKind::iOS)
-          .Case("macos", PlatformKind::OSX)
+          .Case("macos", PlatformKind::macOS)
           .Case("tvos", PlatformKind::tvOS)
           .Case("watchos", PlatformKind::watchOS)
           .Case("ios_app_extension", PlatformKind::iOSApplicationExtension)
           .Case("macos_app_extension",
-                PlatformKind::OSXApplicationExtension)
+                PlatformKind::macOSApplicationExtension)
           .Case("tvos_app_extension",
                 PlatformKind::tvOSApplicationExtension)
           .Case("watchos_app_extension",

lib/Driver/DarwinToolChains.cpp

@@ -619,7 +619,7 @@ toolchains::Darwin::addDeploymentTargetArgs(ArgStringList &Arguments,
         // The first deployment of arm64 for macOS is version 10.16;
         if (triple.isAArch64() && major <= 10 && minor < 16) {
           llvm::VersionTuple firstMacARM64e(10, 16, 0);
-          firstMacARM64e = canonicalizePlatformVersion(PlatformKind::OSX,
+          firstMacARM64e = canonicalizePlatformVersion(PlatformKind::macOS,
                                                        firstMacARM64e);
           major = firstMacARM64e.getMajor();
           minor = firstMacARM64e.getMinor().getValueOr(0);

lib/IDE/CodeCompletion.cpp

@@ -4429,14 +4429,9 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
       if (ParamIndex == 0) {
         addDeclAttrParamKeyword("*", "Platform", false);
 
-      // For code completion, suggest 'macOS' instead of 'OSX'.
 #define AVAILABILITY_PLATFORM(X, PrettyName)                                  \
-      if (StringRef(#X) == "OSX")                                             \
-        addDeclAttrParamKeyword("macOS", "Platform", false);                  \
-      else if (StringRef(#X) == "OSXApplicationExtension")                    \
-        addDeclAttrParamKeyword("macOSApplicationExtension", "Platform", false); \
-      else                                                                    \
-        addDeclAttrParamKeyword(#X, "Platform", false);
+        addDeclAttrParamKeyword(swift::platformString(PlatformKind::X),       \
+                                "Platform", false);
 #include "swift/AST/PlatformKinds.def"
 
       } else {

lib/Parse/ParseStmt.cpp

@@ -1350,10 +1350,9 @@ Parser::parseAvailabilitySpecList(SmallVectorImpl<AvailabilitySpec *> &Specs) {
             auto *PlatformSpec =
                 cast<PlatformVersionConstraintAvailabilitySpec>(Previous);
 
-            auto PlatformName = platformString(PlatformSpec->getPlatform());
             auto PlatformNameEndLoc =
-                PlatformSpec->getPlatformLoc().getAdvancedLoc(
-                    PlatformName.size());
+              Lexer::getLocForEndOfToken(SourceManager,
+                                         PlatformSpec->getPlatformLoc());
 
             diagnose(PlatformSpec->getPlatformLoc(),
                      diag::avail_query_meant_introduced)

lib/PrintAsObjC/DeclAndTypePrinter.cpp

@@ -821,7 +821,7 @@ class DeclAndTypePrinter::Implementation
 
       const char *plat;
       switch (AvAttr->Platform) {
-      case PlatformKind::OSX:
+      case PlatformKind::macOS:
         plat = "macos";
         break;
       case PlatformKind::iOS:
@@ -836,7 +836,7 @@ class DeclAndTypePrinter::Implementation
       case PlatformKind::watchOS:
         plat = "watchos";
         break;
-      case PlatformKind::OSXApplicationExtension:
+      case PlatformKind::macOSApplicationExtension:
         plat = "macos_app_extension";
         break;
       case PlatformKind::iOSApplicationExtension:

lib/Sema/TypeCheckAvailability.cpp

@@ -1253,8 +1253,8 @@ static bool fixAvailabilityByNarrowingNearbyVersionCheck(
     auto Platform = targetPlatform(Context.LangOpts);
     if (RunningVers.getMajor() != RequiredVers.getMajor())
       return false;
-    if ((Platform == PlatformKind::OSX ||
-         Platform == PlatformKind::OSXApplicationExtension) &&
+    if ((Platform == PlatformKind::macOS ||
+         Platform == PlatformKind::macOSApplicationExtension) &&
         !(RunningVers.getMinor().hasValue() &&
           RequiredVers.getMinor().hasValue() &&
           RunningVers.getMinor().getValue() ==