Skip to content

[4.2-04-30][migrator] Revert "migrator: avoid inserting base name while renaming if users' member access doesn't specify the base name. rdar://40373279" #16780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
najacque merged 1 commit into from
May 23, 2018
Merged

[4.2-04-30][migrator] Revert "migrator: avoid inserting base name while renaming if users' member access doesn't specify the base name. rdar://40373279" #16780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 7 additions & 23 deletions lib/Migrator/APIDiffMigratorPass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,21 +260,6 @@ struct APIDiffMigratorPass : public ASTMigratorPass, public SourceEntityWalker {
SF->getASTContext().SourceMgr, Range).str() == "nil";
}

bool isDotMember(CharSourceRange Range) {
auto S = Range.str();
return S.startswith(".") && S.substr(1).find(".") == StringRef::npos;
}

bool isDotMember(SourceRange Range) {
return isDotMember(Lexer::getCharSourceRangeFromSourceRange(
SF->getASTContext().SourceMgr, Range));
}

bool isDotMember(Expr *E) {
auto Range = E->getSourceRange();
return Range.isValid() && isDotMember(Range);
}

std::vector<APIDiffItem*> getRelatedDiffItems(ValueDecl *VD) {
std::vector<APIDiffItem*> results;
auto addDiffItems = [&](ValueDecl *VD) {
Expand Down Expand Up @@ -323,11 +308,11 @@ struct APIDiffMigratorPass : public ASTMigratorPass, public SourceEntityWalker {
}


bool isSimpleReplacement(APIDiffItem *Item, bool isDotMember, std::string &Text) {
bool isSimpleReplacement(APIDiffItem *Item, std::string &Text) {
if (auto *MD = dyn_cast<TypeMemberDiffItem>(Item)) {
if (MD->Subkind == TypeMemberDiffItemSubKind::SimpleReplacement) {
Text = (llvm::Twine(isDotMember ? "" : MD->newTypeName) + "." +
MD->getNewName().base()).str();
Text = (llvm::Twine(MD->newTypeName) + "." + MD->getNewName().base()).
str();
return true;
}
}
Expand Down Expand Up @@ -390,7 +375,7 @@ struct APIDiffMigratorPass : public ASTMigratorPass, public SourceEntityWalker {
Type T, ReferenceMetaData Data) override {
for (auto *Item: getRelatedDiffItems(CtorTyRef ? CtorTyRef: D)) {
std::string RepText;
if (isSimpleReplacement(Item, isDotMember(Range), RepText)) {
if (isSimpleReplacement(Item, RepText)) {
Editor.replace(Range, RepText);
return true;
}
Expand Down Expand Up @@ -465,9 +450,8 @@ struct APIDiffMigratorPass : public ASTMigratorPass, public SourceEntityWalker {
for (auto *I: getRelatedDiffItems(VD)) {
if (auto *Item = dyn_cast<TypeMemberDiffItem>(I)) {
if (Item->Subkind == TypeMemberDiffItemSubKind::QualifiedReplacement) {
Editor.replace(ToReplace,
(llvm::Twine(isDotMember(ToReplace) ? "" : Item->newTypeName) + "." +
Item->getNewName().base()).str());
Editor.replace(ToReplace, (llvm::Twine(Item->newTypeName) + "." +
Item->getNewName().base()).str());
return true;
}
}
Expand Down Expand Up @@ -741,7 +725,7 @@ struct APIDiffMigratorPass : public ASTMigratorPass, public SourceEntityWalker {
StringRef LeftComment;
StringRef RightComment;
for (auto *Item: getRelatedDiffItems(RD)) {
if (isSimpleReplacement(Item, isDotMember(Reference), Rename)) {
if (isSimpleReplacement(Item, Rename)) {
} else if (auto *CI = dyn_cast<CommonDiffItem>(Item)) {
if (CI->isStringRepresentableChange() &&
CI->NodeKind == SDKNodeKind::DeclVar) {
Expand Down
2 changes: 0 additions & 2 deletions test/Migrator/qualified-replacement.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ func foo() {
_ = Cities.CityKind.Town
_ = ToplevelType()
_ = ToplevelType(recordName: "")
bar(.orderedSame)
}

func foo(_: ToplevelType) {}
func bar(_ : FooComparisonResult) {}
4 changes: 1 addition & 3 deletions test/Migrator/qualified-replacement.swift.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,10 @@ func foo() {
_ = NewPropertyUserInterface.newFieldPlus
NewPropertyUserInterface.newMethodPlus(1)
_ = NewFooComparisonResult.NewFooOrderedSame
let _ : FooComparisonResult = .NewFooOrderedSame
let _ : FooComparisonResult = NewFooComparisonResult.NewFooOrderedSame
_ = NewCityKind.NewTown
_ = ToplevelWrapper.internalType()
_ = ToplevelWrapper.internalType(recordName: "")
bar(.NewFooOrderedSame)
}

func foo(_: ToplevelWrapper.internalType) {}
func bar(_ : FooComparisonResult) {}