Messages in this thread | | | Subject | Re: [PATCH 2/2] checkpatch: kconfig: add missing types to regex | From | Joe Perches <> | Date | Mon, 21 Dec 2020 09:17:52 -0800 |
| |
On Mon, 2020-12-21 at 16:08 +0100, Nicolai Fischer wrote: > On Sun, 2020-12-20 at 20:16 +0100, Joe Perches wrote: > > On Mon, 2020-12-14 at 11:24 +0100, Nicolai Fischer wrote: > > > Kconfig parsing does not recognise all type attributes. > > > This adds the missing 'int', 'sting' and 'hex' types. > > [] > > > diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl > > [] > > > @@ -3321,7 +3321,7 @@ sub process { > > > next if ($f =~ /^-/); > > > last if (!$file && $f =~ /^\@\@/); > > > > > > > > > - if ($lines[$ln - 1] =~ /^\+\s*(?:bool|tristate|prompt)\s*["']/) { > > > + if ($lines[$ln - 1] =~ /^\+\s*(?:bool|tristate|int|hex|string|prompt)\s*["']/) { > > > $is_start = 1; > > > } elsif ($lines[$ln - 1] =~ /^\+\s*help$/) { > > > $length = -1; > > > > Another thing that could be done is to enforce the "extra 2 spaces" > > indent by capturing the whitespace before the help keyword: > > > > } elsif ($lines[$ln - 1] =~ /^\+\s*help$/) { > > > > could be > > > > } elsif ($lines[$ln - 1] =~ /^\+(\s*)help\s*$/) { > > > > with $1 used to validate the extra indent. > > > > > > > In case the indent does not match, should we display a new warning as in our previous patch?
Sure, but in a separate patch and ensure blank lines are ignored.
+ if ($l !~ /^\ {2}/) { + $wrong_indent = 1; }
The message you used: + WARN("CONFIG_DESCRIPTION", + "help text is not indented 2 spaces more than the help keyword\n" . $herecurr);
is IMO a bit oddly phrased and could/should test only the first line after the help keyword and show the help line using $hereprev.
| |