ld/yasnippet
1
0
Fork 0
mirror of https://github.com/joaotavora/yasnippet.git synced 2025-10-13 21:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: fix issue #255, removing a keybinding from a snippet doesn't really unbind it if it's the last one

Browse Source 
enhancement: internal doc update with ascii diagram
This commit is contained in:
João Távora 2012-06-15 01:27:08 +01:00
parent 28cd4ca0c9
commit 73073f9078
1 changed files with 52 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
yasnippet.el
View File

@ -976,17 +976,58 @@ Has the following fields:
(when table (when table
(gethash uuid (yas/table-uuidhash table))))) (gethash uuid (yas/table-uuidhash table)))))
;; Apropos storing/updating, this works with two steps: ;; Apropos storing/updating in TABLE, this works in two steps:
;; ;;
;; 1. `yas/remove-template-by-uuid' to remove any existing mappings by ;; 1. `yas/remove-template-by-uuid' removes any
;; snippet uuid ;; keyhash-namehash-template mappings from TABLE, grabing the
;; snippet by its uuid. Also removes mappings from TABLE's
;; `yas/table-direct-keymap' (FIXME: and should probably take care
;; of potentially stale menu bindings right?.)
;; ;;
;; 2. `yas/add-template' to add the mappings again: ;; 2. `yas/add-template' adds this all over again.
;; ;;
;; Create or index the entry in TABLES's `yas/table-hash' ;; Create a new or add to an existing keyhash-namehash mapping.
;; linking KEY to a namehash. That namehash links NAME to ;;
;; TEMPLATE, and is also created a new namehash inside that ;; For reference on understanding this, consider three snippet
;; entry. ;; definitions:
;;
;; A: # name: The Foo
;; # key: foo
;; # binding: C-c M-l
;;
;; B: # name: Mrs Foo
;; # key: foo
;;
;; C: # name: The Bar
;; # binding: C-c M-l
;;
;; D: # name: Baz
;; # key: baz
;;
;; keyhash namehashes(3) yas/template structs(4)
;; -----------------------------------------------------
;; __________
;; / \
;; "foo" ---> "The Foo" ---> [yas/template A] |
;; "Mrs Foo" ---> [yas/template B] |
;; |
;; [C-c M-l] ---> "The Foo" -------------------------/
;; "The Bar" ---> [yas/template C]
;;
;; "baz" ---> "Baz" ---> [yas/template D]
;;
;; Additionally, since uuid defaults to the name, we have a
;; `yas/table-uuidhash' for TABLE
;;
;; uuidhash yas/template structs
;; -------------------------------
;; "The Foo" ---> [yas/template A]
;; "Mrs Foo" ---> [yas/template B]
;; "The Bar" ---> [yas/template C]
;; "Baz" ---> [yas/template D]
;;
;; FIXME: the more I look at this data-structure the more I think I'm
;; stupid. There has to be an easier way (but beware lots of code depends on this).
;; ;;
(defun yas/remove-template-by-uuid (table uuid) (defun yas/remove-template-by-uuid (table uuid)
"Remove from TABLE a template identified by UUID." "Remove from TABLE a template identified by UUID."
@ -1004,9 +1045,11 @@ Has the following fields:
(when (zerop (hash-table-count v)) (when (zerop (hash-table-count v))
(push k empty-keys))))) (push k empty-keys)))))
(yas/table-hash table)) (yas/table-hash table))
;; Remove the namehashed themselves if they've become empty ;; Remove the namehash themselves if they've become empty
;; ;;
(dolist (key empty-keys) (dolist (key empty-keys)
(when (vectorp key)
(define-key (yas/table-direct-keymap table) key nil))
(remhash key (yas/table-hash table))) (remhash key (yas/table-hash table)))
;; Finally, remove the uuid from the uuidhash ;; Finally, remove the uuid from the uuidhash