danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-26 20:34:47 +01:00
Code Issues Projects Releases Wiki Activity

Fix slowness when invalidating heavily-used files

Browse Source
This commit is contained in:
Brown 2018-10-17 18:11:02 -04:00
parent 53719447f5
commit b7c438bf97
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Psalm/Checker/ProjectChecker.php
View File

@ -712,7 +712,7 @@ class ProjectChecker
*
* @return array<string, string>
*/
public function getReferencedFilesFromDiff(array $diff_files)
public function getReferencedFilesFromDiff(array $diff_files, bool $include_referencing_files = true)
{
$all_inherited_files_to_check = $diff_files;
@ -720,17 +720,20 @@ class ProjectChecker
$diff_file = array_shift($diff_files);
$dependent_files = $this->file_reference_provider->getFilesInheritingFromFile($diff_file);
$new_dependent_files = array_diff($dependent_files, $all_inherited_files_to_check);
$all_inherited_files_to_check += $new_dependent_files;
$diff_files += $new_dependent_files;
$all_inherited_files_to_check = array_merge($all_inherited_files_to_check, $new_dependent_files);
$diff_files = array_merge($diff_files, $new_dependent_files);
}
$all_files_to_check = $all_inherited_files_to_check;
foreach ($all_inherited_files_to_check as $file_name) {
$dependent_files = $this->file_reference_provider->getFilesReferencingFile($file_name);
$all_files_to_check = array_merge($dependent_files, $all_files_to_check);
if ($include_referencing_files) {
foreach ($all_inherited_files_to_check as $file_name) {
$dependent_files = $this->file_reference_provider->getFilesReferencingFile($file_name);
$all_files_to_check = array_merge($dependent_files, $all_files_to_check);
}
}
return array_combine($all_files_to_check, $all_files_to_check);

2
src/Psalm/Codebase.php
View File

@ -245,7 +245,7 @@ class Codebase
}
}
$referenced_files = $project_checker->getReferencedFilesFromDiff($diff_files);
$referenced_files = $project_checker->getReferencedFilesFromDiff($diff_files, false);
foreach ($diff_files as $diff_file_path) {
$this->invalidateInformationForFile($diff_file_path);