From: capitaomorte Date: Sun, 15 Aug 2010 23:38:56 +0000 (+0000) Subject: minor tweaks to the rails-related bundles import strategy, which are quite usable... X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/58ce46468ebb79481656c81e0d4f83f4f5abc9b8 minor tweaks to the rails-related bundles import strategy, which are quite usable already\nAlso don't activate yasnippet in the minibuffer --- diff --git a/Rakefile b/Rakefile index 6c1e968ee..b908c3b6e 100644 --- a/Rakefile +++ b/Rakefile @@ -23,7 +23,7 @@ end desc "convert some textmate bundles to yasnippets" task :convert_bundles do - sh 'for bundle in html ruby rails; do ./extras/textmate_import.rb -d extras/bundles/$bundle-bundle -o extras/imported/$bundle-mode -q ; done' + sh 'for bundle in html ruby rails css; do ./extras/textmate_import.rb -d extras/bundles/$bundle-tmbundle -o extras/imported/$bundle-mode -q ; done' end desc "create a release package" diff --git a/extras/imported/html-mode/.yas-setup.el b/extras/imported/html-mode/.yas-setup.el index 37aeaea5e..3c5e3138c 100644 --- a/extras/imported/html-mode/.yas-setup.el +++ b/extras/imported/html-mode/.yas-setup.el @@ -7,6 +7,12 @@ (defvar yas/html-just-like-tm nil "Html-mode snippets behave as close to TextMate as possible.") +(defun yas/html-activate () + (add-to-list 'yas/mode-symbol 'html-mode)) + +(add-hook 'nxml-mode-hook 'yas/html-activate) +(add-hook 'rhtml-mode-hook 'yas/html-activate) + (defun yas/html-remove-preceding-word () (interactive) (let (word-begin @@ -209,7 +215,7 @@ ;; # as in Snippets/Emphasize.yasnippet ;; ${TM_SELECTED_TEXT/\A(.*)<\/em>\z|.*/(?1:$1:$0<\/em>)/m} =yyas> `(yas/html-toggle-wrap yas/selected-text "em")` ;; ${TM_SELECTED_TEXT/\A(.*)<\/strong>\z|.*/(?1:$1:$0<\/strong>)/m} =yyas> `(yas/html-toggle-wrap yas/selected-text "strong")` -;; ${1/\s.*//} =yyas> ${1:$(replace-regexp-in-string "^[\s\t\n]*" "" yas/text)} +;; ${1/\s.*//} =yyas> ${1:$(replace-regexp-in-string "[\s\t\n].*" "" yas/text)} ;; ${1/[[:alpha:]]+|( )/(?1:_:\L$0)/g} =yyas> ${1:$(replace-regexp-in-string " " "_" (downcase yas/text))} ;; ${TM_XHTML} =yyas> `yas/html-xhtml-attr` @@ -226,6 +232,7 @@ ;; @b =yyas> s-b ;; ;; # as in Snippets/Emphasize.yasnippet +;; ^@i =yyas> ;; @i =yyas> s-i ;; ;; # as in Snippets/Wrap Selection In Tag.yasnippet @@ -446,33 +453,33 @@ (yas/ignore-item "45F92B81-6F0E-11D9-A1E4-000D9332809C")) '("7B7E945E-A112-11D9-A5A2-000D93C8BE28" "3C44EABE-8D6F-4B1B-AB91-F419FAD1A0AD" - "4400BCE9-20E3-426E-B1D7-2C0BCA53BCF8" - "3463E85F-F500-49A0-8631-D78ED85F9D60" + "9AFDEB2C-D9F0-423E-8211-EBB089F51F0C" "CBD82CF3-74E9-4E7A-B3F6-9348754EB5AA" + "3463E85F-F500-49A0-8631-D78ED85F9D60" "9B13543F-8356-443C-B6E7-D9259B604927" "0D814247-7A00-46EE-A2A4-45FBBF4B1181" - "9AFDEB2C-D9F0-423E-8211-EBB089F51F0C" - "C8B717C2-6B33-11D9-BB47-000D93589AF6" - "CD6D2CC6-6B33-11D9-BDFD-000D93589AF6" - "B23D6E15-6B33-11D9-86C1-000D93589AF6" - "7B7E945E-A112-11D9-A5A2-000D93C8BE28" - "45F92B81-6F0E-11D9-A1E4-000D9332809C" + "4400BCE9-20E3-426E-B1D7-2C0BCA53BCF8" + "6B024865-6095-4CE3-8EDD-DC6F2230C2FF" "3DD8406C-A116-11D9-A5A2-000D93C8BE28" - "3F26240E-6E4A-11D9-B411-000D93589AF6" "43C9E8AE-3E53-4B82-A1AF-56697BB3EF09" - "89E5CC0A-3EFF-4DEF-A299-2E9651DE6529" + "C183920D-A126-11D9-A5A2-000D93C8BE28" "2C4C9673-B166-432A-8938-75A5CA622481" - "6B024865-6095-4CE3-8EDD-DC6F2230C2FF" "0658019F-3635-462E-AAC2-74E4FE508A9B" - "20D760B5-A127-11D9-A5A2-000D93C8BE28" + "89E5CC0A-3EFF-4DEF-A299-2E9651DE6529" "B8651C6E-A05E-11D9-86AC-000D93C8BE28" - "C183920D-A126-11D9-A5A2-000D93C8BE28" - "CDE8EFD6-9DE2-4E8C-BB6A-52E8CCD2E977" + "20D760B5-A127-11D9-A5A2-000D93C8BE28" + "45F92B81-6F0E-11D9-A1E4-000D9332809C" + "3F26240E-6E4A-11D9-B411-000D93589AF6" + "B23D6E15-6B33-11D9-86C1-000D93589AF6" + "C8B717C2-6B33-11D9-BB47-000D93589AF6" + "CD6D2CC6-6B33-11D9-BDFD-000D93589AF6" + "7B7E945E-A112-11D9-A5A2-000D93C8BE28" + "04332FA8-8157-46C4-9854-8C190FFD96C6" "E6F19171-F664-4B4F-92DA-3E15E6CAD35C" - "EBEE6B51-29C7-4362-818F-A190CACD5296" "26068A55-4C84-409D-BA00-162B55AF6961" + "EBEE6B51-29C7-4362-818F-A190CACD5296" "65D38039-6B0A-48E9-9E49-43832ECC4107" - "04332FA8-8157-46C4-9854-8C190FFD96C6")) + "CDE8EFD6-9DE2-4E8C-BB6A-52E8CCD2E977")) ;; Unknown substitutions ;; @@ -481,12 +488,12 @@ ;; # as in Templates/XHTML 1.1/info.yasnippet ;; CDE8EFD6-9DE2-4E8C-BB6A-52E8CCD2E977 =yyas> (yas/unknown) ;; -;; # as in Snippets/IE Conditional Comment Internet Explorer 5_0 only.yasnippet -;; `(or (yas/selected-text) " IE Conditional Comment: Internet Explorer 5.0 only ")` =yyas> (yas/unknown) -;; ;; # as in Snippets/IE Conditional Comment Internet Explorer.yasnippet ;; `(or (yas/selected-text) " IE Conditional Comment: Internet Explorer ")` =yyas> (yas/unknown) ;; +;; # as in Snippets/IE Conditional Comment Internet Explorer 5_0 only.yasnippet +;; `(or (yas/selected-text) " IE Conditional Comment: Internet Explorer 5.0 only ")` =yyas> (yas/unknown) +;; ;; # as in Commands/CodeCompletion HTML Tags.yasnippet ;; 3463E85F-F500-49A0-8631-D78ED85F9D60 =yyas> (yas/unknown) ;; @@ -496,18 +503,18 @@ ;; # as in Templates/HTML 4.0 Transitional/info.yasnippet ;; E6F19171-F664-4B4F-92DA-3E15E6CAD35C =yyas> (yas/unknown) ;; +;; # as in Snippets/XHTML form.yasnippet +;; ${TM_FILENAME/(.*?)\..*/$1_submit/} =yyas> (yas/unknown) +;; +;; # as in Snippets/XHTML body.yasnippet +;; ${TM_FILENAME/(.*)\..*/\L$1/} =yyas> (yas/unknown) +;; ;; # as in Commands/Insert Entity.yasnippet ;; 89E5CC0A-3EFF-4DEF-A299-2E9651DE6529 =yyas> (yas/unknown) ;; ;; # as in Commands/Convert to HTML Entities.yasnippet ;; 3DD8406C-A116-11D9-A5A2-000D93C8BE28 =yyas> (yas/unknown) ;; -;; # as in Snippets/XHTML body.yasnippet -;; ${TM_FILENAME/(.*)\..*/\L$1/} =yyas> (yas/unknown) -;; -;; # as in Snippets/XHTML form.yasnippet -;; ${TM_FILENAME/(.*?)\..*/$1_submit/} =yyas> (yas/unknown) -;; ;; # as in Commands/Persistent Include.yasnippet ;; 0D814247-7A00-46EE-A2A4-45FBBF4B1181 =yyas> (yas/unknown) ;; @@ -520,6 +527,9 @@ ;; # as in Snippets/IE Conditional Comment Internet Explorer 5_5 only.yasnippet ;; `(or (yas/selected-text) " IE Conditional Comment: Internet Explorer 5.5 only ")` =yyas> (yas/unknown) ;; +;; # as in DragCommands/CSS Link.yasnippet +;; C8B717C2-6B33-11D9-BB47-000D93589AF6 =yyas> (yas/unknown) +;; ;; # as in Commands/Insert Close Tag.yasnippet ;; 0658019F-3635-462E-AAC2-74E4FE508A9B =yyas> (yas/unknown) ;; @@ -529,13 +539,10 @@ ;; # as in Commands/Convert to named entities excl tags.yasnippet ;; 43C9E8AE-3E53-4B82-A1AF-56697BB3EF09 =yyas> (yas/unknown) ;; -;; # as in DragCommands/CSS Link.yasnippet -;; C8B717C2-6B33-11D9-BB47-000D93589AF6 =yyas> (yas/unknown) -;; ;; # as in Commands/About Persistent Includes.yasnippet ;; 9AFDEB2C-D9F0-423E-8211-EBB089F51F0C =yyas> (yas/unknown) ;; -;; # as in Snippets/XHTML link.yasnippet +;; # as in Snippets/XHTML meta.yasnippet ;; `yas/html-xhtml-attr` =yyas> (yas/unknown) ;; ;; # as in Templates/HTML 4.0 Strict/info.yasnippet @@ -550,14 +557,14 @@ ;; # as in Templates/XHTML 1.0 Transitional/info.yasnippet ;; 65D38039-6B0A-48E9-9E49-43832ECC4107 =yyas> (yas/unknown) ;; -;; # as in Commands/Strip HTML tags.yasnippet -;; 20D760B5-A127-11D9-A5A2-000D93C8BE28 =yyas> (yas/unknown) +;; # as in Snippets/XHTML title.yasnippet +;; ${TM_FILENAME/((.+)\..*)?/(?2:$2:Page Title)/} =yyas> (yas/unknown) ;; ;; # as in Commands/Tidy.yasnippet ;; 45F92B81-6F0E-11D9-A1E4-000D9332809C =yyas> (yas/unknown) ;; -;; # as in Snippets/XHTML title.yasnippet -;; ${TM_FILENAME/((.+)\..*)?/(?2:$2:Page Title)/} =yyas> (yas/unknown) +;; # as in Commands/Strip HTML tags.yasnippet +;; 20D760B5-A127-11D9-A5A2-000D93C8BE28 =yyas> (yas/unknown) ;; ;; # as in Commands/Encrypt Line Selection (ROT 13).yasnippet ;; 9B13543F-8356-443C-B6E7-D9259B604927 =yyas> (yas/unknown) @@ -565,18 +572,18 @@ ;; # as in Templates/XHTML 1.0 Strict/info.yasnippet ;; EBEE6B51-29C7-4362-818F-A190CACD5296 =yyas> (yas/unknown) ;; -;; # as in Commands/Convert Line Selection to URL Escapes.yasnippet -;; 6B024865-6095-4CE3-8EDD-DC6F2230C2FF =yyas> (yas/unknown) -;; ;; # as in Commands/W3C validation.yasnippet ;; 3F26240E-6E4A-11D9-B411-000D93589AF6 =yyas> (yas/unknown) ;; -;; # as in Commands/CodeCompletion HTML Attributes.yasnippet -;; CBD82CF3-74E9-4E7A-B3F6-9348754EB5AA =yyas> (yas/unknown) +;; # as in Commands/Convert Line Selection to URL Escapes.yasnippet +;; 6B024865-6095-4CE3-8EDD-DC6F2230C2FF =yyas> (yas/unknown) ;; ;; # as in Commands/Update Includes.yasnippet ;; 4400BCE9-20E3-426E-B1D7-2C0BCA53BCF8 =yyas> (yas/unknown) ;; +;; # as in Commands/CodeCompletion HTML Attributes.yasnippet +;; CBD82CF3-74E9-4E7A-B3F6-9348754EB5AA =yyas> (yas/unknown) +;; ;; # as in Snippets/IE Conditional Comment Internet Explorer 6 and below.yasnippet ;; `(or (yas/selected-text) " IE Conditional Comment: Internet Explorer 6 and below ")` =yyas> (yas/unknown) ;; @@ -586,24 +593,24 @@ ;; # as in DragCommands/Image Tag.yasnippet ;; CD6D2CC6-6B33-11D9-BDFD-000D93589AF6 =yyas> (yas/unknown) ;; -;; # as in Snippets/XHTML h1.yasnippet -;; `yas/selected-text` =yyas> (yas/unknown) -;; ;; # as in Snippets/IE Conditional Comment NOT Internet Explorer.yasnippet ;; `(or (yas/selected-text) " IE Conditional Comment: NOT Internet Explorer ")` =yyas> (yas/unknown) ;; +;; # as in Snippets/XHTML h1.yasnippet +;; `yas/selected-text` =yyas> (yas/unknown) +;; ;; # as in Templates/XHTML 1.0 Frameset/info.yasnippet ;; 26068A55-4C84-409D-BA00-162B55AF6961 =yyas> (yas/unknown) ;; ;; # as in Commands/Decode HTML Entities.yasnippet ;; C183920D-A126-11D9-A5A2-000D93C8BE28 =yyas> (yas/unknown) ;; -;; # as in Snippets/IE Conditional Comment Internet Explorer 6 only.yasnippet -;; `(or (yas/selected-text) " IE Conditional Comment: Internet Explorer 6 only ")` =yyas> (yas/unknown) -;; ;; # as in Snippets/IE Conditional Comment Internet Explorer 7+.yasnippet ;; `(or (yas/selected-text) " IE Conditional Comment: Internet Explorer 7 and above ")` =yyas> (yas/unknown) ;; +;; # as in Snippets/IE Conditional Comment Internet Explorer 6 only.yasnippet +;; `(or (yas/selected-text) " IE Conditional Comment: Internet Explorer 6 only ")` =yyas> (yas/unknown) +;; ;; ;; Substitutions for: condition @@ -626,7 +633,7 @@ ;; # as in Commands/Refresh All Active Browsers.yasnippet ;; text.html, source.css =yyas> (yas/unknown) ;; -;; # as in Templates/HTML 4.0 Strict/info.yasnippet +;; # as in Templates/XHTML 1.1/info.yasnippet ;; text.html =yyas> (yas/unknown) ;; ;; # as in Commands/Documentation for Tag.yasnippet @@ -642,14 +649,14 @@ ;; Substitutions for: binding ;; -;; # as in Commands/W3C validation.yasnippet -;; ^V =yyas> (yas/unknown) +;; # as in Snippets/XHTML   NonBreakingSpace.yasnippet +;; ~ =yyas> (yas/unknown) ;; ;; # as in Snippets/Smart returnindent for tag pairs.yasnippet ;; =yyas> (yas/unknown) ;; -;; # as in Snippets/XHTML   NonBreakingSpace.yasnippet -;; ~ =yyas> (yas/unknown) +;; # as in Commands/W3C validation.yasnippet +;; ^V =yyas> (yas/unknown) ;; ;; # as in Commands/Insert Close Tag.yasnippet ;; ~@. =yyas> (yas/unknown) @@ -657,13 +664,13 @@ ;; # as in Snippets/XHTML br.yasnippet ;; ^ =yyas> (yas/unknown) ;; -;; # as in Commands/Decode HTML Entities.yasnippet +;; # as in Commands/Insert Entity.yasnippet ;; @& =yyas> (yas/unknown) ;; ;; # as in Commands/Refresh All Active Browsers.yasnippet ;; @r =yyas> (yas/unknown) ;; -;; # as in Commands/CodeCompletion HTML Attributes.yasnippet +;; # as in Commands/CodeCompletion HTML Tags.yasnippet ;; ~ =yyas> (yas/unknown) ;; ;; # as in Commands/Update Includes.yasnippet diff --git a/extras/imported/objc-mode/.yas-setup.el b/extras/imported/objc-mode/.yas-setup.el index a072e9963..9f5ab6e7a 100644 --- a/extras/imported/objc-mode/.yas-setup.el +++ b/extras/imported/objc-mode/.yas-setup.el @@ -26,14 +26,14 @@ (add-to-list 'yas/objc-languages (match-string 1)) (add-to-list 'yas/objc-defkinds (match-string 2))))) -(put (intern-soft (setq chosen (completing-read "Method: " yas/objc-method-names)) yas/objc-method-names) - 'someshit - 'someday) +;; (put (intern-soft (setq chosen (completing-read "Method: " yas/objc-method-names)) yas/objc-method-names) +;; 'someshit +;; 'someday) -(completing-read "Class: " yas/objc-class-names) +;; (completing-read "Class: " yas/objc-class-names) -(get (intern-soft (setq chosen (completing-read "hey: " yas/objc-method-names)) yas/objc-method-names) - 'someshit) +;; (get (intern-soft (setq chosen (completing-read "hey: " yas/objc-method-names)) yas/objc-method-names) +;; 'someshit) (defun yas/objc-current-method-signature () (let ((orig-point (point)) diff --git a/extras/imported/rails-mode/.yas-setup.el b/extras/imported/rails-mode/.yas-setup.el index d80b6519c..289bd3489 100644 --- a/extras/imported/rails-mode/.yas-setup.el +++ b/extras/imported/rails-mode/.yas-setup.el @@ -1,7 +1,14 @@ ;; .yas-setup.el for rails-mode (defvar yas/rails-root-cache nil) -(add-to-list 'auto-mode-alist '("\\.erb$" . yas/rails-erb-mode)) +(defun yas/rails-online-doc () + (interactive) + (browse-url (format "http://apidock.com/rails/search/quick?query=%s" (read-from-minibuffer "Word: " (thing-at-point 'word))))) + +(if (require 'rhtml-mode nil t) + (add-to-list 'auto-mode-alist '("\\.erb$" . rhtml-mode)) + (add-to-list 'auto-mode-alist '("\\.erb$" . yas/rails-erb-mode))) + (define-derived-mode yas/rails-erb-mode nxml-mode "eRB" @@ -36,6 +43,18 @@ (unless (string-match "\\(^[[:alpha:]]:/$\\|^/[^\/]+:\\|^/$\\)" dir) (yas/rails-root new-dir)))))) +(defun yas/rails-find-alternate-file () + (if (featurep 'rinari) + (cond ((yas/rails-view-p) + (rinari-find-model)) + ((yas/rails-model-p) + (rinari-find-controller)) + ((yas/rails-controller-p) + (rinari-find-view)) + (t + (message "oops, have to improve `yas/rails-find-alternate-file'"))) + (yas/unimplemented))) + ;; stolen from rinari-mode's rinari-extract-partial (defun yas/rails-extract-partial (begin end partial-name) (interactive "r\nsName your partial: ") @@ -179,7 +198,7 @@ are recognized. Stolen from `rinari-mode' more or`' less." ;; A7F692C1-778A-48B8-945E-573568BA0403 =yyas> (yas/unknown) ;; ;; # as in Commands/Go To Unit Test.yasnippet -;; BDBB15A4-2824-4BEC-93A5-7475F9C46A39 =yyas> (yas/rails-find 'unit-test) +;; BDBB15A4-2824-4BEC-93A5-7475F9C46A39 =yyas> (if (featurep 'rinari) (rinari-find-test) (yas/unimplemented 'rinari)) ;; ;; # as in Commands/Go To File on This Line.yasnippet ;; 09BB96F2-75FD-48A7-8314-B5B56B09B477 =yyas> (ffap) @@ -190,6 +209,9 @@ are recognized. Stolen from `rinari-mode' more or`' less." ;; # as in Commands/Redo Last Migration.yasnippet ;; CFDA9F62-D071-4E0F-AD10-66AE0729FFCF =yyas> (yas/rails-compile "rake") ;; +;; # as in Commands/Documentation for Word.yasnippet +;; 32F30207-D827-46D9-889A-451C35269D52 =yyas> (yas/rails-online-doc) +;; ;; # as in Commands/Autocomplete Foreign Key Fixture Reference.yasnippet ;; 0BCF0EE2-35EE-4959-A771-E74D55271D5A =yyas> (yas/unknown) ;; @@ -197,7 +219,7 @@ are recognized. Stolen from `rinari-mode' more or`' less." ;; 275C0B86-F735-49B6-8A22-218A8F4CC2E0 =yyas> (yas/unknown) ;; ;; # as in Macros/Change Change Table.yasnippet -;; 20FC02C5-32A3-4F20-B163-FF75C9FDFABF =yyas> (yas/unknown) +;; 20FC02C5-32A3-4F20-B163-FF75C9FDFABF =yyas> (yas/rails-intelligent-migration-snippet :change_change_table) ;; ;; # as in Commands/Rake Migrate.yasnippet ;; 985F56D4-82ED-4C45-8250-2ECCFC71957E =yyas> (yas/unknown) @@ -221,7 +243,7 @@ are recognized. Stolen from `rinari-mode' more or`' less." ;; 18C76913-061C-4D65-866D-67AA3724AFEF =yyas> (yas/rails-intelligent-migration-snippet :add_remove_column) ;; ;; # as in Commands/Go To View.yasnippet -;; EE862691-A624-4797-90CF-EDD39EFB2D8E =yyas> (yas/rails-find 'view) +;; EE862691-A624-4797-90CF-EDD39EFB2D8E =yyas> (if (featurep 'rinari) (rinari-find-view) (yas/unimplemented 'rinari)) ;; ;; # as in Commands/Test Plugins.yasnippet ;; 0D966168-D9B1-11DC-94E9-00112475D960 =yyas> (yas/unknown) @@ -233,7 +255,7 @@ are recognized. Stolen from `rinari-mode' more or`' less." ;; 1DD8A214-1C97-45BA-ADEE-8F888DDE8570 =yyas> (call-interactively 'yas/rails-extract-partial) ;; ;; # as in Commands/Go To Functional Test.yasnippet -;; DFE393BE-0764-49FE-B464-6350A50921E6 =yyas> (yas/rails-find 'functional-test) +;; DFE393BE-0764-49FE-B464-6350A50921E6 =yyas> (if (featurep 'rinari) (rinari-find-test) (yas/unimplemented 'rinari)) ;; ;; # as in Commands/Test Recent.yasnippet ;; 190401C2-D9B1-11DC-94E9-00112475D960 =yyas> (yas/unknown) @@ -254,7 +276,7 @@ are recognized. Stolen from `rinari-mode' more or`' less." ;; 221969A1-A5EA-4A8E-8817-C74EBED63901 =yyas> (yas/unknown) ;; ;; # as in Commands/Go To Helper.yasnippet -;; 51C9C27A-D931-49F9-B6D8-C0E7ABEC992D =yyas> (yas/unknown) +;; 51C9C27A-D931-49F9-B6D8-C0E7ABEC992D =yyas> (if (featurep 'rinari) (rinari-find-helper) (yas/unimplemented 'rinari)) ;; ;; # as in Commands/DB Schema Dump.yasnippet ;; 310C901C-EF32-4E88-938A-804ABBF8C428 =yyas> (yas/unknown) @@ -266,7 +288,7 @@ are recognized. Stolen from `rinari-mode' more or`' less." ;; 9A1AE6BA-8350-4AB7-B5BD-969A7E64CF29 =yyas> (yas/unknown) ;; ;; # as in Commands/Go To Model.yasnippet -;; C7151BF3-7068-4344-9B09-86F3BF4A9C63 =yyas> (yas/rails-find 'model) +;; C7151BF3-7068-4344-9B09-86F3BF4A9C63 =yyas> (if (featurep 'rinari) (rinari-find-model) (yas/unimplemented 'rinari)) ;; ;; # as in Macros/Drop 3A Create Table.yasnippet ;; A2135370-67A1-488D-B43C-B4F221127C2F =yyas> (yas/unknown) @@ -280,8 +302,7 @@ are recognized. Stolen from `rinari-mode' more or`' less." ;; # as in Commands/Load Fixtures.yasnippet ;; 5EEA0C71-B34B-4408-953B-F47AAD343CCC =yyas> (yas/unknown) ;; -;; # as in Commands/Documentation for Word.yasnippet -;; 32F30207-D827-46D9-889A-451C35269D52 =yyas> (yas/unknown) + ;; ;; # as in Commands/Clone Development DB to Test DB.yasnippet ;; 6F2AB859-46E3-4FF5-A9A7-E9A813AB5DE1 =yyas> (yas/unknown) @@ -290,22 +311,22 @@ are recognized. Stolen from `rinari-mode' more or`' less." ;; F03162DE-9DB6-417B-9DD7-52D9F11EA736 =yyas> (yas/unknown) ;; ;; # as in Commands/Go To Stylesheet.yasnippet -;; B207BBD4-D6AA-41E9-9530-27210F2D7B66 =yyas> (yas/unknown) +;; B207BBD4-D6AA-41E9-9530-27210F2D7B66 =yyas> (if (featurep 'rinari) (rinari-find-stylesheet) (yas/unimplemented 'rinari)) ;; ;; # as in Commands/Go To Javascript.yasnippet -;; B078346F-61D8-4E75-9427-80720FBC67F7 =yyas> (yas/unknown) +;; B078346F-61D8-4E75-9427-80720FBC67F7 =yyas> (if (featurep 'rinari) (rinari-find-javascript) (yas/unimplemented 'rinari)) ;; ;; # as in Commands/Rake Migrate to Version.yasnippet ;; 07C696F8-79F5-4E0B-9EE9-03B693A54ABB =yyas> (yas/unknown) ;; ;; # as in Commands/Go To Alternate File.yasnippet -;; 9453F0B3-B946-445F-BDB0-B01DE70732FC =yyas> (yas/rails-find 'alternate) +;; 9453F0B3-B946-445F-BDB0-B01DE70732FC =yyas> (yas/rails-find-alternate-file) ;; ;; # as in Commands/View demo help.yasnippet ;; 964436B8-E578-11DC-8177-00112475D960 =yyas> (yas/unknown) ;; ;; # as in Commands/Go to Fixture.yasnippet -;; 638D94A4-BDFC-4FE9-8909-9934F3FD2899 =yyas> (yas/unknown) +;; 638D94A4-BDFC-4FE9-8909-9934F3FD2899 =yyas> (if (featurep 'rinari) (rinari-find-fixture) (yas/unimplemented 'rinari)) ;; ;; # as in Macros/Rename Table.yasnippet ;; FD8CC811-2AD3-480F-B975-DF959DC96C67 =yyas> (yas/unknown) @@ -329,7 +350,7 @@ are recognized. Stolen from `rinari-mode' more or`' less." ;; 46ECE243-0448-4A64-A223-27CC21E7704D =yyas> (yas/unknown) ;; ;; # as in Commands/Go To File.yasnippet -;; 0CCC8443-40F3-4BAB-9440-D737562B5F45 =yyas> (yas/rails-find 'file) +;; 0CCC8443-40F3-4BAB-9440-D737562B5F45 =yyas> (if (featurep 'rinari) (rinari-find-file-in-project) (yas/unimplemented 'rinari)) ;; ;; # as in Commands/Test Units.yasnippet ;; 2C60CBA1-D9B1-11DC-94E9-00112475D960 =yyas> (yas/unknown) @@ -359,22 +380,26 @@ are recognized. Stolen from `rinari-mode' more or`' less." ;; Substitutions for: condition -;; text.html.ruby, source.ruby.rails.embedded.html, meta.rails.helper, meta.rails.unit_test, source.js, source.css, source.yaml, meta.rails.controller, meta.rails.functional_test, text.haml =yyas> (yas/unknown) -;; text.html.ruby, source.ruby.rails.embedded.html, meta.rails.helper, meta.rails.functional_test, source.js, source.css, source.yaml, meta.rails.model, meta.rails.unit_test, text.haml =yyas> (yas/unknown) +;; text.html.ruby, source.ruby.rails.embedded.html, meta.rails.helper, meta.rails.unit_test, source.js, source.css, source.yaml, meta.rails.controller, meta.rails.functional_test, text.haml =yyas> t +;; text.html.ruby, source.ruby.rails.embedded.html, meta.rails.helper, meta.rails.functional_test, source.js, source.css, source.yaml, meta.rails.model, meta.rails.unit_test, text.haml =yyas> t ;; text.html.ruby, source.ruby.rails.embedded.html, meta.rails.controller, meta.rails.model, meta.rails.unit_test, meta.rails.functional_test, text.haml =yyas> t -;; meta.rails.controller, meta.rails.helper, meta.rails.model, meta.rails.unit_test, meta.rails.functional_test =yyas> (yas/unknown) -;; text.html.ruby, source.ruby.rails.embedded.html, meta.rails.controller, meta.rails.helper, text.haml =yyas> (yas/unknown) +;; meta.rails.controller, meta.rails.helper, meta.rails.model, meta.rails.unit_test, meta.rails.functional_test =yyas> t +;; text.html.ruby, source.ruby.rails.embedded.html, meta.rails.controller, meta.rails.helper, text.haml =yyas> t ;; meta.rails.controller, meta.rails.helper, meta.rails.model, meta.rails.functional_test, source.yaml =yyas> t +;; meta.rails.controller, meta.rails.mailer, source.js, source.css =yyas> t ;; meta.rails.controller, meta.rails.helper, meta.rails.model, source.yaml, meta.rails.unit_test =yyas> t ;; meta.rails.migration - meta.rails.migration.create_table - meta.rails.migration.change_table =yyas> (yas/rails-intelligent-migration-snippet-condition-p) ;; meta.rails.migration.create_table, meta.rails.migration.change_table =yyas> (or (yas/rails-in-create-table-p) (yas/rails-in-change-table-p)) ;; meta.rails.controller, meta.rails.mailer, source.js, source.css =yyas> (yas/unknown) -;; meta.rails.migration.create_table =yyas> (yas/rails-in-create-table-p) -;; meta.rails.functional_test =yyas> (yas/rails-in-functional-test-p) +;; meta.rails.migration.create_table =yyas> (yas/rails-create-table-p) +;; meta.rails.functional_test =yyas> (yas/rails-functional-test-p) ;; text.html.ruby, text.haml =yyas> (yas/rails-view-p) -;; meta.rails.controller =yyas> (yas/rails-in-controller-p) -;; meta.rails.routes =yyas> (yas/rails-in-routes-p) +;; meta.rails.controller =yyas> (yas/rails-controller-p) +;; meta.rails.routes =yyas> (yas/rails-routes-p) ;; text.html.ruby =yyas> (yas/unknown) +;; +;; +;; AC385ABF-96CD-4FCB-80AD-BF37D6EE79D2 =yyas> (yas/rails-view-p) ;; Substitutions for: binding @@ -386,7 +411,7 @@ are recognized. Stolen from `rinari-mode' more or`' less." ;; ~$ =yyas> (yas/unknown) ;; ;; # as in Commands/Go To View.yasnippet -;; ~$@ =yyas> C-M-s-down +;; ~$@ =yyas> [M-S-s-down] ;; ;; # as in Commands/Generate Quick Migration.yasnippet ;; ^M =yyas> (yas/unknown) @@ -401,9 +426,9 @@ are recognized. Stolen from `rinari-mode' more or`' less." ;; ^p =yyas> C-c M-p ;; ;; # as in Commands/Go To File.yasnippet -;; 0CCC8443-40F3-4BAB-9440-D737562B5F45 =yyas> M-s-up +;; 0CCC8443-40F3-4BAB-9440-D737562B5F45 =yyas> [M-s-up] ;; # as in Commands/Go To Alternate File.yasnippet -;; 9453F0B3-B946-445F-BDB0-B01DE70732FC =yyas> M-s-down +;; 9453F0B3-B946-445F-BDB0-B01DE70732FC =yyas> [M-s-down] ;; ;; # as in Commands/Autocomplete Foreign Key Fixture Reference.yasnippet ;; ~ =yyas> (yas/unknown) @@ -415,13 +440,13 @@ are recognized. Stolen from `rinari-mode' more or`' less." ;; ^| =yyas> C-c M-| ;; ;; # as in Snippets/respond_to (html).yasnippet -;; @H =yyas> C-c M-h +;; @H =yyas> s-h ;; ;; # as in Commands/Make Selection in to Partial.yasnippet ;; ^H =yyas> C-c M-m ;; ;; # as in Commands/View demo help.yasnippet -;; ^h =yyas> (yas/unknown) +;; ^h =yyas> C-c M-h ;; ;; ;; @@ -445,16 +470,16 @@ are recognized. Stolen from `rinari-mode' more or`' less." (yas/item "EE862691-A624-4797-90CF-EDD39EFB2D8E") ;; Go to Functional Test (yas/item "DFE393BE-0764-49FE-B464-6350A50921E6") - ;; Ignoring Go to Helper - (yas/ignore-item "51C9C27A-D931-49F9-B6D8-C0E7ABEC992D") - ;; Ignoring Go to Javascript - (yas/ignore-item "B078346F-61D8-4E75-9427-80720FBC67F7") - ;; Ignoring Go to Stylesheet - (yas/ignore-item "B207BBD4-D6AA-41E9-9530-27210F2D7B66") + ;; Go to Helper + (yas/item "51C9C27A-D931-49F9-B6D8-C0E7ABEC992D") + ;; Go to Javascript + (yas/item "B078346F-61D8-4E75-9427-80720FBC67F7") + ;; Go to Stylesheet + (yas/item "B207BBD4-D6AA-41E9-9530-27210F2D7B66") ;; Go to Unit Test (yas/item "BDBB15A4-2824-4BEC-93A5-7475F9C46A39") - ;; Ignoring Go to Fixture - (yas/ignore-item "638D94A4-BDFC-4FE9-8909-9934F3FD2899"))) + ;; Go to Fixture + (yas/item "638D94A4-BDFC-4FE9-8909-9934F3FD2899"))) (yas/submenu "Run Tests" (;; Ignoring Test All (yas/ignore-item "DC549A45-D9B0-11DC-94E9-00112475D960") @@ -1023,8 +1048,8 @@ are recognized. Stolen from `rinari-mode' more or`' less." (yas/separator) ;; Ignoring View demo help (yas/ignore-item "964436B8-E578-11DC-8177-00112475D960") - ;; Ignoring Documentation for Word - (yas/ignore-item "32F30207-D827-46D9-889A-451C35269D52") + ;; Documentation for Word + (yas/item "32F30207-D827-46D9-889A-451C35269D52") ;; find_each (yas/item "B105C480-FB21-4511-9AD0-D5B4FED3BA21") ) @@ -1033,9 +1058,7 @@ are recognized. Stolen from `rinari-mode' more or`' less." "275C0B86-F735-49B6-8A22-218A8F4CC2E0" "0BCF0EE2-35EE-4959-A771-E74D55271D5A" "6F2AB859-46E3-4FF5-A9A7-E9A813AB5DE1" - "32F30207-D827-46D9-889A-451C35269D52" "D696FA2C-785A-4B73-A2F6-F750904DD7C2" - "638D94A4-BDFC-4FE9-8909-9934F3FD2899" "AECD46CF-9031-4059-B386-262DBABD97B1" "F758BFD1-00CA-4742-BE71-032580080F5C" "5EEA0C71-B34B-4408-953B-F47AAD343CCC" @@ -1053,9 +1076,6 @@ are recognized. Stolen from `rinari-mode' more or`' less." "310C901C-EF32-4E88-938A-804ABBF8C428" "6DEF923E-2347-46EC-AFBE-183D08E63DC1" "4904EDC7-5ED3-4132-AAB2-C2AD87C97EFE" - "51C9C27A-D931-49F9-B6D8-C0E7ABEC992D" - "B078346F-61D8-4E75-9427-80720FBC67F7" - "B207BBD4-D6AA-41E9-9530-27210F2D7B66" "985F56D4-82ED-4C45-8250-2ECCFC71957E" "95F83E1D-5B03-424F-8BEC-8AF66C8939BC" "A7F692C1-778A-48B8-945E-573568BA0403" @@ -1138,9 +1158,6 @@ are recognized. Stolen from `rinari-mode' more or`' less." ;; # as in Macros/Add 3A Remove Timestamps.yasnippet ;; 221969A1-A5EA-4A8E-8817-C74EBED63901 =yyas> (yas/unknown) ;; -;; # as in Commands/Go To Helper.yasnippet -;; 51C9C27A-D931-49F9-B6D8-C0E7ABEC992D =yyas> (yas/unknown) -;; ;; # as in Commands/DB Schema Dump.yasnippet ;; 310C901C-EF32-4E88-938A-804ABBF8C428 =yyas> (yas/unknown) ;; @@ -1162,21 +1179,12 @@ are recognized. Stolen from `rinari-mode' more or`' less." ;; # as in Commands/Load Fixtures.yasnippet ;; 5EEA0C71-B34B-4408-953B-F47AAD343CCC =yyas> (yas/unknown) ;; -;; # as in Commands/Documentation for Word.yasnippet -;; 32F30207-D827-46D9-889A-451C35269D52 =yyas> (yas/unknown) -;; ;; # as in Commands/Clone Development DB to Test DB.yasnippet ;; 6F2AB859-46E3-4FF5-A9A7-E9A813AB5DE1 =yyas> (yas/unknown) ;; ;; # as in Macros/Rename 3A Rename Several Columns.yasnippet ;; F03162DE-9DB6-417B-9DD7-52D9F11EA736 =yyas> (yas/unknown) ;; -;; # as in Commands/Go To Stylesheet.yasnippet -;; B207BBD4-D6AA-41E9-9530-27210F2D7B66 =yyas> (yas/unknown) -;; -;; # as in Commands/Go To Javascript.yasnippet -;; B078346F-61D8-4E75-9427-80720FBC67F7 =yyas> (yas/unknown) -;; ;; # as in Commands/Rake Migrate to Version.yasnippet ;; 07C696F8-79F5-4E0B-9EE9-03B693A54ABB =yyas> (yas/unknown) ;; @@ -1186,9 +1194,6 @@ are recognized. Stolen from `rinari-mode' more or`' less." ;; # as in Commands/View demo help.yasnippet ;; 964436B8-E578-11DC-8177-00112475D960 =yyas> (yas/unknown) ;; -;; # as in Commands/Go to Fixture.yasnippet -;; 638D94A4-BDFC-4FE9-8909-9934F3FD2899 =yyas> (yas/unknown) -;; ;; # as in Macros/Rename Table.yasnippet ;; FD8CC811-2AD3-480F-B975-DF959DC96C67 =yyas> (yas/unknown) ;; @@ -1245,9 +1250,6 @@ are recognized. Stolen from `rinari-mode' more or`' less." ;; # as in Commands/Jump to Method Definition.yasnippet ;; ^f =yyas> (yas/unknown) ;; -;; # as in Commands/View demo help.yasnippet -;; ^h =yyas> (yas/unknown) -;; ;; ;; .yas-setup.el for rails-mode ends here diff --git a/extras/imported/ruby-mode/.yas-setup.el b/extras/imported/ruby-mode/.yas-setup.el index 96d854100..5203451c2 100644 --- a/extras/imported/ruby-mode/.yas-setup.el +++ b/extras/imported/ruby-mode/.yas-setup.el @@ -217,7 +217,7 @@ (orig-line (count-screen-lines (window-start) (line-beginning-position)))) (unless (zerop (shell-command-on-region start end "xmpfilter" (get-buffer-create "*xmpfilter*") t (get-buffer-create "*xmpfilter errors*") t)) - ;;some undo actions here + (undo) ) (goto-char (min (point-max) orig)) (recenter orig-line) @@ -275,6 +275,8 @@ (ruby-backward-sexp) (not (eq (point) (point-min))))) +(provide 'yas/ruby) + ;; My work in progress substitutions ;; ;; Substitutions for: content @@ -315,7 +317,7 @@ ;; 7990EE60-C850-4779-A8C0-7FD2C853B99B =yyas> (yas/ruby-toggle-single-multi-line-block) ;; 7E084412-80E6-4B70-8092-C03D1ECE4CD2 =yyas> (yas/ruby-require "eac")(yas/expand-uuid 'ruby-mode "FDD73070-6D32-4301-A86A-C55B77C3D8ED") ;; FBFC214F-B019-4967-95D2-028F374A3221 =yyas> (yas/ruby-pipe-through-xmpfilter) -;; 63F3B3B7-CBE2-426B-B551-657733F3868B =yyas> (call-interactively (if (featurep 'ri) 'ri 'yas/ri)) +;; 63F3B3B7-CBE2-426B-B551-657733F3868B =yyas> (call-interactively (if (featurep 'yari) 'yari 'yas/ri)) ;; ;; `[[ $TM_LINE_INDEX != 0 ]] && echo; echo` =yyas> `(concat (if (eq 0 current-line) "\n" "") "\n")` @@ -805,39 +807,40 @@ "835FAAC6-5431-436C-998B-241F7226B99B" "A83F68A9-F751-4BB4-AE16-56812878C16A" "47D203ED-EB9B-4653-A07B-A897800CEB76" - "835FAAC6-5431-436C-998B-241F7226B99B" - "569C9822-8C41-4907-94C7-1A8A0031B66D" - "BF4CA9F1-51CD-48D4-8357-852234F59046" - "B3875596-723C-41EE-9E6F-F84930C3B568" - "B297E4B8-A8FF-49CE-B9C4-6D4911724D43" - "931DD73E-615E-476E-9B0D-8341023AE730" - "DAA69A0C-FC1E-4509-9931-DFFB38B4D6AE" "47D203ED-EB9B-4653-A07B-A897800CEB76" + "931DD73E-615E-476E-9B0D-8341023AE730" "2DDB6FE0-6111-4C40-A149-8E67E76F8272" - "35222962-C50D-4D58-A6AE-71E7AD980BE4" + "DAA69A0C-FC1E-4509-9931-DFFB38B4D6AE" + "BF4CA9F1-51CD-48D4-8357-852234F59046" "8646378E-91F5-4771-AC7C-43FC49A93576" "E07FF68B-C87D-4332-8477-D026929FDADA" - "2C07D4E7-D74F-4AE4-82BE-B0BA82247AFA" - "E5158F94-CC52-4424-A495-14EF9272653F" - "58FDEA60-10AF-4C49-AA09-29B77030DB25" - "825B721D-4367-4DF7-98C0-F005695DF9E3" - "121B334B-2AA6-4E9A-A8B8-BF93B627982B" - "BFB65D1C-62F1-485D-8A67-3E5A2E55107C" - "EC73D5CC-5F05-46B9-A6F4-82037E4A38C9" - "9460392B-C036-4A76-A5AE-1191F10E4B1B" - "1AD6A138-2E89-4D6A-AB3F-416BF9CE968D" + "569C9822-8C41-4907-94C7-1A8A0031B66D" + "35222962-C50D-4D58-A6AE-71E7AD980BE4" + "835FAAC6-5431-436C-998B-241F7226B99B" + "B297E4B8-A8FF-49CE-B9C4-6D4911724D43" + "E0E058FC-0DC3-4872-A1C2-0B1A322A0CF5" + "B3875596-723C-41EE-9E6F-F84930C3B568" + "76FCF165-54CB-4213-BC55-BD60B9C6A3EC" + "EE5F19BA-6C02-11D9-92BA-0011242E4184" "EE5F1FB2-6C02-11D9-92BA-0011242E4184" "9FB64639-F776-499B-BA6F-BB45F86F80FD" "7F79BC8D-8A4F-4570-973B-05DFEC25747F" - "EE5F19BA-6C02-11D9-92BA-0011242E4184" - "97054C4D-E4A3-45B1-9C00-B82DBCB30CAD" - "76FCF165-54CB-4213-BC55-BD60B9C6A3EC" "0275EF39-9357-408F-AF20-79E415CA9504" "5289EE40-86B8-11D9-A8D4-000A95E13C98" + "1AD6A138-2E89-4D6A-AB3F-416BF9CE968D" "6519CB08-8326-4B77-A251-54722FFBFC1F" + "97054C4D-E4A3-45B1-9C00-B82DBCB30CAD" + "E5158F94-CC52-4424-A495-14EF9272653F" + "9460392B-C036-4A76-A5AE-1191F10E4B1B" + "2C07D4E7-D74F-4AE4-82BE-B0BA82247AFA" + "121B334B-2AA6-4E9A-A8B8-BF93B627982B" + "EC73D5CC-5F05-46B9-A6F4-82037E4A38C9" + "825B721D-4367-4DF7-98C0-F005695DF9E3" + "58FDEA60-10AF-4C49-AA09-29B77030DB25" + "BFB65D1C-62F1-485D-8A67-3E5A2E55107C" "C649F945-DAB8-4DA2-B73C-2EFF9D7D34F3" - "5AE7CFB4-418E-4E00-AD76-06DB755EE876" "A83F68A9-F751-4BB4-AE16-56812878C16A" + "5AE7CFB4-418E-4E00-AD76-06DB755EE876" "F6BF907E-FDF7-4D9B-9E57-BE159561349D")) ;; Unknown substitutions @@ -847,23 +850,20 @@ ;; # as in Macros/xmlread(__).yasnippet ;; F6BF907E-FDF7-4D9B-9E57-BE159561349D =yyas> (yas/unknown) ;; -;; # as in Commands/Check Ruby Syntax.yasnippet -;; EE5F19BA-6C02-11D9-92BA-0011242E4184 =yyas> (yas/unknown) -;; ;; # as in Macros/Overwrite } in #{ .. }.yasnippet ;; E5158F94-CC52-4424-A495-14EF9272653F =yyas> (yas/unknown) ;; +;; # as in Commands/Check Ruby Syntax.yasnippet +;; EE5F19BA-6C02-11D9-92BA-0011242E4184 =yyas> (yas/unknown) +;; ;; # as in Commands/Enclose in + (RDoc comments).yasnippet ;; 2DDB6FE0-6111-4C40-A149-8E67E76F8272 =yyas> (yas/unknown) ;; -;; # as in Snippets/RDoc documentation block.yasnippet -;; `(concat (if (eq 0 current-line) "\n" "") "\n")` =yyas> (yas/unknown) -;; ;; # as in Snippets/class __ TestUnitTestCase with test_helper.yasnippet ;; (yas/multi-line-unknown 228CAB3A-E221-4727-B430-31E94F76C9D3) =yyas> (yas/unknown) ;; -;; # as in Macros/YAML.dump(.., file) (Yd).yasnippet -;; 9460392B-C036-4A76-A5AE-1191F10E4B1B =yyas> (yas/unknown) +;; # as in Snippets/RDoc documentation block.yasnippet +;; `(concat (if (eq 0 current-line) "\n" "") "\n")` =yyas> (yas/unknown) ;; ;; # as in Macros/map_with_index { e, i .. } (mapwi).yasnippet ;; BFB65D1C-62F1-485D-8A67-3E5A2E55107C =yyas> (yas/unknown) @@ -871,6 +871,9 @@ ;; # as in Macros/each_slice(..) { group .. } (eas).yasnippet ;; 825B721D-4367-4DF7-98C0-F005695DF9E3 =yyas> (yas/unknown) ;; +;; # as in Macros/YAML.dump(.., file) (Yd).yasnippet +;; 9460392B-C036-4A76-A5AE-1191F10E4B1B =yyas> (yas/unknown) +;; ;; # as in Commands/Run.yasnippet ;; 35222962-C50D-4D58-A6AE-71E7AD980BE4 =yyas> (yas/unknown) ;; @@ -880,7 +883,7 @@ ;; # as in Commands/Omit from RDoc.yasnippet ;; BF4CA9F1-51CD-48D4-8357-852234F59046 =yyas> (yas/unknown) ;; -;; # as in Snippets/assert_not_nil(..) (asnn).yasnippet +;; # as in Snippets/flunk(..) (fl).yasnippet ;; `yas/ruby-snippet-close-paren` =yyas> (yas/unknown) ;; ;; # as in Macros/YAML.load(file) (Yl).yasnippet @@ -895,23 +898,32 @@ ;; # as in Macros/Benchmark_bmbm(__) do __ end.yasnippet ;; C649F945-DAB8-4DA2-B73C-2EFF9D7D34F3 =yyas> (yas/unknown) ;; -;; # as in Commands/Toggle Quote Style.yasnippet -;; 6519CB08-8326-4B77-A251-54722FFBFC1F =yyas> (yas/unknown) -;; ;; # as in Commands/word_wrap() (worw).yasnippet ;; 97054C4D-E4A3-45B1-9C00-B82DBCB30CAD =yyas> (yas/unknown) ;; +;; # as in Commands/Toggle Quote Style.yasnippet +;; 6519CB08-8326-4B77-A251-54722FFBFC1F =yyas> (yas/unknown) +;; ;; # as in Snippets/class .. TestUnitTestCase .. end (tc).yasnippet ;; (yas/multi-line-unknown 31D1F145-33AB-4441-BA11-4D1C46928C4C) =yyas> (yas/unknown) ;; +;; # as in Macros/extend Forwardable (Forw).yasnippet +;; 58FDEA60-10AF-4C49-AA09-29B77030DB25 =yyas> (yas/unknown) +;; ;; # as in Commands/Make Destructive Call.yasnippet ;; 7F79BC8D-8A4F-4570-973B-05DFEC25747F =yyas> (yas/unknown) ;; ;; # as in Commands/Insert Missing Requires.yasnippet ;; 9FB64639-F776-499B-BA6F-BB45F86F80FD =yyas> (yas/unknown) ;; -;; # as in Macros/extend Forwardable (Forw).yasnippet -;; 58FDEA60-10AF-4C49-AA09-29B77030DB25 =yyas> (yas/unknown) +;; # as in Commands/gsub - remove whitespace from front of line.yasnippet +;; B3875596-723C-41EE-9E6F-F84930C3B568 =yyas> (yas/unknown) +;; +;; # as in Commands/Validate and Save.yasnippet +;; E0E058FC-0DC3-4872-A1C2-0B1A322A0CF5 =yyas> (yas/unknown) +;; +;; # as in Commands/Toggle ERb Tags.yasnippet +;; 835FAAC6-5431-436C-998B-241F7226B99B =yyas> (yas/unknown) ;; ;; # as in Commands/RakeSake task using file path.yasnippet ;; E07FF68B-C87D-4332-8477-D026929FDADA =yyas> (yas/unknown) @@ -919,40 +931,34 @@ ;; # as in Commands/Completion Ruby (rcodetools).yasnippet ;; 47D203ED-EB9B-4653-A07B-A897800CEB76 =yyas> (yas/unknown) ;; -;; # as in Commands/gsub - remove whitespace from front of line.yasnippet -;; B3875596-723C-41EE-9E6F-F84930C3B568 =yyas> (yas/unknown) -;; -;; # as in Commands/Toggle ERb Tags.yasnippet -;; 835FAAC6-5431-436C-998B-241F7226B99B =yyas> (yas/unknown) -;; -;; # as in Snippets/assert_not_nil(..) (asnn).yasnippet +;; # as in Snippets/flunk(..) (fl).yasnippet ;; `yas/ruby-snippet-open-paren` =yyas> (yas/unknown) ;; +;; # as in Macros/class .. DelegateClass .. initialize .. end (class).yasnippet +;; 121B334B-2AA6-4E9A-A8B8-BF93B627982B =yyas> (yas/unknown) +;; ;; # as in Commands/New Method.yasnippet ;; 0275EF39-9357-408F-AF20-79E415CA9504 =yyas> (yas/unknown) ;; ;; # as in Commands/Execute Line with Ruby.yasnippet ;; EE5F1FB2-6C02-11D9-92BA-0011242E4184 =yyas> (yas/unknown) ;; -;; # as in Macros/class .. DelegateClass .. initialize .. end (class).yasnippet -;; 121B334B-2AA6-4E9A-A8B8-BF93B627982B =yyas> (yas/unknown) -;; ;; # as in Macros/PStore_new( __ ).yasnippet ;; 5AE7CFB4-418E-4E00-AD76-06DB755EE876 =yyas> (yas/unknown) ;; -;; # as in Commands/Run focused unit test.yasnippet -;; 5289EE40-86B8-11D9-A8D4-000A95E13C98 =yyas> (yas/unknown) -;; ;; # as in Commands/Show RDoc for this file.yasnippet ;; 1AD6A138-2E89-4D6A-AB3F-416BF9CE968D =yyas> (yas/unknown) ;; +;; # as in Commands/Run focused unit test.yasnippet +;; 5289EE40-86B8-11D9-A8D4-000A95E13C98 =yyas> (yas/unknown) +;; ;; # as in Snippets/module .. end.yasnippet ;; `(yas/ruby-infer-class-name)` =yyas> (yas/unknown) ;; ;; # as in Commands/Check ERB Syntax.yasnippet ;; 76FCF165-54CB-4213-BC55-BD60B9C6A3EC =yyas> (yas/unknown) ;; -;; # as in Snippets/embed string variable.yasnippet +;; # as in Snippets/open yield block ({).yasnippet ;; `yas/selected-text` =yyas> (yas/unknown) ;; ;; # as in Macros/Delete forwardbackward.yasnippet @@ -984,7 +990,7 @@ ;; # as in Commands/Enclose in + (RDoc comments).yasnippet ;; @k =yyas> (yas/unknown) ;; -;; # as in Commands/Check ERB Syntax.yasnippet +;; # as in Commands/Check Ruby Syntax.yasnippet ;; ^V =yyas> (yas/unknown) ;; ;; # as in Commands/Omit from RDoc.yasnippet @@ -1002,15 +1008,18 @@ ;; # as in Commands/Open Require.yasnippet ;; @D =yyas> (yas/unknown) ;; -;; # as in Commands/Execute Line with Ruby.yasnippet -;; ^E =yyas> (yas/unknown) -;; ;; # as in Macros/Overwrite } in #{ .. }.yasnippet ;; } =yyas> (yas/unknown) ;; +;; # as in Commands/Execute Line with Ruby.yasnippet +;; ^E =yyas> (yas/unknown) +;; ;; # as in Commands/Completion Ruby (rcodetools).yasnippet ;; ~ =yyas> (yas/unknown) ;; +;; # as in Commands/Validate and Save.yasnippet +;; @s =yyas> (yas/unknown) +;; ;; # as in Macros/Delete forwardbackward.yasnippet ;;  =yyas> (yas/unknown) ;; diff --git a/extras/textmate_import.rb b/extras/textmate_import.rb index 639e508ec..e76f8140d 100755 --- a/extras/textmate_import.rb +++ b/extras/textmate_import.rb @@ -197,7 +197,7 @@ class TmSnippet "binding" => {}, "type" => {} } - + def self.extra_substitutions; @@extra_substitutions; end @@extra_substitutions = { "content" => {}, @@ -360,10 +360,12 @@ class TmSnippet # Sort merged substitutions by length (bigger ones first, # regexps last), and apply them to the value gotten for plist. # - merged.sort_by do |what, with| + allsubs = merged.sort_by do |what, with| if what.respond_to? :length then -what.length else 0 end - end.each do |sub| + end + allsubs.each do |sub| if val.gsub!(sub[0],sub[1]) + # puts "SUBBED #{sub[0]} for #{sub[1]}" return "# #{yas_directive}: "+ val + "\n" unless val.empty? end end @@ -515,3 +517,4 @@ if __FILE__ == $PROGRAM_NAME end end end +# ~> -:200: undefined method `length' for /shit/:Regexp (NoMethodError) diff --git a/yasnippet.el b/yasnippet.el index d13c40c90..13724d9e9 100644 --- a/yasnippet.el +++ b/yasnippet.el @@ -838,10 +838,10 @@ behaviour.") (defun yas/minor-mode-on () "Turn on YASnippet minor mode. -Do this unless `yas/dont-activate' is t or the function -`yas/get-snippet-tables' (which see), returns an empty list." +Do this unless `yas/dont-activate' is t " (interactive) - (unless (or (and (functionp yas/dont-activate) + (unless (or (minibufferp) + (and (functionp yas/dont-activate) (funcall yas/dont-activate)) (and (not (functionp yas/dont-activate)) yas/dont-activate)) @@ -1265,11 +1265,10 @@ return an expression that when evaluated will issue an error." (when (and keybinding (not (string-match "keybinding" keybinding))) (condition-case err - (let ((keybinding-string (or (and (string-match "\".*\"" keybinding) - (read keybinding)) - ;; "KEY-DESC" with quotes is deprecated..., but supported - keybinding))) - (read-kbd-macro keybinding-string 'need-vector)) + (let ((res (or (and (string-match "^\\[.*\\]$" keybinding) + (read keybinding)) + (read-kbd-macro keybinding 'need-vector)))) + res) (error (message "[yas] warning: keybinding \"%s\" invalid since %s." keybinding (error-message-string err)) @@ -2791,11 +2790,13 @@ Use this in primary and mirror transformations to tget." (defun yas/inside-string () (equal 'font-lock-string-face (get-char-property (1- (point)) 'face))) -(defun yas/unimplemented () +(defun yas/unimplemented (&optional missing-feature) (if yas/current-template - (if (y-or-n-p "This snippet is unimplemented. Visit the snippet definition? ") + (if (y-or-n-p (format "This snippet is unimplemented (missing %s) Visit the snippet definition? " + (or missing-feature + "something"))) (yas/visit-snippet-file-1 yas/current-template)) - (message "No implementation."))) + (message "No implementation. Missing %s" (or missing-feature "something")))) ;;; Snippet expansion and field management