From: Grégoire PARIS Date: Wed, 18 Nov 2020 08:17:49 GMT Subject: Re: phpdoc diff in git -L is not the correct one Message-ID: In-Reply-To: <5a2d70eb-da75-ff59-8ac1-6ba81e1632da@web.de> Hi René! Sorry for not seeing your answer before! On 11/15/20 12:40 AM, René Scharfe wrote: > > The --function-context options of git diff and git grep try to show > comments by including non-empty lines before function lines. That would indeed do the first part of the job. Do you think something similarcould be done to remove non-empty lines before the next funcname? > This > heuristic might work for -L :funcname:file as well (patch below), but > breaks seven tests in each of t8001-annotate.sh, t8002-blame.sh and > t8012-blame-colors.sh. I haven't written C in 10 literal years but I think I managed to apply this patch, and something looks wrong: it's looking too "far" before: See for instance: --- commit 1a8a640f87cad94d36713f45e5e257de20930171 Author: Michael Moravec Date: Mon Mar 5 04:01:58 2018 +0100 Upgrade to Doctrine CS 4.0 diff --git a/src/Doctrine/Instantiator/Instantiator.php b/src/Doctrine/Instantiator/Instantiator.php --- a/src/Doctrine/Instantiator/Instantiator.php +++ b/src/Doctrine/Instantiator/Instantiator.php @@ -31,12 +33,14 @@ */ private static $cachedInstantiators = []; /** - * @var object[] of objects that can directly be cloned, indexed by class name + * Array of objects that can directly be cloned, indexed by class name. + * + * @var object[] */ private static $cachedCloneables = []; /** * {@inheritDoc} */ public function instantiate($className) --- Here it's picking changes in the phpdoc of the property that precedes `instantiate`, (when using git log -L/instantiate\(/,-14:src/Doctrine/Instantiator/Instantiator.php) What's wrong? -- greg0ire