Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2024-11-22 23:55:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge ParseFile and DoParseFile

Browse Source
This commit is contained in:
Jacob Dufault 2018-01-17 21:48:09 -08:00
parent 8fef86c0f8
commit 4c1ee74b27
1 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/import_pipeline.cc
View File

@ -83,7 +83,8 @@ struct ActiveThread {
enum class FileParseQuery { NeedsParse, DoesNotNeedParse, NoSuchFile }; enum class FileParseQuery { NeedsParse, DoesNotNeedParse, NoSuchFile };
std::vector<Index_DoIdMap> DoParseFile(
std::vector<Index_DoIdMap> ParseFile(
Config* config, Config* config,
WorkingFiles* working_files, WorkingFiles* working_files,
FileConsumerSharedState* file_consumer_shared, FileConsumerSharedState* file_consumer_shared,
@ -92,9 +93,21 @@ std::vector<Index_DoIdMap> DoParseFile(
ICacheManager* cache_manager, ICacheManager* cache_manager,
IIndexer* indexer, IIndexer* indexer,
bool is_interactive, bool is_interactive,
const std::string& path, const Project::Entry& entry,
const std::vector<std::string>& args, const std::string& entry_contents) {
const FileContents& contents) {
FileContents contents(entry.filename, entry_contents);
// If the file is inferred, we may not actually be able to parse that file
// directly (ie, a header file, which are not listed in the project). If this
// file is inferred, then try to use the file which originally imported it.
std::string path = entry.filename;
if (entry.is_inferred) {
IndexFile* entry_cache = cache_manager->TryLoad(entry.filename);
if (entry_cache)
path = entry_cache->import_file;
}
std::vector<Index_DoIdMap> result; std::vector<Index_DoIdMap> result;
// Always run this block, even if we are interactive, so we can check // Always run this block, even if we are interactive, so we can check
@ -236,7 +249,7 @@ std::vector<Index_DoIdMap> DoParseFile(
PerformanceImportFile perf; PerformanceImportFile perf;
std::vector<std::unique_ptr<IndexFile>> indexes = indexer->Index( std::vector<std::unique_ptr<IndexFile>> indexes = indexer->Index(
config, file_consumer_shared, path, args, file_contents, &perf); config, file_consumer_shared, path, entry.args, file_contents, &perf);
for (std::unique_ptr<IndexFile>& new_index : indexes) { for (std::unique_ptr<IndexFile>& new_index : indexes) {
Timer time; Timer time;
@ -256,29 +269,6 @@ std::vector<Index_DoIdMap> DoParseFile(
return result; return result;
} }
std::vector<Index_DoIdMap> ParseFile(
Config* config,
WorkingFiles* working_files,
FileConsumerSharedState* file_consumer_shared,
TimestampManager* timestamp_manager,
ImportManager* import_manager,
ICacheManager* cache_manager,
IIndexer* indexer,
bool is_interactive,
const Project::Entry& entry,
const std::string& contents) {
FileContents file_contents(entry.filename, contents);
// Try to determine the original import file by loading the file from cache.
// This lets the user request an index on a header file, which clang will
// complain about if indexed by itself.
IndexFile* entry_cache = cache_manager->TryLoad(entry.filename);
std::string tu_path = entry_cache ? entry_cache->import_file : entry.filename;
return DoParseFile(config, working_files, file_consumer_shared,
timestamp_manager, import_manager, cache_manager, indexer,
is_interactive, tu_path, entry.args, file_contents);
}
bool IndexMain_DoParse(Config* config, bool IndexMain_DoParse(Config* config,
WorkingFiles* working_files, WorkingFiles* working_files,
FileConsumerSharedState* file_consumer_shared, FileConsumerSharedState* file_consumer_shared,