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

* more bug fixes and a global mode

Browse Source
This commit is contained in:
capitaomorte 2009-07-14 17:07:42 +00:00
parent 0ee010ce65
commit 4429104dfc
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
yasnippet.el
View File

@ -3,7 +3,7 @@
;; Copyright 2008 pluskid ;; Copyright 2008 pluskid
;; ;;
;; Authors: pluskid <pluskid@gmail.com>, joaotavora <joaotavora@gmail.com> ;; Authors: pluskid <pluskid@gmail.com>, joaotavora <joaotavora@gmail.com>
;; Version: 0.6.0 XXX: Change this ;; Version: 0.6.0
;; X-URL: http://code.google.com/p/yasnippet/ ;; X-URL: http://code.google.com/p/yasnippet/
;; This file is free software; you can redistribute it and/or modify ;; This file is free software; you can redistribute it and/or modify
@ -355,19 +355,20 @@ snippet templates")
(define-minor-mode yas/minor-mode (define-minor-mode yas/minor-mode
"Toggle YASnippet mode. "Toggle YASnippet mode.
When YASnippet mode is enabled, the `tas/trigger-key' key expands
snippets of code depending on the mode.
With no argument, this command toggles the mode. With no argument, this command toggles the mode.
positive prefix argument turns on the mode. positive prefix argument turns on the mode.
Negative prefix argument turns off the mode. Negative prefix argument turns off the mode.
When YASnippet mode is enabled, the TAB key
expands snippets of code depending on the mode.
You can customize the key through `yas/trigger-key'." You can customize the key through `yas/trigger-key'."
;; The initial value. ;; The initial value.
nil nil
;; The indicator for the mode line. ;; The indicator for the mode line.
" yas" " yas"
:group 'editing :group 'yasnippet
(define-key yas/minor-mode-map (read-kbd-macro yas/trigger-key) 'yas/expand)) (define-key yas/minor-mode-map (read-kbd-macro yas/trigger-key) 'yas/expand))
(defun yas/minor-mode-on () (defun yas/minor-mode-on ()
@ -380,6 +381,9 @@ You can customize the key through `yas/trigger-key'."
(interactive) (interactive)
(yas/minor-mode -1)) (yas/minor-mode -1))
(define-globalized-minor-mode yas/global-mode yas/minor-mode yas/minor-mode-on
:group 'yasnippet)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Internal structs for template management ;; Internal structs for template management
;; ;;
@ -1016,8 +1020,8 @@ to `yas/prompt-function'."
(id (yas/snippet-next-id) :read-only t) (id (yas/snippet-next-id) :read-only t)
(control-overlay nil) (control-overlay nil)
active-field active-field
;; stacked expansion: this slot saves the active field where the ;; stacked expansion: the `previous-active-field' slot saves the
;; child expansion took place ;; active field where the child expansion took place
previous-active-field previous-active-field
exit-hook) exit-hook)
@ -1213,7 +1217,10 @@ is done by setting MARKER to POINT with `set-marker'."
snippet as ordinary text. snippet as ordinary text.
Return a buffer position where the point should be placed if Return a buffer position where the point should be placed if
exiting the snippet." exiting the snippet.
NO-HOOKS means don't run the `yas/after-exit-snippet-hook' hooks."
(let ((control-overlay (yas/snippet-control-overlay snippet)) (let ((control-overlay (yas/snippet-control-overlay snippet))
yas/snippet-beg yas/snippet-beg
yas/snippet-end) yas/snippet-end)
@ -1245,11 +1252,14 @@ exiting the snippet."
;; ;;
(yas/markers-to-points snippet) (yas/markers-to-points snippet)
;; Push an action for snippet revival ;; Take care of snippet revival
;; ;;
(when yas/snippet-revival (if yas/snippet-revival
(push `(apply yas/snippet-revive ,yas/snippet-beg ,yas/snippet-end ,snippet) (push `(apply yas/snippet-revive ,yas/snippet-beg ,yas/snippet-end ,snippet)
buffer-undo-list)) buffer-undo-list)
;; Dismember the snippet... this is useful if we get called
;; again from `yas/take-care-of-redo'....
(setf (yas/snippet-fields snippet) nil))
;; XXX: `yas/after-exit-snippet-hook' should be run with ;; XXX: `yas/after-exit-snippet-hook' should be run with
;; `yas/snippet-beg' and `yas/snippet-end' bound. That might not ;; `yas/snippet-beg' and `yas/snippet-end' bound. That might not
@ -1588,7 +1598,7 @@ will be deleted before inserting template."
reviving it. reviving it.
Meant to exit in the `buffer-undo-list'." Meant to exit in the `buffer-undo-list'."
(yas/commit-snippet snippet)) (yas/commit-snippet snippet 'no-hooks))
(defun yas/snippet-revive (beg end snippet) (defun yas/snippet-revive (beg end snippet)
"Revives the SNIPPET and creates a control overlay from BEG to "Revives the SNIPPET and creates a control overlay from BEG to
@ -1698,7 +1708,7 @@ Meant to be called in a narrowed buffer, does various passes"
(yas/indent snippet))) (yas/indent snippet)))
(defun yas/indent (snippet) (defun yas/indent (snippet)
(message "would be indenting") ;;; XXX: fixed indentation not working
(cond ((eq yas/indent-line 'fixed) (cond ((eq yas/indent-line 'fixed)
(let ((fill-prefix (make-string yas/start-column ? ))) (let ((fill-prefix (make-string yas/start-column ? )))
(indent-region (point-min) (point-max)))) (indent-region (point-min) (point-max))))
@ -1915,6 +1925,7 @@ When multiple expressions are found, only the last one counts."
(defun yas/exterminate-package () (defun yas/exterminate-package ()
(interactive) (interactive)
(yas/minor-mode -1) (yas/minor-mode -1)
(unintern 'yasnippet)
(mapatoms #'(lambda (atom) (mapatoms #'(lambda (atom)
(when (string-match "yas/" (symbol-name atom)) (when (string-match "yas/" (symbol-name atom))
(unintern atom))))) (unintern atom)))))