From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94776C63798 for ; Mon, 23 Nov 2020 05:47:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5316F2071E for ; Mon, 23 Nov 2020 05:47:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727922AbgKWFrS (ORCPT ); Mon, 23 Nov 2020 00:47:18 -0500 Received: from smtprelay0166.hostedemail.com ([216.40.44.166]:51520 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726802AbgKWFrR (ORCPT ); Mon, 23 Nov 2020 00:47:17 -0500 Received: from filter.hostedemail.com (clb03-v110.bra.tucows.net [216.40.38.60]) by smtprelay08.hostedemail.com (Postfix) with ESMTP id 0BAAB182CF665; Mon, 23 Nov 2020 05:47:16 +0000 (UTC) X-Session-Marker: 6A6F6540706572636865732E636F6D X-HE-Tag: room91_1714d1927363 X-Filterd-Recvd-Size: 2627 Received: from XPS-9350.home (unknown [47.151.128.180]) (Authenticated sender: joe@perches.com) by omf19.hostedemail.com (Postfix) with ESMTPA; Mon, 23 Nov 2020 05:47:15 +0000 (UTC) Message-ID: Subject: Re: [PATCH v6] checkpatch: add fix option for LOGICAL_CONTINUATIONS From: Joe Perches To: Aditya Srivastava Cc: lukas.bulwahn@gmail.com, linux-kernel-mentees@lists.linuxfoundation.org, linux-kernel@vger.kernel.org Date: Sun, 22 Nov 2020 21:47:13 -0800 In-Reply-To: <20201122125908.22212-1-yashsri421@gmail.com> References: <368300090d93ad66f7fb19076d076d4321a04c42.camel@perches.com> <20201122125908.22212-1-yashsri421@gmail.com> Content-Type: text/plain; charset="ISO-8859-1" User-Agent: Evolution 3.38.1-1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, 2020-11-22 at 18:29 +0530, Aditya Srivastava wrote: > Currently, checkpatch warns if logical continuations are placed at the > start of a line and not at the end of previous line. > > E.g., running checkpatch on commit 3485507fc272 ("staging: > bcm2835-camera: Reduce length of enum names") reports: > > CHECK:LOGICAL_CONTINUATIONS: Logical continuations should be on the > previous line > + if (!ret > + && camera_port == > > Provide a simple fix by inserting logical operator at the last > non-comment, non-whitespace char of the previous line and removing from > current line, if both the lines are additions(ie start with '+') > > Signed-off-by: Aditya Srivastava [] > diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl [] > @@ -3553,8 +3553,16 @@ sub process { >   > >  # check for && or || at the start of a line >   if ($rawline =~ /^\+\s*(&&|\|\|)/) { > - CHK("LOGICAL_CONTINUATIONS", > - "Logical continuations should be on the previous line\n" . $hereprev); > + my $operator = $1; > + if (CHK("LOGICAL_CONTINUATIONS", > + "Logical continuations should be on the previous line\n" . $hereprev) && > + $fix && $prevrawline =~ /^\+/) { > + # insert logical operator at last non-comment, non-whitepsace char on previous line > + $prevline =~ /[\s$;]*$/; > + my $line_end = substr($prevrawline, $-[0]); > + $fixed[$fixlinenr - 1] =~ s/\Q$line_end\E/ $operator$line_end/; This doesn't work when the same leading whitespace and trailing whitespace characters exist. You need to use something like: $fixed[$fixlinenr - 1] =~ s/\Q$line_end\E$/ $operator$line_end/; (note the $ after \E to use EOL)