From 284817fae6514701902ccdb834c2faa46462f2e8 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 30 Aug 2021 10:58:08 +0200 Subject: Merge CppTools into CppEditor There was no proper separation of responsibilities between these plugins. In particular, CppTools had lots of editor-related functionality, so it's not clear why it was separated out in the first place. In fact, for a lot of code, it seemed quite arbitrary where it was put (just one example: switchHeaderSource() was in CppTools, wheras switchDeclarationDefinition() was in CppEditor). Merging the plugins will enable us to get rid of various convoluted pseudo-abstractions that were only introduced to keep up the artificial separation. Change-Id: Iafc3bce625b4794f6d4aa03df6cddc7f2d26716a Reviewed-by: Christian Stenger --- src/plugins/cpptools/cpprefactoringengine.cpp | 117 -------------------------- 1 file changed, 117 deletions(-) delete mode 100644 src/plugins/cpptools/cpprefactoringengine.cpp (limited to 'src/plugins/cpptools/cpprefactoringengine.cpp') diff --git a/src/plugins/cpptools/cpprefactoringengine.cpp b/src/plugins/cpptools/cpprefactoringengine.cpp deleted file mode 100644 index 38f997f539..0000000000 --- a/src/plugins/cpptools/cpprefactoringengine.cpp +++ /dev/null @@ -1,117 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#include "cppcanonicalsymbol.h" -#include "cppmodelmanager.h" -#include "cpprefactoringengine.h" -#include "cppsemanticinfo.h" -#include "cpptoolsreuse.h" -#include "cppfollowsymbolundercursor.h" - -#include -#include - -#include - -namespace CppTools { - -void CppRefactoringEngine::startLocalRenaming(const CursorInEditor &data, - const ProjectPart *, - RenameCallback &&renameSymbolsCallback) -{ - CppEditorWidgetInterface *editorWidget = data.editorWidget(); - QTC_ASSERT(editorWidget, renameSymbolsCallback(QString(), - ClangBackEnd::SourceLocationsContainer(), - 0); return;); - editorWidget->updateSemanticInfo(); - // Call empty callback - renameSymbolsCallback(QString(), - ClangBackEnd::SourceLocationsContainer(), - data.cursor().document()->revision()); -} - -void CppRefactoringEngine::globalRename(const CursorInEditor &data, - UsagesCallback &&, - const QString &replacement) -{ - CppModelManager *modelManager = CppModelManager::instance(); - if (!modelManager) - return; - - CppEditorWidgetInterface *editorWidget = data.editorWidget(); - QTC_ASSERT(editorWidget, return;); - - SemanticInfo info = editorWidget->semanticInfo(); - info.snapshot = modelManager->snapshot(); - info.snapshot.insert(info.doc); - const QTextCursor &cursor = data.cursor(); - if (const CPlusPlus::Macro *macro = findCanonicalMacro(cursor, info.doc)) { - modelManager->renameMacroUsages(*macro, replacement); - } else { - CanonicalSymbol cs(info.doc, info.snapshot); - CPlusPlus::Symbol *canonicalSymbol = cs(cursor); - if (canonicalSymbol) - modelManager->renameUsages(canonicalSymbol, cs.context(), replacement); - } -} - -void CppRefactoringEngine::findUsages(const CursorInEditor &data, - UsagesCallback &&) const -{ - CppModelManager *modelManager = CppModelManager::instance(); - if (!modelManager) - return; - - CppEditorWidgetInterface *editorWidget = data.editorWidget(); - QTC_ASSERT(editorWidget, return;); - - SemanticInfo info = editorWidget->semanticInfo(); - info.snapshot = modelManager->snapshot(); - info.snapshot.insert(info.doc); - const QTextCursor &cursor = data.cursor(); - if (const CPlusPlus::Macro *macro = findCanonicalMacro(cursor, info.doc)) { - modelManager->findMacroUsages(*macro); - } else { - CanonicalSymbol cs(info.doc, info.snapshot); - CPlusPlus::Symbol *canonicalSymbol = cs(cursor); - if (canonicalSymbol) - modelManager->findUsages(canonicalSymbol, cs.context()); - } -} - -void CppRefactoringEngine::globalFollowSymbol( - const CursorInEditor &data, - Utils::ProcessLinkCallback &&processLinkCallback, - const CPlusPlus::Snapshot &snapshot, - const CPlusPlus::Document::Ptr &documentFromSemanticInfo, - SymbolFinder *symbolFinder, - bool inNextSplit) const -{ - FollowSymbolUnderCursor followSymbol; - return followSymbol.findLink(data, std::move(processLinkCallback), true, snapshot, - documentFromSemanticInfo, symbolFinder, inNextSplit); -} - -} // namespace CppEditor -- cgit v1.2.1