Merge pull request #38882 from egorzhdan/astprinter-protocols

ASTPrinter: print public inherited protocols of the skipped private protocols

Author: egorzhdan

lib/AST/ASTPrinter.cpp

@@ -5747,10 +5747,9 @@ swift::getInheritedForPrinting(
 
   // Collect synthesized conformances.
   auto &ctx = decl->getASTContext();
+  llvm::SetVector<ProtocolDecl *> protocols;
   for (auto attr : decl->getAttrs().getAttributes<SynthesizedProtocolAttr>()) {
     if (auto *proto = ctx.getProtocol(attr->getProtocolKind())) {
-      if (!options.shouldPrint(proto))
-        continue;
       // The SerialExecutor conformance is only synthesized on the root
       // actor class, so we can just test resilience immediately.
       if (proto->isSpecificProtocol(KnownProtocolKind::SerialExecutor) &&
@@ -5760,9 +5759,28 @@ swift::getInheritedForPrinting(
           isa<EnumDecl>(decl) &&
           cast<EnumDecl>(decl)->hasRawType())
         continue;
-      Results.push_back({TypeLoc::withoutLoc(proto->getDeclaredInterfaceType()),
-                      /*isUnchecked=*/false});
+      protocols.insert(proto);
+    }
+  }
+
+  for (size_t i = 0; i < protocols.size(); i++) {
+    auto proto = protocols[i];
+
+    if (!options.shouldPrint(proto)) {
+      // If private stdlib protocols are skipped and this is a private stdlib
+      // protocol, see if any of its inherited protocols are public. Those
+      // protocols can affect the user-visible behavior of the declaration, and
+      // should be printed.
+      if (options.SkipPrivateStdlibDecls &&
+          proto->isPrivateStdlibDecl(!options.SkipUnderscoredStdlibProtocols)) {
+        auto inheritedProtocols = proto->getInheritedProtocols();
+        protocols.insert(inheritedProtocols.begin(), inheritedProtocols.end());
+      }
+      continue;
     }
+
+    Results.push_back({TypeLoc::withoutLoc(proto->getDeclaredInterfaceType()),
+                       /*isUnchecked=*/false});
   }
 }
 

test/ClangImporter/enum-error.swift

@@ -14,6 +14,8 @@
 // RUN: echo '#include "enum-error.h"' > %t.m
 // RUN: %target-swift-ide-test -source-filename %s -print-header -header-to-print %S/Inputs/enum-error.h -import-objc-header %S/Inputs/enum-error.h -print-regular-comments --cc-args %target-cc-options -fsyntax-only %t.m -I %S/Inputs > %t.txt
 // RUN: %FileCheck -check-prefix=HEADER %s < %t.txt
+// RUN: %target-swift-ide-test -source-filename %s -print-header -header-to-print %S/Inputs/enum-error.h -import-objc-header %S/Inputs/enum-error.h -print-regular-comments --skip-private-stdlib-decls -skip-underscored-stdlib-protocols --cc-args %target-cc-options -fsyntax-only %t.m -I %S/Inputs > %t2.txt
+// RUN: %FileCheck -check-prefix=HEADER-NO-PRIVATE %s < %t2.txt
 
 import Foundation
 
@@ -121,12 +123,25 @@ class ObjCTest {
 }
 #endif
 
-// HEADER: enum Code : Int32, _ErrorCodeProtocol {
-// HEADER:   init?(rawValue: Int32)
-// HEADER:   var rawValue: Int32 { get }
-// HEADER:   typealias _ErrorType = TestError
-// HEADER:   case TENone
-// HEADER:   case TEOne
-// HEADER:   case TETwo
+// HEADER: struct TestError : _BridgedStoredNSError {
+// HEADER:   enum Code : Int32, _ErrorCodeProtocol {
+// HEADER:     init?(rawValue: Int32)
+// HEADER:     var rawValue: Int32 { get }
+// HEADER:     typealias _ErrorType = TestError
+// HEADER:     case TENone
+// HEADER:     case TEOne
+// HEADER:     case TETwo
+// HEADER:   }
 // HEADER: }
 // HEADER: func getErr() -> TestError.Code
+
+// HEADER-NO-PRIVATE: struct TestError : CustomNSError, Hashable, Error {
+// HEADER-NO-PRIVATE:   enum Code : Int32, Equatable {
+// HEADER-NO-PRIVATE:     init?(rawValue: Int32)
+// HEADER-NO-PRIVATE:     var rawValue: Int32 { get }
+// HEADER-NO-PRIVATE:     typealias _ErrorType = TestError
+// HEADER-NO-PRIVATE:     case TENone
+// HEADER-NO-PRIVATE:     case TEOne
+// HEADER-NO-PRIVATE:     case TETwo
+// HEADER-NO-PRIVATE:   }
+// HEADER-NO-PRIVATE: }

test/SourceKit/DocSupport/doc_error_domain.swift

@@ -3,8 +3,8 @@
 // RUN:         -sdk %sdk | %sed_clean > %t.response
 // RUN: %FileCheck -input-file=%t.response %s
 
-// CHECK: struct MyError {
-// CHECK:     enum Code : Int32 {
+// CHECK: struct MyError : CustomNSError, Hashable, Error {
+// CHECK:     enum Code : Int32, Equatable {
 // CHECK:         case errFirst
 // CHECK:         case errSecond
 // CHECK:     }