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

[ModuleInterface] Print full type if ambiguous for extensions.

Browse Source 
The patch introduces a new setting instead of changing existing settings
because the generated interfaces in the IDE have slightly different
requirements; the extended type there is unconditionally not printed
qualified (even if it is ambiguous). This is likely because the
ambiguity heuristic is very weak; it doesn't even do name lookup.
Simplifying that logic would be nice, but then we'd need to update
a bunch of IDE/print* tests and end up with more more visual clutter
in the IDE.

Introducing the new setting means we can change the behavior for
swiftinterface files without affecting the behavior for IDE interfaces.

Fixes rdar://79093752.
This commit is contained in:
Varun Gandhi
2021-06-11 00:09:32 -07:00
parent 88cf178fab
commit 02afb9d49b
15 changed files with 134 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Frontend/ModuleInterfaceSupport.cpp
View File

@@ -589,10 +589,16 @@ public:
DeclAttributes::print(printer, printOptions, attrs);
printer << "extension ";
PrintOptions typePrintOptions = printOptions;
typePrintOptions.FullyQualifiedTypes = false;
typePrintOptions.FullyQualifiedTypesIfAmbiguous = false;
nominal->getDeclaredType().print(printer, typePrintOptions);
{
PrintOptions typePrintOptions = printOptions;
bool oldFullyQualifiedTypesIfAmbiguous =
typePrintOptions.FullyQualifiedTypesIfAmbiguous;
typePrintOptions.FullyQualifiedTypesIfAmbiguous =
typePrintOptions.FullyQualifiedExtendedTypesIfAmbiguous;
nominal->getDeclaredType().print(printer, typePrintOptions);
typePrintOptions.FullyQualifiedTypesIfAmbiguous =
oldFullyQualifiedTypesIfAmbiguous;
}
printer << " : ";
proto->getDeclaredInterfaceType()->print(printer, printOptions);