From 0cf7179430f29b98cd77867b71e9aa5cb15be985 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 21 Jan 2013 21:06:34 +0100 Subject: [PATCH] Revert "org-element: Change return value for element at point in some corner cases" This reverts commit 13e49a63853b95e6033e3e3230dda0b824bc350a. Conflicts: lisp/org-element.el --- lisp/org-element.el | 241 ++++++++++++++++++--------------------- testing/lisp/test-org-element.el | 13 +-- 2 files changed, 112 insertions(+), 142 deletions(-) diff --git a/lisp/org-element.el b/lisp/org-element.el index ad4580f34..fcb21c5c2 100644 --- a/lisp/org-element.el +++ b/lisp/org-element.el @@ -4582,8 +4582,7 @@ As a special case, if point is at the very beginning of a list or sub-list, returned element will be that list instead of the first item. In the same way, if point is at the beginning of the first row of a table, returned element will be the table instead of the -first row. Also, if point is within the first blank lines of -a buffer, return nil. +first row. If optional argument KEEP-TRAIL is non-nil, the function returns a list of of elements leading to element at point. The list's @@ -4599,8 +4598,8 @@ first element of current section." (beginning-of-line) (if (not keep-trail) (org-element-headline-parser (point-max) t) (list (org-element-headline-parser (point-max) t)))) - ;; Otherwise try to move at the beginning of the section - ;; containing point. + ;; Otherwise move at the beginning of the section containing + ;; point. (let ((origin (point)) (end (save-excursion (org-with-limited-levels (outline-next-heading)) (point))) @@ -4609,74 +4608,62 @@ first element of current section." (if (org-before-first-heading-p) (goto-char (point-min)) (org-back-to-heading) (forward-line))) - (skip-chars-forward " \r\t\n" origin) + (org-skip-whitespace) (beginning-of-line) - (if (looking-at "[ \t]*$") - ;; If point is still at a blank line, we didn't reach - ;; section beginning. it means we started either at the - ;; beginning of the buffer, before any element, or in the - ;; blank area after an headline. In the first case, return - ;; a dummy `org-data' element. In the second case, return - ;; the headline. - (progn (skip-chars-backward " \r\t\n") - (cond ((bobp) nil) - (keep-trail - (list (org-element-headline-parser (point-max) t))) - (t (org-element-headline-parser (point-max) t)))) - ;; Parse successively each element, skipping those ending - ;; before original position. - (catch 'exit - (while t - (setq element (org-element--current-element - end 'element special-flag struct) - type (car element)) - (org-element-put-property element :parent parent) - (when keep-trail (push element trail)) - (cond - ;; 1. Skip any element ending before point. Also skip - ;; element ending at point when we're sure that another - ;; element has started. - ((let ((elem-end (org-element-property :end element))) - (when (or (< elem-end origin) - (and (= elem-end origin) (/= elem-end end))) - (goto-char elem-end)))) - ;; 2. An element containing point is always the element at - ;; point. - ((not (memq type org-element-greater-elements)) - (throw 'exit (if keep-trail trail element))) - ;; 3. At any other greater element type, if point is - ;; within contents, move into it. - (t - (let ((cbeg (org-element-property :contents-begin element)) - (cend (org-element-property :contents-end element))) - (if (or (not cbeg) (not cend) (> cbeg origin) (< cend origin) - ;; Create an anchor for tables and plain lists: - ;; when point is at the very beginning of these - ;; elements, ignoring affiliated keywords, - ;; target them instead of their contents. - (and (= cbeg origin) (memq type '(plain-list table))) - ;; When point is at contents end, do not move - ;; into elements with an explicit ending, but - ;; return that element instead. - (and (= cend origin) - (memq type - '(center-block - drawer dynamic-block inlinetask item - plain-list property-drawer quote-block - special-block)))) - (throw 'exit (if keep-trail trail element)) - (setq parent element) - (case type - (plain-list - (setq special-flag 'item - struct (org-element-property :structure element))) - (item (setq special-flag nil)) - (property-drawer - (setq special-flag 'node-property struct nil)) - (table (setq special-flag 'table-row struct nil)) - (otherwise (setq special-flag nil struct nil))) - (setq end cend) - (goto-char cbeg)))))))))))) + ;; Parse successively each element, skipping those ending + ;; before original position. + (catch 'exit + (while t + (setq element + (org-element--current-element end 'element special-flag struct) + type (car element)) + (org-element-put-property element :parent parent) + (when keep-trail (push element trail)) + (cond + ;; 1. Skip any element ending before point. Also skip + ;; element ending at point when we're sure that another + ;; element has started. + ((let ((elem-end (org-element-property :end element))) + (when (or (< elem-end origin) + (and (= elem-end origin) (/= elem-end end))) + (goto-char elem-end)))) + ;; 2. An element containing point is always the element at + ;; point. + ((not (memq type org-element-greater-elements)) + (throw 'exit (if keep-trail trail element))) + ;; 3. At any other greater element type, if point is + ;; within contents, move into it. + (t + (let ((cbeg (org-element-property :contents-begin element)) + (cend (org-element-property :contents-end element))) + (if (or (not cbeg) (not cend) (> cbeg origin) (< cend origin) + ;; Create an anchor for tables and plain lists: + ;; when point is at the very beginning of these + ;; elements, ignoring affiliated keywords, + ;; target them instead of their contents. + (and (= cbeg origin) (memq type '(plain-list table))) + ;; When point is at contents end, do not move + ;; into elements with an explicit ending, but + ;; return that element instead. + (and (= cend origin) + (memq type + '(center-block + drawer dynamic-block inlinetask item + plain-list property-drawer quote-block + special-block)))) + (throw 'exit (if keep-trail trail element)) + (setq parent element) + (case type + (plain-list + (setq special-flag 'item + struct (org-element-property :structure element))) + (item (setq special-flag nil)) + (property-drawer + (setq special-flag 'node-property struct nil)) + (table (setq special-flag 'table-row struct nil)) + (otherwise (setq special-flag nil struct nil))) + (setq end cend) + (goto-char cbeg))))))))))) ;;;###autoload (defun org-element-context (&optional element) @@ -4684,8 +4671,7 @@ first element of current section." Return value is a list like (TYPE PROPS) where TYPE is the type of the element or object and PROPS a plist of properties -associated to it, or nil if point is within the first blank lines -of the buffer. +associated to it. Possible types are defined in `org-element-all-elements' and `org-element-all-objects'. Properties depend on element or @@ -4700,63 +4686,58 @@ Providing it allows for quicker computation." (element (or element (org-element-at-point))) (type (org-element-type element)) end) - (cond - ;; If point is within blank lines at the beginning of the - ;; buffer, return nil. - ((not element) nil) - ;; Check if point is inside an element containing objects or at - ;; a secondary string. In that case, move to beginning of the - ;; element or secondary string and set END to the other side. - ((not (or (let ((post (org-element-property :post-affiliated element))) - (and post (> post origin) - (< (org-element-property :begin element) origin) + ;; Check if point is inside an element containing objects or at + ;; a secondary string. In that case, move to beginning of the + ;; element or secondary string and set END to the other side. + (if (not (or (let ((post (org-element-property :post-affiliated element))) + (and post (> post origin) + (< (org-element-property :begin element) origin) + (progn (beginning-of-line) + (looking-at org-element--affiliated-re) + (member (upcase (match-string 1)) + org-element-parsed-keywords)) + ;; We're at an affiliated keyword. Change + ;; type to retrieve correct restrictions. + (setq type 'keyword) + ;; Determine if we're at main or dual value. + (if (and (match-end 2) (<= origin (match-end 2))) + (progn (goto-char (match-beginning 2)) + (setq end (match-end 2))) + (goto-char (match-end 0)) + (setq end (line-end-position))))) + (and (eq type 'item) + (let ((tag (org-element-property :tag element))) + (and tag + (progn + (beginning-of-line) + (search-forward tag (point-at-eol)) + (goto-char (match-beginning 0)) + (and (>= origin (point)) + (<= origin + ;; `1+' is required so some + ;; successors can match + ;; properly their object. + (setq end (1+ (match-end 0))))))))) + (and (memq type '(headline inlinetask)) (progn (beginning-of-line) - (looking-at org-element--affiliated-re) - (member (upcase (match-string 1)) - org-element-parsed-keywords)) - ;; We're at an affiliated keyword. Change - ;; type to retrieve correct restrictions. - (setq type 'keyword) - ;; Determine if we're at main or dual value. - (if (and (match-end 2) (<= origin (match-end 2))) - (progn (goto-char (match-beginning 2)) - (setq end (match-end 2))) - (goto-char (match-end 0)) - (setq end (line-end-position))))) - (and (eq type 'item) - (let ((tag (org-element-property :tag element))) - (and tag - (progn - (beginning-of-line) - (search-forward tag (point-at-eol)) - (goto-char (match-beginning 0)) - (and (>= origin (point)) - (<= origin - ;; `1+' is required so some - ;; successors can match - ;; properly their object. - (setq end (1+ (match-end 0))))))))) - (and (memq type '(headline inlinetask)) - (progn (beginning-of-line) - (skip-chars-forward "* ") - (setq end (point-at-eol)))) - (and (memq type '(paragraph table-row verse-block)) - (let ((cbeg (org-element-property - :contents-begin element)) - (cend (org-element-property - :contents-end element))) - (and (>= origin cbeg) - (<= origin cend) - (progn (goto-char cbeg) (setq end cend))))) - (and (eq type 'keyword) - (let ((key (org-element-property :key element))) - (and (member key org-element-document-properties) - (progn (beginning-of-line) - (search-forward key (line-end-position) t) - (forward-char) - (setq end (line-end-position)))))))) - element) - (t + (skip-chars-forward "* ") + (setq end (point-at-eol)))) + (and (memq type '(paragraph table-row verse-block)) + (let ((cbeg (org-element-property + :contents-begin element)) + (cend (org-element-property + :contents-end element))) + (and (>= origin cbeg) + (<= origin cend) + (progn (goto-char cbeg) (setq end cend))))) + (and (eq type 'keyword) + (let ((key (org-element-property :key element))) + (and (member key org-element-document-properties) + (progn (beginning-of-line) + (search-forward key (line-end-position) t) + (forward-char) + (setq end (line-end-position)))))))) + element (let ((restriction (org-element-restriction type)) (parent element) candidates) @@ -4794,7 +4775,7 @@ Providing it allows for quicker computation." (setq parent object restriction (org-element-restriction object) end cend))))))) - parent))))))) + parent)))))) (defsubst org-element-nested-p (elem-A elem-B) "Non-nil when elements ELEM-A and ELEM-B are nested." diff --git a/testing/lisp/test-org-element.el b/testing/lisp/test-org-element.el index af85c346b..8c6acdad2 100644 --- a/testing/lisp/test-org-element.el +++ b/testing/lisp/test-org-element.el @@ -2661,15 +2661,6 @@ Paragraph \\alpha." (org-test-with-temp-text "- Para1\n- Para2\n\nPara3" (progn (forward-line 2) (org-element-type (org-element-at-point)))))) - ;; Special case: within the first blank lines in buffer, return nil. - (should-not (org-test-with-temp-text "\nParagraph" (org-element-at-point))) - ;; Special case: within the blank lines after a headline, return - ;; that headline. - (should - (eq 'headline - (org-test-with-temp-text "* Headline\n\nParagraph" - (progn (forward-line) - (org-element-type (org-element-at-point)))))) ;; With an optional argument, return trail. (should (equal '(paragraph center-block) @@ -2742,9 +2733,7 @@ Paragraph \\alpha." (org-test-with-temp-text "Some *text with _underline_ text*" (progn (search-forward "under") - (org-element-type (org-element-context (org-element-at-point))))))) - ;; Return nil when point is within the first blank lines. - (should-not (org-test-with-temp-text "\n* Headline" (org-element-context)))) + (org-element-type (org-element-context (org-element-at-point)))))))) (provide 'test-org-element) -- 2.11.4.GIT