From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id ECYmEp6nBF/CQQAA0tVLHw (envelope-from ) for ; Tue, 07 Jul 2020 16:49:34 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id KDYRDp6nBF+cUQAA1q6Kng (envelope-from ) for ; Tue, 07 Jul 2020 16:49:34 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BCF909404CA for ; Tue, 7 Jul 2020 16:49:33 +0000 (UTC) Received: from localhost ([::1]:45710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsqmi-0006e1-1W for larch@yhetil.org; Tue, 07 Jul 2020 12:49:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42808) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsqls-0006ZD-Us for emacs-orgmode@gnu.org; Tue, 07 Jul 2020 12:48:40 -0400 Received: from static.214.254.202.116.clients.your-server.de ([116.202.254.214]:33550 helo=ciao.gmane.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsqlr-0006Dm-4l for emacs-orgmode@gnu.org; Tue, 07 Jul 2020 12:48:40 -0400 Received: from list by ciao.gmane.io with local (Exim 4.92) (envelope-from ) id 1jsqln-0008U1-As for emacs-orgmode@gnu.org; Tue, 07 Jul 2020 18:48:35 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: emacs-orgmode@gnu.org From: Nick Dokos Subject: Re: [PATCH] org: add property names from #+PROPERTY keywords to completion list Date: Tue, 07 Jul 2020 12:48:26 -0400 Message-ID: <87y2nvw9t1.fsf@alphaville.usersys.redhat.com> References: <87o8osxevq.fsf@alphaville.usersys.redhat.com> <87v9j054ya.fsf@kyleam.com> Mime-Version: 1.0 Content-Type: text/plain User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cancel-Lock: sha1:6JHh9R3N1AYyBxSJEzGs56N85KA= Received-SPF: pass client-ip=116.202.254.214; envelope-from=geo-emacs-orgmode@m.gmane-mx.org; helo=ciao.gmane.io X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/07 12:48:36 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: 30 X-Spam_score: 3.0 X-Spam_bar: +++ X-Spam_report: (3.0 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FORGED_GMAIL_RCVD=1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, FUZZY_DR_OZ=1, HEADER_FROM_DIFFERENT_DOMAINS=1, NML_ADSP_CUSTOM_MED=0.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: "Emacs-orgmode" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Spam-Score: -0.41 X-TUID: 9ZVtIC3Po+Bx Here's the amended patch: it includes the fixes from Kyle's review, the modification he suggested that adds the plain property for each _ALL property to the list and a few test cases to the test/org-buffer-property-keys test. --8<---------------cut here---------------start------------->8--- >From 60b9ababe42c91ec6fcd2c53f6923d75daa12454 Mon Sep 17 00:00:00 2001 From: Nick Dokos Date: Mon, 6 Jul 2020 21:49:41 -0400 Subject: [PATCH] org: add property names from #+PROPERTY keywords to completion list * lisp/org.el (org-buffer-property-keys): Enhance the completion list with property names from #+PROPERTY keywords, not just property drawers. Also, for each xxx_ALL property, make sure that the bare xxx property is added too. * testing/lisp/test-org.el (test-org/buffer-property-keys): Add test cases for #+PROPERTY keywords and also for xxx_ALL --> xxx properties. See https://emacs.stackexchange.com/questions/59448/ for details. --- lisp/org.el | 17 +++++++++++++++-- testing/lisp/test-org.el | 21 +++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 4a1a83d0f..ccdb0dd5c 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -13084,7 +13084,12 @@ COLUMN formats in the current buffer." (props (append (and specials org-special-properties) (and defaults (cons org-effort-property org-default-properties)) - nil))) + ;; Get property names from #+PROPERTY keywords as well + (mapcar (lambda (s) + (nth 0 (split-string s))) + (cdar (org-collect-keywords '("PROPERTY")))) + nil)) + bare-props) (org-with-wide-buffer (goto-char (point-min)) (while (re-search-forward org-property-start-re nil t) @@ -13132,7 +13137,15 @@ COLUMN formats in the current buffer." (let ((p (match-string-no-properties 1 value))) (unless (member-ignore-case p org-special-properties) (push p props)))))))))) - (sort (delete-dups props) (lambda (a b) (string< (upcase a) (upcase b)))))) + (sort (delete-dups (append props + ;; for each xxx_ALL property, make sure + ;; the bare xxx property is also + ;; included + (dolist (x props bare-props) + (if (string-match "_ALL\\b" x) + (setq bare-props (cons (substring x 0 -4) + bare-props)))))) + (lambda (a b) (string< (upcase a) (upcase b)))))) (defun org-property-values (key) "List all non-nil values of property KEY in current buffer." diff --git a/testing/lisp/test-org.el b/testing/lisp/test-org.el index 30a8067db..61e642d4f 100644 --- a/testing/lisp/test-org.el +++ b/testing/lisp/test-org.el @@ -5409,6 +5409,27 @@ Paragraph" (equal '("A") (org-test-with-temp-text "* H\n:PROPERTIES:\n:A: 1\n:A+: 2\n:END:" (org-buffer-property-keys)))) + ;; Add bare property if xxx_ALL property is there + (should + (equal '("A" "B" "B_ALL") + (org-test-with-temp-text "* H\n:PROPERTIES:\n:A: 1\n:A+: 2\n:B_ALL: foo bar\n:END:" + (org-buffer-property-keys)))) + ;; Add bare property if xxx_ALL property is there - check dupes + (should + (equal '("A" "B" "B_ALL") + (org-test-with-temp-text "* H\n:PROPERTIES:\n:A: 1\n:B: 2\n:B_ALL: foo bar\n:END:" + (org-buffer-property-keys)))) + ;; Retrieve properties from #+PROPERTY keyword lines + (should + (equal '("A" "C") + (org-test-with-temp-text "#+PROPERTY: C foo\n* H\n:PROPERTIES:\n:A: 1\n:A+: 2\n:END:" + (org-buffer-property-keys)))) + ;; Retrieve properties from #+PROPERTY keyword lines - make sure an _ALL property also + ;; adds the bare property + (should + (equal '("A" "C" "C_ALL") + (org-test-with-temp-text "#+PROPERTY: C_ALL foo bar\n* H\n:PROPERTIES:\n:A: 1\n:A+: 2\n:END:" + (org-buffer-property-keys)))) ;; With non-nil COLUMNS, extract property names from columns. (should (equal '("A" "B") -- 2.25.1 --8<---------------cut here---------------end--------------->8--- -- Nick "There are only two hard problems in computer science: cache invalidation, naming things, and off-by-one errors." -Martin Fowler