From patchwork Mon Dec 2 22:38:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gabriel Wicki X-Patchwork-Id: 34395 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C5DC627BBEA; Mon, 2 Dec 2024 22:40:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 34D7B27BBE2 for ; Mon, 2 Dec 2024 22:40:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tIF5I-0007r1-JA; Mon, 02 Dec 2024 17:40:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tIF5G-0007pz-Vj for guix-patches@gnu.org; Mon, 02 Dec 2024 17:40:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tIF5G-0006cO-N4 for guix-patches@gnu.org; Mon, 02 Dec 2024 17:40:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:From:Date:To:In-Reply-To:References:Subject; bh=1diCPUwCZMoU7m49flk/0WqGd+oH4fU8dEMy3gkjhQ4=; b=r295mr94uwrn/azMCcfvH10aHqyHZas+nN67zQxQOKP45Cl42fXfB/4RCBocB6EZMKZf1rLMhmG0K44zRm/Tuht/jxGBgL3dAOxTJa9g51YKyU4rqRhAa6Cli45hnJCXvO80wDSeXPHwfu7BCG77TRtfdIBtgteawirZejf+gr3bTwx5bysjHAaOfTeJPPESo8QnjNYoG996O9CXn5iJcgFn5B8fojW35N07Rf1cM8d+WezmME73ieMd4eToFrmnz2PYewyMZ/6glbAQEGC6vouLgjE4ggIOkL3oAd8V8ZFZbyr6Rhmj7KtjwzoyCBSWUkCDW8ZvwTAVOQ7jVSk7BQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tIF5G-0004A8-Ga for guix-patches@gnu.org; Mon, 02 Dec 2024 17:40:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74459] [PATCH v2 5/7] guix: lint: Prevent false positives in description typo check. References: In-Reply-To: Resent-From: Gabriel Wicki Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Dec 2024 22:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74459 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74459@debbugs.gnu.org Received: via spool by 74459-submit@debbugs.gnu.org id=B74459.173317914515892 (code B ref 74459); Mon, 02 Dec 2024 22:40:02 +0000 Received: (at 74459) by debbugs.gnu.org; 2 Dec 2024 22:39:05 +0000 Received: from localhost ([127.0.0.1]:56880 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tIF4K-00048G-Pz for submit@debbugs.gnu.org; Mon, 02 Dec 2024 17:39:05 -0500 Received: from cotopaxi.ee.ethz.ch ([129.132.148.196]:52101) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tIF4I-00047k-UK for 74459@debbugs.gnu.org; Mon, 02 Dec 2024 17:39:03 -0500 Received: from localhost (antispam.ee.ethz.ch [129.132.2.16]) by cotopaxi.ee.ethz.ch (Postfix) with ESMTP id 92C6E1FFFF for <74459@debbugs.gnu.org>; Mon, 2 Dec 2024 23:38:57 +0100 (CET) X-Virus-Scanned: by amavisd at antispam.ee.ethz.ch Received: from cotopaxi.ee.ethz.ch ([129.132.148.196]) by localhost (antispam.ee.ethz.ch [129.132.2.16]) (amavisd-new, port 10028) with ESMTP id qTJ4_X8kStFs for <74459@debbugs.gnu.org>; Mon, 2 Dec 2024 23:38:56 +0100 (CET) Received: from blackbox (212-51-128-25.fiber7.init7.net [212.51.128.25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: gabriel) by cotopaxi.ee.ethz.ch (Postfix) with ESMTPSA for <74459@debbugs.gnu.org>; Mon, 2 Dec 2024 23:38:56 +0100 (CET) Date: Mon, 2 Dec 2024 23:38:51 +0100 From: Gabriel Wicki Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/lint.scm(check-description-style)[check-description-typo]: Add spaces to match strings to prevent matching false positives, like "allows tokens" or "prevents torpedoes". * tests/lint.scm: Add test. Change-Id: Ifc2ec6167a590b9d2e742dd86fecd798c4bfaa24 --- guix/lint.scm | 4 ++-- tests/lint.scm | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/guix/lint.scm b/guix/lint.scm index 396ee01fed..ee2059d812 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -507,8 +507,8 @@ (define (check-description-style package) (check-trademarks description) (check-description-typo description '(("This packages" . "This package") ("This modules" . "This module") - ("allows to" . #f) - ("permits to" . #f))) + ("allows to " . #f) + ("permits to " . #f))) ;; Use raw description for this because Texinfo rendering ;; automatically fixes end of sentence space. (check-end-of-sentence-space description) diff --git a/tests/lint.scm b/tests/lint.scm index 6631034151..47e31a69bf 100644 --- a/tests/lint.scm +++ b/tests/lint.scm @@ -219,12 +219,18 @@ (define (warning-contains? str warnings) (check-description-style pkg)))) (test-equal "description: grammar 'allows to'" - "description contains typo 'allows to'" + "description contains typo 'allows to '" (single-lint-warning-message (let ((pkg (dummy-package "x" (description "This package allows to do stuff.")))) (check-description-style pkg)))) +(test-equal "description: grammar 'allows to' 2" + '() + (let ((pkg (dummy-package "x" + (description "This package allows tokenization.")))) + (check-description-style pkg))) + (test-equal "synopsis: not a string" "invalid synopsis: #f" (single-lint-warning-message