forked from qt-creator/qt-creator
ad49e64ff0
The m_parserFuture.cancel() in ~BuiltinEditorDocumentProcessor() did not cancel anything. Thus, closing a document while the parser was running led to a blocking UI thread. Now it cancels at the next include directive it encounters. Change-Id: I092fddbbd747e0bc95265b6e9b4fcc26b3f76cb3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
87 lines
2.8 KiB
C++
87 lines
2.8 KiB
C++
/****************************************************************************
|
|
**
|
|
** 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 "cppmodelmanager.h"
|
|
#include "cpptoolsbridge.h"
|
|
#include "editordocumenthandle.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()
|
|
{
|
|
}
|
|
|
|
TextEditor::QuickFixOperations
|
|
BaseEditorDocumentProcessor::extraRefactoringOperations(const TextEditor::AssistInterface &)
|
|
{
|
|
return TextEditor::QuickFixOperations();
|
|
}
|
|
|
|
bool BaseEditorDocumentProcessor::hasDiagnosticsAt(uint, uint) const
|
|
{
|
|
return false;
|
|
}
|
|
|
|
void BaseEditorDocumentProcessor::addDiagnosticToolTipToLayout(uint, uint, QLayout *) const
|
|
{
|
|
}
|
|
|
|
void BaseEditorDocumentProcessor::runParser(QFutureInterface<void> &future,
|
|
BaseEditorDocumentParser::Ptr parser,
|
|
const WorkingCopy workingCopy)
|
|
{
|
|
future.setProgressRange(0, 1);
|
|
if (future.isCanceled()) {
|
|
future.setProgressValue(1);
|
|
return;
|
|
}
|
|
|
|
parser->update(future, workingCopy);
|
|
CppToolsBridge::finishedRefreshingSourceFiles({parser->filePath()});
|
|
|
|
future.setProgressValue(1);
|
|
}
|
|
|
|
} // namespace CppTools
|