Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Alex Ghiti <alex@ghiti.fr>
To:     Andy Whitcroft <apw@canonical.com>, Joe Perches <joe@perches.com>,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3] scripts: checkpatch: Check multiple blank lines when
 deleting code
References: <20190306195324.11634-1-alex@ghiti.fr>
 <f2f39283-677f-e617-5edb-f55624ac21e2@ghiti.fr>
Message-ID: <43f07161-8405-c934-ee84-3eb1f99c0b9b@ghiti.fr>
Date:   Mon, 25 Mar 2019 03:07:52 -0400
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101
 Thunderbird/60.4.0
MIME-Version: 1.0
In-Reply-To: <f2f39283-677f-e617-5edb-f55624ac21e2@ghiti.fr>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On 3/17/19 11:49 AM, Alex Ghiti wrote:
> On 3/6/19 2:53 PM, Alexandre Ghiti wrote:
>> By matching only current line starting with '+', we miss the case
>> when deleting code makes consecutive blank lines appear: this patch
>> then makes it possible to detect this case by also matching current
>> line starting with ' ', which is an already existing blank line.
>>
>> Signed-off-by: Alexandre Ghiti <alex@ghiti.fr>
>> ---
>>
>> Changes in v3 as suggested by Joe Perches:
>>     - Do not try to fix this case
>>     - Make this test separate from the insertion one so that warning
>>       is more explicit
>>
>> Changes in v2:
>>     - Fix the --fix option
>>
>>   scripts/checkpatch.pl | 12 +++++++++++-
>>   1 file changed, 11 insertions(+), 1 deletion(-)
>>
>> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
>> index b737ca9d7204..c0728cff292f 100755
>> --- a/scripts/checkpatch.pl
>> +++ b/scripts/checkpatch.pl
>> @@ -3296,7 +3296,7 @@ sub process {
>>               }
>>           }
>>   -# check for multiple consecutive blank lines
>> +# check for multiple consecutive blank lines caused by blank line 
>> insertion
>>           if ($prevline =~ /^[\+ ]\s*$/ &&
>>               $line =~ /^\+\s*$/ &&
>>               $last_blank_line != ($linenr - 1)) {
>> @@ -3309,6 +3309,16 @@ sub process {
>>               $last_blank_line = $linenr;
>>           }
>>   +# check for multiple consecutive blank lines caused by code deletion
>> +        if ($prevline =~ /^[\+ ]\s*$/ &&
>> +            $line =~ /^ \s*$/ &&
>> +            $last_blank_line != ($linenr - 1)) {
>> +            CHK("LINE_SPACING",
>> +                "Avoid deleting lines that create consecutive blank 
>> lines\n" . $hereprev);
>> +
>> +            $last_blank_line = $linenr;
>> +        }
>> +
>>   # check for missing blank lines after declarations
>>           if ($sline =~ /^\+\s+\S/ &&            #Not at char 1
>>               # actual declarations
>
>
> Hi Joe,
>
> Can I do something more this patch ?
>
> Thanks,
>
> Alex
>

Hi,

Sorry for insisting, but do you consider this patch for inclusion ?

Thanks,

Alex