Fix issue manateelazycat#1077, org-mode input bound use "string" branch.

fuyu0425 · Oct 17, 2024 · be1e69e · be1e69e
1 parent 7b92406
commit be1e69e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 22 deletions.
diff --git a/acm/acm-backend-capf.el b/acm/acm-backend-capf.el
@@ -114,6 +114,7 @@
                                         anaconda-mode
                                         redis-mode
                                         lisp-mode
+                                        org-mode
                                         )
   "The mode list to support capf."
   :type 'cons)

diff --git a/acm/acm.el b/acm/acm.el
@@ -377,27 +377,28 @@ So we use `minor-mode-overriding-map-alist' to override key, make sure all keys
        (<= (match-beginning 2) (point))))
 
 (defun acm-get-input-prefix-bound ()
-  (pcase acm-input-bound-style
-    ("symbol"
-     (bounds-of-thing-at-point 'symbol))
-    ("org-roam"
-     (when (org-in-regexp org-roam-bracket-completion-re 1)
-       (cons (match-beginning 2)
-             (match-end 2))))
-    ("string"
-     (cons (point)
-           (save-excursion
-             (if (search-backward-regexp "\\s-" (point-at-bol) t)
-                 (progn
-                   (forward-char)
-                   (point))
-               (point-at-bol)))))
-    ("ascii"
-     (when-let ((bound (bounds-of-thing-at-point 'symbol)))
-       (let* ((keyword (buffer-substring-no-properties (car bound) (cdr bound)))
-              (offset (or (string-match "[[:nonascii:]]+" (reverse keyword))
-                          (length keyword))))
-         (cons (- (cdr bound) offset) (cdr bound)))))))
+  (cond
+   ((or (equal "string" acm-input-bound-style)
+        (derived-mode-p 'org-mode))
+    (cons (point)
+          (save-excursion
+            (if (search-backward-regexp "\\s-" (point-at-bol) t)
+                (progn
+                  (forward-char)
+                  (point))
+              (point-at-bol)))))
+   ((equal "symbol" acm-input-bound-style)
+    (bounds-of-thing-at-point 'symbol))
+   ((equal "org-roam" acm-input-bound-style)
+    (when (org-in-regexp org-roam-bracket-completion-re 1)
+      (cons (match-beginning 2)
+            (match-end 2))))
+   ((equal "ascii" acm-input-bound-style)
+    (when-let ((bound (bounds-of-thing-at-point 'symbol)))
+      (let* ((keyword (buffer-substring-no-properties (car bound) (cdr bound)))
+             (offset (or (string-match "[[:nonascii:]]+" (reverse keyword))
+                         (length keyword))))
+        (cons (- (cdr bound) offset) (cdr bound)))))))
 
 (defun acm-get-input-prefix ()
   "Get user input prefix."
@@ -538,7 +539,7 @@ Only calculate template candidate when type last character."
           (setq file-words-candidates (acm-remove-duplicate-candidates file-words-candidates lsp-labels)))
 
 
-          
+
         (setq mode-candidates
               (apply #'append (mapcar (lambda (mode-candidate-name)
                                         (pcase mode-candidate-name