feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
d37ec2c1e511df19f48b4a621270df3e7135a731
qt-creator/tests/unit/unittest/symbolindexer-test.cpp

661 lines
29 KiB
C++
Raw Normal View History

Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#include "googletest.h"
Clang: Collect source files Change-Id: If0183cafd00ed7e42bacbdb72a1d65624dc03cee Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2017-10-26 13:23:27 +02:00
#include "mockclangpathwatcher.h"
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
#include "mocksymbolscollector.h"
#include "mocksymbolstorage.h"
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
#include "mockfilepathcaching.h"
#include "mocksqlitetransactionbackend.h"
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
#include "mockusedmacroandsourcestorage.h"
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
Clang: Add time stamp based filtering for project parts The source ids are now filtered by the modified time. If the modified time in the database is older than the modified time of the file it will be parsed. If it is not newer it will be not parsed. Change-Id: I4ade3443dd66573ac88053a2cafa600e54cfe973 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 17:49:02 +01:00
#include <filepathcaching.h>
#include <filestatuscache.h>
#include <projectpartcontainerv2.h>
#include <refactoringdatabaseinitializer.h>
Clang: Reuse thread based pipeline for pch creation The pch creation so far used signal and slots but there was no explicit pipeline. This patch is introducing the same architecture like the refactoring plugin. It is filtering out older project parts from the pipeline. Change-Id: Iaa6bd2ca1272231b97ebe1f5f7b2ce8e43bc590c Task-number: QTCREATORBUG-21111 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-11 17:02:45 +02:00
#include <processormanager.h>
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
#include <symbolindexer.h>
Clang: Introduce parallel indexing Change-Id: I522cb18e6d24b7dbed5d5dfa3a732e5b3b5113bb Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-08-28 12:08:37 +02:00
#include <symbolindexertaskqueue.h>
Clang: Reuse thread based pipeline for pch creation The pch creation so far used signal and slots but there was no explicit pipeline. This patch is introducing the same architecture like the refactoring plugin. It is filtering out older project parts from the pipeline. Change-Id: Iaa6bd2ca1272231b97ebe1f5f7b2ce8e43bc590c Task-number: QTCREATORBUG-21111 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-11 17:02:45 +02:00
#include <taskscheduler.h>
Clang: Use PCHs for indexing As generating the AST is quite expensive it would be very useful to cache the not changed include. So we generate PCHs for include outside of a project part. With this change this PCHs are used by the indexer. For that they are save to the symbol database by the PCH manager and when fetched by the symbol indexer. Change-Id: I7a5b07cfb32d72d50dc52d2b108cd41727a7bfc7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-20 12:43:05 +01:00
#include <updateprojectpartsmessage.h>
Clang: Add time stamp based filtering for project parts The source ids are now filtered by the modified time. If the modified time in the database is older than the modified time of the file it will be parsed. If it is not newer it will be not parsed. Change-Id: I4ade3443dd66573ac88053a2cafa600e54cfe973 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 17:49:02 +01:00
Clang: Introduce parallel indexing Change-Id: I522cb18e6d24b7dbed5d5dfa3a732e5b3b5113bb Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-08-28 12:08:37 +02:00
#include <QCoreApplication>
Clang: Add time stamp based filtering for project parts The source ids are now filtered by the modified time. If the modified time in the database is older than the modified time of the file it will be parsed. If it is not newer it will be not parsed. Change-Id: I4ade3443dd66573ac88053a2cafa600e54cfe973 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 17:49:02 +01:00
#include <QDateTime>
#include <fstream>
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
namespace {
using Utils::PathString;
Clang: Introduce CompilerMacro We want not only the name but the value of the macro too. So we can compare if anything has changed. Change-Id: Ie59caf8cbf54d108f9e15299d25306a406b5c40d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-06 19:03:14 +01:00
using ClangBackEnd::CompilerMacro;
Clang: Rename FileInformation in FileStatus It's more near to the Unix convention and it has a plural too. Change-Id: I53f85911d8fcbaadba9947c70e9a375dc6995ed5 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-01 18:29:45 +01:00
using ClangBackEnd::FileStatuses;
Clang: Don't reparse if the macros haven't changed We have to extend that to include paths too, which will be happen in a follow up patch. Change-Id: I7f8ac663ae8588e647fc6a6b5d689a629a28ef65 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-07 16:18:16 +01:00
using ClangBackEnd::FilePathId;
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
using ClangBackEnd::FilePathIds;
using ClangBackEnd::FilePathView;
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
using ClangBackEnd::V2::ProjectPartContainer;
using ClangBackEnd::V2::ProjectPartContainers;
Clang: Add Symbol Indexing It is a first step and now a database is generated if you start QtCreator. Some code is now shared with the PchManager which can be improved in the future. Change-Id: Ic267fe7960f6c455d91832859a673ce98f269aa2 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-17 12:44:52 +02:00
using ClangBackEnd::V2::FileContainers;
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
using ClangBackEnd::SymbolEntries;
using ClangBackEnd::SymbolEntry;
Clang: Introduce parallel indexing Change-Id: I522cb18e6d24b7dbed5d5dfa3a732e5b3b5113bb Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-08-28 12:08:37 +02:00
using ClangBackEnd::SymbolIndexerTask;
using ClangBackEnd::SymbolIndexerTaskQueue;
Clang: Reuse thread based pipeline for pch creation The pch creation so far used signal and slots but there was no explicit pipeline. This patch is introducing the same architecture like the refactoring plugin. It is filtering out older project parts from the pipeline. Change-Id: Iaa6bd2ca1272231b97ebe1f5f7b2ce8e43bc590c Task-number: QTCREATORBUG-21111 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-11 17:02:45 +02:00
using ClangBackEnd::TaskScheduler;
using ClangBackEnd::ProcessorManager;
Clang: Handle source dependencies in symbol indexer Get the source dependencies from the collector and save them in the symbol storage. Change-Id: Ibc141970a100625398c1526f5bc644cc14d25c0c Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-31 14:14:34 +01:00
using ClangBackEnd::SourceDependencies;
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
using ClangBackEnd::SourceLocationEntries;
using ClangBackEnd::SourceLocationEntry;
Clang: Process SymbolKind and SymbolTags with the indexer We add the infrastructure to compute the SymbolKind and SymbolTags in the indexer. Later we have to add more for templates, virtual functions etc.. Change-Id: I9203c5cfbfffed3065337292010de5fce5736453 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-03-22 17:46:43 +01:00
using ClangBackEnd::SymbolKind;
Clang: Locator filter for the symbol database There are no symbol queries for the locator filters. The signature generation is still not implemented but for simple cases it should work. Change-Id: Ic6b04fbe1e7e057892f194ac139615c47d6ec33f Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-04-09 13:30:30 +02:00
using ClangBackEnd::SourceLocationKind;
Clang: Rename defineName in macroName Change-Id: Iaf8da991032e5ed4726384c051290a77887351fa Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-25 15:20:47 +01:00
using ClangBackEnd::UsedMacros;
Clang: Use PCHs for indexing As generating the AST is quite expensive it would be very useful to cache the not changed include. So we generate PCHs for include outside of a project part. With this change this PCHs are used by the indexer. For that they are save to the symbol database by the PCH manager and when fetched by the symbol indexer. Change-Id: I7a5b07cfb32d72d50dc52d2b108cd41727a7bfc7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-20 12:43:05 +01:00
using OptionalProjectPartArtefact = Utils::optional<ClangBackEnd::ProjectPartArtefact>;
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
MATCHER_P2(IsFileId, directoryId, fileNameId,
std::string(negation ? "isn't " : "is ")
+ PrintToString(ClangBackEnd::FilePathId(directoryId, fileNameId)))
{
return arg == ClangBackEnd::FilePathId(directoryId, fileNameId);
}
Clang: Add time stamp based filtering for project parts The source ids are now filtered by the modified time. If the modified time in the database is older than the modified time of the file it will be parsed. If it is not newer it will be not parsed. Change-Id: I4ade3443dd66573ac88053a2cafa600e54cfe973 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 17:49:02 +01:00
struct Data
{
Sqlite::Database database{":memory:", Sqlite::JournalMode::Memory};
ClangBackEnd::RefactoringDatabaseInitializer<Sqlite::Database> databaseInitializer{database};
ClangBackEnd::FilePathCaching filePathCache{database};
};
Clang: Reuse thread based pipeline for pch creation The pch creation so far used signal and slots but there was no explicit pipeline. This patch is introducing the same architecture like the refactoring plugin. It is filtering out older project parts from the pipeline. Change-Id: Iaa6bd2ca1272231b97ebe1f5f7b2ce8e43bc590c Task-number: QTCREATORBUG-21111 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-11 17:02:45 +02:00
class Manager final : public ProcessorManager<NiceMock<MockSymbolsCollector>>
{
public:
using Processor = NiceMock<MockSymbolsCollector>;
Manager(const ClangBackEnd::GeneratedFiles &generatedFiles)
: ProcessorManager(generatedFiles)
{}
protected:
std::unique_ptr<NiceMock<MockSymbolsCollector>> createProcessor() const
{
return std::make_unique<NiceMock<MockSymbolsCollector>>();
}
};
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
class SymbolIndexer : public testing::Test
{
protected:
Clang: Cleanup symbol indexer test Change-Id: I1cfa70d092d27949e0cf9466b190afbc40c1a591 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2017-12-27 13:19:21 +01:00
void SetUp()
{
ON_CALL(mockCollector, symbols()).WillByDefault(ReturnRef(symbolEntries));
ON_CALL(mockCollector, sourceLocations()).WillByDefault(ReturnRef(sourceLocations));
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
ON_CALL(mockCollector, sourceFiles()).WillByDefault(ReturnRef(sourceFileIds));
Clang: Rename defineName in macroName Change-Id: Iaf8da991032e5ed4726384c051290a77887351fa Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-25 15:20:47 +01:00
ON_CALL(mockCollector, usedMacros()).WillByDefault(ReturnRef(usedMacros));
Clang: Rename FileInformation in FileStatus It's more near to the Unix convention and it has a plural too. Change-Id: I53f85911d8fcbaadba9947c70e9a375dc6995ed5 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-01 18:29:45 +01:00
ON_CALL(mockCollector, fileStatuses()).WillByDefault(ReturnRef(fileStatus));
Clang: Handle source dependencies in symbol indexer Get the source dependencies from the collector and save them in the symbol storage. Change-Id: Ibc141970a100625398c1526f5bc644cc14d25c0c Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-31 14:14:34 +01:00
ON_CALL(mockCollector, sourceDependencies()).WillByDefault(ReturnRef(sourceDependencies));
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
ON_CALL(mockSymbolStorage, fetchProjectPartArtefact(A<FilePathId>())).WillByDefault(Return(artefact));
ON_CALL(mockUsedMacroAndSourceStorage, fetchLowestLastModifiedTime(A<FilePathId>())).WillByDefault(Return(-1));
Clang: Introduce parallel indexing Change-Id: I522cb18e6d24b7dbed5d5dfa3a732e5b3b5113bb Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-08-28 12:08:37 +02:00
mockCollector.setIsUsed(false);
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
generatedFiles.update(unsaved);
Clang: Introduce parallel indexing Change-Id: I522cb18e6d24b7dbed5d5dfa3a732e5b3b5113bb Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-08-28 12:08:37 +02:00
}
void TearDown()
{
syncTasks();
}
void syncTasks()
{
while (!indexerQueue.tasks().empty() || !indexerScheduler.futures().empty()) {
indexerScheduler.syncTasks();
QCoreApplication::processEvents();
}
Clang: Add time stamp based filtering for project parts The source ids are now filtered by the modified time. If the modified time in the database is older than the modified time of the file it will be parsed. If it is not newer it will be not parsed. Change-Id: I4ade3443dd66573ac88053a2cafa600e54cfe973 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 17:49:02 +01:00
}
static void SetUpTestCase()
{
data = std::make_unique<Data>();
}
static void TearDownTestCase()
{
data.reset();
}
void touchFile(FilePathId filePathId)
{
std::ofstream ostream(std::string(filePathCache.filePath(filePathId)), std::ios::binary);
ostream.write("\n", 1);
ostream.close();
}
FilePathId filePathId(Utils::SmallStringView path) const
{
return filePathCache.filePathId(ClangBackEnd::FilePathView(path));
Clang: Cleanup symbol indexer test Change-Id: I1cfa70d092d27949e0cf9466b190afbc40c1a591 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2017-12-27 13:19:21 +01:00
}
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
protected:
Clang: Add time stamp based filtering for project parts The source ids are now filtered by the modified time. If the modified time in the database is older than the modified time of the file it will be parsed. If it is not newer it will be not parsed. Change-Id: I4ade3443dd66573ac88053a2cafa600e54cfe973 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 17:49:02 +01:00
static std::unique_ptr<Data> data; // it can be non const because data holds no tested classes
Clang: Reuse thread based pipeline for pch creation The pch creation so far used signal and slots but there was no explicit pipeline. This patch is introducing the same architecture like the refactoring plugin. It is filtering out older project parts from the pipeline. Change-Id: Iaa6bd2ca1272231b97ebe1f5f7b2ce8e43bc590c Task-number: QTCREATORBUG-21111 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-11 17:02:45 +02:00
using Scheduler = TaskScheduler<Manager, ClangBackEnd::SymbolIndexerTask::Callable>;
Clang: Add time stamp based filtering for project parts The source ids are now filtered by the modified time. If the modified time in the database is older than the modified time of the file it will be parsed. If it is not newer it will be not parsed. Change-Id: I4ade3443dd66573ac88053a2cafa600e54cfe973 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 17:49:02 +01:00
ClangBackEnd::FilePathCaching &filePathCache = data->filePathCache;
ClangBackEnd::FilePathId main1PathId{filePathId(TESTDATA_DIR "/symbolindexer_main1.cpp")};
ClangBackEnd::FilePathId main2PathId{filePathId(TESTDATA_DIR "/symbolindexer_main2.cpp")};
ClangBackEnd::FilePathId header2PathId{filePathId(TESTDATA_DIR "/symbolindexer_header1.h")};
ClangBackEnd::FilePathId header1PathId{filePathId(TESTDATA_DIR "/symbolindexer_header2.h")};
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
PathString generatedFileName = "includecollector_generated_file.h";
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
ClangBackEnd::FilePathId generatedFilePathId{1, 21};
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
ProjectPartContainer projectPart1{"project1",
{"-I", TESTDATA_DIR, "-Wno-pragma-once-outside-header"},
Clang: Improve ProjectPartArtefact Empty strings were only handled by accident and wrongly formatted ones were never handled. Now we do nothing for empty strings and throw an exception from wrongly formatted strings. The exceptions are very helpful in the test code because the show errors the the testing data. Change-Id: I87d1678eda7502fdc3f74f51fad491803d28582b Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-07 16:11:28 +01:00
{{"BAR", "1"}, {"FOO", "1"}},
Clang: Check if the include search path has changed If the include search paths and the compiler macros have not changed it is save to assume that we don't need to update the symbol database. This saves us from executing a very expensive task. Later we have to test the modification time of the files too. Change-Id: I6b958075024a811c2abd3d7918263fd74bba090b Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 12:48:46 +01:00
{"/includes"},
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
{header1PathId},
{main1PathId}};
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
ProjectPartContainer projectPart2{"project2",
{"-I", TESTDATA_DIR, "-x", "c++-header", "-Wno-pragma-once-outside-header"},
Clang: Improve ProjectPartArtefact Empty strings were only handled by accident and wrongly formatted ones were never handled. Now we do nothing for empty strings and throw an exception from wrongly formatted strings. The exceptions are very helpful in the test code because the show errors the the testing data. Change-Id: I87d1678eda7502fdc3f74f51fad491803d28582b Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-07 16:11:28 +01:00
{{"BAR", "1"}, {"FOO", "0"}},
Clang: Check if the include search path has changed If the include search paths and the compiler macros have not changed it is save to assume that we don't need to update the symbol database. This saves us from executing a very expensive task. Later we have to test the modification time of the files too. Change-Id: I6b958075024a811c2abd3d7918263fd74bba090b Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 12:48:46 +01:00
{"/includes"},
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
{header2PathId},
{main2PathId}};
Clang: Add time stamp based filtering for project parts The source ids are now filtered by the modified time. If the modified time in the database is older than the modified time of the file it will be parsed. If it is not newer it will be not parsed. Change-Id: I4ade3443dd66573ac88053a2cafa600e54cfe973 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 17:49:02 +01:00
ProjectPartContainer projectPart3{"project3",
{"-I", TESTDATA_DIR, "-Wno-pragma-once-outside-header"},
{{"BAR", "1"}, {"FOO", "1"}},
{"/includes", "/other/includes"},
{header1PathId},
{main1PathId}};
Clang: Add Symbol Indexing It is a first step and now a database is generated if you start QtCreator. Some code is now shared with the PchManager which can be improved in the future. Change-Id: Ic267fe7960f6c455d91832859a673ce98f269aa2 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-17 12:44:52 +02:00
FileContainers unsaved{{{TESTDATA_DIR, "query_simplefunction.h"},
"void f();",
{}}};
Clang: Process SymbolKind and SymbolTags with the indexer We add the infrastructure to compute the SymbolKind and SymbolTags in the indexer. Later we have to add more for templates, virtual functions etc.. Change-Id: I9203c5cfbfffed3065337292010de5fce5736453 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-03-22 17:46:43 +01:00
SymbolEntries symbolEntries{{1, {"function", "function", SymbolKind::Function}}};
Clang: Locator filter for the symbol database There are no symbol queries for the locator filters. The signature generation is still not implemented but for simple cases it should work. Change-Id: Ic6b04fbe1e7e057892f194ac139615c47d6ec33f Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-04-09 13:30:30 +02:00
SourceLocationEntries sourceLocations{{1, {1, 1}, {42, 23}, SourceLocationKind::Declaration}};
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
FilePathIds sourceFileIds{{1, 1}, {42, 23}};
Clang: Rename defineName in macroName Change-Id: Iaf8da991032e5ed4726384c051290a77887351fa Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-25 15:20:47 +01:00
UsedMacros usedMacros{{"Foo", {1, 1}}};
Clang: Add isInPrecompiledHeader to the file status table It will useful to find out if we have to wait for an updated precompiled header. Change-Id: I6a314f278485965571cc6e46982bbd6f5523c581 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-14 18:49:25 +01:00
FileStatuses fileStatus{{{1, 2}, 3, 4, false}};
Clang: Handle source dependencies in symbol indexer Get the source dependencies from the collector and save them in the symbol storage. Change-Id: Ibc141970a100625398c1526f5bc644cc14d25c0c Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-31 14:14:34 +01:00
SourceDependencies sourceDependencies{{{1, 1}, {1, 2}}, {{1, 1}, {1, 3}}};
Clang: Check if the include search path has changed If the include search paths and the compiler macros have not changed it is save to assume that we don't need to update the symbol database. This saves us from executing a very expensive task. Later we have to test the modification time of the files too. Change-Id: I6b958075024a811c2abd3d7918263fd74bba090b Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 12:48:46 +01:00
ClangBackEnd::ProjectPartArtefact artefact{"[\"-DFOO\"]", "{\"FOO\":\"1\",\"BAR\":\"1\"}", "[\"/includes\"]", 74};
Clang: Use PCHs for indexing As generating the AST is quite expensive it would be very useful to cache the not changed include. So we generate PCHs for include outside of a project part. With this change this PCHs are used by the indexer. For that they are save to the symbol database by the PCH manager and when fetched by the symbol indexer. Change-Id: I7a5b07cfb32d72d50dc52d2b108cd41727a7bfc7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-20 12:43:05 +01:00
ClangBackEnd::ProjectPartArtefact emptyArtefact{"", "", "", 74};
Clang: Cleanup symbol indexer Change-Id: I1a7bcc807bf222ae0d8f622bca512c47489bfb79 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-04 14:24:42 +02:00
Utils::optional<ClangBackEnd::ProjectPartArtefact > nullArtefact;
Clang: Use PCHs for indexing As generating the AST is quite expensive it would be very useful to cache the not changed include. So we generate PCHs for include outside of a project part. With this change this PCHs are used by the indexer. For that they are save to the symbol database by the PCH manager and when fetched by the symbol indexer. Change-Id: I7a5b07cfb32d72d50dc52d2b108cd41727a7bfc7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-20 12:43:05 +01:00
ClangBackEnd::ProjectPartPch projectPartPch{"/path/to/pch", 4};
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
NiceMock<MockSqliteTransactionBackend> mockSqliteTransactionBackend;
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
NiceMock<MockSymbolStorage> mockSymbolStorage;
NiceMock<MockUsedMacroAndSourceStorage> mockUsedMacroAndSourceStorage;
Clang: Collect source files Change-Id: If0183cafd00ed7e42bacbdb72a1d65624dc03cee Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2017-10-26 13:23:27 +02:00
NiceMock<MockClangPathWatcher> mockPathWatcher;
Clang: Add time stamp based filtering for project parts The source ids are now filtered by the modified time. If the modified time in the database is older than the modified time of the file it will be parsed. If it is not newer it will be not parsed. Change-Id: I4ade3443dd66573ac88053a2cafa600e54cfe973 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 17:49:02 +01:00
ClangBackEnd::FileStatusCache fileStatusCache{filePathCache};
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
ClangBackEnd::GeneratedFiles generatedFiles;
Clang: Reuse thread based pipeline for pch creation The pch creation so far used signal and slots but there was no explicit pipeline. This patch is introducing the same architecture like the refactoring plugin. It is filtering out older project parts from the pipeline. Change-Id: Iaa6bd2ca1272231b97ebe1f5f7b2ce8e43bc590c Task-number: QTCREATORBUG-21111 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-11 17:02:45 +02:00
Manager collectorManger{generatedFiles};
Scheduler indexerScheduler{collectorManger, indexerQueue, 1};
Clang: Introduce parallel indexing Change-Id: I522cb18e6d24b7dbed5d5dfa3a732e5b3b5113bb Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-08-28 12:08:37 +02:00
SymbolIndexerTaskQueue indexerQueue{indexerScheduler};
ClangBackEnd::SymbolIndexer indexer{indexerQueue,
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
mockSymbolStorage,
mockUsedMacroAndSourceStorage,
Clang: Add time stamp based filtering for project parts The source ids are now filtered by the modified time. If the modified time in the database is older than the modified time of the file it will be parsed. If it is not newer it will be not parsed. Change-Id: I4ade3443dd66573ac88053a2cafa600e54cfe973 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 17:49:02 +01:00
mockPathWatcher,
filePathCache,
fileStatusCache,
mockSqliteTransactionBackend};
Clang: Reuse thread based pipeline for pch creation The pch creation so far used signal and slots but there was no explicit pipeline. This patch is introducing the same architecture like the refactoring plugin. It is filtering out older project parts from the pipeline. Change-Id: Iaa6bd2ca1272231b97ebe1f5f7b2ce8e43bc590c Task-number: QTCREATORBUG-21111 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-11 17:02:45 +02:00
MockSymbolsCollector &mockCollector{static_cast<MockSymbolsCollector&>(collectorManger.unusedProcessor())};
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
};
Clang: Add time stamp based filtering for project parts The source ids are now filtered by the modified time. If the modified time in the database is older than the modified time of the file it will be parsed. If it is not newer it will be not parsed. Change-Id: I4ade3443dd66573ac88053a2cafa600e54cfe973 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 17:49:02 +01:00
std::unique_ptr<Data> SymbolIndexer::data;
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
TEST_F(SymbolIndexer, UpdateProjectPartsCallsAddFilesInCollector)
{
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
EXPECT_CALL(mockCollector, setFile(main1PathId, projectPart1.arguments));
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
indexer.updateProjectParts({projectPart1});
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
}
Clang: Use PCHs for indexing As generating the AST is quite expensive it would be very useful to cache the not changed include. So we generate PCHs for include outside of a project part. With this change this PCHs are used by the indexer. For that they are save to the symbol database by the PCH manager and when fetched by the symbol indexer. Change-Id: I7a5b07cfb32d72d50dc52d2b108cd41727a7bfc7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-20 12:43:05 +01:00
TEST_F(SymbolIndexer, UpdateProjectPartsCallsAddFilesWithPrecompiledHeaderInCollector)
{
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
ON_CALL(mockSymbolStorage, fetchProjectPartArtefact(TypedEq<Utils::SmallStringView>(projectPart1.projectPartId))).WillByDefault(Return(emptyArtefact));
ON_CALL(mockSymbolStorage, fetchPrecompiledHeader(Eq(artefact.projectPartId))).WillByDefault(Return(projectPartPch));
Clang: Use PCHs for indexing As generating the AST is quite expensive it would be very useful to cache the not changed include. So we generate PCHs for include outside of a project part. With this change this PCHs are used by the indexer. For that they are save to the symbol database by the PCH manager and when fetched by the symbol indexer. Change-Id: I7a5b07cfb32d72d50dc52d2b108cd41727a7bfc7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-20 12:43:05 +01:00
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
EXPECT_CALL(mockCollector, setFile(main1PathId,
Clang: Introduce parallel indexing Change-Id: I522cb18e6d24b7dbed5d5dfa3a732e5b3b5113bb Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-08-28 12:08:37 +02:00
ElementsAre(Eq("-I"),
Eq(TESTDATA_DIR),
Eq("-Wno-pragma-once-outside-header"),
Eq("-Xclang"),
Eq("-include-pch"),
Eq("-Xclang"),
Eq("/path/to/pch"))));
Clang: Use PCHs for indexing As generating the AST is quite expensive it would be very useful to cache the not changed include. So we generate PCHs for include outside of a project part. With this change this PCHs are used by the indexer. For that they are save to the symbol database by the PCH manager and when fetched by the symbol indexer. Change-Id: I7a5b07cfb32d72d50dc52d2b108cd41727a7bfc7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-20 12:43:05 +01:00
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
indexer.updateProjectParts({projectPart1});
Clang: Use PCHs for indexing As generating the AST is quite expensive it would be very useful to cache the not changed include. So we generate PCHs for include outside of a project part. With this change this PCHs are used by the indexer. For that they are save to the symbol database by the PCH manager and when fetched by the symbol indexer. Change-Id: I7a5b07cfb32d72d50dc52d2b108cd41727a7bfc7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-20 12:43:05 +01:00
}
TEST_F(SymbolIndexer, UpdateProjectPartsCallsAddFilesWithoutPrecompiledHeaderInCollector)
{
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
ON_CALL(mockSymbolStorage, fetchProjectPartArtefact(TypedEq<Utils::SmallStringView>(projectPart1.projectPartId))).WillByDefault(Return(emptyArtefact));
Clang: Use PCHs for indexing As generating the AST is quite expensive it would be very useful to cache the not changed include. So we generate PCHs for include outside of a project part. With this change this PCHs are used by the indexer. For that they are save to the symbol database by the PCH manager and when fetched by the symbol indexer. Change-Id: I7a5b07cfb32d72d50dc52d2b108cd41727a7bfc7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-20 12:43:05 +01:00
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
EXPECT_CALL(mockCollector, setFile(main1PathId,
Clang: Introduce parallel indexing Change-Id: I522cb18e6d24b7dbed5d5dfa3a732e5b3b5113bb Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-08-28 12:08:37 +02:00
ElementsAre(Eq("-I"),
Eq(TESTDATA_DIR),
Eq("-Wno-pragma-once-outside-header"))));
Clang: Use PCHs for indexing As generating the AST is quite expensive it would be very useful to cache the not changed include. So we generate PCHs for include outside of a project part. With this change this PCHs are used by the indexer. For that they are save to the symbol database by the PCH manager and when fetched by the symbol indexer. Change-Id: I7a5b07cfb32d72d50dc52d2b108cd41727a7bfc7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-20 12:43:05 +01:00
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
indexer.updateProjectParts({projectPart1});
Clang: Use PCHs for indexing As generating the AST is quite expensive it would be very useful to cache the not changed include. So we generate PCHs for include outside of a project part. With this change this PCHs are used by the indexer. For that they are save to the symbol database by the PCH manager and when fetched by the symbol indexer. Change-Id: I7a5b07cfb32d72d50dc52d2b108cd41727a7bfc7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-20 12:43:05 +01:00
}
Clang: Clear SymbolCollector before updating new project parts Change-Id: I82e9bb4f66a7597bb911fbc97d6022ff3fdb0b35 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2017-12-13 12:04:19 +01:00
TEST_F(SymbolIndexer, UpdateProjectPartsCallsClearInCollector)
{
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
EXPECT_CALL(mockCollector, clear()).Times(2);
Clang: Clear SymbolCollector before updating new project parts Change-Id: I82e9bb4f66a7597bb911fbc97d6022ff3fdb0b35 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2017-12-13 12:04:19 +01:00
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
indexer.updateProjectParts({projectPart1, projectPart2});
Clang: Clear SymbolCollector before updating new project parts Change-Id: I82e9bb4f66a7597bb911fbc97d6022ff3fdb0b35 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2017-12-13 12:04:19 +01:00
}
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
TEST_F(SymbolIndexer, UpdateProjectPartsCallsAddFilesInCollectorForEveryProjectPart)
{
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
EXPECT_CALL(mockCollector, setFile(_, _)).Times(2);
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
indexer.updateProjectParts({projectPart1, projectPart2});
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
}
TEST_F(SymbolIndexer, UpdateProjectPartsDoesNotCallAddFilesInCollectorForEmptyEveryProjectParts)
{
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
EXPECT_CALL(mockCollector, setFile(_, _))
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
.Times(0);
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
indexer.updateProjectParts({});
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
}
TEST_F(SymbolIndexer, UpdateProjectPartsCallscollectSymbolsInCollector)
{
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
EXPECT_CALL(mockCollector, collectSymbols()).Times(2);;
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
indexer.updateProjectParts({projectPart1, projectPart2});
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
}
TEST_F(SymbolIndexer, UpdateProjectPartsCallsSymbolsInCollector)
{
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
EXPECT_CALL(mockCollector, symbols()).Times(2);
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
indexer.updateProjectParts({projectPart1, projectPart2});
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
}
TEST_F(SymbolIndexer, UpdateProjectPartsCallsSourceLocationsInCollector)
{
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
EXPECT_CALL(mockCollector, sourceLocations()).Times(2);
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
indexer.updateProjectParts({projectPart1, projectPart2});
Clang: Add Symbol Indexing It is a first step and now a database is generated if you start QtCreator. Some code is now shared with the PchManager which can be improved in the future. Change-Id: Ic267fe7960f6c455d91832859a673ce98f269aa2 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-17 12:44:52 +02:00
}
TEST_F(SymbolIndexer, UpdateProjectPartsCallsAddUnsavedFilesInCollector)
{
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
EXPECT_CALL(mockCollector, setUnsavedFiles(unsaved)).Times(2);
Clang: Add Symbol Indexing It is a first step and now a database is generated if you start QtCreator. Some code is now shared with the PchManager which can be improved in the future. Change-Id: Ic267fe7960f6c455d91832859a673ce98f269aa2 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-17 12:44:52 +02:00
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
indexer.updateProjectParts({projectPart1, projectPart2});
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
}
TEST_F(SymbolIndexer, UpdateProjectPartsCallsAddSymbolsAndSourceLocationsInStorage)
{
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
EXPECT_CALL(mockSymbolStorage, addSymbolsAndSourceLocations(symbolEntries, sourceLocations)).Times(2);
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
indexer.updateProjectParts({projectPart1, projectPart2});
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
}
TEST_F(SymbolIndexer, UpdateProjectPartsCallsUpdateProjectPartsInStorage)
{
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
EXPECT_CALL(mockSymbolStorage, insertOrUpdateProjectPart(Eq("project1"),
Clang: Add macro names the to project part So we can compare later if the macro names have changed. Change-Id: I65c5f76e07fced8df6cc7282c03430adffcf5fa8 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-29 12:07:15 +01:00
ElementsAre("-I", TESTDATA_DIR, "-Wno-pragma-once-outside-header"),
Clang: Check if the include search path has changed If the include search paths and the compiler macros have not changed it is save to assume that we don't need to update the symbol database. This saves us from executing a very expensive task. Later we have to test the modification time of the files too. Change-Id: I6b958075024a811c2abd3d7918263fd74bba090b Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 12:48:46 +01:00
ElementsAre(CompilerMacro{"BAR", "1"}, CompilerMacro{"FOO", "1"}),
ElementsAre("/includes")));
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
EXPECT_CALL(mockSymbolStorage, insertOrUpdateProjectPart(Eq("project2"),
Clang: Add macro names the to project part So we can compare later if the macro names have changed. Change-Id: I65c5f76e07fced8df6cc7282c03430adffcf5fa8 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-29 12:07:15 +01:00
ElementsAre("-I", TESTDATA_DIR, "-x", "c++-header", "-Wno-pragma-once-outside-header"),
Clang: Check if the include search path has changed If the include search paths and the compiler macros have not changed it is save to assume that we don't need to update the symbol database. This saves us from executing a very expensive task. Later we have to test the modification time of the files too. Change-Id: I6b958075024a811c2abd3d7918263fd74bba090b Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 12:48:46 +01:00
ElementsAre(CompilerMacro{"BAR", "1"}, CompilerMacro{"FOO", "0"}),
ElementsAre("/includes")));
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
indexer.updateProjectParts({projectPart1, projectPart2});
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
}
Clang: Cleanup symbol indexer Change-Id: I1a7bcc807bf222ae0d8f622bca512c47489bfb79 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-04 14:24:42 +02:00
TEST_F(SymbolIndexer, UpdateProjectPartsCallsUpdateProjectPartSourcesWithArtifact)
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
{
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
ON_CALL(mockSymbolStorage, fetchProjectPartArtefact(TypedEq<Utils::SmallStringView>("project1"))).WillByDefault(Return(artefact));
ON_CALL(mockSymbolStorage, insertOrUpdateProjectPart(Eq("project1"), _, _, _)).WillByDefault(Return(-1));
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
EXPECT_CALL(mockSymbolStorage, updateProjectPartSources(_, _));
Clang: Cleanup symbol indexer Change-Id: I1a7bcc807bf222ae0d8f622bca512c47489bfb79 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-04 14:24:42 +02:00
indexer.updateProjectParts({projectPart1});
}
TEST_F(SymbolIndexer, UpdateProjectPartsCallsUpdateProjectPartSourcesWithoutArtifact)
{
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
ON_CALL(mockSymbolStorage, fetchProjectPartArtefact(TypedEq<Utils::SmallStringView>("project2"))).WillByDefault(Return(nullArtefact));
ON_CALL(mockSymbolStorage, insertOrUpdateProjectPart(Eq("project2"), _, _, _)).WillByDefault(Return(3));
Clang: Cleanup symbol indexer Change-Id: I1a7bcc807bf222ae0d8f622bca512c47489bfb79 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-04 14:24:42 +02:00
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
EXPECT_CALL(mockSymbolStorage, updateProjectPartSources(3, ElementsAre(IsFileId(1, 1), IsFileId(42, 23))));
Clang: Cleanup symbol indexer Change-Id: I1a7bcc807bf222ae0d8f622bca512c47489bfb79 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-04 14:24:42 +02:00
indexer.updateProjectParts({projectPart2});
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
}
Clang: Rename defineName in macroName Change-Id: Iaf8da991032e5ed4726384c051290a77887351fa Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-25 15:20:47 +01:00
TEST_F(SymbolIndexer, UpdateProjectPartsCallsInsertOrUpdateUsedMacros)
Clang: Update or insert used defines in the storage by the symbol indexer Change-Id: Id8af85976be391e17886c9947863b81d206bb575 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-23 18:08:17 +01:00
{
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
EXPECT_CALL(mockUsedMacroAndSourceStorage, insertOrUpdateUsedMacros(Eq(usedMacros)))
Clang: Update or insert used defines in the storage by the symbol indexer Change-Id: Id8af85976be391e17886c9947863b81d206bb575 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-23 18:08:17 +01:00
.Times(2);
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
indexer.updateProjectParts({projectPart1, projectPart2});
Clang: Update or insert used defines in the storage by the symbol indexer Change-Id: Id8af85976be391e17886c9947863b81d206bb575 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-23 18:08:17 +01:00
}
Clang: Rename FileInformation in FileStatus It's more near to the Unix convention and it has a plural too. Change-Id: I53f85911d8fcbaadba9947c70e9a375dc6995ed5 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-01 18:29:45 +01:00
TEST_F(SymbolIndexer, UpdateProjectPartsCallsInsertFileStatuses)
Clang: SymbolIndexer is saving the file information to the symbol storage Change-Id: Id34ce9901c1a938e7ea14da444a9ef1b052286e5 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-30 14:02:48 +01:00
{
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
EXPECT_CALL(mockUsedMacroAndSourceStorage, insertFileStatuses(Eq(fileStatus)))
Clang: SymbolIndexer is saving the file information to the symbol storage Change-Id: Id34ce9901c1a938e7ea14da444a9ef1b052286e5 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-30 14:02:48 +01:00
.Times(2);
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
indexer.updateProjectParts({projectPart1, projectPart2});
Clang: SymbolIndexer is saving the file information to the symbol storage Change-Id: Id34ce9901c1a938e7ea14da444a9ef1b052286e5 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-30 14:02:48 +01:00
}
Clang: Handle source dependencies in symbol indexer Get the source dependencies from the collector and save them in the symbol storage. Change-Id: Ibc141970a100625398c1526f5bc644cc14d25c0c Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-31 14:14:34 +01:00
TEST_F(SymbolIndexer, UpdateProjectPartsCallsInsertOrUpdateSourceDependencies)
{
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
EXPECT_CALL(mockUsedMacroAndSourceStorage, insertOrUpdateSourceDependencies(Eq(sourceDependencies)))
Clang: Handle source dependencies in symbol indexer Get the source dependencies from the collector and save them in the symbol storage. Change-Id: Ibc141970a100625398c1526f5bc644cc14d25c0c Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-31 14:14:34 +01:00
.Times(2);
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
indexer.updateProjectParts({projectPart1, projectPart2});
Clang: Handle source dependencies in symbol indexer Get the source dependencies from the collector and save them in the symbol storage. Change-Id: Ibc141970a100625398c1526f5bc644cc14d25c0c Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-31 14:14:34 +01:00
}
Clang: Don't reparse if the macros haven't changed We have to extend that to include paths too, which will be happen in a follow up patch. Change-Id: I7f8ac663ae8588e647fc6a6b5d689a629a28ef65 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-07 16:18:16 +01:00
TEST_F(SymbolIndexer, UpdateProjectPartsCallsFetchProjectPartArtefacts)
{
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
EXPECT_CALL(mockSymbolStorage, fetchProjectPartArtefact(TypedEq<Utils::SmallStringView>(projectPart1.projectPartId)));
EXPECT_CALL(mockSymbolStorage, fetchProjectPartArtefact(TypedEq<Utils::SmallStringView>(projectPart2.projectPartId)));
Clang: Don't reparse if the macros haven't changed We have to extend that to include paths too, which will be happen in a follow up patch. Change-Id: I7f8ac663ae8588e647fc6a6b5d689a629a28ef65 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-07 16:18:16 +01:00
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
indexer.updateProjectParts({projectPart1, projectPart2});
Clang: Don't reparse if the macros haven't changed We have to extend that to include paths too, which will be happen in a follow up patch. Change-Id: I7f8ac663ae8588e647fc6a6b5d689a629a28ef65 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-07 16:18:16 +01:00
}
Clang: Cleanup symbol indexer Change-Id: I1a7bcc807bf222ae0d8f622bca512c47489bfb79 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-04 14:24:42 +02:00
TEST_F(SymbolIndexer, UpdateProjectPartsCallsInOrderWithoutProjectPartArtifact)
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
{
Clang: Clear SymbolCollector before updating new project parts Change-Id: I82e9bb4f66a7597bb911fbc97d6022ff3fdb0b35 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2017-12-13 12:04:19 +01:00
InSequence s;
Clang: Introduce parallel indexing Change-Id: I522cb18e6d24b7dbed5d5dfa3a732e5b3b5113bb Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-08-28 12:08:37 +02:00
EXPECT_CALL(mockSqliteTransactionBackend, immediateBegin());
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
EXPECT_CALL(mockSymbolStorage, fetchProjectPartArtefact(TypedEq<Utils::SmallStringView>(projectPart1.projectPartId))).WillOnce(Return(nullArtefact));
EXPECT_CALL(mockSymbolStorage, insertOrUpdateProjectPart(Eq(projectPart1.projectPartId), Eq(projectPart1.arguments), Eq(projectPart1.compilerMacros), Eq(projectPart1.includeSearchPaths))).WillOnce(Return(12));
EXPECT_CALL(mockSymbolStorage, fetchPrecompiledHeader(Eq(12)));
EXPECT_CALL(mockUsedMacroAndSourceStorage, fetchLowestLastModifiedTime(Eq(main1PathId))).Times(0);
Clang: Introduce parallel indexing Change-Id: I522cb18e6d24b7dbed5d5dfa3a732e5b3b5113bb Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-08-28 12:08:37 +02:00
EXPECT_CALL(mockSqliteTransactionBackend, commit());
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
EXPECT_CALL(mockCollector, setFile(main1PathId, projectPart1.arguments));
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
EXPECT_CALL(mockCollector, collectSymbols());
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
EXPECT_CALL(mockSqliteTransactionBackend, immediateBegin());
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
EXPECT_CALL(mockSymbolStorage, addSymbolsAndSourceLocations(symbolEntries, sourceLocations));
EXPECT_CALL(mockSymbolStorage, updateProjectPartSources(TypedEq<int>(12), Eq(sourceFileIds)));
EXPECT_CALL(mockUsedMacroAndSourceStorage, insertOrUpdateUsedMacros(Eq(usedMacros)));
EXPECT_CALL(mockUsedMacroAndSourceStorage, insertFileStatuses(Eq(fileStatus)));
EXPECT_CALL(mockUsedMacroAndSourceStorage, insertOrUpdateSourceDependencies(Eq(sourceDependencies)));
Clang: Cleanup symbol indexer Change-Id: I1a7bcc807bf222ae0d8f622bca512c47489bfb79 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-04 14:24:42 +02:00
EXPECT_CALL(mockSqliteTransactionBackend, commit());
indexer.updateProjectParts({projectPart1});
}
TEST_F(SymbolIndexer, UpdateProjectPartsCallsInOrderWithProjectPartArtifact)
{
InSequence s;
EXPECT_CALL(mockSqliteTransactionBackend, immediateBegin());
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
EXPECT_CALL(mockSymbolStorage, fetchProjectPartArtefact(TypedEq<Utils::SmallStringView>(projectPart1.projectPartId))).WillRepeatedly(Return(artefact));
EXPECT_CALL(mockSymbolStorage, insertOrUpdateProjectPart(Eq(projectPart1.projectPartId), Eq(projectPart1.arguments), Eq(projectPart1.compilerMacros), Eq(projectPart1.includeSearchPaths))).WillOnce(Return(-1));
EXPECT_CALL(mockSymbolStorage, fetchPrecompiledHeader(Eq(artefact.projectPartId)));
EXPECT_CALL(mockUsedMacroAndSourceStorage, fetchLowestLastModifiedTime(Eq(main1PathId))).WillOnce(Return(-1));
Clang: Cleanup symbol indexer Change-Id: I1a7bcc807bf222ae0d8f622bca512c47489bfb79 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-04 14:24:42 +02:00
EXPECT_CALL(mockSqliteTransactionBackend, commit());
EXPECT_CALL(mockCollector, setFile(Eq(main1PathId), Eq(projectPart1.arguments)));
EXPECT_CALL(mockCollector, collectSymbols());
EXPECT_CALL(mockSqliteTransactionBackend, immediateBegin());
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
EXPECT_CALL(mockSymbolStorage, addSymbolsAndSourceLocations(symbolEntries, sourceLocations));
EXPECT_CALL(mockSymbolStorage, updateProjectPartSources(TypedEq<int>(artefact.projectPartId), Eq(sourceFileIds)));
EXPECT_CALL(mockUsedMacroAndSourceStorage, insertOrUpdateUsedMacros(Eq(usedMacros)));
EXPECT_CALL(mockUsedMacroAndSourceStorage, insertFileStatuses(Eq(fileStatus)));
EXPECT_CALL(mockUsedMacroAndSourceStorage, insertOrUpdateSourceDependencies(Eq(sourceDependencies)));
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
EXPECT_CALL(mockSqliteTransactionBackend, commit());
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
indexer.updateProjectParts({projectPart1});
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
}
Clang: Add path notifier to symbol indexer Change-Id: I2a605a5a5ac2511566edd9c069e84b5ec9d95279 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2017-12-27 13:20:24 +01:00
TEST_F(SymbolIndexer, CallSetNotifier)
{
EXPECT_CALL(mockPathWatcher, setNotifier(_));
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
ClangBackEnd::SymbolIndexer indexer{indexerQueue, mockSymbolStorage, mockUsedMacroAndSourceStorage, mockPathWatcher, filePathCache, fileStatusCache, mockSqliteTransactionBackend};
Clang: Add path notifier to symbol indexer Change-Id: I2a605a5a5ac2511566edd9c069e84b5ec9d95279 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2017-12-27 13:20:24 +01:00
}
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
Clang: Update symbol database if file has changed The code in the symbol indexer is quite similar, but still different enough to prevent easy reuse of the function. Change-Id: I47907d90066da922eafe8ff3cce124ea47ea4a0a Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-06 11:16:29 +01:00
TEST_F(SymbolIndexer, PathChangedCallsFetchProjectPartArtefactInStorage)
{
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
EXPECT_CALL(mockSymbolStorage, fetchProjectPartArtefact(sourceFileIds[0]));
EXPECT_CALL(mockSymbolStorage, fetchProjectPartArtefact(sourceFileIds[1]));
Clang: Update symbol database if file has changed The code in the symbol indexer is quite similar, but still different enough to prevent easy reuse of the function. Change-Id: I47907d90066da922eafe8ff3cce124ea47ea4a0a Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-06 11:16:29 +01:00
indexer.pathsChanged(sourceFileIds);
}
TEST_F(SymbolIndexer, UpdateChangedPathCallsInOrder)
{
InSequence s;
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
EXPECT_CALL(mockSqliteTransactionBackend, deferredBegin());
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
EXPECT_CALL(mockSymbolStorage, fetchProjectPartArtefact(TypedEq<FilePathId>(sourceFileIds[0]))).WillOnce(Return(artefact));
EXPECT_CALL(mockSymbolStorage, fetchPrecompiledHeader(Eq(artefact.projectPartId)));
Clang: Introduce parallel indexing Change-Id: I522cb18e6d24b7dbed5d5dfa3a732e5b3b5113bb Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-08-28 12:08:37 +02:00
EXPECT_CALL(mockSqliteTransactionBackend, commit());
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
EXPECT_CALL(mockCollector, setFile(Eq(sourceFileIds[0]), Eq(artefact.compilerArguments)));
Clang: Update symbol database if file has changed The code in the symbol indexer is quite similar, but still different enough to prevent easy reuse of the function. Change-Id: I47907d90066da922eafe8ff3cce124ea47ea4a0a Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-06 11:16:29 +01:00
EXPECT_CALL(mockCollector, collectSymbols());
EXPECT_CALL(mockSqliteTransactionBackend, immediateBegin());
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
EXPECT_CALL(mockSymbolStorage, addSymbolsAndSourceLocations(symbolEntries, sourceLocations));
EXPECT_CALL(mockSymbolStorage, updateProjectPartSources(artefact.projectPartId, Eq(sourceFileIds)));
EXPECT_CALL(mockUsedMacroAndSourceStorage, insertOrUpdateUsedMacros(Eq(usedMacros)));
EXPECT_CALL(mockUsedMacroAndSourceStorage, insertFileStatuses(Eq(fileStatus)));
EXPECT_CALL(mockUsedMacroAndSourceStorage, insertOrUpdateSourceDependencies(Eq(sourceDependencies)));
Clang: Update symbol database if file has changed The code in the symbol indexer is quite similar, but still different enough to prevent easy reuse of the function. Change-Id: I47907d90066da922eafe8ff3cce124ea47ea4a0a Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-06 11:16:29 +01:00
EXPECT_CALL(mockSqliteTransactionBackend, commit());
Clang: Introduce parallel indexing Change-Id: I522cb18e6d24b7dbed5d5dfa3a732e5b3b5113bb Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-08-28 12:08:37 +02:00
indexer.pathsChanged({sourceFileIds[0]});
Clang: Update symbol database if file has changed The code in the symbol indexer is quite similar, but still different enough to prevent easy reuse of the function. Change-Id: I47907d90066da922eafe8ff3cce124ea47ea4a0a Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-06 11:16:29 +01:00
}
Clang: Add time stamp based filtering for project parts The source ids are now filtered by the modified time. If the modified time in the database is older than the modified time of the file it will be parsed. If it is not newer it will be not parsed. Change-Id: I4ade3443dd66573ac88053a2cafa600e54cfe973 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 17:49:02 +01:00
TEST_F(SymbolIndexer, HandleEmptyOptionalArtifactInUpdateChangedPath)
Clang: Update symbol database if file has changed The code in the symbol indexer is quite similar, but still different enough to prevent easy reuse of the function. Change-Id: I47907d90066da922eafe8ff3cce124ea47ea4a0a Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-06 11:16:29 +01:00
{
Clang: Introduce parallel indexing Change-Id: I522cb18e6d24b7dbed5d5dfa3a732e5b3b5113bb Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-08-28 12:08:37 +02:00
InSequence s;
Clang: Update symbol database if file has changed The code in the symbol indexer is quite similar, but still different enough to prevent easy reuse of the function. Change-Id: I47907d90066da922eafe8ff3cce124ea47ea4a0a Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-06 11:16:29 +01:00
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
EXPECT_CALL(mockSqliteTransactionBackend, deferredBegin());
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
EXPECT_CALL(mockSymbolStorage, fetchProjectPartArtefact(sourceFileIds[0])).WillOnce(Return(nullArtefact));
EXPECT_CALL(mockSymbolStorage, fetchPrecompiledHeader(_)).Times(0);
Clang: Cleanup symbol indexer Change-Id: I1a7bcc807bf222ae0d8f622bca512c47489bfb79 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-04 14:24:42 +02:00
EXPECT_CALL(mockSqliteTransactionBackend, commit()).Times(0);
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
EXPECT_CALL(mockCollector, setFile(_, _)).Times(0);
Clang: Update symbol database if file has changed The code in the symbol indexer is quite similar, but still different enough to prevent easy reuse of the function. Change-Id: I47907d90066da922eafe8ff3cce124ea47ea4a0a Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-06 11:16:29 +01:00
EXPECT_CALL(mockCollector, collectSymbols()).Times(0);
EXPECT_CALL(mockSqliteTransactionBackend, immediateBegin()).Times(0);
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
EXPECT_CALL(mockSymbolStorage, addSymbolsAndSourceLocations(_, _)).Times(0);
EXPECT_CALL(mockSymbolStorage, updateProjectPartSources(An<int>(), _)).Times(0);
EXPECT_CALL(mockUsedMacroAndSourceStorage, insertOrUpdateUsedMacros(_)).Times(0);
EXPECT_CALL(mockUsedMacroAndSourceStorage, insertFileStatuses(_)).Times(0);
EXPECT_CALL(mockUsedMacroAndSourceStorage, insertOrUpdateSourceDependencies(_)).Times(0);
Clang: Update symbol database if file has changed The code in the symbol indexer is quite similar, but still different enough to prevent easy reuse of the function. Change-Id: I47907d90066da922eafe8ff3cce124ea47ea4a0a Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-06 11:16:29 +01:00
EXPECT_CALL(mockSqliteTransactionBackend, commit()).Times(0);
Clang: Introduce parallel indexing Change-Id: I522cb18e6d24b7dbed5d5dfa3a732e5b3b5113bb Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-08-28 12:08:37 +02:00
indexer.pathsChanged({sourceFileIds[0]});
Clang: Update symbol database if file has changed The code in the symbol indexer is quite similar, but still different enough to prevent easy reuse of the function. Change-Id: I47907d90066da922eafe8ff3cce124ea47ea4a0a Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-06 11:16:29 +01:00
}
Clang: Use PCHs for indexing As generating the AST is quite expensive it would be very useful to cache the not changed include. So we generate PCHs for include outside of a project part. With this change this PCHs are used by the indexer. For that they are save to the symbol database by the PCH manager and when fetched by the symbol indexer. Change-Id: I7a5b07cfb32d72d50dc52d2b108cd41727a7bfc7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-20 12:43:05 +01:00
TEST_F(SymbolIndexer, UpdateChangedPathIsUsingPrecompiledHeader)
{
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
ON_CALL(mockSymbolStorage, fetchProjectPartArtefact(TypedEq<FilePathId>(sourceFileIds[0])))
Clang: Use PCHs for indexing As generating the AST is quite expensive it would be very useful to cache the not changed include. So we generate PCHs for include outside of a project part. With this change this PCHs are used by the indexer. For that they are save to the symbol database by the PCH manager and when fetched by the symbol indexer. Change-Id: I7a5b07cfb32d72d50dc52d2b108cd41727a7bfc7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-20 12:43:05 +01:00
.WillByDefault(Return(artefact));
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
ON_CALL(mockSymbolStorage, fetchPrecompiledHeader(Eq(artefact.projectPartId)))
Clang: Use PCHs for indexing As generating the AST is quite expensive it would be very useful to cache the not changed include. So we generate PCHs for include outside of a project part. With this change this PCHs are used by the indexer. For that they are save to the symbol database by the PCH manager and when fetched by the symbol indexer. Change-Id: I7a5b07cfb32d72d50dc52d2b108cd41727a7bfc7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-20 12:43:05 +01:00
.WillByDefault(Return(projectPartPch));
Clang: Introduce parallel indexing Change-Id: I522cb18e6d24b7dbed5d5dfa3a732e5b3b5113bb Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-08-28 12:08:37 +02:00
std::vector<SymbolIndexerTask> symbolIndexerTask;
Clang: Use PCHs for indexing As generating the AST is quite expensive it would be very useful to cache the not changed include. So we generate PCHs for include outside of a project part. With this change this PCHs are used by the indexer. For that they are save to the symbol database by the PCH manager and when fetched by the symbol indexer. Change-Id: I7a5b07cfb32d72d50dc52d2b108cd41727a7bfc7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-20 12:43:05 +01:00
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
EXPECT_CALL(mockCollector, setFile(Eq(sourceFileIds[0]),
Clang: Introduce parallel indexing Change-Id: I522cb18e6d24b7dbed5d5dfa3a732e5b3b5113bb Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-08-28 12:08:37 +02:00
ElementsAre(Eq("-DFOO"),
Eq("-Xclang"),
Eq("-include-pch"),
Eq("-Xclang"),
Eq("/path/to/pch"))));
Clang: Use PCHs for indexing As generating the AST is quite expensive it would be very useful to cache the not changed include. So we generate PCHs for include outside of a project part. With this change this PCHs are used by the indexer. For that they are save to the symbol database by the PCH manager and when fetched by the symbol indexer. Change-Id: I7a5b07cfb32d72d50dc52d2b108cd41727a7bfc7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-20 12:43:05 +01:00
Clang: Introduce parallel indexing Change-Id: I522cb18e6d24b7dbed5d5dfa3a732e5b3b5113bb Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-08-28 12:08:37 +02:00
indexer.pathsChanged({sourceFileIds[0]});
Clang: Use PCHs for indexing As generating the AST is quite expensive it would be very useful to cache the not changed include. So we generate PCHs for include outside of a project part. With this change this PCHs are used by the indexer. For that they are save to the symbol database by the PCH manager and when fetched by the symbol indexer. Change-Id: I7a5b07cfb32d72d50dc52d2b108cd41727a7bfc7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-20 12:43:05 +01:00
}
TEST_F(SymbolIndexer, UpdateChangedPathIsNotUsingPrecompiledHeaderIfItNotExists)
{
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
ON_CALL(mockSymbolStorage, fetchProjectPartArtefact(TypedEq<FilePathId>(sourceFileIds[0])))
Clang: Use PCHs for indexing As generating the AST is quite expensive it would be very useful to cache the not changed include. So we generate PCHs for include outside of a project part. With this change this PCHs are used by the indexer. For that they are save to the symbol database by the PCH manager and when fetched by the symbol indexer. Change-Id: I7a5b07cfb32d72d50dc52d2b108cd41727a7bfc7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-20 12:43:05 +01:00
.WillByDefault(Return(artefact));
Clang: Introduce parallel indexing Change-Id: I522cb18e6d24b7dbed5d5dfa3a732e5b3b5113bb Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-08-28 12:08:37 +02:00
std::vector<SymbolIndexerTask> symbolIndexerTask;
Clang: Use PCHs for indexing As generating the AST is quite expensive it would be very useful to cache the not changed include. So we generate PCHs for include outside of a project part. With this change this PCHs are used by the indexer. For that they are save to the symbol database by the PCH manager and when fetched by the symbol indexer. Change-Id: I7a5b07cfb32d72d50dc52d2b108cd41727a7bfc7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-20 12:43:05 +01:00
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
EXPECT_CALL(mockCollector, setFile(Eq(sourceFileIds[0]),
Clang: Introduce parallel indexing Change-Id: I522cb18e6d24b7dbed5d5dfa3a732e5b3b5113bb Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-08-28 12:08:37 +02:00
ElementsAre(Eq("-DFOO"))));
Clang: Use PCHs for indexing As generating the AST is quite expensive it would be very useful to cache the not changed include. So we generate PCHs for include outside of a project part. With this change this PCHs are used by the indexer. For that they are save to the symbol database by the PCH manager and when fetched by the symbol indexer. Change-Id: I7a5b07cfb32d72d50dc52d2b108cd41727a7bfc7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-20 12:43:05 +01:00
Clang: Introduce parallel indexing Change-Id: I522cb18e6d24b7dbed5d5dfa3a732e5b3b5113bb Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-08-28 12:08:37 +02:00
indexer.pathsChanged({sourceFileIds[0]});
Clang: Use PCHs for indexing As generating the AST is quite expensive it would be very useful to cache the not changed include. So we generate PCHs for include outside of a project part. With this change this PCHs are used by the indexer. For that they are save to the symbol database by the PCH manager and when fetched by the symbol indexer. Change-Id: I7a5b07cfb32d72d50dc52d2b108cd41727a7bfc7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-20 12:43:05 +01:00
}
Clang: Check if the include search path has changed If the include search paths and the compiler macros have not changed it is save to assume that we don't need to update the symbol database. This saves us from executing a very expensive task. Later we have to test the modification time of the files too. Change-Id: I6b958075024a811c2abd3d7918263fd74bba090b Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 12:48:46 +01:00
TEST_F(SymbolIndexer, CompilerMacrosAndIncludeSearchPathsAreNotDifferent)
Clang: Don't reparse if the macros haven't changed We have to extend that to include paths too, which will be happen in a follow up patch. Change-Id: I7f8ac663ae8588e647fc6a6b5d689a629a28ef65 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-07 16:18:16 +01:00
{
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
ON_CALL(mockSymbolStorage, fetchProjectPartArtefact(An<Utils::SmallStringView>())).WillByDefault(Return(artefact));
Clang: Don't reparse if the macros haven't changed We have to extend that to include paths too, which will be happen in a follow up patch. Change-Id: I7f8ac663ae8588e647fc6a6b5d689a629a28ef65 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-07 16:18:16 +01:00
Clang: Use PCHs for indexing As generating the AST is quite expensive it would be very useful to cache the not changed include. So we generate PCHs for include outside of a project part. With this change this PCHs are used by the indexer. For that they are save to the symbol database by the PCH manager and when fetched by the symbol indexer. Change-Id: I7a5b07cfb32d72d50dc52d2b108cd41727a7bfc7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-20 12:43:05 +01:00
auto areDifferent = indexer.compilerMacrosOrIncludeSearchPathsAreDifferent(projectPart1,
artefact);
Clang: Don't reparse if the macros haven't changed We have to extend that to include paths too, which will be happen in a follow up patch. Change-Id: I7f8ac663ae8588e647fc6a6b5d689a629a28ef65 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-07 16:18:16 +01:00
ASSERT_FALSE(areDifferent);
}
TEST_F(SymbolIndexer, CompilerMacrosAreDifferent)
{
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
ON_CALL(mockSymbolStorage, fetchProjectPartArtefact(An<Utils::SmallStringView>())).WillByDefault(Return(artefact));
Clang: Don't reparse if the macros haven't changed We have to extend that to include paths too, which will be happen in a follow up patch. Change-Id: I7f8ac663ae8588e647fc6a6b5d689a629a28ef65 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-07 16:18:16 +01:00
Clang: Use PCHs for indexing As generating the AST is quite expensive it would be very useful to cache the not changed include. So we generate PCHs for include outside of a project part. With this change this PCHs are used by the indexer. For that they are save to the symbol database by the PCH manager and when fetched by the symbol indexer. Change-Id: I7a5b07cfb32d72d50dc52d2b108cd41727a7bfc7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-20 12:43:05 +01:00
auto areDifferent = indexer.compilerMacrosOrIncludeSearchPathsAreDifferent(projectPart2,
artefact);
Clang: Check if the include search path has changed If the include search paths and the compiler macros have not changed it is save to assume that we don't need to update the symbol database. This saves us from executing a very expensive task. Later we have to test the modification time of the files too. Change-Id: I6b958075024a811c2abd3d7918263fd74bba090b Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 12:48:46 +01:00
ASSERT_TRUE(areDifferent);
}
TEST_F(SymbolIndexer, IncludeSearchPathsAreDifferent)
{
ProjectPartContainer projectPart3{"project3",
{"-I", TESTDATA_DIR, "-Wno-pragma-once-outside-header"},
{{"BAR", "1"}, {"FOO", "1"}},
{"/includes", "/other/includes"},
{header1PathId},
{main1PathId}};
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
ON_CALL(mockSymbolStorage, fetchProjectPartArtefact(An<Utils::SmallStringView>())).WillByDefault(Return(artefact));
Clang: Check if the include search path has changed If the include search paths and the compiler macros have not changed it is save to assume that we don't need to update the symbol database. This saves us from executing a very expensive task. Later we have to test the modification time of the files too. Change-Id: I6b958075024a811c2abd3d7918263fd74bba090b Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 12:48:46 +01:00
Clang: Use PCHs for indexing As generating the AST is quite expensive it would be very useful to cache the not changed include. So we generate PCHs for include outside of a project part. With this change this PCHs are used by the indexer. For that they are save to the symbol database by the PCH manager and when fetched by the symbol indexer. Change-Id: I7a5b07cfb32d72d50dc52d2b108cd41727a7bfc7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-20 12:43:05 +01:00
auto areDifferent = indexer.compilerMacrosOrIncludeSearchPathsAreDifferent(projectPart3,
artefact);
Clang: Don't reparse if the macros haven't changed We have to extend that to include paths too, which will be happen in a follow up patch. Change-Id: I7f8ac663ae8588e647fc6a6b5d689a629a28ef65 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-07 16:18:16 +01:00
ASSERT_TRUE(areDifferent);
}
TEST_F(SymbolIndexer, DontReparseInUpdateProjectPartsIfDefinesAreTheSame)
{
Clang: Introduce parallel indexing Change-Id: I522cb18e6d24b7dbed5d5dfa3a732e5b3b5113bb Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-08-28 12:08:37 +02:00
InSequence s;
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
ON_CALL(mockUsedMacroAndSourceStorage, fetchLowestLastModifiedTime(A<FilePathId>())).WillByDefault(Return(QDateTime::currentSecsSinceEpoch()));
Clang: Don't reparse if the macros haven't changed We have to extend that to include paths too, which will be happen in a follow up patch. Change-Id: I7f8ac663ae8588e647fc6a6b5d689a629a28ef65 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-07 16:18:16 +01:00
Clang: Introduce parallel indexing Change-Id: I522cb18e6d24b7dbed5d5dfa3a732e5b3b5113bb Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-08-28 12:08:37 +02:00
EXPECT_CALL(mockSqliteTransactionBackend, immediateBegin());
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
EXPECT_CALL(mockSymbolStorage, fetchProjectPartArtefact(TypedEq<Utils::SmallStringView>(projectPart1.projectPartId))).WillRepeatedly(Return(artefact));
EXPECT_CALL(mockSymbolStorage, insertOrUpdateProjectPart(Eq(projectPart1.projectPartId), Eq(projectPart1.arguments), Eq(projectPart1.compilerMacros), Eq(projectPart1.includeSearchPaths)));
EXPECT_CALL(mockUsedMacroAndSourceStorage, fetchLowestLastModifiedTime(A<FilePathId>())).WillRepeatedly(Return(QDateTime::currentSecsSinceEpoch()));
Clang: Introduce parallel indexing Change-Id: I522cb18e6d24b7dbed5d5dfa3a732e5b3b5113bb Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-08-28 12:08:37 +02:00
EXPECT_CALL(mockSqliteTransactionBackend, commit());
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
EXPECT_CALL(mockCollector, setFile(_, _)).Times(0);
Clang: Don't reparse if the macros haven't changed We have to extend that to include paths too, which will be happen in a follow up patch. Change-Id: I7f8ac663ae8588e647fc6a6b5d689a629a28ef65 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-07 16:18:16 +01:00
EXPECT_CALL(mockCollector, collectSymbols()).Times(0);
EXPECT_CALL(mockSqliteTransactionBackend, immediateBegin()).Times(0);
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
EXPECT_CALL(mockSymbolStorage, addSymbolsAndSourceLocations(_, _)).Times(0);
EXPECT_CALL(mockSymbolStorage, updateProjectPartSources(An<int>(), _)).Times(0);
EXPECT_CALL(mockUsedMacroAndSourceStorage, insertOrUpdateUsedMacros(_)).Times(0);
EXPECT_CALL(mockUsedMacroAndSourceStorage, insertFileStatuses(_)).Times(0);
EXPECT_CALL(mockUsedMacroAndSourceStorage, insertOrUpdateSourceDependencies(_)).Times(0);
Clang: Don't reparse if the macros haven't changed We have to extend that to include paths too, which will be happen in a follow up patch. Change-Id: I7f8ac663ae8588e647fc6a6b5d689a629a28ef65 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-07 16:18:16 +01:00
EXPECT_CALL(mockSqliteTransactionBackend, commit()).Times(0);
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
indexer.updateProjectPart(std::move(projectPart1));
Clang: Don't reparse if the macros haven't changed We have to extend that to include paths too, which will be happen in a follow up patch. Change-Id: I7f8ac663ae8588e647fc6a6b5d689a629a28ef65 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-07 16:18:16 +01:00
}
Clang: Add time stamp based filtering for project parts The source ids are now filtered by the modified time. If the modified time in the database is older than the modified time of the file it will be parsed. If it is not newer it will be not parsed. Change-Id: I4ade3443dd66573ac88053a2cafa600e54cfe973 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 17:49:02 +01:00
TEST_F(SymbolIndexer, PathsChangedUpdatesFileStatusCache)
{
auto sourceId = filePathId(TESTDATA_DIR "/symbolindexer_pathChanged.cpp");
auto oldLastModified = fileStatusCache.lastModifiedTime(sourceId);
touchFile(sourceId);
indexer.pathsChanged({sourceId});
ASSERT_THAT(fileStatusCache.lastModifiedTime(sourceId), Gt(oldLastModified));
}
TEST_F(SymbolIndexer, GetUpdatableFilePathIdsIfCompilerMacrosAreDifferent)
{
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
ON_CALL(mockSymbolStorage, fetchProjectPartArtefact(An<Utils::SmallStringView>())).WillByDefault(Return(artefact));
Clang: Add time stamp based filtering for project parts The source ids are now filtered by the modified time. If the modified time in the database is older than the modified time of the file it will be parsed. If it is not newer it will be not parsed. Change-Id: I4ade3443dd66573ac88053a2cafa600e54cfe973 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 17:49:02 +01:00
Clang: Use PCHs for indexing As generating the AST is quite expensive it would be very useful to cache the not changed include. So we generate PCHs for include outside of a project part. With this change this PCHs are used by the indexer. For that they are save to the symbol database by the PCH manager and when fetched by the symbol indexer. Change-Id: I7a5b07cfb32d72d50dc52d2b108cd41727a7bfc7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-20 12:43:05 +01:00
auto filePathIds = indexer.updatableFilePathIds(projectPart2, artefact);
Clang: Add time stamp based filtering for project parts The source ids are now filtered by the modified time. If the modified time in the database is older than the modified time of the file it will be parsed. If it is not newer it will be not parsed. Change-Id: I4ade3443dd66573ac88053a2cafa600e54cfe973 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 17:49:02 +01:00
ClangSupport: Use simpler structures in some cases The patch is mostly mechanical, but contains also a few spurious changes from values references for some local variables, foreach -> ranged for etc that I coulnd't resist. Change-Id: I58f0bd972546895eb318607cbfbd7ac35caf3f23 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-04-04 18:25:23 +02:00
ASSERT_THAT(filePathIds, projectPart2.sourcePathIds);
Clang: Add time stamp based filtering for project parts The source ids are now filtered by the modified time. If the modified time in the database is older than the modified time of the file it will be parsed. If it is not newer it will be not parsed. Change-Id: I4ade3443dd66573ac88053a2cafa600e54cfe973 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 17:49:02 +01:00
}
TEST_F(SymbolIndexer, GetUpdatableFilePathIdsIfIncludeSearchPathsAreDifferent)
{
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
ON_CALL(mockSymbolStorage, fetchProjectPartArtefact(An<Utils::SmallStringView>())).WillByDefault(Return(artefact));
Clang: Add time stamp based filtering for project parts The source ids are now filtered by the modified time. If the modified time in the database is older than the modified time of the file it will be parsed. If it is not newer it will be not parsed. Change-Id: I4ade3443dd66573ac88053a2cafa600e54cfe973 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 17:49:02 +01:00
Clang: Use PCHs for indexing As generating the AST is quite expensive it would be very useful to cache the not changed include. So we generate PCHs for include outside of a project part. With this change this PCHs are used by the indexer. For that they are save to the symbol database by the PCH manager and when fetched by the symbol indexer. Change-Id: I7a5b07cfb32d72d50dc52d2b108cd41727a7bfc7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-20 12:43:05 +01:00
auto filePathIds = indexer.updatableFilePathIds(projectPart3, artefact);
Clang: Add time stamp based filtering for project parts The source ids are now filtered by the modified time. If the modified time in the database is older than the modified time of the file it will be parsed. If it is not newer it will be not parsed. Change-Id: I4ade3443dd66573ac88053a2cafa600e54cfe973 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 17:49:02 +01:00
ClangSupport: Use simpler structures in some cases The patch is mostly mechanical, but contains also a few spurious changes from values references for some local variables, foreach -> ranged for etc that I coulnd't resist. Change-Id: I58f0bd972546895eb318607cbfbd7ac35caf3f23 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-04-04 18:25:23 +02:00
ASSERT_THAT(filePathIds, projectPart3.sourcePathIds);
Clang: Add time stamp based filtering for project parts The source ids are now filtered by the modified time. If the modified time in the database is older than the modified time of the file it will be parsed. If it is not newer it will be not parsed. Change-Id: I4ade3443dd66573ac88053a2cafa600e54cfe973 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 17:49:02 +01:00
}
TEST_F(SymbolIndexer, GetNoUpdatableFilePathIdsIfArtefactsAreTheSame)
{
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
ON_CALL(mockSymbolStorage, fetchProjectPartArtefact(An<Utils::SmallStringView>())).WillByDefault(Return(artefact));
ON_CALL(mockUsedMacroAndSourceStorage, fetchLowestLastModifiedTime(A<FilePathId>())).WillByDefault(Return(QDateTime::currentSecsSinceEpoch()));
Clang: Add time stamp based filtering for project parts The source ids are now filtered by the modified time. If the modified time in the database is older than the modified time of the file it will be parsed. If it is not newer it will be not parsed. Change-Id: I4ade3443dd66573ac88053a2cafa600e54cfe973 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 17:49:02 +01:00
Clang: Use PCHs for indexing As generating the AST is quite expensive it would be very useful to cache the not changed include. So we generate PCHs for include outside of a project part. With this change this PCHs are used by the indexer. For that they are save to the symbol database by the PCH manager and when fetched by the symbol indexer. Change-Id: I7a5b07cfb32d72d50dc52d2b108cd41727a7bfc7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-20 12:43:05 +01:00
auto filePathIds = indexer.updatableFilePathIds(projectPart1, artefact);
Clang: Add time stamp based filtering for project parts The source ids are now filtered by the modified time. If the modified time in the database is older than the modified time of the file it will be parsed. If it is not newer it will be not parsed. Change-Id: I4ade3443dd66573ac88053a2cafa600e54cfe973 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 17:49:02 +01:00
ASSERT_THAT(filePathIds, IsEmpty());
}
TEST_F(SymbolIndexer, OutdatedFilesPassUpdatableFilePathIds)
{
indexer.pathsChanged({main1PathId});
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
ON_CALL(mockSymbolStorage, fetchProjectPartArtefact(An<Utils::SmallStringView>())).WillByDefault(Return(artefact));
ON_CALL(mockUsedMacroAndSourceStorage, fetchLowestLastModifiedTime(A<FilePathId>()))
Clang: Add time stamp based filtering for project parts The source ids are now filtered by the modified time. If the modified time in the database is older than the modified time of the file it will be parsed. If it is not newer it will be not parsed. Change-Id: I4ade3443dd66573ac88053a2cafa600e54cfe973 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 17:49:02 +01:00
.WillByDefault(Return(0));
Clang: Use PCHs for indexing As generating the AST is quite expensive it would be very useful to cache the not changed include. So we generate PCHs for include outside of a project part. With this change this PCHs are used by the indexer. For that they are save to the symbol database by the PCH manager and when fetched by the symbol indexer. Change-Id: I7a5b07cfb32d72d50dc52d2b108cd41727a7bfc7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-20 12:43:05 +01:00
auto filePathIds = indexer.updatableFilePathIds(projectPart1, artefact);
Clang: Add time stamp based filtering for project parts The source ids are now filtered by the modified time. If the modified time in the database is older than the modified time of the file it will be parsed. If it is not newer it will be not parsed. Change-Id: I4ade3443dd66573ac88053a2cafa600e54cfe973 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 17:49:02 +01:00
ASSERT_THAT(filePathIds, ElementsAre(main1PathId));
}
TEST_F(SymbolIndexer, UpToDateFilesDontPassFilteredUpdatableFilePathIds)
{
indexer.pathsChanged({main1PathId});
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
ON_CALL(mockSymbolStorage, fetchProjectPartArtefact(An<Utils::SmallStringView>())).WillByDefault(Return(artefact));
ON_CALL(mockUsedMacroAndSourceStorage, fetchLowestLastModifiedTime(A<FilePathId>()))
Clang: Add time stamp based filtering for project parts The source ids are now filtered by the modified time. If the modified time in the database is older than the modified time of the file it will be parsed. If it is not newer it will be not parsed. Change-Id: I4ade3443dd66573ac88053a2cafa600e54cfe973 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 17:49:02 +01:00
.WillByDefault(Return(QDateTime::currentSecsSinceEpoch()));
Clang: Use PCHs for indexing As generating the AST is quite expensive it would be very useful to cache the not changed include. So we generate PCHs for include outside of a project part. With this change this PCHs are used by the indexer. For that they are save to the symbol database by the PCH manager and when fetched by the symbol indexer. Change-Id: I7a5b07cfb32d72d50dc52d2b108cd41727a7bfc7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-20 12:43:05 +01:00
auto filePathIds = indexer.updatableFilePathIds(projectPart1, artefact);
Clang: Add time stamp based filtering for project parts The source ids are now filtered by the modified time. If the modified time in the database is older than the modified time of the file it will be parsed. If it is not newer it will be not parsed. Change-Id: I4ade3443dd66573ac88053a2cafa600e54cfe973 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 17:49:02 +01:00
ASSERT_THAT(filePathIds, IsEmpty());
}
TEST_F(SymbolIndexer, OutdatedFilesAreParsedInUpdateProjectParts)
{
indexer.pathsChanged({main1PathId});
Clang: Introduce parallel indexing Change-Id: I522cb18e6d24b7dbed5d5dfa3a732e5b3b5113bb Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-08-28 12:08:37 +02:00
indexerScheduler.syncTasks();
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
ON_CALL(mockSymbolStorage, fetchProjectPartArtefact(An<Utils::SmallStringView>())).WillByDefault(Return(artefact));
ON_CALL(mockUsedMacroAndSourceStorage, fetchLowestLastModifiedTime(A<FilePathId>()))
Clang: Add time stamp based filtering for project parts The source ids are now filtered by the modified time. If the modified time in the database is older than the modified time of the file it will be parsed. If it is not newer it will be not parsed. Change-Id: I4ade3443dd66573ac88053a2cafa600e54cfe973 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 17:49:02 +01:00
.WillByDefault(Return(0));
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
EXPECT_CALL(mockCollector, setFile(Eq(main1PathId), _));
Clang: Add time stamp based filtering for project parts The source ids are now filtered by the modified time. If the modified time in the database is older than the modified time of the file it will be parsed. If it is not newer it will be not parsed. Change-Id: I4ade3443dd66573ac88053a2cafa600e54cfe973 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 17:49:02 +01:00
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
indexer.updateProjectParts({projectPart1});
Clang: Add time stamp based filtering for project parts The source ids are now filtered by the modified time. If the modified time in the database is older than the modified time of the file it will be parsed. If it is not newer it will be not parsed. Change-Id: I4ade3443dd66573ac88053a2cafa600e54cfe973 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 17:49:02 +01:00
}
TEST_F(SymbolIndexer, UpToDateFilesAreNotParsedInUpdateProjectParts)
{
indexer.pathsChanged({main1PathId});
Clang: Introduce parallel indexing Change-Id: I522cb18e6d24b7dbed5d5dfa3a732e5b3b5113bb Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-08-28 12:08:37 +02:00
indexerScheduler.syncTasks();
Clang: Split symbol storage We need UsedMacros and source related statements in the PCH manager too, so we have to split that class. Task-number: QTCREATORBUG-21289 Change-Id: Ie27d4b518b3d6d9174e93fcb243fdb55a09ddf51 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 18:09:55 +02:00
ON_CALL(mockSymbolStorage, fetchProjectPartArtefact(An<Utils::SmallStringView>())).WillByDefault(Return(artefact));
ON_CALL(mockUsedMacroAndSourceStorage, fetchLowestLastModifiedTime(A<FilePathId>()))
Clang: Add time stamp based filtering for project parts The source ids are now filtered by the modified time. If the modified time in the database is older than the modified time of the file it will be parsed. If it is not newer it will be not parsed. Change-Id: I4ade3443dd66573ac88053a2cafa600e54cfe973 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 17:49:02 +01:00
.WillByDefault(Return(QDateTime::currentSecsSinceEpoch()));
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
EXPECT_CALL(mockCollector, setFile(_, _)).Times(0);
Clang: Add time stamp based filtering for project parts The source ids are now filtered by the modified time. If the modified time in the database is older than the modified time of the file it will be parsed. If it is not newer it will be not parsed. Change-Id: I4ade3443dd66573ac88053a2cafa600e54cfe973 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 17:49:02 +01:00
Clang: Improve generated files handling Generated files are referenced by the system collector directly to set the unsaved files. Change-Id: I24be3ee544b7824b8b0e518eafd409f32bd002ab Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-03 14:38:01 +02:00
indexer.updateProjectParts({projectPart1});
Clang: Add time stamp based filtering for project parts The source ids are now filtered by the modified time. If the modified time in the database is older than the modified time of the file it will be parsed. If it is not newer it will be not parsed. Change-Id: I4ade3443dd66573ac88053a2cafa600e54cfe973 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 17:49:02 +01:00
}
Clang: Add symbol indexer Change-Id: I8ff879631ae022bc870431628be002903360369c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-02 16:00:55 +02:00
}
Copy Permalink