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

Sema: Change property wrappers fixit to always remove the correct number of '$'

Browse Source
This commit is contained in:
Sam Lazarus
2019-06-26 14:24:49 -04:00
committed by Pavel Yaskevich
parent 55b17feac1
commit bd54febb37
9 changed files with 51 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Sema/CSSimplify.cpp
View File

@@ -4837,9 +4837,18 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyMemberConstraint(
auto result = solveWithNewBaseOrName(wrappedTy, member);
if (result == SolutionKind::Solved) {
auto name = wrappedProperty->first->getName();
bool fromStorageWrapper = true;
if (!name.empty()) {
auto nameStr = name.str();
assert(!nameStr.empty() && nameStr[0] == '$');
fromStorageWrapper = nameStr.size() >= 2 && nameStr[1] != '$';
}
auto *fix = UseWrappedPropertyType::create(
*this, member, baseTy, wrappedTy,
/*isMemberAccess=*/true, locator);
*this, member, baseTy, wrappedTy, /*isMemberAccess=*/true,
fromStorageWrapper, locator);
return recordFix(fix) ? SolutionKind::Error : SolutionKind::Solved;
}
}