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

CppTools: Prioritize project parts from active project

Browse Source 
...when selecting one for the editor document.

Change-Id: I85066aaa0862870cb2db2fb2cb40c2b2c23b2cac
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Nikolai Kosjar
2016-12-16 13:12:04 +01:00
parent b8b6f348e0
commit 566ab175b3
16 changed files with 119 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/clangcodemodel/clangeditordocumentparser.cpp
View File

@@ -36,10 +36,11 @@ ClangEditorDocumentParser::ClangEditorDocumentParser(const QString &filePath)
}
void ClangEditorDocumentParser::updateHelper(const QFutureInterface<void> &,
const CppTools::WorkingCopy &)
const CppTools::WorkingCopy &,
const ProjectExplorer::Project *activeProject)
{
State state_ = state();
state_.projectPart = determineProjectPart(filePath(), configuration(), state_);
state_.projectPart = determineProjectPart(filePath(), configuration(), state_, activeProject);
setState(state_);
}

3
src/plugins/clangcodemodel/clangeditordocumentparser.h
View File

@@ -38,7 +38,8 @@ public:
private:
void updateHelper(const QFutureInterface<void> &future,
const CppTools::WorkingCopy &) override;
const CppTools::WorkingCopy &,
const ProjectExplorer::Project *activeProject) override;
};
} // namespace ClangCodeModel

9
src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
View File

@@ -46,6 +46,8 @@
#include <cpptools/cppworkingcopy.h>
#include <cpptools/editordocumenthandle.h>
#include <projectexplorer/session.h>
#include <texteditor/convenience.h>
#include <texteditor/fontsettings.h>
#include <texteditor/texteditor.h>
@@ -115,7 +117,12 @@ void ClangEditorDocumentProcessor::run()
connect(&m_parserWatcher, &QFutureWatcher<void>::finished,
this, &ClangEditorDocumentProcessor::onParserFinished);
const CppTools::WorkingCopy workingCopy = CppTools::CppModelManager::instance()->workingCopy();
const QFuture<void> future = ::Utils::runAsync(&runParser, parser(), workingCopy);
const ProjectExplorer::Project *activeProject
= ProjectExplorer::SessionManager::startupProject();
const QFuture<void> future = ::Utils::runAsync(&runParser,
parser(),
workingCopy,
activeProject);
m_parserWatcher.setFuture(future);
// Run builtin processor