diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2021-08-30 10:58:08 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2021-09-01 14:53:58 +0000 |
commit | 284817fae6514701902ccdb834c2faa46462f2e8 (patch) | |
tree | 44a8c7d9813dc110b61c4639036366c7696bd7e9 /src/plugins/cpptools/baseeditordocumentprocessor.cpp | |
parent | 3e1fa0f170d523971d2c3c12da15a6e291f56511 (diff) | |
download | qt-creator-284817fae6514701902ccdb834c2faa46462f2e8.tar.gz |
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>
Diffstat (limited to 'src/plugins/cpptools/baseeditordocumentprocessor.cpp')
-rw-r--r-- | src/plugins/cpptools/baseeditordocumentprocessor.cpp | 112 |
1 files changed, 0 insertions, 112 deletions
diff --git a/src/plugins/cpptools/baseeditordocumentprocessor.cpp b/src/plugins/cpptools/baseeditordocumentprocessor.cpp deleted file mode 100644 index 6bd91fc564..0000000000 --- a/src/plugins/cpptools/baseeditordocumentprocessor.cpp +++ /dev/null @@ -1,112 +0,0 @@ -/**************************************************************************** -** -** 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. -** -****************************************************************************/ - -#include "baseeditordocumentprocessor.h" - -#include "cppcodemodelsettings.h" -#include "cppmodelmanager.h" -#include "cpptoolsbridge.h" -#include "cpptoolsreuse.h" -#include "cpptools_utils.h" -#include "editordocumenthandle.h" - -#include <projectexplorer/session.h> -#include <texteditor/quickfix.h> - -namespace CppTools { - -/*! - \class CppTools::BaseEditorDocumentProcessor - - \brief The BaseEditorDocumentProcessor class controls and executes all - document relevant actions (reparsing, semantic highlighting, additional - semantic calculations) after a text document has changed. -*/ - -BaseEditorDocumentProcessor::BaseEditorDocumentProcessor(QTextDocument *textDocument, - const QString &filePath) - : m_filePath(filePath), - m_textDocument(textDocument) -{ -} - -BaseEditorDocumentProcessor::~BaseEditorDocumentProcessor() = default; - -void BaseEditorDocumentProcessor::run(bool projectsUpdated) -{ - const Language languagePreference = codeModelSettings()->interpretAmbigiousHeadersAsCHeaders() - ? Language::C - : Language::Cxx; - - runImpl({CppModelManager::instance()->workingCopy(), - ProjectExplorer::SessionManager::startupProject(), - languagePreference, - projectsUpdated}); -} - -TextEditor::QuickFixOperations -BaseEditorDocumentProcessor::extraRefactoringOperations(const TextEditor::AssistInterface &) -{ - return TextEditor::QuickFixOperations(); -} - -void BaseEditorDocumentProcessor::editorDocumentTimerRestarted() -{ -} - -void BaseEditorDocumentProcessor::invalidateDiagnostics() -{ -} - -void BaseEditorDocumentProcessor::setParserConfig( - const BaseEditorDocumentParser::Configuration &config) -{ - parser()->setConfiguration(config); -} - -QFuture<ToolTipInfo> BaseEditorDocumentProcessor::toolTipInfo(const QByteArray &/*codecName*/, - int /*line*/, - int /*column*/) -{ - return QFuture<ToolTipInfo>(); -} - -void BaseEditorDocumentProcessor::runParser(QFutureInterface<void> &future, - BaseEditorDocumentParser::Ptr parser, - BaseEditorDocumentParser::UpdateParams updateParams) -{ - future.setProgressRange(0, 1); - if (future.isCanceled()) { - future.setProgressValue(1); - return; - } - - parser->update(future, updateParams); - CppToolsBridge::finishedRefreshingSourceFiles({parser->filePath()}); - - future.setProgressValue(1); -} - -} // namespace CppTools |