From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 02 05:37:14 2023 Received: (at submit) by debbugs.gnu.org; 2 Apr 2023 09:37:15 +0000 Received: from localhost ([127.0.0.1]:39232 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piu9C-0008Fe-CX for submit@debbugs.gnu.org; Sun, 02 Apr 2023 05:37:14 -0400 Received: from lists.gnu.org ([209.51.188.17]:33932) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piu9A-0008FW-KQ for submit@debbugs.gnu.org; Sun, 02 Apr 2023 05:37:13 -0400 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 1piu9A-0002sC-DD for bug-gnu-emacs@gnu.org; Sun, 02 Apr 2023 05:37:12 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1piu98-0007cC-Pv for bug-gnu-emacs@gnu.org; Sun, 02 Apr 2023 05:37:12 -0400 Received: by mail-wm1-x333.google.com with SMTP id v6-20020a05600c470600b003f034269c96so6122598wmo.4 for ; Sun, 02 Apr 2023 02:37:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680428229; h=mime-version:message-id:date:subject:to:from:user-agent:from:to:cc :subject:date:message-id:reply-to; bh=5MHotk+Sjf5B72zDB0rdSQqJWtA3UbDDemcQGpBR7r4=; b=B5LKgEprCe5cTKSqbhRdGs6oAaLtfB1UgjQMFYA1lbrhI2kTdnTQCu60OgaOdjaXhW Avdu36tIq6N9ovJ+2SSpHpPd8+AU2CkV+/2wMIwCv1esJ2qfYIFxBuWij8EfcXDsrscq qkoBBy9FyxgjS5EcKA05tbvJQ4Vq2QjyrIuOb56yW0ZbrD3Jc/spGxvxgzQ+FZLX41mL ckWqqGJy5wdL80pBbUfR7XOLir9MYB2JsDDzlXphziLwjQL1a/xy8gDATUZepmQgVK2g HhoSBibRULMNZ7jWuKO70zEcwh4SekjLmYVR3f7PK3P52xYLRgPSrCvRswsSiUcjJ9oT vH0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680428229; h=mime-version:message-id:date:subject:to:from:user-agent :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=5MHotk+Sjf5B72zDB0rdSQqJWtA3UbDDemcQGpBR7r4=; b=NOZZKrEIjGgVKch67b4Lc6qF6+SaY1QZPLB2tlpQQDTbMsJYAtg8q5Ni8MnzQOqAF0 AtpJDkAg5lHVF0t71IntqsXqfeceEN95h52WgFdBCmLqRWEcBYmqkaJy/HuLAm6wyjrm 1hb6oyBPN2y+UytZ5dlyCrbJgKnwLOJ67aopsdJu0EjfyubcUOf4M/u7dZRoZ/6+obzq r4Mqo+fXCboq0XgHsUzUkGzUA+2cMAXyQKGH0rfctnWIX7pi6y4D16tp+7Y+7Z9jNGC8 Pf2TBsrRViQCYVLuulcgPC3wyhl62qeZEQCBlifv3qMvD/4qj1L/kfe7YRP4HrefwekI tT0Q== X-Gm-Message-State: AO0yUKVqLgdhZcLu2QwPLVVGIC2U9a+VDUScdlgJAjNYIZoTq2fbPTpT Cis2olzJIMa23oNNsoRaAGmfkmRfBLE= X-Google-Smtp-Source: AK7set8lxFEsuDKy1nybFIcMCcxC/DH8cP0TmAPe2/+hGmEEg5JIEh+pvi19/rRcebgTx5Ou+2TfHQ== X-Received: by 2002:a7b:c44b:0:b0:3ed:301c:375c with SMTP id l11-20020a7bc44b000000b003ed301c375cmr24957263wmi.21.1680428228958; Sun, 02 Apr 2023 02:37:08 -0700 (PDT) Received: from melissa.local ([2c0f:ef18:1431:0:b09:9616:db04:c248]) by smtp.gmail.com with ESMTPSA id y5-20020a1c4b05000000b003edd1c44b57sm8564493wma.27.2023.04.02.02.37.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Apr 2023 02:37:08 -0700 (PDT) User-agent: mu4e 1.9.3; emacs 30.0.50 From: Wilhelm Kirschbaum To: bug-gnu-emacs@gnu.org Subject: 30.0.50; Improvements for elixir-ts-mode Date: Sun, 02 Apr 2023 11:33:37 +0200 Message-ID: <87o7o6y69q.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=wkirschbaum@gmail.com; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --=-=-= Content-Type: text/plain; format=flowed Hi, Here are two improvements to elixir-ts-mode. One improves the sigil fontification and the other improves indentation for lists. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Improve-list-indentation-for-elixir-ts-mode.patch Content-Description: Improve list indentation for elixir-ts-mode >From f85fa091931712136575c194d8cc19320bb0365f Mon Sep 17 00:00:00 2001 From: Wilhelm H Kirschbaum Date: Sun, 2 Apr 2023 11:26:02 +0200 Subject: [PATCH 1/2] Improve list indentation for elixir-ts-mode * lisp/progmodes/elixir-ts-mode.el (elixir-ts--argument-indent-offset): Add empty line check. (elixir-ts--argument-indent-anchor): Change ERROR offset. * test/lisp/progmodes/elixir-ts-mode-resources/indent.erts: Add test. --- lisp/progmodes/elixir-ts-mode.el | 10 ++++++++-- .../elixir-ts-mode-resources/indent.erts | 20 ++++++++++++++++++- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/lisp/progmodes/elixir-ts-mode.el b/lisp/progmodes/elixir-ts-mode.el index e462758f0f8..d09beafb77a 100644 --- a/lisp/progmodes/elixir-ts-mode.el +++ b/lisp/progmodes/elixir-ts-mode.el @@ -171,7 +171,13 @@ elixir-ts--syntax-table (defun elixir-ts--argument-indent-offset (node _parent &rest _) "Return the argument offset position for NODE." - (if (treesit-node-prev-sibling node t) 0 elixir-ts-indent-offset)) + (if (or (treesit-node-prev-sibling node t) + ;; Don't indent if this is the first node or + ;; if the line is empty. + (save-excursion + (beginning-of-line) + (looking-at-p "[[:blank:]]*$"))) + 0 elixir-ts-indent-offset)) (defun elixir-ts--argument-indent-anchor (node parent &rest _) "Return the argument anchor position for NODE and PARENT." @@ -266,7 +272,7 @@ elixir-ts--indent-rules ;; Handle incomplete maps when parent is ERROR. ((n-p-gp "^binary_operator$" "ERROR" nil) parent-bol 0) ;; When there is an ERROR, just indent to prev-line. - ((parent-is "ERROR") prev-line 0) + ((parent-is "ERROR") prev-line ,offset) ((node-is "^binary_operator$") (lambda (node parent &rest _) (let ((top-level diff --git a/test/lisp/progmodes/elixir-ts-mode-resources/indent.erts b/test/lisp/progmodes/elixir-ts-mode-resources/indent.erts index ea5d9e62240..9ad604e5198 100644 --- a/test/lisp/progmodes/elixir-ts-mode-resources/indent.erts +++ b/test/lisp/progmodes/elixir-ts-mode-resources/indent.erts @@ -1,6 +1,5 @@ Code: (lambda () - (setq indent-tabs-mode nil) (elixir-ts-mode) (indent-region (point-min) (point-max))) @@ -330,3 +329,22 @@ defmodule Foo do end end =-=-= + +Code: + (lambda () + (elixir-ts-mode) + (newline) + (indent-for-tab-command)) + +Name: New list item + +=-= +[ + :foo,$ +] +=-= +[ + :foo, + $ +] +=-=-= -- 2.40.0 --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0002-Improve-sigil-fontification-for-elixir-ts-mode.patch Content-Description: Improve sigil fontification for elixir-ts-mode >From 1054d917a6dbecc26f3c49e3e1383ee0c26f2a7a Mon Sep 17 00:00:00 2001 From: Wilhelm H Kirschbaum Date: Sun, 2 Apr 2023 11:28:27 +0200 Subject: [PATCH 2/2] Improve sigil fontification for elixir-ts-mode lisp/progmodes/elixir-ts-mode.el (elixir-ts--font-lock-settings): Update sigil queries. --- lisp/progmodes/elixir-ts-mode.el | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lisp/progmodes/elixir-ts-mode.el b/lisp/progmodes/elixir-ts-mode.el index d09beafb77a..576afd8104f 100644 --- a/lisp/progmodes/elixir-ts-mode.el +++ b/lisp/progmodes/elixir-ts-mode.el @@ -457,16 +457,13 @@ elixir-ts--font-lock-settings :override t `((sigil (sigil_name) @elixir-ts-font-sigil-name-face - quoted_start: _ @font-lock-string-face - quoted_end: _ @font-lock-string-face - (:match "^[sSwWpP]$" @elixir-ts-font-sigil-name-face)) + (:match "^[sSwWpPUD]$" @elixir-ts-font-sigil-name-face)) @font-lock-string-face (sigil + "~" @font-lock-string-face (sigil_name) @elixir-ts-font-sigil-name-face - quoted_start: _ @font-lock-regex-face - quoted_end: _ @font-lock-regex-face (:match "^[rR]$" @elixir-ts-font-sigil-name-face)) - @font-lock-regex-face + @font-lock-regexp-face (sigil "~" @font-lock-string-face (sigil_name) @elixir-ts-font-sigil-name-face -- 2.40.0 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 05 02:02:54 2023 Received: (at control) by debbugs.gnu.org; 5 Apr 2023 06:02:54 +0000 Received: from localhost ([127.0.0.1]:50647 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pjwEP-0007d3-QM for submit@debbugs.gnu.org; Wed, 05 Apr 2023 02:02:54 -0400 Received: from mail-pj1-f48.google.com ([209.85.216.48]:34313) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pjwEO-0007cp-7C for control@debbugs.gnu.org; Wed, 05 Apr 2023 02:02:52 -0400 Received: by mail-pj1-f48.google.com with SMTP id l9-20020a17090a3f0900b0023d32684e7fso3046803pjc.1 for ; Tue, 04 Apr 2023 23:02:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680674566; h=to:date:message-id:subject:mime-version:content-transfer-encoding :from:from:to:cc:subject:date:message-id:reply-to; bh=KVOTf29v7yVvEHOzeVktOKDgdFbaewUtzzXgRj1vOPc=; b=e5MOvapugY999YS4hTK+Kj/F5wPR8kZsB+BCWkXwOPEPXdsOuNs3MAVJy2h25FBHa3 xUh4bO4jO482ph15ZDajUk72NJ2LGWmvRj+gcFb5euE57LUGbrrS47mULQors8qVbUXL oTKHLRo3aSsHU6ofUpQgRuGYt0d804ZLVLmD2TISFAhnP8XQUAkhLWyZW06XBglvwca7 DP96Xz3W2Wc7marOSt5TDwslxea+CUky/wi+VhUom/WnLVwnYKlb3b8iOp7M7moc7qo4 +AwepAQ9NcdnY/652LRGmejeeFWN1EH4OE4jCaWtLJWMcPBjutoW1RGChZ/M1NVYn8tU 2pow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680674566; h=to:date:message-id:subject:mime-version:content-transfer-encoding :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=KVOTf29v7yVvEHOzeVktOKDgdFbaewUtzzXgRj1vOPc=; b=yGQqrEdlxL6DjCjBUnpah8Z3SiZGl9Wv1gpw7gai7ssSnYmNDsR4MAr4gY7MfXNq2u UzF6uZ1wZ8NyQ9VUMsRqJhlbcuEUq7GoF6hb71VN/rByig8IHULZfTlnghH+N7lIqIzH oyaORiXoGvVp3iQHOGaytovY7GKObfO+oN2IStbypFB8HSNK9THztDt5cTcKj81Vh6oC Ixv8vIK0DHc13Gt3alwSr3l+0L8i0JGN0VzL680UWwa/nr7pCh/ARTpN77/vRO+6WTnx eCuAzUzG2nMvA3SF7mScAVMfkpWKIcN7Nd112Myq9DzjpkTnDFbQJbu/+jzEfSLDrOyS FFGQ== X-Gm-Message-State: AAQBX9dNaLgqXRaSkD9EbPGKZZIud9/J4c31xNllln/hlSZKVUdsco0r 3XKG5kCBVwGGSTf5xzt03tI6wuH5lsM= X-Google-Smtp-Source: AKy350YeuHCt6kxWGHshskewoOw3R9RzLvIRLi3kv3RJOYpbH0oJ2VwJeVO3cRWm4ShsmirJS9xdRw== X-Received: by 2002:a17:902:ecc3:b0:19d:1720:3873 with SMTP id a3-20020a170902ecc300b0019d17203873mr6989092plh.57.1680674566316; Tue, 04 Apr 2023 23:02:46 -0700 (PDT) Received: from smtpclient.apple (cpe-172-117-161-177.socal.res.rr.com. [172.117.161.177]) by smtp.gmail.com with ESMTPSA id x9-20020a1709029a4900b001a1bf30cef1sm9270572plv.46.2023.04.04.23.02.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Apr 2023 23:02:46 -0700 (PDT) From: Yuan Fu Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.400.51.1.1\)) Subject: control message for bug #62611 Message-Id: Date: Tue, 4 Apr 2023 23:02:35 -0700 To: control@debbugs.gnu.org X-Mailer: Apple Mail (2.3731.400.51.1.1) X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) close 62611 30.1 quit From unknown Sun Sep 21 05:22:21 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 03 May 2023 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator