Changeset 8388 for lang/elisp

Timestamp:

03/26/08 00:24:25 (8 months ago)

Author:

imakado

Message:

lang/elisp/anything-c-yasnippet/anything-c-yasnippet.el: 補完候補を自前で用意する方法からyasnippet.elから得る方法に変更。

Files:

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

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

@@ -8 +8 @@
 ;; Actions: Insert snippet, Open snippet file, Open snippet file other window
 ;; C-z: execute-persistent-action
+
+;; here's my yasnippet's configuration
+;; (require 'yasnippet)
+;; (require 'anything-c-yasnippet)
+;; (setq anything-c-yas-space-match-any-greedy t) ;[default: nil]
+;; (global-set-key (kbd "C-c y") 'anything-c-yas-complete)
+;; (yas/initialize)
+;; (yas/load-directory "<path>/<to>/snippets/")
+;; (add-to-list 'yas/extra-mode-hooks 'ruby-mode-hook)
+;; (add-to-list 'yas/extra-mode-hooks 'cperl-mode-hook)
 
 (require 'cl)
@@ -44 +54 @@
 
 (defvar anything-c-yas-appear-rule nil) ;; customizable e.i (add-to-list 'anything-c-yas-appear-rule '(ruby-mode . (text-mode html-mode)))
-(defvar anything-c-yas-not-display-dups nil) ;; customizable
+(defvar anything-c-yas-not-display-dups t) ;; customizable
 (defvar anything-c-yas-display-msg-after-complete t) ;; customizable
-
-;;; advise to get data for completion
-(defvar anything-c-yas-snippets-alist nil)
-(defvar anything-c-yas-load-directory-histry nil)
+(defvar anything-c-yas-snippets-dir-list nil) ;;customizable list of path(string) for finding snippet file in Action
+(defvar anything-c-yas-space-match-any-greedy nil
+  "non-nil anything pattern, space match anyword greedy.
+pattern regexp: \"if else\" replace to \"if.*else\"
+so match \"if (...) { ... } else { ... }\" and \"if, elsif, else ...\"
+quite convenience") ;; customizable
+
+
+(defvar anything-c-yas-snippets-dir-list nil)
 (defadvice yas/load-directory-1 (around anything-yas-build-alist activate)
-  (let* ((directory (ad-get-arg 0))
-         (mode-sym (intern (file-name-nondirectory directory)))
-         (snippets nil))
-    (ignore-errors
-      (add-to-list 'anything-c-yas-load-directory-histry directory)
-      (with-temp-buffer
-        (dolist (file (yas/directory-files directory t))
-          (when (file-readable-p file)
-            (insert-file-contents file nil nil nil t)
-            (push (cons (file-name-nondirectory file)
-                        (yas/parse-template))
-                  snippets))))
-      ;; build alist for anything-c-yasnippet
-      (let ((mode-alist (assq mode-sym anything-c-yas-snippets-alist)))
-        (cond
-         (mode-alist
-          (setcdr mode-alist (nconc snippets (cdr mode-alist))))
-         (t
-          (push `(,mode-sym . ,snippets) anything-c-yas-snippets-alist))))))
+  (let ((directory (ad-get-arg 0)))
+    (when (stringp directory)
+      (add-to-list 'anything-c-yas-snippets-dir-list directory)))
   ad-do-it)
 
 
-(defun anything-c-yas-build-cur-snippets-alist ()
-  (let* ((result-alist nil)
-         (modes (anything-c-yas-get-modes))
-         (snippets (loop for mode in modes
-                         append (assoc-default mode anything-c-yas-snippets-alist 'eq))))
-    ;; build result-alist
+(defun anything-c-yas-build-cur-snippets-alist (&optional table)
+  (let* ((result-alist '((candidates) (transformed) (template-key-alist)))
+         (hash-value-alist nil)
+         (cur-table (or table (yas/snippet-table anything-c-yas-cur-major-mode)))
+         (parent-table (yas/snippet-table-parent cur-table)) ;`yas/snippet-table-parent'
+         (hash-table (yas/snippet-table-hash cur-table))) ;`yas/snippet-table-hash'
+    (maphash (lambda (k v) (setq hash-value-alist (append v hash-value-alist))) hash-table)
+    (setq hsh hash-value-alist)
     (loop with transformed
           with templates
-          for snippet in snippets
-          for name = (third snippet)
-          and template = (second snippet)
-          when (and (not (null name))
-                    (not (null template))
-                    (stringp name)
-                    (stringp template))
+          with template-key-alist
+          for lst in hash-value-alist
+          for key = (car lst)
+          for template-struct = (cdr lst)
+          for name = (yas/template-name template-struct) ;`yas/template-name'
+          for template = (yas/template-content template-struct) ;`yas/template-content'
           do (progn (push template templates)
-                    (push `(,name . ,template) transformed))
+                    (push `(,name . ,template) transformed)
+                    (push `(,template . ,key) template-key-alist))
           finally (progn (push `(candidates . ,templates) result-alist)
                          (push `(transformed . ,transformed) result-alist)
-                         (push `(snippets . ,snippets) result-alist)))
+                         (push `(template-key-alist . ,template-key-alist) result-alist)))
+    ;; if cur-table has parent build recursively
+    (when parent-table
+      (let ((rec-ret (anything-c-yas-build-cur-snippets-alist parent-table))
+            (alist-keys '(candidates transformed template-key-alist)))
+        (mapc (lambda (key)
+                (let ((res-list (assq key result-alist))
+                      (rec-val (assoc-default key rec-ret)))
+                  (setcdr res-list (nconc rec-val (cdr res-list)))))
+              alist-keys)))
     result-alist))
 
@@ -114 +124 @@
 (defun anything-c-yas-get-key-by-template (template alist) ;str template
   "Return key"
-  (let ((snippets (assoc-default 'snippets alist 'eq)))
-    (car
-     (rassoc-if (lambda (ls) (equal template (car ls))) snippets))))
+  (assoc-default template (assoc-default 'template-key-alist alist)))
 
 (defun anything-c-yas-get-candidates (alist)
@@ -136 +144 @@
 (defun anything-c-yas-find-snippet-file-by-key (key)
   (let ((modes (anything-c-yas-get-modes))
-        (done nil)
-        (path nil))
-    (loop for mode in modes
-          for snippet-path-re = (concat (symbol-name mode) "/" key "$")
-          unless done
-          do (loop for directory in anything-c-yas-load-directory-histry
-                   for files = (directory-files directory t)
-                   unless done
-                   do (loop for file in files
-                            when (string-match snippet-path-re file)
-                            return (setq done t
-                                         path file)))
-          finally return path)))
+        (snippet-dirs (add-to-list 'anything-c-yas-snippets-dir-list yas/root-directory)))
+    (let ((found-path (loop for mode in modes
+                            for test-re = (concat (symbol-name mode) "/" key "$")
+                            for path =  (anything-c-yas-find-snippet-file-aux test-re snippet-dirs)
+                            when path return path)))
+      ;; if not found in major-mode try to find in all dirs
+      (unless found-path
+        (setq found-path (anything-c-yas-find-snippet-file-aux (concat "/" key "$") snippet-dirs)))
+      found-path)))
+
+(defun anything-c-yas-find-snippet-file-aux (test-re dirs)
+  (loop with done
+        with path
+        for directory in dirs
+        for files = (directory-files directory t)
+        unless done
+        do (loop for file in files
+                 when (string-match test-re file)
+                 return (setq done t
+                              path file))
+        finally return path))
 
 (defun anything-c-yas-find-file-snippet-by-template (template &optional other-window)
@@ -157 +173 @@
       (funcall ff-func path))))
 
+(defun anything-c-yas-match (candidate)
+  "if customize variable `anything-c-yas-space-match-any-greedy' is non-nil
+space match anyword greedy"
+  (cond
+   (anything-c-yas-space-match-any-greedy
+    (let ((re (replace-regexp-in-string "[ \t]+" ".*" anything-pattern)))
+      (string-match re candidate)))
+   (t
+    (string-match anything-pattern candidate))))
 
 (defvar anything-c-yas-cur-snippets-alist nil)
@@ -184 +209 @@
                                                 (anything-c-yas-find-file-snippet-by-template template t)))))
     (persistent-action . (lambda (template)
-                           (anything-c-yas-find-file-snippet-by-template template)))))
+                           (anything-c-yas-find-file-snippet-by-template template)))
+    (match . (anything-c-yas-match))))
+
 
 
@@ -193 +220 @@
     (anything)))
 
-
 (provide 'anything-c-yasnippet)
 ;; anything-c-yasnippet.el ends here