arphaman created this revision.
arphaman added reviewers: jkorous, ilya-biryukov.
Herald added subscribers: usaxena95, ributzka, kadircet, dexonsmith, MaskRay,
mgorny.
Herald added a project: clang.
This is a patch to add a refactoring to Clangd that mimics the existing
refactoring action in Xcode that wraps around an Objective-C string literal in
an `NSLocalizedString` macro.
This is still a WIP as I still haven't figured out how to make the test pass,
and more test cases are missing :)
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D69543
Files:
clang-tools-extra/clangd/refactor/tweaks/CMakeLists.txt
clang-tools-extra/clangd/refactor/tweaks/ObjCLocalizeStringLiteral.cpp
clang-tools-extra/clangd/unittests/TweakTests.cpp
Index: clang-tools-extra/clangd/unittests/TweakTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/TweakTests.cpp
+++ clang-tools-extra/clangd/unittests/TweakTests.cpp
@@ -122,6 +122,13 @@
EXPECT_EQ(apply(Input), Output);
}
+TWEAK_TEST(ObjCLocalizeStringLiteral);
+TEST_F(ObjCLocalizeStringLiteralTest, Test) {
+ ExtraArgs.push_back("-x=objective-c");
+ Context = Expression;
+ EXPECT_AVAILABLE("@\"test string\"");
+}
+
TWEAK_TEST(DumpAST);
TEST_F(DumpASTTest, Test) {
EXPECT_AVAILABLE("^int f^oo() { re^turn 2 ^+ 2; }");
Index: clang-tools-extra/clangd/refactor/tweaks/ObjCLocalizeStringLiteral.cpp
===================================================================
--- /dev/null
+++ clang-tools-extra/clangd/refactor/tweaks/ObjCLocalizeStringLiteral.cpp
@@ -0,0 +1,77 @@
+//===--- ObjcLocalizeStringLiteral.cpp ---------------------------*- C++-*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "Logger.h"
+#include "ParsedAST.h"
+#include "SourceCode.h"
+#include "refactor/Tweak.h"
+#include "clang/AST/ExprObjC.h"
+#include "clang/Basic/LangOptions.h"
+#include "clang/Basic/SourceLocation.h"
+#include "clang/Basic/SourceManager.h"
+#include "clang/Tooling/Core/Replacement.h"
+#include "llvm/ADT/None.h"
+#include "llvm/ADT/Optional.h"
+#include "llvm/ADT/StringRef.h"
+#include "llvm/ADT/iterator_range.h"
+#include "llvm/Support/Casting.h"
+#include "llvm/Support/Error.h"
+
+namespace clang {
+namespace clangd {
+namespace {
+
+/// Wraps an Objective-C string literal with the NSLocalizedString macro.
+/// Before:
+/// @"description"
+/// ^^^
+/// After:
+/// NSLocalizedString(@"description", "")
+class ObjCLocalizeStringLiteral : public Tweak {
+public:
+ const char *id() const override final;
+ Intent intent() const override { return Intent::Refactor; }
+
+ bool prepare(const Selection &Inputs) override;
+ Expected<Tweak::Effect> apply(const Selection &Inputs) override;
+ std::string title() const override;
+
+private:
+ const clang::ObjCStringLiteral *Str = nullptr;
+};
+
+REGISTER_TWEAK(ObjCLocalizeStringLiteral)
+
+bool ObjCLocalizeStringLiteral::prepare(const Selection &Inputs) {
+ const SelectionTree::Node *N = Inputs.ASTSelection.commonAncestor();
+ if (!N)
+ return false;
+ Str = dyn_cast_or_null<ObjCStringLiteral>(N->ASTNode.get<Stmt>());
+ return Str;
+}
+
+Expected<Tweak::Effect>
+ObjCLocalizeStringLiteral::apply(const Selection &Inputs) {
+ auto &SM = Inputs.AST.getSourceManager();
+ auto Reps = tooling::Replacements(tooling::Replacement(
+ SM, CharSourceRange::getCharRange(Str->getBeginLoc()),
+ "NSLocalizedString(", Inputs.AST.getASTContext().getLangOpts()));
+ if (auto Err = Reps.add(tooling::Replacement(
+ SM, CharSourceRange::getCharRange(Str->getEndLoc()), "@\"\")",
+ Inputs.AST.getASTContext().getLangOpts())))
+ return std::move(Err);
+ return Effect::mainFileEdit(SM, std::move(Reps));
+}
+
+std::string ObjCLocalizeStringLiteral::title() const {
+ return "Wrap in NSLocalizedString";
+}
+
+} // namespace
+} // namespace clangd
+} // namespace clang
Index: clang-tools-extra/clangd/refactor/tweaks/CMakeLists.txt
===================================================================
--- clang-tools-extra/clangd/refactor/tweaks/CMakeLists.txt
+++ clang-tools-extra/clangd/refactor/tweaks/CMakeLists.txt
@@ -19,6 +19,7 @@
ExpandMacro.cpp
ExtractFunction.cpp
ExtractVariable.cpp
+ ObjCLocalizeStringLiteral.cpp
RawStringLiteral.cpp
RemoveUsingNamespace.cpp
SwapIfBranches.cpp
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
