This is an archive of the discontinued LLVM Phabricator instance.

Differential D75230

[clangd] Get rid of lexer usage in ObjCLocalizeStringLiteral tweak
ClosedPublic

Authored by kadircet on Feb 27 2020, 1:35 AM.

Details

Reviewers
hokein
Commits
rG48fad110e08a: [clangd] Get rid of lexer usage in ObjCLocalizeStringLiteral tweak

Diff Detail

Event Timeline

kadircet created this revision.Feb 27 2020, 1:35 AM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 27 2020, 1:35 AM
Herald added subscribers: cfe-commits, usaxena95, arphaman and 3 others. · View Herald Transcript
Harbormaster completed remote builds in B47391: Diff 246892.Feb 27 2020, 2:29 AM
hokein accepted this revision.Feb 27 2020, 5:00 AM
This revision is now accepted and ready to land.Feb 27 2020, 5:00 AM
Closed by commit rG48fad110e08a: [clangd] Get rid of lexer usage in ObjCLocalizeStringLiteral tweak (authored by kadircet). · Explain WhyFeb 28 2020, 1:04 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
clang-tools-extra/
clangd/
refactor/
tweaks/
20 lines

Diff 247182

clang-tools-extra/clangd/refactor/tweaks/ObjCLocalizeStringLiteral.cpp

Show First 20 Lines • Show All 57 Lines • ▼ Show 20 Lines if (N->Parent)
N = N->Parent; N = N->Parent;
} }
Str = dyn_cast_or_null<ObjCStringLiteral>(N->ASTNode.get<Stmt>()); Str = dyn_cast_or_null<ObjCStringLiteral>(N->ASTNode.get<Stmt>());
return Str; return Str;
} }
Expected<Tweak::Effect> Expected<Tweak::Effect>
ObjCLocalizeStringLiteral::apply(const Selection &Inputs) { ObjCLocalizeStringLiteral::apply(const Selection &Inputs) {
auto &SM = Inputs.AST->getSourceManager(); auto *AST = Inputs.AST;
auto &LangOpts = Inputs.AST->getASTContext().getLangOpts(); auto &SM = AST->getSourceManager();
const auto &TB = AST->getTokens();
auto Toks = TB.spelledForExpanded(TB.expandedTokens(Str->getSourceRange()));
if (!Toks || Toks->empty())
return llvm::createStringError(llvm::inconvertibleErrorCode(),
"Failed to find tokens to replace.");
// Insert `NSLocalizedString(` before the literal.
auto Reps = tooling::Replacements(tooling::Replacement( auto Reps = tooling::Replacements(tooling::Replacement(
SM, CharSourceRange::getCharRange(Str->getBeginLoc()), SM, Toks->front().location(), 0, "NSLocalizedString("));
"NSLocalizedString(", LangOpts)); // Insert `, @"")` after the literal.
SourceLocation EndLoc = Lexer::getLocForEndOfToken( if (auto Err = Reps.add(
Str->getEndLoc(), 0, Inputs.AST->getSourceManager(), LangOpts); tooling::Replacement(SM, Toks->back().endLocation(), 0, ", @\"\")")))
if (auto Err = Reps.add(tooling::Replacement(
SM, CharSourceRange::getCharRange(EndLoc), ", @\"\")", LangOpts)))
return std::move(Err); return std::move(Err);
return Effect::mainFileEdit(SM, std::move(Reps)); return Effect::mainFileEdit(SM, std::move(Reps));
} }
std::string ObjCLocalizeStringLiteral::title() const { std::string ObjCLocalizeStringLiteral::title() const {
return "Wrap in NSLocalizedString"; return "Wrap in NSLocalizedString";
} }
} // namespace } // namespace
} // namespace clangd } // namespace clangd
} // namespace clang } // namespace clang