Files
qt-creator/src/plugins/cpptools/generatedcodemodelsupport.cpp
Nikolai Kosjar b4d6884c25 CppTools: Fix propagating unsaved files
On project loading ExtraCompiler objects are created that might read the
already existing ui_*.h files in the build directory. In this case,
ExtraCompiler::setContent() is called, which will emit a signal about
the modified content.

Now GeneratedCodeModelSupport is a client of this signal and it forwards
the changed contents to the clang code model. However,
GeneratedCodeModelSupport objects might be created later and miss the
initial signal emission, thus leaving the code model unaware of some
unsaved files.

Fix by notifying the code model at construction time of
GeneratedCodeModelSupport.

Change-Id: I7311867ad7f534920357801647bd2d0c82bb4edb
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-11-22 12:21:07 +00:00

129 lines
4.3 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 "generatedcodemodelsupport.h"
#include "cppmodelmanager.h"
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/idocument.h>
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/buildmanager.h>
#include <projectexplorer/project.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/session.h>
#include <projectexplorer/target.h>
#include <utils/algorithm.h>
#include <utils/qtcassert.h>
#include <QFile>
#include <QFileInfo>
#include <QLoggingCategory>
using namespace ProjectExplorer;
using namespace CPlusPlus;
namespace CppTools {
class QObjectCache
{
public:
bool contains(QObject *object) const
{
return m_cache.contains(object);
}
void insert(QObject *object)
{
QObject::connect(object, &QObject::destroyed, [this](QObject *dead) {
m_cache.remove(dead);
});
m_cache.insert(object);
}
private:
QSet<QObject *> m_cache;
};
GeneratedCodeModelSupport::GeneratedCodeModelSupport(CppModelManager *modelmanager,
ProjectExplorer::ExtraCompiler *generator,
const Utils::FileName &generatedFile) :
CppTools::AbstractEditorSupport(modelmanager, generator), m_generatedFileName(generatedFile),
m_generator(generator)
{
QLoggingCategory log("qtc.cpptools.generatedcodemodelsupport");
qCDebug(log) << "ctor GeneratedCodeModelSupport for" << m_generator->source()
<< generatedFile;
connect(m_generator, &ProjectExplorer::ExtraCompiler::contentsChanged,
this, &GeneratedCodeModelSupport::onContentsChanged, Qt::QueuedConnection);
onContentsChanged(generatedFile);
}
GeneratedCodeModelSupport::~GeneratedCodeModelSupport()
{
CppTools::CppModelManager::instance()->emitAbstractEditorSupportRemoved(
m_generatedFileName.toString());
QLoggingCategory log("qtc.cpptools.generatedcodemodelsupport");
qCDebug(log) << "dtor ~generatedcodemodelsupport for" << m_generatedFileName;
}
void GeneratedCodeModelSupport::onContentsChanged(const Utils::FileName &file)
{
if (file == m_generatedFileName) {
notifyAboutUpdatedContents();
updateDocument();
}
}
QByteArray GeneratedCodeModelSupport::contents() const
{
return m_generator->content(m_generatedFileName);
}
QString GeneratedCodeModelSupport::fileName() const
{
return m_generatedFileName.toString();
}
void GeneratedCodeModelSupport::update(const QList<ProjectExplorer::ExtraCompiler *> &generators)
{
static QObjectCache extraCompilerCache;
CppTools::CppModelManager *mm = CppTools::CppModelManager::instance();
foreach (ExtraCompiler *generator, generators) {
if (extraCompilerCache.contains(generator))
continue;
extraCompilerCache.insert(generator);
generator->forEachTarget([mm, generator](const Utils::FileName &generatedFile) {
new GeneratedCodeModelSupport(mm, generator, generatedFile);
});
}
}
} // namespace CppTools