forked from qt-creator/qt-creator
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:
112
src/plugins/cppeditor/baseeditordocumentprocessor.cpp
Normal file
112
src/plugins/cppeditor/baseeditordocumentprocessor.cpp
Normal file
@@ -0,0 +1,112 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** 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 "cppeditor_utils.h"
|
||||
#include "cppmodelmanager.h"
|
||||
#include "cpptoolsbridge.h"
|
||||
#include "cpptoolsreuse.h"
|
||||
#include "editordocumenthandle.h"
|
||||
|
||||
#include <projectexplorer/session.h>
|
||||
#include <texteditor/quickfix.h>
|
||||
|
||||
namespace CppEditor {
|
||||
|
||||
/*!
|
||||
\class CppEditor::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 CppEditor
|
||||
Reference in New Issue
Block a user