averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #85501 from xedin/prevent-printModuleInterface-from-printing-extensions-twice

Browse Source 
[IDE] Avoid printing some Swift extensions twice in mixed source fram…
This commit is contained in:
Pavel Yaskevich
2025-11-14 07:12:27 -08:00
committed by GitHub
parent 7e95f8b614 700d9fd669
commit d8549ec6da
5 changed files with 50 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/IDE/ModuleInterfacePrinting.cpp
View File

@@ -145,17 +145,6 @@ static bool printModuleInterfaceDecl(Decl *D,
Printer.callAvoidPrintDeclPost(D);
return false;
}
if (auto Ext = dyn_cast<ExtensionDecl>(D)) {
// Clang extensions (categories) are always printed in source order.
// Swift extensions are printed with their associated type unless it's
// a cross-module extension.
if (!extensionHasClangNode(Ext)) {
auto ExtendedNominal = Ext->getExtendedNominal();
if (!ExtendedNominal ||
Ext->getModuleContext() == ExtendedNominal->getModuleContext())
return false;
}
}
// It'd be nice to avoid cloning the options here, but that would require
// SynthesizedExtensionAnalyzer to promise to stay within the lifetime of
@@ -677,6 +666,14 @@ void swift::ide::printModuleInterface(
addToClangDecls(Ext, extensionGetClangNode(Ext));
continue;
}
// Swift extensions are printed with their associated type unless it's
// a cross-module extension.
if (auto extendedTy = Ext->getExtendedNominal()) {
if (TargetMod->isSameModuleLookingThroughOverlays(
extendedTy->getModuleContext()))
continue;
}
}
if (!IsSubmodule) {

2
test/SynthesizeInterfaceTool/Inputs/Frameworks/TestExt.framework/Headers/MyType.h Normal file
View File

@@ -0,0 +1,2 @@
@interface MyType
@end

16
test/SynthesizeInterfaceTool/Inputs/Frameworks/TestExt.framework/Modules/TestExt.swiftmodule/arm64-apple-macos.swiftinterface Normal file
View File

@@ -0,0 +1,16 @@
// swift-interface-format-version: 1.0
// swift-compiler-version: Apple Swift version 6.2
// swift-module-flags: -target arm64-apple-macos10.13 -enable-library-evolution -swift-version 5 -module-name TestExt
@_exported import TestExt
extension MyType {
public struct MyInnerType {
public func test() {}
}
}
extension Int {
public struct OtherInnerType {
}
}

4
test/SynthesizeInterfaceTool/Inputs/Frameworks/TestExt.framework/Modules/module.modulemap Normal file
View File

@@ -0,0 +1,4 @@
framework module TestExt {
header "MyType.h"
export *
}

20
test/SynthesizeInterfaceTool/test-swift-extension-printing.swift Normal file
View File

@@ -0,0 +1,20 @@
// RUN: %target-swift-synthesize-interface -module-name TestExt -F %S/Inputs/Frameworks -o - | %FileCheck %s
// REQUIRES: OS=macosx && CPU=arm64
// CHECK: open class MyType
// CHECK: extension MyType {
// CHECK: public struct MyInnerType {
// CHECK: public func test()
// CHECK: }
// CHECK: }
// CHECK-NOT: public struct MyInnerType
// CHECK: extension Int {
// CHECK: public struct OtherInnerType {
// CHECK: }
// CHECK: }
// CHECK-NOT: public struct MyInnerType