[clang-tools-extra] [clangd] Add support for renaming ObjC properties and implicit properties (PR #81775)

[via cfe-commits]

github-actions[bot] wrote:

<!--LLVM CODE FORMAT COMMENT: {clang-format}-->


:warning: C/C++ code formatter, clang-format found issues in your code. 
:warning:

<details>
<summary>
You can test this locally with the following command:
</summary>

``````````bash
git-clang-format --diff 8b485070844d03cda467e75aa8c924184ba671cf 
36f1457e235b687c31e308c496fb67b6a477c3ea -- 
clang-tools-extra/clangd/ClangdLSPServer.cpp 
clang-tools-extra/clangd/ClangdLSPServer.h 
clang-tools-extra/clangd/FindTarget.cpp clang-tools-extra/clangd/Protocol.cpp 
clang-tools-extra/clangd/Protocol.h 
clang-tools-extra/clangd/index/SymbolCollector.cpp 
clang-tools-extra/clangd/refactor/Rename.cpp 
clang-tools-extra/clangd/refactor/Rename.h 
clang-tools-extra/clangd/unittests/RenameTests.cpp 
clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp 
clang-tools-extra/clangd/unittests/SymbolCollectorTests.cpp
``````````

</details>

<details>
<summary>
View the diff from clang-format here.
</summary>

``````````diff
diff --git a/clang-tools-extra/clangd/refactor/Rename.cpp 
b/clang-tools-extra/clangd/refactor/Rename.cpp
index 004a091bce..ffd5d50c17 100644
--- a/clang-tools-extra/clangd/refactor/Rename.cpp
+++ b/clang-tools-extra/clangd/refactor/Rename.cpp
@@ -950,9 +950,9 @@ renameObjCMethodWithinFile(ParsedAST &AST, const 
ObjCMethodDecl *MD,
 }
 
 // AST-based rename, it renames all occurrences in the main file.
-llvm::Expected<tooling::Replacements>
-renameWithinFile(ParsedAST &AST,
-                 const llvm::DenseMap<const NamedDecl *, std::string> 
&DeclToNewName) {
+llvm::Expected<tooling::Replacements> renameWithinFile(
+    ParsedAST &AST,
+    const llvm::DenseMap<const NamedDecl *, std::string> &DeclToNewName) {
   trace::Span Tracer("RenameWithinFile");
   const SourceManager &SM = AST.getSourceManager();
 
@@ -992,7 +992,8 @@ renameWithinFile(ParsedAST &AST,
     }
     if (const auto *MD = dyn_cast<ObjCMethodDecl>(Entry.first)) {
       if (MD->getSelector().getNumArgs() > 1) {
-        auto Res = renameObjCMethodWithinFile(AST, MD, Entry.second, 
std::move(Locs));
+        auto Res =
+            renameObjCMethodWithinFile(AST, MD, Entry.second, std::move(Locs));
         if (!Res)
           return Res.takeError();
         FilteredChanges = FilteredChanges.merge(Res.get());
@@ -1274,7 +1275,7 @@ llvm::Expected<RenameResult> rename(const RenameInputs 
&RInputs) {
         }
       } else if (const auto *ID = CD->getClassInterface()) {
         if (!ASTCtx.getObjCPropertyImplDeclForPropertyDecl(
-              PD, ID->getImplementation())) {
+                PD, ID->getImplementation())) {
           return makeError(ReasonToReject::OnlyRenameableFromDefinition);
         }
       }
@@ -1295,7 +1296,7 @@ llvm::Expected<RenameResult> rename(const RenameInputs 
&RInputs) {
       Placeholder = Name;
 
     auto Reject =
-      renameable(*Entry.first, RInputs.MainFilePath, RInputs.Index, Opts);
+        renameable(*Entry.first, RInputs.MainFilePath, RInputs.Index, Opts);
     if (Reject)
       return makeError(*Reject);
   }
@@ -1370,7 +1371,7 @@ llvm::Expected<RenameResult> rename(const RenameInputs 
&RInputs) {
     auto OtherFilesEdits = renameOutsideFile(
         *Entry.first, RInputs.MainFilePath, Entry.second, *RInputs.Index,
         Opts.LimitFiles == 0 ? std::numeric_limits<size_t>::max()
-                            : Opts.LimitFiles,
+                             : Opts.LimitFiles,
         *RInputs.FS);
     if (!OtherFilesEdits)
       return OtherFilesEdits.takeError();
diff --git a/clang-tools-extra/clangd/unittests/RenameTests.cpp 
b/clang-tools-extra/clangd/unittests/RenameTests.cpp
index 66c3a33fe6..d92ba709ca 100644
--- a/clang-tools-extra/clangd/unittests/RenameTests.cpp
+++ b/clang-tools-extra/clangd/unittests/RenameTests.cpp
@@ -907,8 +907,8 @@ TEST(RenameTest, WithinFileComplexRename) {
   };
   TestCase Tests[] = {
       {
-        "setBar:",
-        R"cpp(
+          "setBar:",
+          R"cpp(
           @interface Foo
           @property(nonatomic) int foo;
           @end
@@ -919,7 +919,7 @@ TEST(RenameTest, WithinFileComplexRename) {
             [f setF^oo:[f foo] ];
           }
         )cpp",
-        R"cpp(
+          R"cpp(
           @interface Foo
           @property(nonatomic) int bar;
           @end
@@ -933,8 +933,8 @@ TEST(RenameTest, WithinFileComplexRename) {
       },
 
       {
-        "one:two:",
-        R"cpp(
+          "one:two:",
+          R"cpp(
           @interface Foo
           - (void)a:(int)a b:(int)b;
           @end
@@ -946,7 +946,7 @@ TEST(RenameTest, WithinFileComplexRename) {
             [f a:1 b:2];
           }
         )cpp",
-        R"cpp(
+          R"cpp(
           @interface Foo
           - (void)one:(int)a two:(int)b;
           @end

``````````

</details>


https://github.com/llvm/llvm-project/pull/81775
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits