Extract orderless--metadata helper function

The helper function can be reused for other style modifiers, for example a style
matching against the group title returned by the `group-function', which is also
specified by the completion metadata.

1 files changed, 9 insertions, 6 deletions

diff --git a/orderless.el b/orderless.el
index 4c96137..821bc67 100644
--- a/orderless.el
+++ b/orderless.el
@@ -286,14 +286,17 @@ which can invert any predicate or regexp."
   (lambda (str)
     (not (orderless--match-p pred regexp str))))
 
+(defun orderless--metadata ()
+  "Return completion metadata."
+  (when-let (((minibufferp))
+             (table minibuffer-completion-table))
+    (completion-metadata (buffer-substring-no-properties
+                          (minibuffer-prompt-end) (point))
+                         table minibuffer-completion-predicate)))
+
 (defun orderless-annotation (pred regexp)
   "Match candidates where the annotation matches PRED and REGEXP."
-  (when-let (((minibufferp))
-             (table minibuffer-completion-table)
-             (metadata (completion-metadata
-                        (buffer-substring-no-properties
-                         (minibuffer-prompt-end) (point))
-                        table minibuffer-completion-predicate))
+  (when-let ((metadata (orderless--metadata))
              (fun (or (completion-metadata-get
                        metadata 'annotation-function)
                       (plist-get completion-extra-properties