CppEditor: Move SplitSimpleDeclaration quickfix into its own files

Change-Id: I74f656ed29ae2eb15afa89a0ad01c91333b99345
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

src/plugins/cppeditor/CMakeLists.txt

@@ -123,6 +123,7 @@ add_qtc_plugin(CppEditor
     quickfixes/removeusingnamespace.cpp quickfixes/removeusingnamespace.h
     quickfixes/rewritecomment.cpp quickfixes/rewritecomment.cpp
     quickfixes/rewritecontrolstatements.cpp quickfixes/rewritecontrolstatements.h
+    quickfixes/splitsimpledeclaration.cpp quickfixes/splitsimpledeclaration.h
     resourcepreviewhoverhandler.cpp resourcepreviewhoverhandler.h
     searchsymbols.cpp searchsymbols.h
     semantichighlighter.cpp semantichighlighter.h

src/plugins/cppeditor/cppeditor.qbs

@@ -275,6 +275,8 @@ QtcPlugin {
             "rewritecomment.h",
             "rewritecontrolstatements.cpp",
             "rewritecontrolstatements.h",
+            "splitsimpledeclaration.cpp",
+            "splitsimpledeclaration.h",
         ]
     }
 

src/plugins/cppeditor/quickfixes/cppquickfixes.cpp

@@ -12,7 +12,6 @@
 #include "../cpprefactoringchanges.h"
 #include "../cpptoolsreuse.h"
 #include "../insertionpointlocator.h"
-#include "../symbolfinder.h"
 #include "assigntolocalvariable.h"
 #include "bringidentifierintoscope.h"
 #include "completeswitchstatement.h"
@@ -34,6 +33,7 @@
 #include "removeusingnamespace.h"
 #include "rewritecomment.h"
 #include "rewritecontrolstatements.h"
+#include "splitsimpledeclaration.h"
 
 #include <coreplugin/icore.h>
 #include <coreplugin/messagemanager.h>
@@ -134,113 +134,6 @@ const QList<CppQuickFixFactory *> &CppQuickFixFactory::cppQuickFixFactories()
 
 namespace Internal {
 
-static bool checkDeclarationForSplit(SimpleDeclarationAST *declaration)
-{
-    if (!declaration->semicolon_token)
-        return false;
-
-    if (!declaration->decl_specifier_list)
-        return false;
-
-    for (SpecifierListAST *it = declaration->decl_specifier_list; it; it = it->next) {
-        SpecifierAST *specifier = it->value;
-        if (specifier->asEnumSpecifier() || specifier->asClassSpecifier())
-            return false;
-    }
-
-    return declaration->declarator_list && declaration->declarator_list->next;
-}
-
-namespace {
-
-class SplitSimpleDeclarationOp: public CppQuickFixOperation
-{
-public:
-    SplitSimpleDeclarationOp(const CppQuickFixInterface &interface, int priority,
-                             SimpleDeclarationAST *decl)
-        : CppQuickFixOperation(interface, priority)
-        , declaration(decl)
-    {
-        setDescription(Tr::tr("Split Declaration"));
-    }
-
-    void perform() override
-    {
-        CppRefactoringChanges refactoring(snapshot());
-        CppRefactoringFilePtr currentFile = refactoring.cppFile(filePath());
-
-        ChangeSet changes;
-
-        SpecifierListAST *specifiers = declaration->decl_specifier_list;
-        int declSpecifiersStart = currentFile->startOf(specifiers->firstToken());
-        int declSpecifiersEnd = currentFile->endOf(specifiers->lastToken() - 1);
-        int insertPos = currentFile->endOf(declaration->semicolon_token);
-
-        DeclaratorAST *prevDeclarator = declaration->declarator_list->value;
-
-        for (DeclaratorListAST *it = declaration->declarator_list->next; it; it = it->next) {
-            DeclaratorAST *declarator = it->value;
-
-            changes.insert(insertPos, QLatin1String("\n"));
-            changes.copy(declSpecifiersStart, declSpecifiersEnd, insertPos);
-            changes.insert(insertPos, QLatin1String(" "));
-            changes.move(currentFile->range(declarator), insertPos);
-            changes.insert(insertPos, QLatin1String(";"));
-
-            const int prevDeclEnd = currentFile->endOf(prevDeclarator);
-            changes.remove(prevDeclEnd, currentFile->startOf(declarator));
-
-            prevDeclarator = declarator;
-        }
-
-        currentFile->setChangeSet(changes);
-        currentFile->apply();
-    }
-
-private:
-    SimpleDeclarationAST *declaration;
-};
-
-} // anonymous namespace
-
-void SplitSimpleDeclaration::doMatch(const CppQuickFixInterface &interface,
-                                     QuickFixOperations &result)
-{
-    CoreDeclaratorAST *core_declarator = nullptr;
-    const QList<AST *> &path = interface.path();
-    CppRefactoringFilePtr file = interface.currentFile();
-    const int cursorPosition = file->cursor().selectionStart();
-
-    for (int index = path.size() - 1; index != -1; --index) {
-        AST *node = path.at(index);
-
-        if (CoreDeclaratorAST *coreDecl = node->asCoreDeclarator()) {
-            core_declarator = coreDecl;
-        } else if (SimpleDeclarationAST *simpleDecl = node->asSimpleDeclaration()) {
-            if (checkDeclarationForSplit(simpleDecl)) {
-                SimpleDeclarationAST *declaration = simpleDecl;
-
-                const int startOfDeclSpecifier = file->startOf(declaration->decl_specifier_list->firstToken());
-                const int endOfDeclSpecifier = file->endOf(declaration->decl_specifier_list->lastToken() - 1);
-
-                if (cursorPosition >= startOfDeclSpecifier && cursorPosition <= endOfDeclSpecifier) {
-                    // the AST node under cursor is a specifier.
-                    result << new SplitSimpleDeclarationOp(interface, index, declaration);
-                    return;
-                }
-
-                if (core_declarator && interface.isCursorOn(core_declarator)) {
-                    // got a core-declarator under the text cursor.
-                    result << new SplitSimpleDeclarationOp(interface, index, declaration);
-                    return;
-                }
-            }
-
-            return;
-        }
-    }
-}
-
 namespace {
 
 class ConvertNumericLiteralOp: public CppQuickFixOperation
@@ -747,8 +640,6 @@ void createCppQuickFixes()
 
     new ConvertNumericLiteral;
 
-    new SplitSimpleDeclaration;
-
     new RearrangeParamDeclarationList;
     new ReformatPointerDeclaration;
 
@@ -773,6 +664,7 @@ void createCppQuickFixes()
     registerAssignToLocalVariableQuickfix();
     registerCompleteSwitchStatementQuickfix();
     registerConvertToMetaMethodCallQuickfix();
+    registerSplitSimpleDeclarationQuickfix();
 
     new ExtraRefactoringOperations;
 }

src/plugins/cppeditor/quickfixes/cppquickfixes.h

@@ -70,22 +70,6 @@ private:
     const bool m_test;
 };
 
-/*!
-  Rewrite
-    int *a, b;
-
-  As
-    int *a;
-    int b;
-
-  Activates on: the type or the variable names.
-*/
-class SplitSimpleDeclaration: public CppQuickFixFactory
-{
-public:
-    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
-};
-
 /*!
   Switches places of the parameter declaration under cursor
   with the next or the previous one in the parameter declaration list

src/plugins/cppeditor/quickfixes/splitsimpledeclaration.cpp

@@ -0,0 +1,144 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#include "splitsimpledeclaration.h"
+
+#include "../cppeditortr.h"
+#include "../cpprefactoringchanges.h"
+#include "cppquickfix.h"
+
+using namespace CPlusPlus;
+using namespace Utils;
+
+namespace CppEditor::Internal {
+namespace {
+
+static bool checkDeclarationForSplit(SimpleDeclarationAST *declaration)
+{
+    if (!declaration->semicolon_token)
+        return false;
+
+    if (!declaration->decl_specifier_list)
+        return false;
+
+    for (SpecifierListAST *it = declaration->decl_specifier_list; it; it = it->next) {
+        SpecifierAST *specifier = it->value;
+        if (specifier->asEnumSpecifier() || specifier->asClassSpecifier())
+            return false;
+    }
+
+    return declaration->declarator_list && declaration->declarator_list->next;
+}
+
+class SplitSimpleDeclarationOp : public CppQuickFixOperation
+{
+public:
+    SplitSimpleDeclarationOp(const CppQuickFixInterface &interface, int priority,
+                             SimpleDeclarationAST *decl)
+        : CppQuickFixOperation(interface, priority)
+        , declaration(decl)
+    {
+        setDescription(Tr::tr("Split Declaration"));
+    }
+
+    void perform() override
+    {
+        CppRefactoringChanges refactoring(snapshot());
+        CppRefactoringFilePtr currentFile = refactoring.cppFile(filePath());
+
+        ChangeSet changes;
+
+        SpecifierListAST *specifiers = declaration->decl_specifier_list;
+        int declSpecifiersStart = currentFile->startOf(specifiers->firstToken());
+        int declSpecifiersEnd = currentFile->endOf(specifiers->lastToken() - 1);
+        int insertPos = currentFile->endOf(declaration->semicolon_token);
+
+        DeclaratorAST *prevDeclarator = declaration->declarator_list->value;
+
+        for (DeclaratorListAST *it = declaration->declarator_list->next; it; it = it->next) {
+            DeclaratorAST *declarator = it->value;
+
+            changes.insert(insertPos, QLatin1String("\n"));
+            changes.copy(declSpecifiersStart, declSpecifiersEnd, insertPos);
+            changes.insert(insertPos, QLatin1String(" "));
+            changes.move(currentFile->range(declarator), insertPos);
+            changes.insert(insertPos, QLatin1String(";"));
+
+            const int prevDeclEnd = currentFile->endOf(prevDeclarator);
+            changes.remove(prevDeclEnd, currentFile->startOf(declarator));
+
+            prevDeclarator = declarator;
+        }
+
+        currentFile->setChangeSet(changes);
+        currentFile->apply();
+    }
+
+private:
+    SimpleDeclarationAST *declaration;
+};
+
+/*!
+  Rewrite
+    int *a, b;
+
+  As
+    int *a;
+    int b;
+
+  Activates on: the type or the variable names.
+*/
+class SplitSimpleDeclaration : public CppQuickFixFactory
+{
+#ifdef WITH_TESTS
+public:
+    static QObject *createTest() { return new QObject; }
+#endif
+
+private:
+    void doMatch(const CppQuickFixInterface &interface, QuickFixOperations &result) override
+    {
+        CoreDeclaratorAST *core_declarator = nullptr;
+        const QList<AST *> &path = interface.path();
+        CppRefactoringFilePtr file = interface.currentFile();
+        const int cursorPosition = file->cursor().selectionStart();
+
+        for (int index = path.size() - 1; index != -1; --index) {
+            AST *node = path.at(index);
+
+            if (CoreDeclaratorAST *coreDecl = node->asCoreDeclarator()) {
+                core_declarator = coreDecl;
+            } else if (SimpleDeclarationAST *simpleDecl = node->asSimpleDeclaration()) {
+                if (checkDeclarationForSplit(simpleDecl)) {
+                    SimpleDeclarationAST *declaration = simpleDecl;
+
+                    const int startOfDeclSpecifier = file->startOf(declaration->decl_specifier_list->firstToken());
+                    const int endOfDeclSpecifier = file->endOf(declaration->decl_specifier_list->lastToken() - 1);
+
+                    if (cursorPosition >= startOfDeclSpecifier && cursorPosition <= endOfDeclSpecifier) {
+                        // the AST node under cursor is a specifier.
+                        result << new SplitSimpleDeclarationOp(interface, index, declaration);
+                        return;
+                    }
+
+                    if (core_declarator && interface.isCursorOn(core_declarator)) {
+                        // got a core-declarator under the text cursor.
+                        result << new SplitSimpleDeclarationOp(interface, index, declaration);
+                        return;
+                    }
+                }
+
+                return;
+            }
+        }
+    }
+};
+
+} // namespace
+
+void registerSplitSimpleDeclarationQuickfix()
+{
+    CppQuickFixFactory::registerFactory<SplitSimpleDeclaration>();
+}
+
+} // namespace CppEditor::Internal

src/plugins/cppeditor/quickfixes/splitsimpledeclaration.h

@@ -0,0 +1,8 @@
+// Copyright (C) 2024 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+
+#pragma once
+
+namespace CppEditor::Internal {
+void registerSplitSimpleDeclarationQuickfix();
+} // namespace CppEditor::Internal