Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-01-31 18:00:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FileNeedsParse no longer takes FileConsumerSharedState

Browse Source
This commit is contained in:
Jacob Dufault 2018-01-18 00:05:12 -08:00
parent a1ae100478
commit e38c6103ea
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/import_pipeline.cc
View File

@ -119,7 +119,6 @@ ShouldParse FileNeedsParse(
IModificationTimestampFetcher* modification_timestamp_fetcher, IModificationTimestampFetcher* modification_timestamp_fetcher,
ImportManager* import_manager, ImportManager* import_manager,
ICacheManager* cache_manager, ICacheManager* cache_manager,
FileConsumerSharedState* file_consumer_shared,
IndexFile* opt_previous_index, IndexFile* opt_previous_index,
const std::string& path, const std::string& path,
const std::vector<std::string>& args, const std::vector<std::string>& args,
@ -151,14 +150,12 @@ ShouldParse FileNeedsParse(
if (!last_cached_modification || if (!last_cached_modification ||
modification_timestamp != *last_cached_modification) { modification_timestamp != *last_cached_modification) {
LOG_S(INFO) << "Timestamp has changed for " << path << unwrap_opt(from); LOG_S(INFO) << "Timestamp has changed for " << path << unwrap_opt(from);
file_consumer_shared->Reset(path);
return ShouldParse::Yes; return ShouldParse::Yes;
} }
// Command-line arguments changed. // Command-line arguments changed.
if (opt_previous_index && opt_previous_index->args != args) { if (opt_previous_index && opt_previous_index->args != args) {
LOG_S(INFO) << "Arguments have changed for " << path << unwrap_opt(from); LOG_S(INFO) << "Arguments have changed for " << path << unwrap_opt(from);
file_consumer_shared->Reset(path);
return ShouldParse::Yes; return ShouldParse::Yes;
} }
@ -189,8 +186,10 @@ CacheLoadResult TryLoadFromCache(
// Check timestamps and update |file_consumer_shared|. // Check timestamps and update |file_consumer_shared|.
ShouldParse path_state = FileNeedsParse( ShouldParse path_state = FileNeedsParse(
is_interactive, timestamp_manager, modification_timestamp_fetcher, is_interactive, timestamp_manager, modification_timestamp_fetcher,
import_manager, cache_manager, file_consumer_shared, previous_index, import_manager, cache_manager, previous_index, path_to_index, entry.args,
path_to_index, entry.args, nullopt); nullopt);
if (path_state == ShouldParse::Yes)
file_consumer_shared->Reset(path_to_index);
// Target file does not exist on disk, do not emit any indexes. // Target file does not exist on disk, do not emit any indexes.
// TODO: Dependencies should be reassigned to other files. We can do this by // TODO: Dependencies should be reassigned to other files. We can do this by
@ -204,14 +203,15 @@ CacheLoadResult TryLoadFromCache(
for (const std::string& dependency : previous_index->dependencies) { for (const std::string& dependency : previous_index->dependencies) {
assert(!dependency.empty()); assert(!dependency.empty());
// note: Use != as there are multiple failure results for FileParseQuery. if (FileNeedsParse(is_interactive, timestamp_manager,
if (FileNeedsParse( modification_timestamp_fetcher, import_manager,
is_interactive, timestamp_manager, modification_timestamp_fetcher, cache_manager, previous_index, dependency, entry.args,
import_manager, cache_manager, file_consumer_shared, previous_index, previous_index->path) == ShouldParse::Yes) {
dependency, entry.args, previous_index->path) != ShouldParse::No) {
needs_reparse = true; needs_reparse = true;
// SUBTLE: Do not break here, as |file_consumer_shared| is updated
// inside of |file_needs_parse|. // Do not break here, as we need to update |file_consumer_shared| for
// every dependency that needs to be reparsed.
file_consumer_shared->Reset(dependency);
} }
} }
@ -755,8 +755,7 @@ TEST_SUITE("ImportPipeline") {
return FileNeedsParse(is_interactive /*is_interactive*/, return FileNeedsParse(is_interactive /*is_interactive*/,
&timestamp_manager, &modification_timestamp_fetcher, &timestamp_manager, &modification_timestamp_fetcher,
&import_manager, cache_manager.get(), &import_manager, cache_manager.get(),
&file_consumer_shared, opt_previous_index.get(), opt_previous_index.get(), file, new_args, from);
file, new_args, from);
}; };
// A file with no timestamp is not imported, since this implies the file no // A file with no timestamp is not imported, since this implies the file no