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

Fix camel-case of *postponed*

Browse Source 
Change-Id: Ie00c35bceba3b772f68e2d9b665af8427a105433
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
This commit is contained in:
Christian Stenger
2015-02-27 14:16:07 +01:00
parent 2b8d6c5fc4
commit 6a3b43fef0
2 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
plugins/autotest/testcodeparser.cpp
View File

@@ -56,12 +56,12 @@ TestCodeParser::TestCodeParser(TestTreeModel *parent)
: QObject(parent), : QObject(parent),
m_model(parent), m_model(parent),
m_parserEnabled(true), m_parserEnabled(true),
m_fullUpdatePostPoned(false), m_fullUpdatePostponed(false),
m_partialUpdatePostPoned(false), m_partialUpdatePostponed(false),
m_dirty(true), m_dirty(true),
m_parserState(Disabled) m_parserState(Disabled)
{ {
// connect to ProgressManager to post-pone test parsing when CppModelManager is parsing // connect to ProgressManager to postpone test parsing when CppModelManager is parsing
auto progressManager = qobject_cast<Core::ProgressManager *>(Core::ProgressManager::instance()); auto progressManager = qobject_cast<Core::ProgressManager *>(Core::ProgressManager::instance());
connect(progressManager, &Core::ProgressManager::taskStarted, connect(progressManager, &Core::ProgressManager::taskStarted,
this, &TestCodeParser::onTaskStarted); this, &TestCodeParser::onTaskStarted);
@@ -88,10 +88,10 @@ void TestCodeParser::setState(State state)
{ {
m_parserState = state; m_parserState = state;
if (m_parserState == Disabled) { if (m_parserState == Disabled) {
m_fullUpdatePostPoned = m_partialUpdatePostPoned = false; m_fullUpdatePostponed = m_partialUpdatePostponed = false;
m_postPonedFiles.clear(); m_postponedFiles.clear();
} else if (m_parserState == Idle && m_dirty && currentProject()) { } else if (m_parserState == Idle && m_dirty && currentProject()) {
scanForTests(m_postPonedFiles.toList()); scanForTests(m_postponedFiles.toList());
} }
} }
@@ -103,14 +103,14 @@ void TestCodeParser::emitUpdateTestTree()
void TestCodeParser::updateTestTree() void TestCodeParser::updateTestTree()
{ {
if (!m_parserEnabled) { if (!m_parserEnabled) {
m_fullUpdatePostPoned = true; m_fullUpdatePostponed = true;
return; return;
} }
if (ProjectExplorer::Project *project = currentProject()) { if (ProjectExplorer::Project *project = currentProject()) {
if (auto qmakeProject = qobject_cast<QmakeProjectManager::QmakeProject *>(project)) { if (auto qmakeProject = qobject_cast<QmakeProjectManager::QmakeProject *>(project)) {
if (qmakeProject->asyncUpdateState() != QmakeProjectManager::QmakeProject::Base) { if (qmakeProject->asyncUpdateState() != QmakeProjectManager::QmakeProject::Base) {
m_fullUpdatePostPoned = true; m_fullUpdatePostponed = true;
return; return;
} }
connect(qmakeProject, &QmakeProjectManager::QmakeProject::proFilesEvaluated, connect(qmakeProject, &QmakeProjectManager::QmakeProject::proFilesEvaluated,
@@ -119,7 +119,7 @@ void TestCodeParser::updateTestTree()
} else } else
return; return;
m_fullUpdatePostPoned = false; m_fullUpdatePostponed = false;
clearCache(); clearCache();
emit cacheCleared(); emit cacheCleared();
@@ -475,9 +475,9 @@ void TestCodeParser::handleQtQuickTest(CPlusPlus::Document::Ptr document)
void TestCodeParser::onCppDocumentUpdated(const CPlusPlus::Document::Ptr &document) void TestCodeParser::onCppDocumentUpdated(const CPlusPlus::Document::Ptr &document)
{ {
if (!m_parserEnabled) { if (!m_parserEnabled) {
if (!m_fullUpdatePostPoned) { if (!m_fullUpdatePostponed) {
m_partialUpdatePostPoned = true; m_partialUpdatePostponed = true;
m_postPonedFiles.insert(document->fileName()); m_postponedFiles.insert(document->fileName());
} }
return; return;
} }
@@ -500,9 +500,9 @@ void TestCodeParser::onCppDocumentUpdated(const CPlusPlus::Document::Ptr &docume
void TestCodeParser::onQmlDocumentUpdated(const QmlJS::Document::Ptr &document) void TestCodeParser::onQmlDocumentUpdated(const QmlJS::Document::Ptr &document)
{ {
if (!m_parserEnabled) { if (!m_parserEnabled) {
if (!m_fullUpdatePostPoned) { if (!m_fullUpdatePostponed) {
m_partialUpdatePostPoned = true; m_partialUpdatePostponed = true;
m_postPonedFiles.insert(document->fileName()); m_postponedFiles.insert(document->fileName());
} }
return; return;
} }
@@ -549,34 +549,34 @@ bool TestCodeParser::postponed(const QStringList &fileList)
case PartialParse: case PartialParse:
// partial is running, postponing a full parse // partial is running, postponing a full parse
if (fileList.isEmpty()) { if (fileList.isEmpty()) {
m_partialUpdatePostPoned = false; m_partialUpdatePostponed = false;
m_postPonedFiles.clear(); m_postponedFiles.clear();
m_fullUpdatePostPoned = true; m_fullUpdatePostponed = true;
} else { } else {
// partial parse triggered, but full parse is postponed already, ignoring this // partial parse triggered, but full parse is postponed already, ignoring this
if (m_fullUpdatePostPoned) if (m_fullUpdatePostponed)
return true; return true;
// partial parse triggered, postpone or add current files to already postponed partial // partial parse triggered, postpone or add current files to already postponed partial
foreach (const QString &file, fileList) foreach (const QString &file, fileList)
m_postPonedFiles.insert(file); m_postponedFiles.insert(file);
m_partialUpdatePostPoned = true; m_partialUpdatePostponed = true;
} }
return true; return true;
case FullParse: case FullParse:
// full parse is running, postponing another full parse // full parse is running, postponing another full parse
if (fileList.isEmpty()) { if (fileList.isEmpty()) {
m_partialUpdatePostPoned = false; m_partialUpdatePostponed = false;
m_postPonedFiles.clear(); m_postponedFiles.clear();
m_fullUpdatePostPoned = true; m_fullUpdatePostponed = true;
} else { } else {
// full parse already postponed, ignoring triggering a partial parse // full parse already postponed, ignoring triggering a partial parse
if (m_fullUpdatePostPoned) { if (m_fullUpdatePostponed) {
return true; return true;
} }
// partial parse triggered, postpone or add current files to already postponed partial // partial parse triggered, postpone or add current files to already postponed partial
foreach (const QString &file, fileList) foreach (const QString &file, fileList)
m_postPonedFiles.insert(file); m_postponedFiles.insert(file);
m_partialUpdatePostPoned = true; m_partialUpdatePostponed = true;
} }
return true; return true;
case Disabled: case Disabled:
@@ -590,14 +590,14 @@ void TestCodeParser::scanForTests(const QStringList &fileList)
if (m_parserState == Disabled) { if (m_parserState == Disabled) {
m_dirty = true; m_dirty = true;
if (fileList.isEmpty()) { if (fileList.isEmpty()) {
m_fullUpdatePostPoned = true; m_fullUpdatePostponed = true;
m_partialUpdatePostPoned = false; m_partialUpdatePostponed = false;
m_postPonedFiles.clear(); m_postponedFiles.clear();
} else { } else {
if (!m_fullUpdatePostPoned) { if (!m_fullUpdatePostponed) {
m_partialUpdatePostPoned = true; m_partialUpdatePostponed = true;
foreach (const QString &file, fileList) foreach (const QString &file, fileList)
m_postPonedFiles.insert(file); m_postponedFiles.insert(file);
} }
} }
return; return;
@@ -725,14 +725,14 @@ void TestCodeParser::onAllTasksFinished(Core::Id type)
if (type != CppTools::Constants::TASK_INDEX) if (type != CppTools::Constants::TASK_INDEX)
return; return;
m_parserEnabled = true; m_parserEnabled = true;
if (m_fullUpdatePostPoned) if (m_fullUpdatePostponed)
updateTestTree(); updateTestTree();
else if (m_partialUpdatePostPoned) { else if (m_partialUpdatePostponed) {
m_partialUpdatePostPoned = false; m_partialUpdatePostponed = false;
QStringList tmp; QStringList tmp;
foreach (const QString &file, m_postPonedFiles) foreach (const QString &file, m_postponedFiles)
tmp << file; tmp << file;
m_postPonedFiles.clear(); m_postponedFiles.clear();
scanForTests(tmp); scanForTests(tmp);
} }
} }
@@ -757,18 +757,18 @@ void TestCodeParser::onFinished()
void TestCodeParser::onPartialParsingFinished() void TestCodeParser::onPartialParsingFinished()
{ {
QTC_ASSERT(m_fullUpdatePostPoned != m_partialUpdatePostPoned QTC_ASSERT(m_fullUpdatePostponed != m_partialUpdatePostponed
|| ((m_fullUpdatePostPoned || m_partialUpdatePostPoned) == false), || ((m_fullUpdatePostponed || m_partialUpdatePostponed) == false),
m_partialUpdatePostPoned = false;m_postPonedFiles.clear();); m_partialUpdatePostponed = false;m_postponedFiles.clear(););
if (m_fullUpdatePostPoned) { if (m_fullUpdatePostponed) {
m_fullUpdatePostPoned = false; m_fullUpdatePostponed = false;
updateTestTree(); updateTestTree();
} else if (m_partialUpdatePostPoned) { } else if (m_partialUpdatePostponed) {
m_partialUpdatePostPoned = false; m_partialUpdatePostponed = false;
QStringList tmp; QStringList tmp;
foreach (const QString &file, m_postPonedFiles) foreach (const QString &file, m_postponedFiles)
tmp << file; tmp << file;
m_postPonedFiles.clear(); m_postponedFiles.clear();
scanForTests(tmp); scanForTests(tmp);
} else { } else {
m_dirty = false; m_dirty = false;

6
plugins/autotest/testcodeparser.h
View File

@@ -110,10 +110,10 @@ private:
QMap<QString, TestInfo> m_quickDocMap; QMap<QString, TestInfo> m_quickDocMap;
QList<UnnamedQuickTestInfo> m_unnamedQuickDocList; QList<UnnamedQuickTestInfo> m_unnamedQuickDocList;
bool m_parserEnabled; bool m_parserEnabled;
bool m_fullUpdatePostPoned; bool m_fullUpdatePostponed;
bool m_partialUpdatePostPoned; bool m_partialUpdatePostponed;
bool m_dirty; bool m_dirty;
QSet<QString> m_postPonedFiles; QSet<QString> m_postponedFiles;
State m_parserState; State m_parserState;
}; };