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

Clang: Fix names for visibility changes in translation units

Browse Source 
Change-Id: Iafee06b8f39610f4245ad86eec2b6d442acc61e2
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
Marco Bubke
2015-11-25 16:33:01 +01:00
committed by Nikolai Kosjar
parent ce2a891c48
commit a610c6740b
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -280,8 +280,8 @@ void ClangIpcServer::updateVisibleTranslationUnits(const UpdateVisibleTranslatio
TIME_SCOPE_DURATION("ClangIpcServer::updateVisibleTranslationUnits"); TIME_SCOPE_DURATION("ClangIpcServer::updateVisibleTranslationUnits");
try { try {
translationUnits.setCurrentEditor(message.currentEditorFilePath()); translationUnits.setUsedByCurrentEditor(message.currentEditorFilePath());
translationUnits.setVisibleEditors(message.visibleEditorFilePaths()); translationUnits.setVisibleInEditors(message.visibleEditorFilePaths());
} catch (const std::exception &exception) { } catch (const std::exception &exception) {
qWarning() << "Error in ClangIpcServer::updateVisibleTranslationUnits:" << exception.what(); qWarning() << "Error in ClangIpcServer::updateVisibleTranslationUnits:" << exception.what();
} }

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

@@ -100,13 +100,13 @@ void TranslationUnits::remove(const QVector<FileContainer> &fileContainers)
updateTranslationUnitsWithChangedDependencies(fileContainers); updateTranslationUnitsWithChangedDependencies(fileContainers);
} }
void TranslationUnits::setCurrentEditor(const Utf8String &filePath) void TranslationUnits::setUsedByCurrentEditor(const Utf8String &filePath)
{ {
for (TranslationUnit &translationUnit : translationUnits_) for (TranslationUnit &translationUnit : translationUnits_)
translationUnit.setIsUsedByCurrentEditor(translationUnit.filePath() == filePath); translationUnit.setIsUsedByCurrentEditor(translationUnit.filePath() == filePath);
} }
void TranslationUnits::setVisibleEditors(const Utf8StringVector &filePaths) void TranslationUnits::setVisibleInEditors(const Utf8StringVector &filePaths)
{ {
for (TranslationUnit &translationUnit : translationUnits_) for (TranslationUnit &translationUnit : translationUnits_)
translationUnit.setIsVisibleInEditor(filePaths.contains(translationUnit.filePath())); translationUnit.setIsVisibleInEditor(filePaths.contains(translationUnit.filePath()));

4
src/tools/clangbackend/ipcsource/translationunits.h
View File

@@ -67,8 +67,8 @@ public:
void update(const QVector<FileContainer> &fileContainers); void update(const QVector<FileContainer> &fileContainers);
void remove(const QVector<FileContainer> &fileContainers); void remove(const QVector<FileContainer> &fileContainers);
void setCurrentEditor(const Utf8String &filePath); void setUsedByCurrentEditor(const Utf8String &filePath);
void setVisibleEditors(const Utf8StringVector &filePaths); void setVisibleInEditors(const Utf8StringVector &filePaths);
const TranslationUnit &translationUnit(const Utf8String &filePath, const Utf8String &projectPartId) const; const TranslationUnit &translationUnit(const Utf8String &filePath, const Utf8String &projectPartId) const;
const TranslationUnit &translationUnit(const FileContainer &fileContainer) const; const TranslationUnit &translationUnit(const FileContainer &fileContainer) const;

16
tests/unit/unittest/translationunitstest.cpp
View File

@@ -317,7 +317,7 @@ TEST_F(TranslationUnits, isUsedByCurrentEditor)
translationUnits.create({fileContainer}); translationUnits.create({fileContainer});
auto translationUnit = translationUnits.translationUnit(fileContainer); auto translationUnit = translationUnits.translationUnit(fileContainer);
translationUnits.setCurrentEditor(filePath); translationUnits.setUsedByCurrentEditor(filePath);
ASSERT_TRUE(translationUnit.isUsedByCurrentEditor()); ASSERT_TRUE(translationUnit.isUsedByCurrentEditor());
} }
@@ -327,7 +327,7 @@ TEST_F(TranslationUnits, IsNotCurrentEditor)
translationUnits.create({fileContainer}); translationUnits.create({fileContainer});
auto translationUnit = translationUnits.translationUnit(fileContainer); auto translationUnit = translationUnits.translationUnit(fileContainer);
translationUnits.setCurrentEditor(headerPath); translationUnits.setUsedByCurrentEditor(headerPath);
ASSERT_FALSE(translationUnit.isUsedByCurrentEditor()); ASSERT_FALSE(translationUnit.isUsedByCurrentEditor());
} }
@@ -336,9 +336,9 @@ TEST_F(TranslationUnits, IsNotCurrentEditorAfterBeingCurrent)
{ {
translationUnits.create({fileContainer}); translationUnits.create({fileContainer});
auto translationUnit = translationUnits.translationUnit(fileContainer); auto translationUnit = translationUnits.translationUnit(fileContainer);
translationUnits.setCurrentEditor(filePath); translationUnits.setUsedByCurrentEditor(filePath);
translationUnits.setCurrentEditor(headerPath); translationUnits.setUsedByCurrentEditor(headerPath);
ASSERT_FALSE(translationUnit.isUsedByCurrentEditor()); ASSERT_FALSE(translationUnit.isUsedByCurrentEditor());
} }
@@ -348,7 +348,7 @@ TEST_F(TranslationUnits, IsVisibleEditor)
translationUnits.create({fileContainer}); translationUnits.create({fileContainer});
auto translationUnit = translationUnits.translationUnit(fileContainer); auto translationUnit = translationUnits.translationUnit(fileContainer);
translationUnits.setVisibleEditors({filePath}); translationUnits.setVisibleInEditors({filePath});
ASSERT_TRUE(translationUnit.isVisibleInEditor()); ASSERT_TRUE(translationUnit.isVisibleInEditor());
} }
@@ -358,7 +358,7 @@ TEST_F(TranslationUnits, IsNotVisibleEditor)
translationUnits.create({fileContainer}); translationUnits.create({fileContainer});
auto translationUnit = translationUnits.translationUnit(fileContainer); auto translationUnit = translationUnits.translationUnit(fileContainer);
translationUnits.setVisibleEditors({headerPath}); translationUnits.setVisibleInEditors({headerPath});
ASSERT_FALSE(translationUnit.isVisibleInEditor()); ASSERT_FALSE(translationUnit.isVisibleInEditor());
} }
@@ -367,9 +367,9 @@ TEST_F(TranslationUnits, IsNotVisibleEditorAfterBeingVisible)
{ {
translationUnits.create({fileContainer}); translationUnits.create({fileContainer});
auto translationUnit = translationUnits.translationUnit(fileContainer); auto translationUnit = translationUnits.translationUnit(fileContainer);
translationUnits.setVisibleEditors({filePath}); translationUnits.setVisibleInEditors({filePath});
translationUnits.setVisibleEditors({headerPath}); translationUnits.setVisibleInEditors({headerPath});
ASSERT_FALSE(translationUnit.isVisibleInEditor()); ASSERT_FALSE(translationUnit.isVisibleInEditor());
} }