Merge pull request #72048 from Jamezzzb/#56350

#56350 - Give Identifier a hasUnderscoredNaming() helper

Author: ahoppen

include/swift/AST/Identifier.h

@@ -177,6 +177,10 @@ class Identifier {
     return str().startswith("$") && !(getLength() == 1);
   }
 
+  bool hasUnderscoredNaming() const {
+    return str().startswith("_");
+  }
+  
   const void *getAsOpaquePointer() const {
       return static_cast<const void *>(Pointer);
   }

include/swift/IDE/CompletionLookup.h

@@ -304,7 +304,7 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
   void includeInstanceMembers() { IncludeInstanceMembers = true; }
 
   bool isHiddenModuleName(Identifier Name) {
-    return (Name.str().startswith("_") || Name == Ctx.SwiftShimsModuleName ||
+    return (Name.hasUnderscoredNaming() || Name == Ctx.SwiftShimsModuleName ||
             Name.str() == SWIFT_ONONE_SUPPORT);
   }
 

include/swift/Sema/CSFix.h

@@ -1335,8 +1335,7 @@ class UseWrappedValue final : public ConstraintFix {
         PropertyWrapper(propertyWrapper), Base(base), Wrapper(wrapper) {}
 
   bool usingProjection() const {
-    auto nameStr = PropertyWrapper->getName().str();
-    return !nameStr.startswith("_");
+    return !PropertyWrapper->getName().hasUnderscoredNaming();
   }
 
 public:

lib/AST/Decl.cpp

@@ -1083,7 +1083,7 @@ bool Decl::hasUnderscoredNaming() const {
   }
 
   if (!VD->getBaseName().isSpecial() &&
-      VD->getBaseIdentifier().str().startswith("_")) {
+      VD->getBaseIdentifier().hasUnderscoredNaming()) {
     return true;
   }
 

lib/AST/Module.cpp

@@ -2297,7 +2297,7 @@ void ModuleDecl::findDeclaredCrossImportOverlaysTransitive(
         for (Identifier overlay: overlays) {
           // We don't present non-underscored overlays as part of the underlying
           // module, so ignore them.
-          if (!overlay.str().startswith("_"))
+          if (!overlay.hasUnderscoredNaming())
             continue;
           ModuleDecl *overlayMod =
               getASTContext().getModuleByName(overlay.str());

lib/AST/NameLookup.cpp

@@ -2420,7 +2420,7 @@ static void installPropertyWrapperMembersIfNeeded(NominalTypeDecl *target,
     return;
 
   if ((!baseName.getIdentifier().str().startswith("$") &&
-       !baseName.getIdentifier().str().startswith("_")) ||
+       !baseName.getIdentifier().hasUnderscoredNaming()) ||
       baseName.getIdentifier().str().size() <= 1) {
     return;
   }

lib/PrintAsClang/ModuleContentsWriter.cpp

@@ -834,7 +834,7 @@ class ModuleWriter {
             [&](const ValueDecl *vd) {
               return !printer.isVisible(vd) || vd->isObjC() ||
                      (vd->isStdlibDecl() && !vd->getName().isSpecial() &&
-                      vd->getBaseIdentifier().str().startswith("_")) ||
+                      vd->getBaseIdentifier().hasUnderscoredNaming()) ||
                      (vd->isStdlibDecl() && isa<StructDecl>(vd)) ||
                      (vd->isStdlibDecl() &&
                       vd->getASTContext().getErrorDecl() == vd);