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 <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2021-08-30 10:58:08 +02:00
parent 3e1fa0f170
commit 284817fae6
525 changed files with 3705 additions and 4179 deletions

View File

@@ -0,0 +1,86 @@
/****************************************************************************
**
** Copyright (C) 2016 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.
**
****************************************************************************/
#pragma once
#include "cppeditor_global.h"
#include <texteditor/codeassist/genericproposal.h>
#include <texteditor/codeassist/iassistprovider.h>
#include <cplusplus/CppDocument.h>
#include <cplusplus/Symbols.h>
#include <cplusplus/TypeOfExpression.h>
#include <QSharedPointer>
#include <QTextCursor>
namespace TextEditor {
class AssistProposalItemInterface;
class IAssistProposalWidget;
}
namespace CppEditor {
class CPPEDITOR_EXPORT VirtualFunctionProposal : public TextEditor::GenericProposal
{
public:
VirtualFunctionProposal(int cursorPos,
const QList<TextEditor::AssistProposalItemInterface *> &items,
bool openInSplit);
private:
TextEditor::IAssistProposalWidget *createWidget() const override;
bool m_openInSplit;
};
class CPPEDITOR_EXPORT VirtualFunctionAssistProvider : public TextEditor::IAssistProvider
{
Q_OBJECT
public:
VirtualFunctionAssistProvider();
struct Parameters {
CPlusPlus::Function *function = nullptr;
CPlusPlus::Class *staticClass = nullptr;
QSharedPointer<CPlusPlus::TypeOfExpression> typeOfExpression; // Keeps instantiated symbols.
CPlusPlus::Snapshot snapshot;
int cursorPosition = -1;
bool openInNextSplit = false;
};
virtual bool configure(const Parameters &parameters);
Parameters params() const { return m_params; }
void clearParams() { m_params = Parameters(); }
IAssistProvider::RunType runType() const override;
TextEditor::IAssistProcessor *createProcessor() const override;
private:
Parameters m_params;
};
} // namespace CppEditor