Changeset 8674 for lang/elisp

Timestamp:

04/02/08 21:45:43 (8 months ago)

Author:

imakado

Message:

lang/elisp/anything-c-yasnippet/anything-c-yasnippet.el:
カスタマイズ可能な変数 `anything-c-yas-display-key-on-candidate'を追加
non-nilで補完候補表示の際に先頭にkey(snippetのファイル名)も含めるようになる。

Files:

• lang/elisp/anything-c-yasnippet/anything-c-yasnippet.el (modified) (6 diffs)

lang/elisp/anything-c-yasnippet/anything-c-yasnippet.el

@@ -2 +2 @@
 
 ;; Author: Kenji.I (Kenji Imakado) <ken.imakaado@gmail.com>
-;; Version: 0.3
+;; Version: 0.4
 ;; Keywords: anything yasnippet
 
@@ -72 +72 @@
 
 ;;; Code
-(defvar anything-c-yas-version "0.3" "Version of anything-c-yasnippet")
+(defvar anything-c-yas-version "0.4" "Version of anything-c-yasnippet")
 
 (defgroup anything-c-yasnippet nil
@@ -87 +87 @@
   :group 'anything-c-yasnippet)
 
-;(defvar anything-c-yas-snippets-dir-list nil) ;;customizable list of path(string) for finding snippet file in Action
 (defcustom anything-c-yas-snippets-dir-list nil
   "list of directory used to find snippet file"
@@ -100 +99 @@
 quite convenience
 Default: nil"
+  :type 'boolean
+  :group 'anything-c-yasnippet)
+
+(defcustom anything-c-yas-display-key-on-candidate nil
+  "if non-nil anything display candidate(snippet name) include key
+ex. [for] for (...) { ... }
+otherwise display just name
+ex. for (...) { ... }"
   :type 'boolean
   :group 'anything-c-yasnippet)
@@ -206 +213 @@
   "Return list of dotlist, (DISPLAY . REAL) DISPLAY is name of snippet, REAL is template of snippet"
   (let ((transformed-list (assoc-default 'transformed alist 'eq)))
-    (setq transformed-list (remove-if-not (lambda (lst)
-                                            (string-match (concat "^" (regexp-quote initial-input)) (car lst)))
-                                          transformed-list))
+    (cond
+     ;; display key on candidate ex: [for] for (...) { ... }
+     (anything-c-yas-display-key-on-candidate
+      (setq transformed-list (remove-if-not (lambda (lst)
+                                              (string-match (concat "^" (regexp-quote initial-input)) (car lst)))
+                                            transformed-list))
+      (setq transformed-list (loop for dotlst in transformed-list
+                                   for name = (car dotlst)
+                                   for template = (cdr dotlst)
+                                   for key = (anything-c-yas-get-key-by-template template alist)
+                                   for name-inc-key = (concat "[" key "] " name)
+                                   collect `(,name-inc-key . ,template))))
+     ;; default ex: for (...) { ... }
+     (t
+      (setq transformed-list (remove-if-not (lambda (lst)
+                                              (string-match (concat "^" (regexp-quote initial-input)) (car lst)))
+                                            transformed-list))))
     (when anything-c-yas-not-display-dups
       (setq transformed-list (delete-dups transformed-list)))
@@ -275 +296 @@
                   (anything-c-yas-initial-input anything-c-yas-point-start anything-c-yas-point-end) (anything-c-yas-get-cmp-context)) ;return values(str point point)
               (setq anything-c-yas-cur-snippets-alist (anything-c-yas-build-cur-snippets-alist))))
-;;     (candidates . (lambda ()
-;;                     (anything-c-yas-get-candidates anything-c-yas-cur-snippets-alist)))
     (candidates . (anything-c-yas-get-candidates anything-c-yas-cur-snippets-alist))
     (candidate-transformer . (lambda (candidates)