From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philip Kaludercic Newsgroups: gmane.emacs.bugs Subject: bug#69605: [PATCH] Query Eglot version via package.el Date: Thu, 07 Mar 2024 09:23:47 +0000 Message-ID: <87y1auo0nw.fsf@posteo.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="12289"; mail-complaints-to="usenet@ciao.gmane.io" To: 69605@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Mar 07 10:24:48 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ri9zc-00030f-29 for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 07 Mar 2024 10:24:48 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ri9zO-0005t4-Vg; Thu, 07 Mar 2024 04:24:34 -0500 Original-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 1ri9zN-0005q0-17 for bug-gnu-emacs@gnu.org; Thu, 07 Mar 2024 04:24:33 -0500 Original-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 1ri9zM-0005JY-OY for bug-gnu-emacs@gnu.org; Thu, 07 Mar 2024 04:24:32 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ri9zq-0004Me-Kr for bug-gnu-emacs@gnu.org; Thu, 07 Mar 2024 04:25:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Philip Kaludercic Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 07 Mar 2024 09:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69605 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.170980346716723 (code B ref -1); Thu, 07 Mar 2024 09:25:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 7 Mar 2024 09:24:27 +0000 Original-Received: from localhost ([127.0.0.1]:52538 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ri9zG-0004Lf-Rw for submit@debbugs.gnu.org; Thu, 07 Mar 2024 04:24:27 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:53138) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ri9zE-0004LV-Re for submit@debbugs.gnu.org; Thu, 07 Mar 2024 04:24:25 -0500 Original-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 1ri9yj-00056e-0Y for bug-gnu-emacs@gnu.org; Thu, 07 Mar 2024 04:23:53 -0500 Original-Received: from mout02.posteo.de ([185.67.36.66]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ri9yh-0005GD-2b for bug-gnu-emacs@gnu.org; Thu, 07 Mar 2024 04:23:52 -0500 Original-Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 06338240101 for ; Thu, 7 Mar 2024 10:23:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1709803428; bh=GYhmCgvl2HspRjUWBFk68ZDqJk03IdeZ+Py5LQY0bEY=; h=From:To:Subject:OpenPGP:Date:Message-ID:MIME-Version:Content-Type: From; b=AfktuM5RTOdmUyMaTqVhr6oZ8Xyqd6oQP+JdM2Exzr26+dnXFIQ/ld4N/cKFGKwzR s+VimgOaQGR3o3oER+FiyhVfl10RoKNLUT70KYMBFpRjBI2/8nmRSccvxIaQD3I/YQ upGlInjEg19bEdiKq40iberI729wAck+2UMjkY5PdjXueZH1SnhbV52gIWGANXBAWK kMFGjgykEjXQwwSi5Brq+B/wmivZQ9ce3anHHpAXP446b44cxssxSf6Hp2YbnSnx8u n9USzTed9nLFgy2OvogDnxzWfRV+kVEBBamcyNEuHjhn57OIoPp4OPsj/+REt+tMNf 5x1/HTlei9htg== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Tr3l74Fnsz9rxL for ; Thu, 7 Mar 2024 10:23:47 +0100 (CET) OpenPGP: id=7126E1DE2F0CE35C770BED01F2C3CC513DB89F66; url="https://keys.openpgp.org/vks/v1/by-fingerprint/7126E1DE2F0CE35C770BED01F2C3CC513DB89F66"; preference=signencrypt Received-SPF: pass client-ip=185.67.36.66; envelope-from=philipk@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:281153 Archived-At: --=-=-= Content-Type: text/plain It seems to me that 'package-get-version' should already implement the logic which is currently being reproduced when defining the constant 'eglot--version', so I suggest the following simplification: --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Query-Eglot-version-via-package-el.patch Content-Description: [PATCH] Query Eglot version via package.el >From 7566857ae869eb4cf01bde527eaedb8a3353f035 Mon Sep 17 00:00:00 2001 From: Philip Kaludercic Date: Thu, 7 Mar 2024 10:21:45 +0100 Subject: [PATCH] Query Eglot version via package.el * lisp/progmodes/eglot.el (eglot--version): Remove constant. (eglot--connect): Use 'package-get-version'. --- lisp/progmodes/eglot.el | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index f341428cac3..1ec186e75f8 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -545,13 +545,6 @@ eglot-withhold-process-id ;;; Constants ;;; -(defconst eglot--version - (eval-when-compile - (when byte-compile-current-file - (require 'lisp-mnt) - (lm-version byte-compile-current-file))) - "The version as a string of this version of Eglot. -It is nil if Eglot is not byte-complied.") (defconst eglot--symbol-kind-names `((1 . "File") (2 . "Module") @@ -1585,8 +1578,10 @@ eglot--connect 'network)) (emacs-pid)) :clientInfo - `(:name "Eglot" ,@(when eglot--version - `(:version ,eglot--version))) + (append + '(:name "Eglot") + (let ((v (package-get-version))) + (and v (list :version v)))) ;; Maybe turn trampy `/ssh:foo@bar:/path/to/baz.py' ;; into `/path/to/baz.py', so LSP groks it. :rootPath (file-local-name -- 2.44.0 --=-=-= Content-Type: text/plain -- Philip Kaludercic on peregrine --=-=-=--