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

Clang: Clear the project part completely on remove

Browse Source 
Change-Id: I6fdb1766a3b407fbaaf86b0216a0dd710673aec1
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2015-07-16 12:32:02 +02:00
parent f77f6e2144
commit 8d23d80139
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/clangbackend/ipcsource/projectpart.cpp
View File

@@ -98,9 +98,11 @@ ProjectPart &ProjectPart::operator=(ProjectPart &&other)
return *this; return *this;
} }
void ProjectPart::clearProjectPartId() void ProjectPart::clear()
{ {
d->projectPartId.clear(); d->projectPartId.clear();
d->clearArguments();
updateLastChangeTimePoint();
} }
const Utf8String &ProjectPart::projectPartId() const const Utf8String &ProjectPart::projectPartId() const

2
src/tools/clangbackend/ipcsource/projectpart.h
View File

@@ -58,7 +58,7 @@ public:
ProjectPart(ProjectPart &&project); ProjectPart(ProjectPart &&project);
ProjectPart &operator=(ProjectPart &&project); ProjectPart &operator=(ProjectPart &&project);
void clearProjectPartId(); void clear();
const Utf8String &projectPartId() const; const Utf8String &projectPartId() const;

2
src/tools/clangbackend/ipcsource/projects.cpp
View File

@@ -51,7 +51,7 @@ void ProjectParts::remove(const Utf8StringVector &projectPartIds)
const bool isRemoved = processedProjectPartFilePaths.removeFast(project.projectPartId()); const bool isRemoved = processedProjectPartFilePaths.removeFast(project.projectPartId());
if (isRemoved) if (isRemoved)
project.clearProjectPartId(); project.clear();
return isRemoved; return isRemoved;
}); });

6
tests/unit/unittest/projecttest.cpp
View File

@@ -165,16 +165,20 @@ TEST(ProjectPart, ThrowsForNotExistingProjectPartButRemovesAllExistingProject)
ASSERT_THAT(projects.projects(), Not(Contains(project))); ASSERT_THAT(projects.projects(), Not(Contains(project)));
} }
TEST(ProjectPart, ProjectPartIdIsEmptyAfterRemove) TEST(ProjectPart, ProjectPartIsClearedAfterRemove)
{ {
ClangBackEnd::ProjectPartContainer projectContainer(Utf8StringLiteral("pathToProjectPart.pro")); ClangBackEnd::ProjectPartContainer projectContainer(Utf8StringLiteral("pathToProjectPart.pro"));
ClangBackEnd::ProjectParts projects; ClangBackEnd::ProjectParts projects;
projects.createOrUpdate({projectContainer}); projects.createOrUpdate({projectContainer});
ClangBackEnd::ProjectPart project = *projects.findProjectPart(projectContainer.projectPartId()); ClangBackEnd::ProjectPart project = *projects.findProjectPart(projectContainer.projectPartId());
const auto lastChangeTimePoint = project.lastChangeTimePoint();
std::this_thread::sleep_for(std::chrono::steady_clock::duration(1));
projects.remove({projectContainer.projectPartId()}); projects.remove({projectContainer.projectPartId()});
ASSERT_THAT(project.projectPartId(), Utf8String()); ASSERT_THAT(project.projectPartId(), Utf8String());
ASSERT_THAT(project.argumentCount(), 0);
ASSERT_THAT(project.lastChangeTimePoint(), Gt(lastChangeTimePoint));
} }
TEST(ProjectPart, HasProjectPart) TEST(ProjectPart, HasProjectPart)