From 79e36b9edd4ee40eb4c0c428f6433c80fcf9fec2 Mon Sep 17 00:00:00 2001 From: plugd Date: Wed, 14 Jul 2021 17:58:51 +0200 Subject: [PATCH] Made command completion extensible. --- lurk.el | 46 +++++++++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/lurk.el b/lurk.el index 2a95e48..45d9424 100644 --- a/lurk.el +++ b/lurk.el @@ -810,23 +810,38 @@ in which case they match anything.") lurk-autoreply-table)) -;;; Command entering +;;; Commands ;; (defvar lurk-command-table - '(("DEBUG" "Toggle debug mode on/off." lurk-command-debug) - ("HEADER" "Toggle display of header." lurk-command-header) - ("CONNECT" "Connect to an IRC network." lurk-command-connect) + '(("DEBUG" "Toggle debug mode on/off." lurk-command-debug lurk-boolean-completions) + ("HEADER" "Toggle display of header." lurk-command-header lurk-boolean-completions) + ("CONNECT" "Connect to an IRC network." lurk-command-connect lurk-network-completions) ("TOPIC" "Set topic for current channel." lurk-command-topic) ("ME" "Display action." lurk-command-me) ("VERSION" "Request version of another user's client via CTCP." lurk-command-version) - ("PART" "Leave channel." lurk-command-part) + ("PART" "Leave channel." lurk-command-part lurk-context-completions) ("QUIT" "Disconnect from current network." lurk-command-quit) ("NICK" "Change nick." lurk-command-nick) ("LIST" "Display details of one or more channels." lurk-command-list) - ("MSG" "Send private message to user." lurk-command-msg)) + ("MSG" "Send private message to user." lurk-command-msg lurk-nick-completions)) "Table of commands explicitly supported by Lurk.") +(defun lurk-boolean-completions () + '("on" "off")) + +(defun lurk-network-completions () + (mapcar (lambda (row) (car row)) lurk-networks)) + +(defun lurk-nick-completions () + (lurk-get-context-users lurk-current-context)) + +(defun lurk-context-completions () + (lurk-get-context-list)) + + +;;; Command entering +;; (defun lurk-enter-string (string) (if (string-prefix-p "/" string) @@ -944,6 +959,10 @@ in which case they match anything.") (lurk-display-message lurk-nick to text)) (lurk-display-notice nil "Usage: /msg "))) + +;;; Command history +;; + (defvar lurk-history nil "Commands and messages sent in current session.") @@ -981,6 +1000,7 @@ in which case they match anything.") (interactive) (lurk-history-cycle +1)) + ;;; Interactive functions ;; @@ -1007,12 +1027,13 @@ in which case they match anything.") (let ((completion-ignore-case t)) (when (and (>= (point) lurk-input-marker)) (pcase (buffer-substring lurk-input-marker (point)) - ((rx (: "/connect" (+ " ") (* (not whitespace)) string-end)) + ((rx (: "/" (let cmd-str (+ (not whitespace))) (+ " ") (* (not whitespace)) string-end)) (let ((space-idx (save-excursion - (re-search-backward " " lurk-input-marker t)))) - (completion-in-region (+ 1 space-idx) - (point) - (mapcar (lambda (row) (car row)) lurk-networks)))) + (re-search-backward " " lurk-input-marker t))) + (table-row (assoc (upcase cmd-str) lurk-command-table #'equal))) + (if (and table-row (elt table-row 3)) + (let ((completions (funcall (elt table-row 3)))) + (completion-in-region (+ 1 space-idx) (point) completions))))) ((rx (: "/" (* (not whitespace)) string-end)) (message (buffer-substring lurk-input-marker (point))) (completion-in-region lurk-input-marker (point) @@ -1022,8 +1043,7 @@ in which case they match anything.") (let* ((end (max lurk-input-marker (point))) (space-idx (save-excursion (re-search-backward " " lurk-input-marker t))) - (start (if space-idx (+ 1 space-idx) lurk-input-marker)) - (completion-ignore-case t)) + (start (if space-idx (+ 1 space-idx) lurk-input-marker))) (unless (string-prefix-p "/" (buffer-substring start end)) (completion-in-region start end (lurk-get-context-users lurk-current-context))))))))) -- 2.20.1