From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Yuan Fu Newsgroups: gmane.emacs.bugs Subject: bug#59945: [PATCH] Fix empty pairs in js tree-sitter imenu alist Date: Tue, 20 Dec 2022 20:48:58 -0800 Message-ID: <7B3A9410-A4E4-4B32-83CE-FADB9588C7A7@gmail.com> References: <43c6e6ed-3ddc-4ae0-a150-f86e852bd83b@app.fastmail.com> Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.1\)) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="29224"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Robert Pluim , 59945-done@debbugs.gnu.org, Eli Zaretskii , 59945@debbugs.gnu.org To: cpbotha@vxlabs.com Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Dec 21 05:50:29 2022 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 1p7r3l-0007LV-8r for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 21 Dec 2022 05:50:29 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7r3N-00008M-Jn; Tue, 20 Dec 2022 23:50:05 -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 1p7r3L-00007D-VF for bug-gnu-emacs@gnu.org; Tue, 20 Dec 2022 23:50:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p7r3K-0001Dk-V1 for bug-gnu-emacs@gnu.org; Tue, 20 Dec 2022 23:50:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7r3K-0001Gf-F1 for bug-gnu-emacs@gnu.org; Tue, 20 Dec 2022 23:50:02 -0500 X-Loop: help-debbugs@gnu.org In-Reply-To: <43c6e6ed-3ddc-4ae0-a150-f86e852bd83b@app.fastmail.com> Resent-From: Yuan Fu Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 21 Dec 2022 04:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59945 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 59945-submit@debbugs.gnu.org id=B59945.16715981474850 (code B ref 59945); Wed, 21 Dec 2022 04:50:02 +0000 Original-Received: (at 59945) by debbugs.gnu.org; 21 Dec 2022 04:49:07 +0000 Original-Received: from localhost ([127.0.0.1]:49276 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7r2Q-0001GA-TG for submit@debbugs.gnu.org; Tue, 20 Dec 2022 23:49:07 -0500 Original-Received: from mail-pl1-f176.google.com ([209.85.214.176]:41944) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7r2Q-0001Fk-39; Tue, 20 Dec 2022 23:49:06 -0500 Original-Received: by mail-pl1-f176.google.com with SMTP id l10so14401484plb.8; Tue, 20 Dec 2022 20:49:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:cc:date:message-id:subject:mime-version :content-transfer-encoding:from:from:to:cc:subject:date:message-id :reply-to; bh=ZGSAjj6Mc+xIE2YLxKsk7Tj+4vvcSJ4g0KPmhY2WCho=; b=U4bA8BTBXrwzFILGD4zO6rirBZuNUhSSUj+w2P3PqYIwDCw3kc4cZrChgbUEX9Wldf Dr10W/JwopFDK6vrpYg1cxTDiZ+mn3P0ZSCbW1G4m7QrHSpMYGdmmrqVBMc8rEZoWkNG oN1WJLLIBKKRaNhuiPSqc91gNF9SeWnHYDuFD25awOhxTgqakwouWC1KrnCOtSqUZcuZ R2b2uv6aTkBqW4V4GuLltCyfCVOKKdhK13Mxey9p2zlTfJuZZPFobgqM7RjYr87ESMv3 n1kQ2/OmIh/FSm5CAtFPSPDfGZtmbYdjHs2ReGysaZ8CInUBXpqHpgXUnNoJx9k2dBOO gClg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:cc:date:message-id:subject:mime-version :content-transfer-encoding:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZGSAjj6Mc+xIE2YLxKsk7Tj+4vvcSJ4g0KPmhY2WCho=; b=dTKjgjUX4yu/3AYFWe9iQffzZdCyrR0GBdbp/cTwIepz4rDOWu/j7UdDaAHPH8Aerb D2kOEKSDCtVoM/a042hNeiA9tzUGOUuwP4lW2BbPQbWa2WYV3Q12J6bLj69z7QZo2+h9 thcgm47WbUpW4bh7OnqawGZWnTzDpnglqArE11Bet2nHWHT0kNczji8Nzh7JQ8M43ZOj sBcQnMWZ3MbiBdXWZo8VrPZaO3YEs2wRj49K2zRd1rtwosd4FKrhvYktFqCHz8teuHsw +KriBfOjbt9AejZMO4no+8tvdnyA5nIJqbjEjL8Q18TkuFw6+r7jY24MNrcdXCfGETfw PPBg== X-Gm-Message-State: AFqh2kr2Zm9ZbsF0vFqtk2CHTuMviWjhqPTVv2KFZ2y1yNblRXUZt4OW LFVntr2U/0PDumBuvyMBXfA= X-Google-Smtp-Source: AMrXdXvajClCH+nOx8RPKXBicmZy66stN0n3TXv4z7FdzX7yi3OJhEn/yf2A1sdEKtqf/FiPuI+SrQ== X-Received: by 2002:a17:903:40d2:b0:191:19ed:d6b3 with SMTP id t18-20020a17090340d200b0019119edd6b3mr844649pld.3.1671598140334; Tue, 20 Dec 2022 20:49:00 -0800 (PST) Original-Received: from smtpclient.apple (cpe-172-117-161-177.socal.res.rr.com. [172.117.161.177]) by smtp.gmail.com with ESMTPSA id d15-20020a170902cecf00b00189758e2b99sm10268166plg.92.2022.12.20.20.48.59 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Dec 2022 20:48:59 -0800 (PST) X-Mailer: Apple Mail (2.3696.120.41.1.1) 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:251561 Archived-At: "Charl P. Botha" writes: > On Fri, Dec 16, 2022, at 16:11, Robert Pluim wrote: >>>>>>> On Fri, 16 Dec 2022 07:58:46 +0200, "Charl P. Botha" = said: >> Charl> I followed the instructions at >> Charl>=20 >> = https://www.gnu.org/software/emacs/manual/html_node/emacs/Sending-Patches.= html >> Charl> which said to use "git format-patch master" and include=20 >> either inline >> Charl> (which I did) or as a mime attachment. >> >> Not quite. You sent the result of 'git format-patch master' as an >> email, not inline in an email (presumably with 'git send-email'). = That >> shouldn=CA=BCt matter, because 'git apply' should work in either = case, but >> attachments are sometimes easier to work with. > > Thank you for the correction, Robert! I thought that sending the > output of `git format-patch master` as a plain-text email was what was > meant by "inline". I'm sorry about this, I'll stick to attachments in > the future. Not really about attachment vs inline. The first patch doesn=E2=80=99t = have author, commit message, etc. I=E2=80=99m fine with either attachment or = inline :-) > Yuan, can you confirm that the patch I eventually attached is OK? Thanks! I applied your patch. I made a little change to it so it=E2=80=99s= more idiomatic. Elisp tip of the day: if you want to make a list of possibly nil objects and don=E2=80=99t want nil=E2=80=99s in the list, you can use append. = Basically change (list a b c) to (append (and xxx (list a)) (and yyy (list b)) (and zzz (list c))) If the condition aren=E2=80=99t met, eg, (and xxx (list a)) returns nil, = append just appends an empty list. Yuan