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

CppEditor: Rework showing/switching parse configurations

Browse Source 
* Move the combox box for switching the parse configurations out of the
  "Additional Preprocessor Directives" dialog ('#'-button) to make it
  better visible/accessible. Also, decouple the extra preprocessor
  directives from the concrete parse context since this is not anymore
  in same dialog.
* The combo box appears only if multiple parse configurations are
  available for a file.
* The first time multiple parse configurations are detected, an info bar
  is shown that points the user to the combox box. A "Do Not Show Again"
  button is provided.
* Upon selecting an entry, the preferred parse configuration is saved as
  part of the session. The setting can be cleared with the context menu
  entry on the combo box.

Follow-up changes need to ensure that the display name and/or tooltip is
unambiguous, e.g. for qbs and cmake projects.

Change-Id: I9e9773704187291524ad7b605bfdddd83ef5b19d
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Nikolai Kosjar
2017-01-18 15:05:46 +01:00
parent 9ac96339ff
commit 38ba61ec4f
18 changed files with 538 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
tests/unit/unittest/cppprojectpartchooser-test.cpp
View File

@@ -49,7 +49,9 @@ protected:
protected:
QString filePath;
ProjectPartInfo currentProjectPartInfo{ProjectPart::Ptr(new ProjectPart),
ProjectPart::Ptr currentProjectPart{new ProjectPart};
ProjectPartInfo currentProjectPartInfo{currentProjectPart,
{currentProjectPart},
ProjectPartInfo::NoHint};
QString preferredProjectPartId;
const ProjectExplorer::Project *activeProject = nullptr;
@@ -74,6 +76,37 @@ TEST_F(ProjectPartChooser, ChooseManuallySet)
ASSERT_THAT(chosen, Eq(p2));
}
TEST_F(ProjectPartChooser, IndicateManuallySet)
{
ProjectPart::Ptr p1(new ProjectPart);
ProjectPart::Ptr p2(new ProjectPart);
p2->projectFile = preferredProjectPartId = "someId";
projectPartsForFile += {p1, p2};
const ProjectPartInfo::Hints hints = choose().hints;
ASSERT_TRUE(hints & ProjectPartInfo::IsPreferredMatch);
}
TEST_F(ProjectPartChooser, IndicateManuallySetForFallbackToProjectPartFromDependencies)
{
ProjectPart::Ptr p1(new ProjectPart);
ProjectPart::Ptr p2(new ProjectPart);
p2->projectFile = preferredProjectPartId = "someId";
projectPartsFromDependenciesForFile += {p1, p2};
const ProjectPartInfo::Hints hints = choose().hints;
ASSERT_TRUE(hints & ProjectPartInfo::IsPreferredMatch);
}
TEST_F(ProjectPartChooser, DoNotIndicateNotManuallySet)
{
const ProjectPartInfo::Hints hints = choose().hints;
ASSERT_FALSE(hints & ProjectPartInfo::IsPreferredMatch);
}
TEST_F(ProjectPartChooser, ForMultipleChooseFromActiveProject)
{
const QList<ProjectPart::Ptr> projectParts = createProjectPartsWithDifferentProjects();
@@ -154,9 +187,20 @@ TEST_F(ProjectPartChooser, IndicateMultiple)
const ProjectPart::Ptr p2{new ProjectPart};
projectPartsForFile += { p1, p2 };
const ProjectPartInfo::Hint hint = choose().hint;
const ProjectPartInfo::Hints hints = choose().hints;
ASSERT_THAT(hint, Eq(ProjectPartInfo::Hint::IsAmbiguousMatch));
ASSERT_TRUE(hints & ProjectPartInfo::IsAmbiguousMatch);
}
TEST_F(ProjectPartChooser, IndicateMultipleForFallbackToProjectPartFromDependencies)
{
const ProjectPart::Ptr p1{new ProjectPart};
const ProjectPart::Ptr p2{new ProjectPart};
projectPartsFromDependenciesForFile += { p1, p2 };
const ProjectPartInfo::Hints hints = choose().hints;
ASSERT_TRUE(hints & ProjectPartInfo::IsAmbiguousMatch);
}
TEST_F(ProjectPartChooser, ForMultipleChooseNewIfPreviousIsGone)
@@ -193,7 +237,7 @@ TEST_F(ProjectPartChooser, ContinueUsingFallbackFromModelManagerIfProjectDoesNot
// ...without re-calculating the dependency table.
fallbackProjectPart.reset(new ProjectPart);
currentProjectPartInfo.projectPart = fallbackProjectPart;
currentProjectPartInfo.hint = ProjectPartInfo::IsFallbackMatch;
currentProjectPartInfo.hints |= ProjectPartInfo::IsFallbackMatch;
projectPartsFromDependenciesForFile += ProjectPart::Ptr(new ProjectPart);
const ProjectPart::Ptr chosen = choose().projectPart;
@@ -205,7 +249,7 @@ TEST_F(ProjectPartChooser, StopUsingFallbackFromModelManagerIfProjectChanges1)
{
fallbackProjectPart.reset(new ProjectPart);
currentProjectPartInfo.projectPart = fallbackProjectPart;
currentProjectPartInfo.hint = ProjectPartInfo::IsFallbackMatch;
currentProjectPartInfo.hints |= ProjectPartInfo::IsFallbackMatch;
const ProjectPart::Ptr addedProject(new ProjectPart);
projectPartsForFile += addedProject;
@@ -218,7 +262,7 @@ TEST_F(ProjectPartChooser, StopUsingFallbackFromModelManagerIfProjectChanges2)
{
fallbackProjectPart.reset(new ProjectPart);
currentProjectPartInfo.projectPart = fallbackProjectPart;
currentProjectPartInfo.hint = ProjectPartInfo::IsFallbackMatch;
currentProjectPartInfo.hints |= ProjectPartInfo::IsFallbackMatch;
const ProjectPart::Ptr addedProject(new ProjectPart);
projectPartsFromDependenciesForFile += addedProject;
projectsChanged = true;
@@ -232,9 +276,27 @@ TEST_F(ProjectPartChooser, IndicateFallbacktoProjectPartFromModelManager)
{
fallbackProjectPart.reset(new ProjectPart);
const ProjectPartInfo::Hint hint = choose().hint;
const ProjectPartInfo::Hints hints = choose().hints;
ASSERT_THAT(hint, Eq(ProjectPartInfo::Hint::IsFallbackMatch));
ASSERT_TRUE(hints & ProjectPartInfo::IsFallbackMatch);
}
TEST_F(ProjectPartChooser, IndicateFromDependencies)
{
projectPartsFromDependenciesForFile += ProjectPart::Ptr(new ProjectPart);
const ProjectPartInfo::Hints hints = choose().hints;
ASSERT_TRUE(hints & ProjectPartInfo::IsFromDependenciesMatch);
}
TEST_F(ProjectPartChooser, DoNotIndicateFromDependencies)
{
projectPartsForFile += ProjectPart::Ptr(new ProjectPart);
const ProjectPartInfo::Hints hints = choose().hints;
ASSERT_FALSE(hints & ProjectPartInfo::IsFromDependenciesMatch);
}
void ProjectPartChooser::SetUp()