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

Fix parser state handling...

Browse Source 
...especially state transitions that may happen while project files
are evaluated or source files are parsed.

Change-Id: Iceef38500b6d6a4deb430738e5e960077f8eb39a
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Christian Stenger
2015-03-30 10:44:54 +02:00
parent d0de2fdbbc
commit 377408b1b0
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/autotest/testcodeparser.cpp
View File

@@ -87,6 +87,9 @@ ProjectExplorer::Project *currentProject()
void TestCodeParser::setState(State state) void TestCodeParser::setState(State state)
{ {
m_parserState = state; m_parserState = state;
// avoid triggering parse before code model parsing has finished
if (!m_parserEnabled)
return;
if (m_parserState == Disabled) { if (m_parserState == Disabled) {
m_fullUpdatePostponed = m_partialUpdatePostponed = false; m_fullUpdatePostponed = m_partialUpdatePostponed = false;
m_postponedFiles.clear(); m_postponedFiles.clear();
@@ -727,6 +730,9 @@ 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;
// avoid illegal parser state if respective widgets became hidden while parsing
if (m_parserState == Disabled)
m_parserState = Idle;
if (m_fullUpdatePostponed) if (m_fullUpdatePostponed)
updateTestTree(); updateTestTree();
else if (m_partialUpdatePostponed) { else if (m_partialUpdatePostponed) {
@@ -888,6 +894,9 @@ void TestCodeParser::onProFileEvaluated()
QStringList files; QStringList files;
foreach (auto projectFile, p->files) foreach (auto projectFile, p->files)
files.append(projectFile.path); files.append(projectFile.path);
// avoid illegal parser state when respective widgets became hidden while evaluating
if (m_parserState == Disabled)
m_parserState = Idle;
scanForTests(files); scanForTests(files);
} }
} }