Messages in this thread |  | | Subject | Re: [PATCH v5] checkpatch: add fix option for LOGICAL_CONTINUATIONS | From | Joe Perches <> | Date | Sun, 22 Nov 2020 03:32:53 -0800 |
| |
On Sun, 2020-11-22 at 16:40 +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 '+')
Not quite yet.
> changes in v5: improve regex for comment and line end with '$;' [] > diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl [] > @@ -3553,8 +3553,17 @@ 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 > + if ($prevline =~ /[\s$;]*$/) {
This if is misleading as it will always match at least the EOL
> + my $line_end = substr($prevrawline, $-[0]); > + $fixed[$fixlinenr - 1] =~ s/\Q$line_end\E/ $operator$line_end/;
It makes it seem as if this part is only done when the test is true. The test is always true.
|  |