Revert "[InterfacePrinting] Print stdlib internal protocols whose names start with no '_'"

This reverts commit ca7c1e5692bdd51cb0800be42c964462a3c84436.

Swift SVN r30191

Author: nkcsgexi

include/swift/AST/ASTPrinter.h

@@ -87,8 +87,6 @@ class ASTPrinter {
     PendingDeclLocCallback = D;
   }
 
-  static bool isInternalProtocol(const Decl *D);
-
   /// To sanitize a malformatted utf8 string to a well-formatted one.
   static std::string sanitizeUtf8(StringRef Text);
 

include/swift/AST/PrintOptions.h

@@ -144,10 +144,6 @@ struct PrintOptions {
   /// Whether we are printing part of SIL body.
   bool PrintInSILBody = false;
 
-  /// Wheter we print the internal protocols in stdlib whose names start with no
-  /// '_'. rdar://21515803
-  bool PrintInternalStdlibProtocols = false;
-
   enum class ArgAndParamPrintingMode {
     ArgumentOnly,
     MatchSource,
@@ -202,7 +198,6 @@ struct PrintOptions {
     result.PrintFunctionRepresentationAttrs = false;
     result.PrintOverrideKeyword = false;
     result.AccessibilityFilter = Accessibility::Public;
-    result.PrintInternalStdlibProtocols = true;
     return result;
   }
 
@@ -217,7 +212,6 @@ struct PrintOptions {
     result.PrintDocumentationComments = false;
     result.PrintRegularClangComments = false;
     result.PrintAccessibility = false;
-    result.PrintInternalStdlibProtocols = true;
     return result;
   }
 

lib/AST/ASTPrinter.cpp

@@ -43,16 +43,6 @@
 
 using namespace swift;
 
-bool ASTPrinter::isInternalProtocol(const Decl *D) {
-  if (auto Pro = dyn_cast<ProtocolDecl>(D)) {
-    if (!Pro->getNameStr().startswith("_") &&
-        Pro->getFormalAccess() == Accessibility::Internal) {
-      return true;
-    }
-  }
-  return false;
-}
-
 std::string ASTPrinter::sanitizeUtf8(StringRef Text) {
   llvm::SmallString<256> Builder;
   Builder.reserve(Text.size());
@@ -627,12 +617,6 @@ void PrintAST::printPatternType(const Pattern *P) {
 }
 
 bool PrintAST::shouldPrint(const Decl *D) {
-  if (D->getModuleContext()->isStdlibModule() &&
-      ASTPrinter::isInternalProtocol(D) &&
-      Options.PrintInternalStdlibProtocols) {
-    return true;
-  }
-
   if (Options.SkipDeinit && isa<DestructorDecl>(D)) {
     return false;
   }
@@ -1346,10 +1330,7 @@ void PrintAST::visitProtocolDecl(ProtocolDecl *decl) {
 
   printInherited(decl, explicitClass);
   if (Options.TypeDefinitions) {
-    if (!Options.PrintInternalStdlibProtocols ||
-        !ASTPrinter::isInternalProtocol(decl) ||
-        !decl->getModuleContext()->isStdlibModule())
-      printMembers(decl->getMembers());
+    printMembers(decl->getMembers());
   }
 }
 

lib/IDE/ModuleInterfacePrinting.cpp

@@ -141,8 +141,6 @@ void swift::ide::printSubmoduleInterface(
        const PrintOptions &Options) {
   auto AdjustedOptions = Options;
   adjustPrintOptions(AdjustedOptions);
-  auto PrintInternalProtocol = Options.PrintInternalStdlibProtocols &&
-                               M->isStdlibModule();
 
   SmallVector<Decl *, 1> Decls;
   M->getDisplayDecls(Decls);
@@ -210,10 +208,6 @@ void swift::ide::printSubmoduleInterface(
     if (Options.SkipUnavailable && D->getAttrs().isUnavailable(SwiftContext))
       continue;
 
-    if (PrintInternalProtocol && ASTPrinter::isInternalProtocol(D)) {
-      SwiftDecls.push_back(D);
-    }
-
     // Skip declarations that are not accessible.
     if (auto *VD = dyn_cast<ValueDecl>(D)) {
       if (Options.AccessibilityFilter > Accessibility::Private &&