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.7 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 CDE77C64E7B for ; Tue, 1 Dec 2020 19:34:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 795B220679 for ; Tue, 1 Dec 2020 19:34:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404335AbgLATdf (ORCPT ); Tue, 1 Dec 2020 14:33:35 -0500 Received: from smtprelay0237.hostedemail.com ([216.40.44.237]:45346 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726148AbgLATdf (ORCPT ); Tue, 1 Dec 2020 14:33:35 -0500 Received: from filter.hostedemail.com (clb03-v110.bra.tucows.net [216.40.38.60]) by smtprelay05.hostedemail.com (Postfix) with ESMTP id 4FF3D18028E7E; Tue, 1 Dec 2020 19:32:54 +0000 (UTC) X-Session-Marker: 6A6F6540706572636865732E636F6D X-HE-Tag: joke83_280d582273ad X-Filterd-Recvd-Size: 3300 Received: from XPS-9350.home (unknown [47.151.128.180]) (Authenticated sender: joe@perches.com) by omf13.hostedemail.com (Postfix) with ESMTPA; Tue, 1 Dec 2020 19:32:53 +0000 (UTC) Message-ID: <7f29e46d73c0b12ce53e659f0bcd3ec194522f2e.camel@perches.com> Subject: Re: [PATCH v3] checkpatch: fix TYPO_SPELLING check for words with apostrophe From: Joe Perches To: Dwaipayan Ray , Andrew Morton Cc: linux-kernel-mentees@lists.linuxfoundation.org, linux-kernel@vger.kernel.org, lukas.bulwahn@gmail.com, Peilin Ye Date: Tue, 01 Dec 2020 11:32:51 -0800 In-Reply-To: <20201201190729.169733-1-dwaipayanray1@gmail.com> References: <20201201190729.169733-1-dwaipayanray1@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 Wed, 2020-12-02 at 00:37 +0530, Dwaipayan Ray wrote: > checkpatch reports a false TYPO_SPELLING warning for some words > containing an apostrophe when run with --codespell option. Thanks. Acked-by: Joe Perches > > A false positive is "doesn't". Occurrence of the word causes > checkpatch to emit the following warning: > > "WARNING: 'doesn'' may be misspelled - perhaps 'doesn't'?" > > Modify the regex pattern to be more in line with the codespell > default word matching regex. This fixes the word capture and > avoids the false warning. > > In addition, highlight the misspelled word location by adding a > caret below the word. > > Suggested-by: Joe Perches > Reported-by: Peilin Ye > Signed-off-by: Dwaipayan Ray > --- > Changes in v3: > - Highlight misspelled word location using a caret > > Changes in v2: > - Use the default codespell word regex. > - Modify commit message to specify --codespell usage > >  scripts/checkpatch.pl | 7 +++++-- >  1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl > index 3c86ea737e9c..e8c1ed0b1fad 100755 > --- a/scripts/checkpatch.pl > +++ b/scripts/checkpatch.pl > @@ -3106,15 +3106,18 @@ sub process { >  # Check for various typo / spelling mistakes >   if (defined($misspellings) && >   ($in_commit_log || $line =~ /^(?:\+|Subject:)/i)) { > - while ($rawline =~ /(?:^|[^a-z@])($misspellings)(?:\b|$|[^a-z@])/gi) { > + while ($rawline =~ /(?:^|[^\w\-'`])($misspellings)(?:[^\w\-'`]|$)/gi) { >   my $typo = $1; > + my $blank = copy_spacing($rawline); > + my $ptr = substr($blank, 0, $-[1]) . "^"; > + my $hereptr = "$hereline$ptr\n"; >   my $typo_fix = $spelling_fix{lc($typo)}; >   $typo_fix = ucfirst($typo_fix) if ($typo =~ /^[A-Z]/); >   $typo_fix = uc($typo_fix) if ($typo =~ /^[A-Z]+$/); >   my $msg_level = \&WARN; >   $msg_level = \&CHK if ($file); >   if (&{$msg_level}("TYPO_SPELLING", > - "'$typo' may be misspelled - perhaps '$typo_fix'?\n" . $herecurr) && > + "'$typo' may be misspelled - perhaps '$typo_fix'?\n" . $hereptr) && >   $fix) { >   $fixed[$fixlinenr] =~ s/(^|[^A-Za-z@])($typo)($|[^A-Za-z@])/$1$typo_fix$3/; >   }