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

16
src/plugins/cpptools/cppprojectpartchooser.cpp
View File

@@ -25,15 +25,25 @@
#include "cppprojectpartchooser.h"
#include <utils/algorithm.h>
#include <utils/qtcassert.h>
namespace CppTools {
namespace Internal {
static ProjectPart::Ptr selectFromActiveProject(const QList<ProjectPart::Ptr> &projectParts,
const ProjectExplorer::Project *activeProject)
{
return Utils::findOr(projectParts, projectParts.first(), [&](const ProjectPart::Ptr &projectPart){
return projectPart->project == activeProject;
});
}
ProjectPart::Ptr ProjectPartChooser::choose(const QString &filePath,
const ProjectPart::Ptr &currentProjectPart,
const ProjectPart::Ptr &manuallySetProjectPart,
bool stickToPreviousProjectPart) const
bool stickToPreviousProjectPart,
const ProjectExplorer::Project *activeProject) const
{
QTC_CHECK(m_projectPartsForFile);
QTC_CHECK(m_projectPartsFromDependenciesForFile);
@@ -57,11 +67,11 @@ ProjectPart::Ptr ProjectPartChooser::choose(const QString &filePath,
// Fall-back step 2: Use fall-back part from the model manager:
projectPart = m_fallbackProjectPart();
else
projectPart = projectParts.first();
projectPart = selectFromActiveProject(projectParts, activeProject);
} else {
if (!projectParts.contains(projectPart))
// Apparently the project file changed, so update our project part.
projectPart = projectParts.first();
projectPart = selectFromActiveProject(projectParts, activeProject);
}
return projectPart;