feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge CppTools into CppEditor

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/fakevim/fakevimplugin.cpp
View File

@@ -75,7 +75,7 @@
#include <utils/qtcassert.h>
#include <utils/stylehelper.h>
#include <cpptools/cpptoolsconstants.h>
#include <cppeditor/cppeditorconstants.h>
#include <extensionsystem/pluginmanager.h>
@@ -1172,7 +1172,7 @@ bool FakeVimUserCommandsModel::setData(const QModelIndex &index,
FakeVimPluginPrivate::FakeVimPluginPrivate()
{
m_defaultExCommandMap[CppTools::Constants::SWITCH_HEADER_SOURCE] =
m_defaultExCommandMap[CppEditor::Constants::SWITCH_HEADER_SOURCE] =
QRegularExpression("^A$");
m_defaultExCommandMap["Coreplugin.OutputPane.previtem"] =
QRegularExpression("^(cN(ext)?|cp(revious)?)!?( (.*))?$");
@@ -2037,10 +2037,10 @@ void FakeVimPluginPrivate::handleExCommand(FakeVimHandler *handler, bool *handle
keepOnlyWindow();
} else if (cmd.cmd == "AS") {
triggerAction(Core::Constants::SPLIT);
triggerAction(CppTools::Constants::SWITCH_HEADER_SOURCE);
triggerAction(CppEditor::Constants::SWITCH_HEADER_SOURCE);
} else if (cmd.cmd == "AV") {
triggerAction(Core::Constants::SPLIT_SIDE_BY_SIDE);
triggerAction(CppTools::Constants::SWITCH_HEADER_SOURCE);
triggerAction(CppEditor::Constants::SWITCH_HEADER_SOURCE);
} else {
// Check whether one of the configure commands matches.
const auto end = m_exCommandMap.constEnd();