From 813fa525fe7f3af672236cd0d39d96d827cbd8c5 Mon Sep 17 00:00:00 2001 From: Joao Tavora Date: Fri, 16 Dec 2011 07:57:51 +0000 Subject: [PATCH] yas/ri uses yas/ri-executable --- extras/imported/ruby-mode/.yas-setup.el | 261 ++++++++++++------------ yasnippet.el | 6 +- 2 files changed, 135 insertions(+), 132 deletions(-) diff --git a/extras/imported/ruby-mode/.yas-setup.el b/extras/imported/ruby-mode/.yas-setup.el index 2200a83..a3e200f 100644 --- a/extras/imported/ruby-mode/.yas-setup.el +++ b/extras/imported/ruby-mode/.yas-setup.el @@ -239,6 +239,7 @@ (defvar yas/ri-history nil "History of yas/ri queries.") +(defvar yas/ri-executable "ri") (require 'ansi-color) (defun yas/ri (query) (interactive (list (read-from-minibuffer "Ri query: " @@ -251,7 +252,7 @@ (erase-buffer) (setq default-directory "~") (setq buffer-read-only nil) - (shell-command (concat "ri -f ansi " query) "*Ri*") + (shell-command (concat yas/ri-executable " -f ansi " query) "*Ri*") (ansi-color-apply-on-region (point-min) (point-max)) (yas/ri-mode) (display-buffer (current-buffer))) @@ -811,9 +812,10 @@ "A83F68A9-F751-4BB4-AE16-56812878C16A" "47D203ED-EB9B-4653-A07B-A897800CEB76" "47D203ED-EB9B-4653-A07B-A897800CEB76" - "931DD73E-615E-476E-9B0D-8341023AE730" "2DDB6FE0-6111-4C40-A149-8E67E76F8272" "DAA69A0C-FC1E-4509-9931-DFFB38B4D6AE" + "931DD73E-615E-476E-9B0D-8341023AE730" + "B3875596-723C-41EE-9E6F-F84930C3B568" "BF4CA9F1-51CD-48D4-8357-852234F59046" "8646378E-91F5-4771-AC7C-43FC49A93576" "E07FF68B-C87D-4332-8477-D026929FDADA" @@ -822,7 +824,6 @@ "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" @@ -833,14 +834,14 @@ "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" + "E5158F94-CC52-4424-A495-14EF9272653F" + "9460392B-C036-4A76-A5AE-1191F10E4B1B" + "2C07D4E7-D74F-4AE4-82BE-B0BA82247AFA" "C649F945-DAB8-4DA2-B73C-2EFF9D7D34F3" "A83F68A9-F751-4BB4-AE16-56812878C16A" "5AE7CFB4-418E-4E00-AD76-06DB755EE876" @@ -850,131 +851,131 @@ ;; ;; Substitutions for: content ;; -;; # as in Macros/xmlread(__).yasnippet -;; F6BF907E-FDF7-4D9B-9E57-BE159561349D =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/class __ TestUnitTestCase with test_helper.yasnippet -;; (yas/multi-line-unknown 228CAB3A-E221-4727-B430-31E94F76C9D3) =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) -;; -;; # 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) -;; -;; # as in Commands/Enclose in _ (RDoc comments).yasnippet -;; DAA69A0C-FC1E-4509-9931-DFFB38B4D6AE =yyas> (yas/unknown) -;; -;; # as in Commands/Omit from RDoc.yasnippet -;; BF4CA9F1-51CD-48D4-8357-852234F59046 =yyas> (yas/unknown) +;; # as in Snippets/flunk(..) (fl).yasnippet +;; `yas/ruby-snippet-open-paren` =yyas> (yas/unknown) ;; ;; # as in Snippets/flunk(..) (fl).yasnippet ;; `yas/ruby-snippet-close-paren` =yyas> (yas/unknown) ;; -;; # as in Macros/YAML.load(file) (Yl).yasnippet -;; 2C07D4E7-D74F-4AE4-82BE-B0BA82247AFA =yyas> (yas/unknown) +;; # as in Snippets/class __ TestUnitTestCase with test_helper.tmSnippet.yasnippet +;; (yas/multi-line-unknown 228CAB3A-E221-4727-B430-31E94F76C9D3) =yyas> (yas/unknown) ;; -;; # as in Commands/Toggle StringSymbol.yasnippet -;; B297E4B8-A8FF-49CE-B9C4-6D4911724D43 =yyas> (yas/unknown) +;; # as in Snippets/Wrap in Begin Rescue End.yasnippet +;; `yas/selected-text` =yyas> (yas/unknown) ;; -;; # as in Commands/Run Rake Task.yasnippet -;; 569C9822-8C41-4907-94C7-1A8A0031B66D =yyas> (yas/unknown) +;; # as in Snippets/RDoc documentation block.yasnippet +;; `(concat (if (eq 0 current-line) "\n" "") "\n")` =yyas> (yas/unknown) ;; -;; # as in Macros/Benchmark_bmbm(__) do __ end.yasnippet -;; C649F945-DAB8-4DA2-B73C-2EFF9D7D34F3 =yyas> (yas/unknown) +;; # as in Commands/Completion Ruby (rcodetools).tmCommand.yasnippet +;; 47D203ED-EB9B-4653-A07B-A897800CEB76 =yyas> (yas/unknown) ;; -;; # as in Commands/word_wrap() (worw).yasnippet -;; 97054C4D-E4A3-45B1-9C00-B82DBCB30CAD =yyas> (yas/unknown) +;; # as in Commands/Enclose in + (RDoc comments).yasnippet +;; 2DDB6FE0-6111-4C40-A149-8E67E76F8272 =yyas> (yas/unknown) ;; -;; # as in Commands/Toggle Quote Style.yasnippet -;; 6519CB08-8326-4B77-A251-54722FFBFC1F =yyas> (yas/unknown) +;; # as in Commands/Enclose in _ (RDoc comments).yasnippet +;; DAA69A0C-FC1E-4509-9931-DFFB38B4D6AE =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 Commands/Enclose in (RDoc comments).yasnippet +;; 931DD73E-615E-476E-9B0D-8341023AE730 =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) -;; -;; # as in Commands/Completion Ruby (rcodetools).yasnippet -;; 47D203ED-EB9B-4653-A07B-A897800CEB76 =yyas> (yas/unknown) -;; -;; # 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/PStore_new( __ ).yasnippet -;; 5AE7CFB4-418E-4E00-AD76-06DB755EE876 =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/open yield block ({).yasnippet -;; `yas/selected-text` =yyas> (yas/unknown) -;; -;; # as in Macros/Delete forwardbackward.yasnippet -;; A83F68A9-F751-4BB4-AE16-56812878C16A =yyas> (yas/unknown) -;; -;; # as in Macros/each_cons(..) { group .. } (eac).yasnippet -;; EC73D5CC-5F05-46B9-A6F4-82037E4A38C9 =yyas> (yas/unknown) +;; # as in Commands/Omit from RDoc.yasnippet +;; BF4CA9F1-51CD-48D4-8357-852234F59046 =yyas> (yas/unknown) ;; ;; # as in Commands/Open Require.yasnippet ;; 8646378E-91F5-4771-AC7C-43FC49A93576 =yyas> (yas/unknown) ;; -;; # as in Commands/Enclose in (RDoc comments).yasnippet -;; 931DD73E-615E-476E-9B0D-8341023AE730 =yyas> (yas/unknown) +;; # as in Commands/RakeSake task using file path.tmCommand.yasnippet +;; E07FF68B-C87D-4332-8477-D026929FDADA =yyas> (yas/unknown) +;; +;; # as in Commands/Run Rake Task.yasnippet +;; 569C9822-8C41-4907-94C7-1A8A0031B66D =yyas> (yas/unknown) +;; +;; # as in Commands/Run.yasnippet +;; 35222962-C50D-4D58-A6AE-71E7AD980BE4 =yyas> (yas/unknown) +;; +;; # as in Commands/Toggle ERb Tags.yasnippet +;; 835FAAC6-5431-436C-998B-241F7226B99B =yyas> (yas/unknown) +;; +;; # as in Commands/Toggle StringSymbol.tmCommand.yasnippet +;; B297E4B8-A8FF-49CE-B9C4-6D4911724D43 =yyas> (yas/unknown) +;; +;; # as in Commands/Validate and Save.yasnippet +;; E0E058FC-0DC3-4872-A1C2-0B1A322A0CF5 =yyas> (yas/unknown) +;; +;; # as in Commands/Check ERB Syntax.yasnippet +;; 76FCF165-54CB-4213-BC55-BD60B9C6A3EC =yyas> (yas/unknown) +;; +;; # as in Commands/Check Ruby Syntax.yasnippet +;; EE5F19BA-6C02-11D9-92BA-0011242E4184 =yyas> (yas/unknown) +;; +;; # as in Commands/Execute Line with Ruby.yasnippet +;; EE5F1FB2-6C02-11D9-92BA-0011242E4184 =yyas> (yas/unknown) +;; +;; # as in Commands/Insert Missing Requires.yasnippet +;; 9FB64639-F776-499B-BA6F-BB45F86F80FD =yyas> (yas/unknown) +;; +;; # as in Commands/Make Destructive Call.yasnippet +;; 7F79BC8D-8A4F-4570-973B-05DFEC25747F =yyas> (yas/unknown) +;; +;; # as in Commands/New Method.yasnippet +;; 0275EF39-9357-408F-AF20-79E415CA9504 =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/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 Macros/class .. DelegateClass .. initialize .. end (class).yasnippet +;; 121B334B-2AA6-4E9A-A8B8-BF93B627982B =yyas> (yas/unknown) +;; +;; # as in Macros/each_cons(..) { group .. } (eac).yasnippet +;; EC73D5CC-5F05-46B9-A6F4-82037E4A38C9 =yyas> (yas/unknown) +;; +;; # as in Macros/each_slice(..) { group .. } (eas).yasnippet +;; 825B721D-4367-4DF7-98C0-F005695DF9E3 =yyas> (yas/unknown) +;; +;; # as in Macros/extend Forwardable (Forw).yasnippet +;; 58FDEA60-10AF-4C49-AA09-29B77030DB25 =yyas> (yas/unknown) +;; +;; # as in Macros/map_with_index { e, i .. } (mapwi).yasnippet +;; BFB65D1C-62F1-485D-8A67-3E5A2E55107C =yyas> (yas/unknown) +;; +;; # as in Macros/Overwrite } in #{ .. }.yasnippet +;; E5158F94-CC52-4424-A495-14EF9272653F =yyas> (yas/unknown) +;; +;; # as in Macros/YAML.dump(.., file) (Yd).yasnippet +;; 9460392B-C036-4A76-A5AE-1191F10E4B1B =yyas> (yas/unknown) +;; +;; # as in Macros/YAML.load(file) (Yl).yasnippet +;; 2C07D4E7-D74F-4AE4-82BE-B0BA82247AFA =yyas> (yas/unknown) +;; +;; # as in Snippets/module .. end.yasnippet +;; `(yas/ruby-infer-class-name)` =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/Benchmark_bmbm(__) do __ end.yasnippet +;; C649F945-DAB8-4DA2-B73C-2EFF9D7D34F3 =yyas> (yas/unknown) +;; +;; # as in Macros/Delete forwardbackward.tmMacro.yasnippet +;; A83F68A9-F751-4BB4-AE16-56812878C16A =yyas> (yas/unknown) +;; +;; # as in Macros/PStore_new( __ ).yasnippet +;; 5AE7CFB4-418E-4E00-AD76-06DB755EE876 =yyas> (yas/unknown) +;; +;; # as in Macros/xmlread(__).yasnippet +;; F6BF907E-FDF7-4D9B-9E57-BE159561349D =yyas> (yas/unknown) ;; ;; @@ -990,17 +991,26 @@ ;; Substitutions for: binding ;; +;; # as in Commands/Completion Ruby (rcodetools).tmCommand.yasnippet +;; ~ =yyas> (yas/unknown) +;; ;; # as in Commands/Enclose in + (RDoc comments).yasnippet ;; @k =yyas> (yas/unknown) ;; -;; # as in Commands/Check Ruby Syntax.yasnippet -;; ^V =yyas> (yas/unknown) -;; ;; # as in Commands/Omit from RDoc.yasnippet ;; ^@O =yyas> (yas/unknown) ;; -;; # as in Snippets/hash pointer.yasnippet -;; ^l =yyas> (yas/unknown) +;; # as in Commands/Open Require.yasnippet +;; @D =yyas> (yas/unknown) +;; +;; # as in Commands/Validate and Save.yasnippet +;; @s =yyas> (yas/unknown) +;; +;; # as in Commands/Check Ruby Syntax.yasnippet +;; ^V =yyas> (yas/unknown) +;; +;; # as in Commands/Execute Line with Ruby.yasnippet +;; ^E =yyas> (yas/unknown) ;; ;; # as in Commands/Make Destructive Call.yasnippet ;; ^! =yyas> (yas/unknown) @@ -1008,22 +1018,13 @@ ;; # as in Commands/Toggle Quote Style.yasnippet ;; ^" =yyas> (yas/unknown) ;; -;; # as in Commands/Open Require.yasnippet -;; @D =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 Snippets/hash pointer.yasnippet +;; ^l =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 +;; # as in Macros/Delete forwardbackward.tmMacro.yasnippet ;;  =yyas> (yas/unknown) ;; ;; diff --git a/yasnippet.el b/yasnippet.el index 387e5a9..8456b75 100644 --- a/yasnippet.el +++ b/yasnippet.el @@ -1455,6 +1455,10 @@ Here's a list of currently recognized directives: ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Popping up for keys and templates ;; +(defvar yas/x-pretty-prompt-templates nil + "If non-nil, attempt to prompt for templates like TextMate.") + + (defun yas/prompt-for-template (templates &optional prompt) "Interactively choose a template from the list TEMPLATES. @@ -1517,8 +1521,6 @@ TEMPLATES is a list of `yas/template'." (or chosen (keyboard-quit))))) -(defvar yas/x-pretty-prompt-templates nil - "If non-nil, attempt to prompt for templates like TextMate.") (defun yas/x-pretty-prompt-templates (prompt templates) "Display TEMPLATES, grouping neatly by table name." (let ((pretty-alist (list))