From patchwork Fri Apr 1 15:01:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 38267 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 B2CCD27BBEA; Fri, 1 Apr 2022 16:07:59 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 6EFFC27BBE9 for ; Fri, 1 Apr 2022 16:07:59 +0100 (BST) Received: from localhost ([::1]:57950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naIsY-00007t-KA for patchwork@mira.cbaines.net; Fri, 01 Apr 2022 11:07:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45522) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naInm-0000jA-CU for guix-patches@gnu.org; Fri, 01 Apr 2022 11:03:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49168) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naInm-00063E-3c for guix-patches@gnu.org; Fri, 01 Apr 2022 11:03:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1naInm-0002rO-0k for guix-patches@gnu.org; Fri, 01 Apr 2022 11:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54668] [PATCH 2/3] ui: Move 'location->hyperlink' to (guix diagnostics). Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Apr 2022 15:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54668 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54668@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 54668-submit@debbugs.gnu.org id=B54668.164882532410892 (code B ref 54668); Fri, 01 Apr 2022 15:03:01 +0000 Received: (at 54668) by debbugs.gnu.org; 1 Apr 2022 15:02:04 +0000 Received: from localhost ([127.0.0.1]:43055 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naImq-0002pW-3Z for submit@debbugs.gnu.org; Fri, 01 Apr 2022 11:02:04 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57574) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naImo-0002oZ-2R for 54668@debbugs.gnu.org; Fri, 01 Apr 2022 11:02:02 -0400 Received: from [2001:470:142:3::e] (port=54946 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naImi-0005tf-Op; Fri, 01 Apr 2022 11:01:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=hVegxZiF76OrAkfB6Ve+trkVS5caVaJ+szK0zurSDFg=; b=kzgAzbFp307nYunyAzcq EmX6K6phH7wSYvM9Onim1axhRsBYXNNdDkxWWpxA45KVklTnIAeK3NdxbFa+zeJ6iGx/yp8QqfYYo CX6iNDZvwVSK6sREbbFpwrtudoWIzfclZMOTB4vxy5V6bA+UcqFNf5uUgLGfYwq6VILT/ZYAEdNzx 9myysEYU/J9xpFFOTP+EMWltLR4/cMl0FEX1gLPC9dIEF+dUlx8LhU7OIXIy/LoPqjblTWAzN0mVj /fX+ziVjren0S/RkW0buBGN03vjKJ2alRaR2fTPcPyZ3UW3QAKtocuyWKStEupnckh6mrORXncOZo 1NL+APWH26UIVQ==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=38740 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naImi-0005LG-Bj; Fri, 01 Apr 2022 11:01:56 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Fri, 1 Apr 2022 17:01:45 +0200 Message-Id: <20220401150146.32529-2-ludo@gnu.org> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220401150146.32529-1-ludo@gnu.org> References: <20220401150146.32529-1-ludo@gnu.org> MIME-Version: 1.0 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" X-getmail-retrieved-from-mailbox: Patches * guix/ui.scm (location->hyperlink): Move to... * guix/diagnostics.scm: ... here. * guix/scripts/system/search.scm: Adjust imports accordingly. --- guix/diagnostics.scm | 11 +++++++++++ guix/scripts/system/search.scm | 1 + guix/ui.scm | 12 ------------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/guix/diagnostics.scm b/guix/diagnostics.scm index 337a73c1a2..2b8cee1ccb 100644 --- a/guix/diagnostics.scm +++ b/guix/diagnostics.scm @@ -39,6 +39,7 @@ (define-module (guix diagnostics) source-properties->location location->source-properties location->string + location->hyperlink &error-location error-location? @@ -259,6 +260,16 @@ (define (location->string loc) (($ file line column) (format #f "~a:~a:~a" file line column)))) +(define (location->hyperlink location) + "Return a string corresponding to LOCATION, with escapes for a hyperlink." + (let ((str (location->string location)) + (file (if (string-prefix? "/" (location-file location)) + (location-file location) + (search-path %load-path (location-file location))))) + (if file + (file-hyperlink file str) + str))) + (define-condition-type &error-location &error error-location? (location error-location)) ; diff --git a/guix/scripts/system/search.scm b/guix/scripts/system/search.scm index ff2ea7652c..93c9fc5644 100644 --- a/guix/scripts/system/search.scm +++ b/guix/scripts/system/search.scm @@ -21,6 +21,7 @@ (define-module (guix scripts system search) #:use-module (guix ui) #:use-module (guix utils) #:autoload (guix colors) (supports-hyperlinks?) + #:autoload (guix diagnostics) (location->hyperlink) #:use-module (gnu services) #:use-module (gnu services shepherd) #:use-module (srfi srfi-1) diff --git a/guix/ui.scm b/guix/ui.scm index 6f2fe62784..37d24030e4 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -118,8 +118,6 @@ (define-module (guix ui) package->recutils package-specification->name+version+output - location->hyperlink - pager-wrapped-port with-paginated-output-port relevance @@ -1484,16 +1482,6 @@ (define (string->recutils str) '() str))) -(define (location->hyperlink location) - "Return a string corresponding to LOCATION, with escapes for a hyperlink." - (let ((str (location->string location)) - (file (if (string-prefix? "/" (location-file location)) - (location-file location) - (search-path %load-path (location-file location))))) - (if file - (file-hyperlink file str) - str))) - (define* (package->recutils p port #:optional (width (%text-width)) #:key (hyperlinks? (supports-hyperlinks? port))