Changeset 35399

Timestamp:

09/16/09 21:22:12 (4 years ago)

Author:

imakado

Message:

fix some that change api yasnippet.el(0.6)

Files:

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

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

@@ -2 +2 @@
 
 ;; Author: Kenji.I (Kenji Imakado) <ken.imakaado@gmail.com>
-;; Version: 0.5
+;; Version: 0.6
 ;; Keywords: anything yasnippet
 
@@ -21 +21 @@
 
 ;;; Commentary:
+;; thans to grandVin for patch on his blog.
 
 ;; anything-source name  => anything-c-source-yasnippet
@@ -70 +71 @@
 (require 'yasnippet)
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
 ;;; Code
-(defvar anything-c-yas-version "0.5" "Version of anything-c-yasnippet")
+(defvar anything-c-yas-version "0.6" "Version of anything-c-yasnippet")
 
 (defgroup anything-c-yasnippet nil
@@ -111 +110 @@
   :type 'boolean
   :group 'anything-c-yasnippet)
-
 
 (defvar anything-c-yas-snippets-dir-list nil)
@@ -159 +157 @@
           finally (return result))))
 
+
 (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)
-    (loop with transformed
-          with templates
-          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 `(,template . ,key) template-key-alist))
-          finally (progn (push `(candidates . ,templates) result-alist)
-                         (push `(transformed . ,transformed) 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))
+  (let ((yas/choose-keys-first nil)
+        (yas/choose-tables-first nil)
+        (yas/buffer-local-condition 'always))
+    (let* ((result-alist '((candidates) (transformed) (template-key-alist)))
+           (hash-value-alist nil)
+           (cur-table (first (yas/get-snippet-tables anything-c-yas-cur-major-mode)))
+           (hash-table (yas/snippet-table-hash cur-table))) ;`yas/snippet-table-hash'
+      (let ((hashes (loop for table in (yas/get-snippet-tables)
+                          collect (yas/snippet-table-hash table))))
+        (loop for hash in hashes
+              do (maphash (lambda (k v)
+                            (setq hash-value-alist (append v hash-value-alist))
+                            )
+                          hash))
+        (loop with transformed
+              with templates
+              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 `(,template . ,key) template-key-alist))
+              finally (progn (push `(candidates . ,templates) result-alist)
+                             (push `(transformed . ,transformed) result-alist)
+                             (push `(template-key-alist . ,template-key-alist) result-alist)))
+        result-alist)
+      )))
 
 (defun anything-c-yas-get-modes ()
@@ -337 +336 @@
     (match . (anything-c-yas-match))))
 
+
+;;; visit template
+(defun anything-c-yas-all-templates ()
+  (let ((tables (yas/get-snippet-tables)))
+    (loop for table in tables
+          append (yas/snippet-table-templates table))))
+
+(defun anything-c-yas-flatten-templates (templates)
+  (loop for lot in templates ;lot is list of templates
+        append lot))
+
+(defun anything-c-yas-snippet-files-candidates ()
+  "called in `anything-c-source-yasnippet-snippet-files' candidates"
+  (let ((yas/choose-keys-first nil)
+        (yas/choose-tables-first nil)
+        (yas/buffer-local-condition 'always))
+    (with-current-buffer anything-current-buffer
+      (mapcar* 'yas/template-file
+               (mapcar 'cdr
+                        (anything-c-yas-all-templates))))))
+
+;; (anything 'anything-c-source-yasnippet-snippet-files)
+(defvar anything-c-source-yasnippet-snippet-files
+  '((name . "yasnippet snippet files")
+    (candidates . anything-c-yas-snippet-files-candidates)
+    (type . file)
+    ))
+
 
 ;;; Commands
@@ -344 +371 @@
   (anything 'anything-c-source-yasnippet))
 
+(defun anything-c-yas-visit-snippet-file ()
+  "List of yasnippet snippet files"
+  (interactive)
+  (anything 'anything-c-source-yasnippet-snippet-files))
+
 (defun anything-c-yas-create-snippet-on-region (&optional start end file-name)
   "Create a snippet from region."
@@ -351 +383 @@
 ;; (anything-c-yas-create-snippet-on-region (region-beginning) (region-end) "aaaa")
 
+
+
 (provide 'anything-c-yasnippet)
 ;; anything-c-yasnippet.el ends here