Messages in this thread | | | Subject | Re: [PATCH v2] checkpatch: add fix option for LOGICAL_CONTINUATIONS | From | Joe Perches <> | Date | Sat, 21 Nov 2020 08:56:05 -0800 |
| |
On Sat, 2020-11-21 at 17:45 +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 adding logical operator at the end of previous > line and removing from current line, if both the lines are additions > (ie start with '+') [] > diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl [] > @@ -3553,8 +3553,14 @@ 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 =~ /^\+/) { > + # add logical operator to the previous line, remove from current line > + $fixed[$fixlinenr - 1] .= " $operator"; > + $fixed[$fixlinenr] =~ s/\Q$operator\E\s*//; > + }
One thing to be concerned about is a statement like
if (foo // comment && bar)
This should really perform the insertion at the last non-comment, non-whitespace char of the previous line.
| |