From patchwork Fri Jan 17 02:09:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Javier Olaechea X-Patchwork-Id: 37094 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 531C427BBEA; Fri, 17 Jan 2025 02:10: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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,HTML_MESSAGE,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 AD0E127BBE2 for ; Fri, 17 Jan 2025 02:10:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tYboB-0006Bf-Tw; Thu, 16 Jan 2025 21:10:03 -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 1tYboA-0006AC-Lc for guix-patches@gnu.org; Thu, 16 Jan 2025 21:10:02 -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 1tYboA-00076a-Ao for guix-patches@gnu.org; Thu, 16 Jan 2025 21:10:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=Date:From:In-Reply-To:References:MIME-Version:To:Subject; bh=h6u3Qi4l4iHVyQ0RjwiLINblYyKIeQznQj1lHIHlxDU=; b=AL8sLbrA5tV+Ccvj/m1xgfL+ywj5WJswEOH4yWR9rTREHBrvBHC25c2psZkjw0wTP/vPxjoUH8TT+lrNsL2mkyc0MKA6y5YcSpn+V5nd16uZkTpOPJu7m1jB3qh48jsryul5wXGVy5MS6zgXQVf0UNLdN+CN39jPX27/z9h05jVhR+yv65kD99He59Jiwq5eU3RoB/Y/1ZYcUT8X9GDQf3e8Q8Cz8VtbAfgwEL6eJtT7eiEmNTYH2h6Hn/+MGTo873WXuHupBxsdUjOCDVsDgZre3ZULX93SAL0CYfUUr0GNg0AFOG/JSc40IB3ykRue9sXYuqWVGHqQMaT275h/aQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tYboA-0001vj-4n for guix-patches@gnu.org; Thu, 16 Jan 2025 21:10:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75597] [PATCH} gnu: emacs-eglot-x: Update to latest commit Resent-From: Javier Olaechea Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Jan 2025 02:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75597 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Liliana Marie Prikler Cc: 75597@debbugs.gnu.org, Katherine Cox-Buday , divya@subvertising.org, Andrew Tropin Received: via spool by 75597-submit@debbugs.gnu.org id=B75597.17370797917396 (code B ref 75597); Fri, 17 Jan 2025 02:10:02 +0000 Received: (at 75597) by debbugs.gnu.org; 17 Jan 2025 02:09:51 +0000 Received: from localhost ([127.0.0.1]:35368 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tYbny-0001vD-SI for submit@debbugs.gnu.org; Thu, 16 Jan 2025 21:09:51 -0500 Received: from mail-yb1-xb2d.google.com ([2607:f8b0:4864:20::b2d]:58566) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tYbnv-0001ux-NU for 75597@debbugs.gnu.org; Thu, 16 Jan 2025 21:09:48 -0500 Received: by mail-yb1-xb2d.google.com with SMTP id 3f1490d57ef6-e46ac799015so2285104276.0 for <75597@debbugs.gnu.org>; Thu, 16 Jan 2025 18:09:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737079782; x=1737684582; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=pUjWtnuR7tlpgSXLqwhFiL4qJNb0pRtSuWp9DStWGUA=; b=WHmZPhb0K3sj6zB8mBERu/r7tChPyRHjgQ+8w870Pt3nfuzyaytc6mCpj7bvUyWGHm vk/hJZluive8NvVDaz+HuLCT5TsBudgsQq3PHdnI0GEK3L6VpI6FmjRsRQ3gZ4ZD03fx txR7nhgKL2MOQ4MtkWHRB40t5bSujo7PDfMmcCJWQaWJZ7PBagHddsZ0wEu/bOtThOSJ XFI2ddaTKrxSrN0RRQowVCxnReeu8RFOi9RRBRleOcXhjtO3ZdZ6rjJjnNsfDf4fqqKS CaGhgxqGuC6NZEE2W/X5zdQ38SGDtdbb39v+y8jZd9PlLz9MvvUPvCOOt7K91FTa0DHu CoSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737079782; x=1737684582; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pUjWtnuR7tlpgSXLqwhFiL4qJNb0pRtSuWp9DStWGUA=; b=Lp1Oxw15UWuxJom+LoZMzpvzdPbmoWmwSLd7V1h5/yTo6cz2M8IY61xp+Hw55XSUEG sbmDxbQRa4xb/JSlkK367HhIurKyfkLnw2QlhcGaocttb3pvtyWvHUIEJ0LeGtNlbWGz d0NbZCUPEgaQK96sDuat5SWMOW/pY0+r3GG1oqCEJ1IyBPERlS2Ldlcau/a/xjGvOmXx kAZgFUIkZ9rfKkztpeDDy/LBKh2FVVWe+zcPUqzIKKooJVqrIzurB+inZnQ2f6TbE2RY K9MELZ1IbWpYM9rSe5UC8++s+0AsEAVBGgowBIbZe1d/qkshB3eHo4If4R2Q4LYRDkgB tI+g== X-Gm-Message-State: AOJu0YyNlT4Coyi++N0RFkJn4BNUDZGzqTZe7ITeJ8hlFNfSLkzGstXn 3n1GO9cm2w52NJyhhf+9CJq4TQQKd3nSoIUSeoL+e7dusojZO3o65Iy9fECy6YLa2wKD1UzUMDo xq4C6gqeqECC4S0RftJDnQg60dF4= X-Gm-Gg: ASbGncu4sRS4QgXeNcG/pJSETmyR0jwWI88sCZDc9Cio6GPK6Hf+4sfogBFhUKzKQz7 uIUuFmtrSu1i9HQCoWW1DseE7/XC87dKZxTAZZJA= X-Google-Smtp-Source: AGHT+IGMRc6Xk6zBWNKZMqoN11vOK3gzbKgc2sMDbqopUBcNXb9lqcP/cXQ3UKVwTSYO7lap+rZKQqtpbw+NWS4/Qmo= X-Received: by 2002:a05:690c:d1f:b0:6ee:4ce9:b33e with SMTP id 00721157ae682-6f6eb677e01mr8088547b3.12.1737079781812; Thu, 16 Jan 2025 18:09:41 -0800 (PST) MIME-Version: 1.0 References: <2df8dec193dcf2a7f71be9f4e48118d067975446.camel@gmail.com> In-Reply-To: <2df8dec193dcf2a7f71be9f4e48118d067975446.camel@gmail.com> From: Javier Olaechea Date: Fri, 17 Jan 2025 02:09:30 +0000 X-Gm-Features: AbW1kvbVuYJmqsa6ShenavWMteAqZcXduAxims-Ole3YpVfeHYxc_OzQZEeAqfA Message-ID: 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 Thanks for the quick response! Btw. you reference commit 354150c in your patch but then build from a > different commit. Perhaps you could use that single commit as a patch > instead? > I like that better, I've updated the patch to instead apply the patch for that commit instead along with a note to drop the patch when the next version of eglot-x is released. On Thu, Jan 16, 2025 at 7:46 AM Liliana Marie Prikler < liliana.prikler@gmail.com> wrote: > Yes, please use git-version. > > And for anyone else using random commits while coding version without > it, let this be a reminder to use git-version. > Given that now we are using the commit for version 0.6 (which doesn't have a tag) there is no need to to use git-version. t was only in the case that we started shipping an unreleased commit as the version, correct? From 0b7653371c0803e03fe04355f3d4e7a247811d51 Mon Sep 17 00:00:00 2001 Message-ID: <0b7653371c0803e03fe04355f3d4e7a247811d51.1737079150.git.pirata@gmail.com> From: Javier Olaechea Date: Wed, 15 Jan 2025 19:48:42 -0500 Subject: [PATCH v2] gnu: emacs-eglot-x: Backport an unreleased fix * gnu/packages/emacs-xyz.scm (emacs-eglot-x): Backport an unreleased fix The current emacs-eglot-x version we package is broken when used with an eglot version higher than 1.16. We currently ship eglot 1.17. Upstream has fixed this in the commit 354150, but still hasn't released a new version. We can apply the fix as stand-alone patch while we wait for them to release a version. 354150c: https://github.com/nemethf/eglot-x/commit/354150c299e241df09c8b904b68177fd9b41fe0e Change-Id: Id39f4805dc37902048139049785a4f7852202a8c --- gnu/packages/emacs-xyz.scm | 6 ++++- .../emacs-eglot-x-fix-apply-text-edits.patch | 23 +++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/emacs-eglot-x-fix-apply-text-edits.patch diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9b3139dfa1..1347e73124 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21480,7 +21480,11 @@ (define-public emacs-eglot-x (file-name (git-file-name name version)) (sha256 (base32 - "0s17nv59gzgqgskid41lfacsqnzdiq2p3ds0vglcfqwypr3k898c")))) + "0s17nv59gzgqgskid41lfacsqnzdiq2p3ds0vglcfqwypr3k898c")) + ;; Backporting an unreleased fix from + ;; https://github.com/nemethf/eglot-x/commit/354150c299e241df09c8b904b68177fd9b41fe0e + ;; Remove this patch once version 0.7 is released + (patches (search-patches "emacs-eglot-x-fix-apply-text-edits.patch")))) (build-system emacs-build-system) (inputs (list emacs-eglot)) (home-page "https://github.com/nemethf/eglot-x") diff --git a/gnu/packages/patches/emacs-eglot-x-fix-apply-text-edits.patch b/gnu/packages/patches/emacs-eglot-x-fix-apply-text-edits.patch new file mode 100644 index 0000000000..b9dcebded3 --- /dev/null +++ b/gnu/packages/patches/emacs-eglot-x-fix-apply-text-edits.patch @@ -0,0 +1,23 @@ +diff --git a/eglot-x.el b/eglot-x.el +index a694f90..221822d 100644 +--- a/eglot-x.el ++++ b/eglot-x.el +@@ -659,10 +659,17 @@ (defun eglot-x--check-capability (&rest capabilities) + + ;;; Snippet TextEdit + +-(defun eglot-x--apply-text-edits (edits &optional version) ++(defun eglot-x--apply-text-edits (edits &optional version silent) + "Apply EDITS for current buffer if at VERSION, or if it's nil. + This is almost a verbatim copy of `eglot--apply-text-edits', but + it handles the SnippetTextEdit format." ++ ;; NOTE: eglot--apply-text-edits changed a lot since this defun was ++ ;; imlemented. Additionally, rust-analyzer has changed as well. ++ ;; Now it only sends one SnippetTextEdit. Hence the implementation ++ ;; should be updated, but "if it ain't broke, don't fix it". And ++ ;; this whole extension is going to be obsoleted soon: ++ ;; https://github.com/microsoft/language-server-protocol/issues/724#issuecomment-1850413029 ++ + ;; This is quite rust-analyzer specific. It assumes there is at + ;; most one meaningful SnippetTextEdit and that can be identified by + ;; searching for "$0". base-commit: 35d13aab7ebca187343c54b800711bfea02859b9 -- 2.47.1