-
Notifications
You must be signed in to change notification settings - Fork 2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix PHP getter and setter UltiSnips snippet #321
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Was broken due to complex regular expressions applied to $1, which made UltiSnips to complain about not knowing it. Simplified the snippet using the already working getter and setter snippets.
This should be reported on the ultisnips repo. |
@honza IMHO this is not a UltiSnips bug, seems more like a bogus snippet. My commit just modifies the snippet to make it work again. Did I send the PR to the wrong repo? Is there a dedicated repo for UltiSnips snippets that gets regularly merged into this one? |
SirVer
added a commit
that referenced
this pull request
Mar 19, 2014
PHP, Ultisnips: Fix getter and setter snippets that contained an invalid reference.
darookee
added a commit
to darookee/vim-snippets
that referenced
this pull request
Jun 13, 2014
commit f3421aa Merge: 405aff0 33803e6 Author: Honza Pokorny <me@honza.ca> Date: Thu Jun 12 04:42:33 2014 -0300 Merge pull request honza#386 from cirosantilli/anchor-clipboard Add HTML `ac` Anchor from Clipboard. commit 405aff0 Merge: 92575e1 106d004 Author: Honza Pokorny <me@honza.ca> Date: Wed Jun 11 14:17:07 2014 -0300 Merge pull request honza#385 from 0hansen/master Corrections and singleton pattern for java commit 33803e6 Author: Ciro Santilli <ciro.santilli@gmail.com> Date: Wed Jun 11 17:09:13 2014 +0200 Add ac Anchor from Clipboard. commit 106d004 Merge: ad254f8 92575e1 Author: Ole Hansen <ole.hansen@fortis-it.de> Date: Wed Jun 11 15:33:02 2014 +0200 Merge branch 'master' of https://github.com/honza/vim-snippets commit ad254f8 Author: Ole Hansen <ole.hansen@fortis-it.de> Date: Wed Jun 11 15:31:01 2014 +0200 Added singleton pattern commit c24c99c Author: Ole Hansen <ole.hansen@fortis-it.de> Date: Wed Jun 11 11:37:36 2014 +0200 Corrected constructor call commit 92575e1 Merge: 7d055aa 32d8eaf Author: Holger Rapp <SirVer@gmx.de> Date: Tue Jun 10 19:26:04 2014 +0200 Merge pull request honza#382 from lpil/master CSS: pseudo elements & classes commit 7d055aa Merge: e77a704 64a4d3c Author: Holger Rapp <SirVer@gmx.de> Date: Tue Jun 10 19:25:47 2014 +0200 Merge pull request honza#383 from 0hansen/master Java: fixed some issues and added declarations for collections commit 64a4d3c Author: Ole Hansen <ole.hansen@fortis-it.de> Date: Mon Jun 9 19:10:02 2014 +0200 Added declarations for common collections: d.al = declare array list; d.hm = declare hash map; d.hs = declare hash set; d.st = declare stack commit e5293e3 Author: Ole Hansen <ole.hansen@fortis-it.de> Date: Mon Jun 9 17:34:32 2014 +0200 Added a trailing space to java snippets that will be followed by a space. commit 0ec9a04 Author: Ole Hansen <ole.hansen@fortis-it.de> Date: Mon Jun 9 17:29:58 2014 +0200 Inserting filenames was not working for java snippets. Fixed by supplying the "$1" argument instead of an empty String. commit e77a704 Merge: 2626c45 b76fe5e Author: Holger Rapp <SirVer@gmx.de> Date: Mon Jun 9 12:53:42 2014 +0200 Merge pull request honza#380 from emzap79/rsnips R: a bunch of clever snippets. commit 32d8eaf Author: Louis <louis@lpil.co.uk> Date: Mon Jun 9 10:46:15 2014 +0100 CSS pseudo elements & classes commit b76fe5e Author: emzap79 <kaktuuus@gmx.de> Date: Mon Jun 9 10:31:58 2014 +0200 add cleaned-up snippets for R commit 2626c45 Merge: 9c7ecb5 ee3900a Author: Honza Pokorny <me@honza.ca> Date: Mon Jun 9 02:47:13 2014 -0300 Merge pull request honza#379 from mjipeo/master Replace spaces with tabs to avoid Python syntax error commit ee3900a Author: Minjong Chung <mjipeo@gmail.com> Date: Mon Jun 9 14:42:09 2014 +0900 Replace spaces with tabs to avoid Python syntax error commit 9c7ecb5 Merge: 45bcd32 1eeef03 Author: Honza Pokorny <me@honza.ca> Date: Sun Jun 8 15:25:05 2014 -0300 Merge pull request honza#378 from Vorzard/master Add snippet for the AGPLv3 license commit 1eeef03 Author: Vorzard <vorzard@betterjapanese.org> Date: Sun Jun 8 17:18:29 2014 +0200 Add AGPL3 commit 45bcd32 Merge: c3db5be b0733ed Author: Holger Rapp <SirVer@gmx.de> Date: Sun Jun 1 12:57:23 2014 +0200 Merge pull request honza#373 from Sawyer47/rust-fix Rust: fixes and one new snippet. commit b0733ed Author: Piotr Jawniak <sawyer47@gmail.com> Date: Sun Jun 1 10:12:07 2014 +0200 One new snippet and one small fix for Rust commit c3db5be Merge: 8ee2c03 c80c281 Author: Holger Rapp <SirVer@gmx.de> Date: Sat May 31 15:51:40 2014 +0200 Merge pull request honza#372 from Sawyer47/rust-snippets Rust: new snippets and cleanup. commit c80c281 Author: Piotr Jawniak <sawyer47@gmail.com> Date: Sat May 31 13:40:59 2014 +0200 New snippets and cleanup for Rust commit 8ee2c03 Merge: 5470b2f 0100f9c Author: Holger Rapp <SirVer@gmx.de> Date: Sat May 31 12:04:12 2014 +0200 Merge pull request honza#371 from rsw0x/master d: Fixed final switch commit 0100f9c Author: rsw0x <avoret@debian.c720> Date: Wed May 28 06:48:18 2014 -0400 Fixed final switch in the UltiSnippets snippet commit 5470b2f Merge: d2455bb d5e0cc5 Author: Holger Rapp <SirVer@gmx.de> Date: Thu May 22 16:43:08 2014 -0700 Merge pull request honza#368 from Nighoo/master sh: Add escaping of $ commit d2455bb Merge: debd257 8c2dd2b Author: Holger Rapp <SirVer@gmx.de> Date: Thu May 22 16:41:54 2014 -0700 Merge pull request honza#369 from majjoha/master Remove line breaks after snippets. commit 8c2dd2b Author: majjoha <mathias@mjj.io> Date: Thu May 22 15:30:56 2014 +0200 Remove line breaks after snippets. commit d5e0cc5 Author: Nico Suhl <nico@overninethousand.de> Date: Thu May 22 15:09:58 2014 +0200 Add escaping of $ without escaping the snippet can not be expanded commit debd257 Merge: 4ed4091 9548538 Author: Holger Rapp <SirVer@gmx.de> Date: Mon May 19 06:32:04 2014 -0700 Merge pull request honza#367 from tebeka/go-test Go: test and benchmark functions snippets. commit 9548538 Author: Miki Tebeka <miki.tebeka@gmail.com> Date: Sun May 18 12:57:53 2014 +0300 description after trigger commit fb0a6fc Author: Miki Tebeka <miki.tebeka@gmail.com> Date: Sun May 18 07:49:08 2014 +0300 Better name commit 84d9764 Author: Miki Tebeka <miki.tebeka@gmail.com> Date: Sat May 17 07:11:35 2014 +0300 Snippets for Go test and benchmark functions commit 4ed4091 Merge: 1406df6 2672bde Author: Holger Rapp <SirVer@gmx.de> Date: Mon May 12 05:23:07 2014 -0700 Merge pull request honza#360 from lucc/descriptions tex,vim: add snippet descriptions commit 1406df6 Merge: 8ee0f3a 7adbe2e Author: Holger Rapp <SirVer@gmx.de> Date: Mon May 12 05:22:01 2014 -0700 Merge pull request honza#365 from joshaw/master java: Add missing semicolons and anchors commit 7adbe2e Merge: 0326b5b 8ee0f3a Author: Josh Wainwright <wainwright.ja@gmail.com> Date: Thu May 8 08:59:34 2014 +0100 Merge branch 'master' of https://github.com/honza/vim-snippets commit 0326b5b Author: Josh Wainwright <wainwright.ja@gmail.com> Date: Thu May 8 08:48:09 2014 +0100 Use more readable format for snippets including ending semi-colon. commit 3cb1383 Author: Josh Wainwright <wainwright.ja@gmail.com> Date: Thu May 8 08:47:05 2014 +0100 Removed implicit $0 at end of snippent commit 8ee0f3a Merge: 9376b6e e7f047b Author: Honza Pokorny <me@honza.ca> Date: Thu May 8 03:05:58 2014 -0300 Merge pull request honza#364 from pgilad/patch-1 Add useful javascript snippets commit 33830ae Author: Josh Wainwright <wainwright.ja@gmail.com> Date: Wed May 7 22:46:43 2014 +0100 Added couple of $0 anchors where missing. commit 2438821 Author: Josh Wainwright <wainwright.ja@gmail.com> Date: Wed May 7 22:45:53 2014 +0100 Added semi-colons to end of lines where missing. commit e7f047b Author: Gilad Peleg <giladp007@gmail.com> Date: Wed May 7 15:10:33 2014 +0300 Update javascript.snippets commit 98b1b48 Author: Gilad Peleg <giladp007@gmail.com> Date: Wed May 7 15:09:41 2014 +0300 add b flag and edit placeholder commit d0d1e59 Author: Gilad Peleg <giladp007@gmail.com> Date: Wed May 7 10:19:01 2014 +0300 Add useful javascript snippets commit 2672bde Author: Lucas Hoffmann <l-m-h@web.de> Date: Tue May 6 14:53:52 2014 +0200 add snippet options to some snippets commit 27c2c2b Author: Lucas Hoffmann <l-m-h@web.de> Date: Tue May 6 14:52:35 2014 +0200 add quotation marks commit da157ef Author: Lucas Hoffmann <l-m-h@web.de> Date: Tue May 6 09:16:15 2014 +0200 add snippet descriptions commit 85004a6 Author: Lucas Hoffmann <l-m-h@web.de> Date: Tue May 6 08:41:56 2014 +0200 add snippet descriptions commit 9376b6e Author: Marc Weber <marco-oweber@gmx.de> Date: Tue May 6 13:13:44 2014 +0200 merging "contributing notes" into "Policies for contributors" - thanks lucc commit 2f5e1da Author: Marc Weber <marco-oweber@gmx.de> Date: Tue May 6 13:09:47 2014 +0200 fix commit 08afc0e Author: Marc Weber <marco-oweber@gmx.de> Date: Tue May 6 12:22:24 2014 +0200 allow discussing UltiSnips & snipmate snippets commit 31d2239 Merge: 27189f6 7011d0f Author: Honza Pokorny <me@honza.ca> Date: Tue May 6 06:46:17 2014 -0300 Merge pull request honza#362 from lucc/duplicates remove some duplicates commit 7011d0f Author: Lucas Hoffmann <l-m-h@web.de> Date: Tue May 6 11:31:43 2014 +0200 remove some duplicates Remove some snippets from the Ultisnips/ directory which are present in the snippets/ directory. commit 27189f6 Merge: 9d8a666 71ac9c8 Author: Marc Weber <marco-oweber@gmx.de> Date: Tue May 6 11:09:07 2014 +0200 Merge pull request honza#361 from lucc/vundle-api-change update vim snippet for plugin definition with Vundle.vim commit 71ac9c8 Author: Lucas Hoffmann <l-m-h@web.de> Date: Tue May 6 09:19:30 2014 +0200 update vim snippet for plugin definition with Vundle.vim Vundle has changed it's public API. The Bundle command is deprecated. See https://github.com/gmarik/Vundle.vim/blob/v0.10/doc/vundle.txt#L372 commit 9d8a666 Author: Louis <louis@lpil.co.uk> Date: Thu May 1 19:49:00 2014 +0100 Add snipmate style rust snippets commit a066d60 Author: Marc Weber <marco-oweber@gmx.de> Date: Mon May 5 17:44:05 2014 +0200 document vs snipmate should be deprecated: not yet commit 8d619ac Author: dhilipsiva <dhilipsiva@gmail.com> Date: Mon May 5 20:12:02 2014 +0530 Indentation missing. commit b57a972 Merge: eed8762 ae24661 Author: Holger Rapp <SirVer@gmx.de> Date: Mon May 5 07:49:59 2014 +0200 Merge pull request honza#356 from lpil/readme Correct readme link formatting commit eed8762 Merge: 0f7742f 519c3be Author: Holger Rapp <SirVer@gmx.de> Date: Mon May 5 07:49:27 2014 +0200 Merge pull request honza#353 from dhilipsiva/master scheme: First snippets commit 0f7742f Merge: d43f278 5eec8a1 Author: Honza Pokorny <me@honza.ca> Date: Fri May 2 16:43:31 2014 -0300 Merge pull request honza#357 from Mayeu/patch-1 Fix the "fun" snippet definition commit 5eec8a1 Author: Mayeu (Cast) <Mayeu@users.noreply.github.com> Date: Fri May 2 20:03:59 2014 +0200 Fix the "fun" snippet definition At line 96, the definition for the snippet "fun" was using spaces instead of tabs commit ae24661 Author: Louis <lpil@users.noreply.github.com> Date: Thu May 1 23:34:52 2014 +0100 Update README.md commit 8aea906 Author: Louis <louis@lpil.co.uk> Date: Thu May 1 21:05:39 2014 +0100 Correct readme link formatting commit d43f278 Merge: 995ab73 2f9bb96 Author: Honza Pokorny <me@honza.ca> Date: Thu May 1 12:36:15 2014 -0300 Merge pull request honza#354 from vim-guru/master Replaced charset property to the html5 equivalent commit 2f9bb96 Author: Henrik Kjelsberg <hkjels@me.com> Date: Thu May 1 14:34:30 2014 +0200 Replaced charset property to the html5 equivalent Also, most html5 style-guides do not use ending slashes with self-closing tags. commit 519c3be Author: dhilipsiva <dhilipsiva@gmail.com> Date: Thu May 1 11:45:06 2014 +0530 Add Scheme snippets commit 995ab73 Merge: fa8778d 18d24cb Author: Honza Pokorny <me@honza.ca> Date: Wed Apr 30 05:58:14 2014 -0300 Merge pull request honza#352 from feju/master Various new snippets and fixes commit 18d24cb Author: Felix Jung <felix@jung.fm> Date: Wed Apr 30 10:14:49 2014 +0200 Indenting label in align environment commit 0561ba6 Author: Felix Jung <felix@jung.fm> Date: Wed Apr 30 10:14:30 2014 +0200 Fixed sapply snippet commit ebbd6a8 Merge: aefcab6 fa8778d Author: Felix Jung <felix@jung.fm> Date: Wed Apr 30 10:09:15 2014 +0200 Merge remote-tracking branch 'upstream/master' commit fa8778d Merge: ec9a7a5 1d5adc3 Author: Holger Rapp <SirVer@gmx.de> Date: Tue Apr 29 09:27:32 2014 +0200 Merge pull request honza#350 from tinyladi/master Pandoc, markdown: Inline code and code block snippets. Create pandoc.snippets commit 1d5adc3 Author: tinyladi <ladislas@weareleka.com> Date: Mon Apr 28 14:40:10 2014 +0200 add priority and inword option commit a34551b Author: tinyladi <ladislas@weareleka.com> Date: Mon Apr 28 12:48:59 2014 +0200 add codeblock and inline code snippets to markdown.snippets commit 8fe8605 Author: tinyladi <ladislas@weareleka.com> Date: Mon Apr 28 12:36:54 2014 +0200 create pandoc.snippets & extend markdown.snippets commit ec9a7a5 Merge: 8efe43e 74ef5cb Author: Holger Rapp <SirVer@gmx.de> Date: Fri Apr 25 06:45:54 2014 +0200 Merge pull request honza#348 from r4d2/master R: Fixed for loop syntax and added while commit 74ef5cb Author: r4d2 <patrick.flick@gmail.com> Date: Thu Apr 24 21:14:50 2014 -0400 Add R for and while snippets commit 5edbfec Author: r4d2 <patrick.flick@gmail.com> Date: Thu Apr 24 21:14:31 2014 -0400 Fix syntax in R for loop commit 8efe43e Merge: ebdc61f ed8c39b Author: Eustáquio Rangel <eustaquiorangel@gmail.com> Date: Wed Apr 23 22:41:41 2014 -0300 Merge pull request honza#347 from kurko/add_brackets_to_ruby_let Adds brackets to RSpec's let() commit ed8c39b Author: Alexandre de Oliveira <chavedomundo@gmail.com> Date: Wed Apr 23 17:59:28 2014 -0300 Adds brackets to RSpec's let() commit ebdc61f Merge: c17df81 b1af469 Author: Holger Rapp <SirVer@gmx.de> Date: Mon Apr 21 20:44:57 2014 +0200 Merge pull request honza#346 from RyanPineo/master Javascript: Add angular snippets. commit b1af469 Author: Ryan Pineo <ryanpineo@gmail.com> Date: Mon Apr 21 14:12:28 2014 -0400 Rename angular config. Add angular controller. commit ec97308 Author: Ryan Pineo <ryanpineo@gmail.com> Date: Mon Apr 21 14:07:28 2014 -0400 Add angular snippets. Add two jasmine snippets for use with angular that prepoulate the "it" and "before" functions with "inject". Add an angular config snippet. commit c17df81 Merge: 44d6f6a 7b5d7de Author: Holger Rapp <SirVer@gmx.de> Date: Sun Apr 20 21:12:51 2014 +0200 Merge pull request honza#345 from dcbishop/cleanups c, cpp, d, rust: Cleanups. commit 7b5d7de Author: David C. Bishop <david@davidbishop.org> Date: Fri Apr 18 18:10:50 2014 +1000 Remove /* code */ placeholders from c, cpp and d. commit 28fc195 Author: David C. Bishop <david@davidbishop.org> Date: Fri Apr 18 18:08:13 2014 +1000 Add b option to rust snippets. commit 7af4b8f Author: David C. Bishop <david@davidbishop.org> Date: Fri Apr 18 18:04:17 2014 +1000 Remove /* code */ placeholders in rust.snippets. commit dba38fc Author: David C. Bishop <david@davidbishop.org> Date: Fri Apr 18 18:02:36 2014 +1000 Add 'priority -50' to rust.snippets. commit 44d6f6a Merge: 0023135 f770dab Author: Holger Rapp <SirVer@gmx.de> Date: Thu Apr 17 21:52:43 2014 +0200 Merge pull request honza#344 from dbarnett/soy Soy: Add snippets for soy filetype (a.k.a. closure templates) commit f770dab Author: David Barnett <davidbarnett2@gmail.com> Date: Wed Apr 16 09:03:41 2014 -0700 Add "priority -50" to UltiSnips/soy.snippets commit aefcab6 Author: Felix Jung <felix@jung.fm> Date: Wed Apr 16 14:50:14 2014 +0200 Changed frame snippet commit 66c2a0b Merge: fc50b15 0023135 Author: Felix Jung <felix@jung.fm> Date: Wed Apr 16 14:46:32 2014 +0200 Merge remote-tracking branch 'upstream/master' commit 0023135 Author: Holger Rapp <HolgerRapp@gmx.net> Date: Wed Apr 16 08:19:50 2014 +0200 Remove placeholder text in proto snippets. commit 9a7a600 Merge: 0370652 593a3b7 Author: Honza Pokorny <me@honza.ca> Date: Tue Apr 15 04:23:58 2014 -0300 Merge pull request honza#342 from WnP/patch-2 key word argument get (kwg) commit 0b8a04f Author: David Barnett <davidbarnett2@gmail.com> Date: Mon Apr 14 20:57:59 2014 -0700 Add snippets for soy filetype (a.k.a. closure templates) commit 593a3b7 Author: Steeve <mo0ofier@gmail.com> Date: Mon Apr 14 12:30:29 2014 +0200 lkwg LocalKeyWordargumentGet commit 7f65658 Author: Steeve <mo0ofier@gmail.com> Date: Mon Apr 14 12:28:03 2014 +0200 remove useless $0 commit 0370652 Merge: 4b9f18c cf39d41 Author: Holger Rapp <SirVer@gmx.de> Date: Mon Apr 14 08:07:30 2014 +0200 Merge pull request honza#343 from dbarnett/proto Proto: Added snippets for Googles protobufs. commit cf39d41 Author: David Barnett <davidbarnett2@gmail.com> Date: Sun Apr 13 22:58:20 2014 -0700 rm unnecessary empty lines commit 3f3b2d5 Author: David Barnett <davidbarnett2@gmail.com> Date: Sun Apr 13 09:17:57 2014 -0700 Add tabstop for message body commit e3c6399 Author: David Barnett <davidbarnett2@gmail.com> Date: Sun Apr 13 09:11:58 2014 -0700 Add type completions commit 280f775 Merge: 76a4d7e 4b9f18c Author: David Barnett <davidbarnett2@gmail.com> Date: Sun Apr 13 08:52:27 2014 -0700 Merge branch 'master' of https://github.com/honza/vim-snippets into proto commit 4b9f18c Author: Holger Rapp <HolgerRapp@gmx.net> Date: Sun Apr 13 10:24:56 2014 +0200 Add a common pythonx directory containing helper methods for snippets. commit 76a4d7e Author: David Barnett <davidbarnett2@gmail.com> Date: Fri Apr 11 21:49:14 2014 -0700 Add message and field snippets for proto filetype commit 8770132 Merge: 5db783d 039a1c0 Author: Holger Rapp <SirVer@gmx.de> Date: Thu Apr 10 21:28:43 2014 +0200 Merge pull request honza#341 from pgilad/patch-1 HTML: update meta charset commit fea2ddc Author: Steeve <mo0ofier@gmail.com> Date: Thu Apr 10 11:17:29 2014 +0200 key word argument get (kwg) a common usage -especially when overloading class- is to use `*args` array and `**kwargs` dictionary to handle method's arguments this snippet is usefull to quickly get the argument value from the keyword arguments dictionary -kwargs- or setting a default value commit 039a1c0 Author: Gilad Peleg <giladp007@gmail.com> Date: Thu Apr 10 12:13:17 2014 +0300 update meta charset in html commit 5db783d Merge: 9b6ee51 fa6d71e Author: Honza Pokorny <me@honza.ca> Date: Wed Apr 9 14:29:13 2014 -0300 Merge pull request honza#340 from WnP/patch-1 add def overloading method (dol) commit fa6d71e Author: Steeve <mo0ofier@gmail.com> Date: Wed Apr 9 12:27:32 2014 +0200 add def overloading methode (dol) I add it because I use it many times a day -not only for the `__init__` method- this snippet is very useful to me, no need to call super and handle all args and kwargs, and no more typo errors :D commit 9b6ee51 Merge: e69e510 513fad9 Author: Steven Oliver <oliver.steven@gmail.com> Date: Tue Apr 8 11:04:04 2014 -0400 Merge pull request honza#339 from dcbishop/patch-1 Add rust.snippets Awesome. Thanks! commit 513fad9 Author: David C. Bishop <david@davidbishop.org> Date: Wed Apr 9 00:18:29 2014 +1000 Add rust.snippets commit e69e510 Merge: ecb5407 0c4960a Author: Honza Pokorny <me@honza.ca> Date: Tue Apr 8 10:36:42 2014 -0300 Merge pull request honza#338 from maxirobaina/master Fixed honza#335 - django snippet fix model save method commit 0c4960a Author: Maximiliano Robaina <maxirobaina@gmail.com> Date: Tue Apr 8 09:35:15 2014 -0300 Fixed honza#335 - django snippet fix model save method commit ecb5407 Merge: e89d9af 40f1db9 Author: Honza Pokorny <me@honza.ca> Date: Mon Apr 7 14:25:30 2014 -0300 Merge pull request honza#337 from maxirobaina/master Added new django fields types commit 40f1db9 Author: Maximiliano Robaina <maxirobaina@gmail.com> Date: Mon Apr 7 13:41:38 2014 -0300 Added new django fields types commit e89d9af Merge: 0d64ef6 8f9a7e3 Author: Holger Rapp <SirVer@gmx.de> Date: Mon Apr 7 08:00:48 2014 +0200 Merge pull request honza#334 from lavrin/master Erlang: Import gen_fsm and gen_event snippets from Vimerl commit 8f9a7e3 Author: Radosław Szymczyszyn <radoslaw.szymczyszyn@erlang-solutions.com> Date: Tue Apr 1 14:35:02 2014 +0200 Add gen_fsm and gen_event imported from vimerl commit fcce90d Author: Radosław Szymczyszyn <radoslaw.szymczyszyn@erlang-solutions.com> Date: Tue Apr 1 14:33:47 2014 +0200 Reindent gen_server export list commit 0d64ef6 Merge: 0bcf724 653a814 Author: Holger Rapp <SirVer@gmx.de> Date: Tue Apr 1 07:42:07 2014 +0200 Merge pull request honza#333 from jdavis/r R: fix snippets syntax error commit 653a814 Author: Josh Davis <josh@joshldavis.com> Date: Mon Mar 31 23:59:21 2014 -0500 Fix snippets syntax error commit 0bcf724 Merge: 6de3bb7 8c7bb5d Author: Holger Rapp <SirVer@gmx.de> Date: Tue Apr 1 06:18:28 2014 +0200 Merge pull request honza#332 from jdavis/r New R and Rnoweb snippets commit 8c7bb5d Author: Josh Davis <josh@joshldavis.com> Date: Mon Mar 31 21:11:47 2014 -0500 Remove trigger from the end of the description commit 6b5d7d3 Author: Josh Davis <josh@joshldavis.com> Date: Sun Mar 30 15:32:13 2014 -0500 Remove duplicate snippet commit d1f2316 Author: Josh Davis <josh@joshldavis.com> Date: Sun Mar 30 11:39:03 2014 -0500 Add a few more snippets, fix errors as per honza#332 Hopefully this looks better, @SirVer! commit 6de3bb7 Merge: 3924bae 87ea532 Author: Holger Rapp <SirVer@gmx.de> Date: Sun Mar 30 12:05:31 2014 +0200 Merge pull request honza#329 from RyanPineo/master Java: fix setter. camel case vars/types properly. commit bd8ef3d Author: Josh Davis <josh@joshldavis.com> Date: Sun Mar 30 01:04:00 2014 -0500 Tidy up some parts of r.snippets commit 87ea532 Author: Ryan Pineo <ryanpineo@gmail.com> Date: Sat Mar 29 20:39:14 2014 -0400 Bug fix for java case coercion helpers. If an empty tab stop was used with either of the java case coercion helper functions then they would blow up. Fixed by returning an empty string if the word passed to them is falsey. commit 55887f0 Author: Josh Davis <josh@joshldavis.com> Date: Sat Mar 29 16:52:21 2014 -0500 Add R snippets to Rnoweb commit 53f8dd5 Author: Josh Davis <josh@joshldavis.com> Date: Sat Mar 29 16:46:23 2014 -0500 Add in r.snippets file I converted these over from the snipMate r.snippets in the snippets/ directory and removed some ones. commit 77bc9bd Author: Josh Davis <josh@joshldavis.com> Date: Sat Mar 29 16:28:00 2014 -0500 Add support for rnoweb filetype Rnoweb is a filetype that combines LaTeX and R. It's used by systems like Sweave and Knitr. commit 3924bae Merge: 2ca5883 6541994 Author: Eustáquio Rangel <eustaquiorangel@gmail.com> Date: Sat Mar 29 09:57:44 2014 -0300 Merge pull request honza#330 from brandonhilkert/master Add asi => assert_includes for Ruby commit 6541994 Author: Brandon Hilkert <brandonhilkert@gmail.com> Date: Fri Mar 28 19:45:20 2014 -0400 Add asi => assert_includes commit e5f3d6b Author: Ryan Pineo <ryanpineo@gmail.com> Date: Fri Mar 28 15:32:39 2014 -0400 Change java set/get snippets to use mixedCase. The java setter and getter snippets were incorrectly formatting the set/get name as all lowercase. It should be mixed case, as per java's coding standard. A new function was made (mixedCase) to handle that. commit ad8883d Author: Ryan Pineo <ryanpineo@gmail.com> Date: Fri Mar 28 12:10:19 2014 -0400 Fix java setter method param case, remove return. The paramater was keeping the case of the setter name. It should have been lowercased. The other uses of the paramter were already lowercased correctly. There should also not be a return statement in a void method. commit 2ca5883 Merge: 7b23338 ba94750 Author: Honza Pokorny <me@honza.ca> Date: Thu Mar 27 01:42:49 2014 -0300 Merge pull request honza#328 from hallaj/master Update python.snippets commit 7b23338 Merge: dbf5851 0b673c3 Author: Honza Pokorny <me@honza.ca> Date: Thu Mar 27 01:42:30 2014 -0300 Merge pull request honza#327 from ches/fixes Scala snippets fix commit ba94750 Author: Muhammad Hallaj Subery <hallaj@users.noreply.github.com> Date: Thu Mar 27 12:08:39 2014 +0800 Update python.snippets adding code encoding. commit 0b673c3 Author: Ches Martin <ches@whiskeyandgrits.net> Date: Thu Mar 27 05:37:14 2014 +0700 Scala snippets fix commit dbf5851 Merge: 3254ebf 1d41c71 Author: Holger Rapp <SirVer@gmx.de> Date: Wed Mar 26 21:30:47 2014 +0100 Merge pull request honza#326 from RyanPineo/master java: Allow else/elif to be expanded mid line. commit 1d41c71 Author: Ryan Pineo <ryanpineo@gmail.com> Date: Wed Mar 26 15:39:47 2014 -0400 Allow java else/elif to be expanded mid line. commit 3254ebf Merge: 773c457 fc65844 Author: Eustáquio Rangel <eustaquiorangel@gmail.com> Date: Tue Mar 25 09:42:47 2014 -0300 Merge pull request honza#320 from wongyouth/add_rails_methods Add rails callback methods commit 773c457 Merge: 4f4ad36 88cd206 Author: Honza Pokorny <me@honza.ca> Date: Mon Mar 24 07:27:13 2014 -0300 Merge pull request honza#325 from jdnavarro/master Add `OPTIONS_HADDOCK` snippet commit fc65844 Author: Ryan Wang <wongyouth@gmail.com> Date: Mon Mar 24 17:51:34 2014 +0800 use m as prefix and fix conflicts with other snippets commit 88cd206 Author: Danny Navarro <j@dannynavarro.net> Date: Mon Mar 24 09:46:51 2014 +0100 Add `OPTIONS_HADDOCK` snippet commit 4f4ad36 Merge: 3ebeb6b 1ffdf75 Author: Honza Pokorny <me@honza.ca> Date: Mon Mar 24 01:51:12 2014 -0300 Merge pull request honza#324 from tUrG0n/patch-2 Added Jade Angular Snippets commit 1ffdf75 Author: Piotr Yordanov <piotr.yordanov@gmail.com> Date: Mon Mar 24 03:29:41 2014 +0000 Added Jade templates commit 3ebeb6b Merge: 4b31551 16630a5 Author: Honza Pokorny <me@honza.ca> Date: Sun Mar 23 03:21:39 2014 -0300 Merge pull request honza#323 from gfixler/master Fix spelling throughout UltiSnips/python.snippets commit 16630a5 Author: gfixler <gfixler@gmail.com> Date: Sat Mar 22 22:33:17 2014 -0700 Fix spelling throughout UltiSnips/python.snippets commit 4b31551 Merge: e868e17 391d4fe Author: Holger Rapp <SirVer@gmx.de> Date: Sat Mar 22 20:39:44 2014 +0100 Merge pull request honza#322 from RyanPineo/master Python: Add Google style docstring support. commit 391d4fe Author: Ryan Pineo <ryanpineo@gmail.com> Date: Sat Mar 22 15:03:16 2014 -0400 Add python google style docstrings. commit fc50b15 Author: Felix Jung <felix@jung.fm> Date: Fri Mar 21 14:21:33 2014 +0100 Syntax changes in accordance with Google. commit 734a8b3 Merge: ab0e535 e868e17 Author: Felix Jung <felix@jung.fm> Date: Fri Mar 21 14:07:44 2014 +0100 Merge remote-tracking branch 'upstream/master' commit e868e17 Merge: 8c1fadf db3b240 Author: Holger Rapp <SirVer@gmx.de> Date: Wed Mar 19 19:00:47 2014 +0100 Merge pull request honza#321 from adoboPullRequests/master PHP, Ultisnips: Fix getter and setter snippets that contained an invalid reference. commit db3b240 Author: Jorge López Pérez <jorge@adobo.org> Date: Wed Mar 19 14:43:08 2014 +0100 Fix PHP getter and setter UltiSnips snippet Was broken due to complex regular expressions applied to $1, which made UltiSnips to complain about not knowing it. Simplified the snippet using the already working getter and setter snippets. commit dfc456e Author: Ryan Wang <wongyouth@gmail.com> Date: Sat Mar 15 00:32:23 2014 +0800 respect the convention commit 7924eee Author: Ryan Wang <wongyouth@gmail.com> Date: Fri Mar 14 23:00:50 2014 +0800 change abbreviation to c for controller commit 9371c64 Author: Ryan Wang <wongyouth@gmail.com> Date: Wed Mar 12 13:35:17 2014 +0800 add rails callbak methods commit b2a91d1 Author: Ryan Wang <wongyouth@gmail.com> Date: Wed Mar 12 13:04:54 2014 +0800 add options_for_select add method `options_for_select` from Rails. commit ab0e535 Author: Felix Jung <felix@jung.fm> Date: Thu Mar 6 17:10:53 2014 +0100 Fixed indentation issue commit 7ce665e Author: Felix Jung <felix@jung.fm> Date: Thu Mar 6 16:59:09 2014 +0100 Fixed citation snippets and added citea and citey commit 56324b8 Author: Felix Jung <felix@jung.fm> Date: Thu Mar 6 15:15:01 2014 +0100 Added label snippet and added labels to ali and eq commit 8c1fadf Author: Holger Rapp <HolgerRapp@gmx.net> Date: Wed Mar 5 08:52:50 2014 +0100 fixed a syntax error in vim.snippets. commit 929acee Author: Holger Rapp <HolgerRapp@gmx.net> Date: Wed Mar 5 06:44:16 2014 +0100 Adjusted priority again. commit 215c567 Author: Sebastian Röder <no-spam-github@sebastianroeder.de> Date: Sat Mar 1 21:35:27 2014 +0100 Add back closing curly braces for puppet type snippets This braces got lost when honza#70 was merged commit b327c8a Author: Holger Rapp <HolgerRapp@gmx.net> Date: Tue Mar 4 17:47:04 2014 +0100 Remove credit line as requested. commit 39fe0b5 Author: Holger Rapp <HolgerRapp@gmx.net> Date: Tue Mar 4 17:46:35 2014 +0100 Adjusted priority. commit 85801ca Merge: 9b0e054 a93d2e8 Author: Holger Rapp <SirVer@gmx.de> Date: Tue Mar 4 17:37:31 2014 +0100 Merge pull request honza#317 from Carif/master HTML form : change get to post, remove accept-charset commit a93d2e8 Author: Florent Lévigne <florent.levigne@mailoo.org> Date: Tue Mar 4 15:10:32 2014 +0100 remove accept-charset attribute from form commit 2d63c6a Author: Florent Lévigne <florent.levigne@mailoo.org> Date: Tue Mar 4 15:08:47 2014 +0100 change default method to post commit 9b0e054 Merge: d5ae1f7 f723f0d Author: Honza Pokorny <me@honza.ca> Date: Tue Mar 4 05:00:19 2014 -0400 Merge pull request honza#316 from honza/readme-fix Remove remaining of old block of code in README commit f723f0d Author: Iuri Fernandes <iurifq@gmail.com> Date: Tue Mar 4 09:37:15 2014 +0100 Remove remaining of old block of code in README commit d5ae1f7 Author: Marc Weber <marco-oweber@gmx.de> Date: Tue Mar 4 09:26:10 2014 +0100 changes for README from SirVers 32650 (last commit of last PR) commit 26ff066 Author: Marc Weber <marco-oweber@gmx.de> Date: Mon Mar 3 08:56:08 2014 +0100 dropping AUTHORS file reasons: * maintaining it adds overhead * git tracks ownership of changes This is also what SirVer included in his pull request commit 59dcc2b Author: Holger Rapp <HolgerRapp@gmx.net> Date: Wed Feb 26 09:31:33 2014 +0100 Brings current UltiSnips snippets into the repository. commit 3f7061a Merge: c022251 9bee487 Author: Honza Pokorny <me@honza.ca> Date: Mon Mar 3 05:38:13 2014 -0400 Merge pull request honza#305 from tUrG0n/master Big Enhancements for Coffeescript. Fixed Bugs with js commit c022251 Merge: de15458 68cb7d8 Author: Honza Pokorny <me@honza.ca> Date: Fri Feb 28 11:33:49 2014 -0400 Merge pull request honza#314 from Carif/perso remove border attribute for table tag commit 68cb7d8 Author: Florent Lévigne <florent.levigne@obspm.fr> Date: Fri Feb 28 15:03:44 2014 +0100 remove border attribute for table tag commit de15458 Merge: 6890f2d 190b3d4 Author: Iuri Fernandes <iurifq@gmail.com> Date: Wed Feb 26 17:22:19 2014 +0100 Merge pull request honza#312 from majjoha/master Fix stupid typo. commit 190b3d4 Author: majjoha <mathias@mjj.io> Date: Wed Feb 26 16:41:19 2014 +0100 Fix stupid typo. commit 6890f2d Merge: 736cdf0 66545e1 Author: Honza Pokorny <me@honza.ca> Date: Fri Feb 21 05:32:03 2014 -0400 Merge pull request honza#310 from majjoha/master Add define snippet with no block. commit 66545e1 Author: majjoha <mathias@mjj.io> Date: Fri Feb 21 07:02:23 2014 +0100 Add define snippet with no block. commit 736cdf0 Merge: a7b6109 5063a02 Author: Holger Rapp <SirVer@gmx.de> Date: Mon Feb 17 12:00:14 2014 +0100 Merge pull request honza#309 from Reen/master UltiSnips/tex: Remove space at end of \section commit 5063a02 Author: René <rene@habr.de> Date: Mon Feb 17 10:37:44 2014 +0100 Remove space at end of \section commit a7b6109 Merge: 9cf1363 c7d3ce0 Author: Iuri Fernandes <iurifq@gmail.com> Date: Mon Feb 17 09:12:47 2014 +0100 Merge pull request honza#308 from robertomiranda/patch-1 Add before_action snippet (Rails) commit c7d3ce0 Author: Roberto Miranda <rjmaltamar@gmail.com> Date: Sun Feb 16 21:54:19 2014 -0500 Add before_action snippet commit 9cf1363 Author: Marc Weber <marco-oweber@gmx.de> Date: Fri Feb 7 12:58:05 2014 +0100 typo, turn names into links commit ad40a2e Author: Marc Weber <marco-oweber@gmx.de> Date: Thu Feb 6 18:29:28 2014 +0100 reference pull request because the work has been done commit 65e0266 Author: Marc Weber <marco-oweber@gmx.de> Date: Thu Feb 6 18:24:54 2014 +0100 fixes honza#307 commit c90e10e Merge: 22b1a14 7c3dc8a Author: Honza Pokorny <me@honza.ca> Date: Tue Jan 7 10:45:19 2014 -0800 Merge pull request honza#306 from strider/master Applied puppet style guide commit 7c3dc8a Author: Gaël Chamoulaud <gael@redhat.com> Date: Tue Jan 7 17:21:54 2014 +0100 Applied puppet style guide commit 9bee487 Author: tUrG0n <piotr.yordanov@gmail.com> Date: Sun Jan 5 11:45:24 2014 +0200 Added jsonp and jsons to coffee.snippet commit bd04745 Author: tUrG0n <piotr.yordanov@gmail.com> Date: Sun Jan 5 11:42:30 2014 +0200 Moved all javascritp into a javascript. Otherwise, snipmate simply doesnt read them commit c52b4d1 Author: tUrG0n <piotr.yordanov@gmail.com> Date: Sun Jan 5 11:42:01 2014 +0200 Converted jquery-js to jquery-coffee commit 22b1a14 Merge: 368e9d2 e9ece38 Author: Honza Pokorny <me@honza.ca> Date: Thu Jan 2 22:56:22 2014 -0800 Merge pull request honza#304 from tUrG0n/patch-1 Added Ajax for Coffescript commit e9ece38 Author: Piotr Yordanov <piotr.yordanov@gmail.com> Date: Fri Jan 3 06:37:03 2014 +0000 Added Ajax for Coffescript commit 368e9d2 Merge: ef252f3 3a5001d Author: Honza Pokorny <me@honza.ca> Date: Thu Dec 26 10:02:27 2013 -0800 Merge pull request honza#302 from chrisyue/master fix twig css commit 3a5001d Author: yuhuanbo <yuhuanbo@fabei.net> Date: Thu Dec 26 21:31:30 2013 +0800 fix twig css commit ef252f3 Merge: 93f677f aef52d6 Author: Honza Pokorny <me@honza.ca> Date: Wed Dec 25 20:42:51 2013 -0800 Merge pull request honza#301 from alex-ross/slim Adds slim. commit aef52d6 Author: Alexander Ross <izepax@gmail.com> Date: Wed Dec 25 01:34:33 2013 +0100 Adds slim. commit 93f677f Merge: acf7dc3 218eb0a Author: Honza Pokorny <me@honza.ca> Date: Sun Dec 15 21:18:20 2013 -0800 Merge pull request honza#299 from chrisyue/master add twig snippets commit 218eb0a Author: yuhuanbo <yuhuanbo@fabei.net> Date: Sun Dec 8 18:35:27 2013 +0800 add twig snippets commit acf7dc3 Merge: c8faad0 4f31132 Author: Honza Pokorny <me@honza.ca> Date: Sun Dec 8 21:28:38 2013 -0800 Merge pull request honza#298 from mcamuzat/master Add Phpunit commit 4f31132 Author: Marc Camuzat <camuzat@crans.org> Date: Sun Dec 8 17:11:57 2013 +0100 Add Phpunit commit c8faad0 Merge: 80eae35 b4bbb98 Author: Honza Pokorny <me@honza.ca> Date: Sun Dec 1 21:38:34 2013 -0800 Merge pull request honza#297 from jby/puppet-snippets Some extensions to service and, primarily, file snippet for puppet commit b4bbb98 Author: Jonas Bygdén <github@bygden.nu> Date: Sun Dec 1 23:21:31 2013 +0100 Some extensions to service and, primarily, file snippet for puppet commit 80eae35 Merge: 8934055 b79fa67 Author: Iuri Fernandes <iurifq@gmail.com> Date: Wed Nov 27 09:00:31 2013 -0800 Merge pull request honza#295 from cpjolicoeur/patch-1 Fix typo commit b79fa67 Author: Craig P Jolicoeur <cpjolicoeur@gmail.com> Date: Wed Nov 27 10:31:54 2013 -0500 Fix typo "cached" now "chached" commit 8934055 Merge: 376007d f4d4005 Author: Holger Rapp <SirVer@gmx.de> Date: Tue Nov 26 01:32:51 2013 -0800 Merge pull request honza#293 from filipegiusti/master eruby: Create '=' and '%' UltiSnips format shortcuts for eruby files commit f4d4005 Author: Filipe Giusti <filipegiusti@gmail.com> Date: Mon Nov 25 18:52:33 2013 -0200 Create '=' and '%' UltiSnips format shortcuts for eruby files That matches the snippets for snipmate commit 376007d Merge: 5598d89 30bc22c Author: Honza Pokorny <me@honza.ca> Date: Fri Nov 15 06:51:01 2013 -0800 Merge pull request honza#292 from alderz/fix-typo Fixed a typo in the README. whith -> with commit 30bc22c Author: Angel Alonso <alderzdev@gmail.com> Date: Fri Nov 15 13:33:07 2013 +0100 Fixed a typo in the README. whith -> with commit 5598d89 Author: Iuri Fernandes <iurifq@gmail.com> Date: Tue Oct 29 22:11:20 2013 -0300 Rename trigger for expectation of error from 'raise' to 'experr' commit 5eeaf6d Author: Iuri Fernandes <iurifq@gmail.com> Date: Tue Oct 29 22:09:20 2013 -0300 Rename 'exp' snippet to more common snippet. The old 'exp' with a block expectation becomes 'expb'. commit 940d31a Merge: f621635 54ca21a Author: Simeon Willbanks <sfw@simeonfosterwillbanks.com> Date: Mon Oct 28 15:44:46 2013 -0700 Merge pull request honza#291 from simeonwillbanks/rename-go-variable-snippets Rename go variable snippets commit 54ca21a Author: Simeon F. Willbanks <sfw@simeonfosterwillbanks.com> Date: Sun Oct 27 13:33:15 2013 -0700 Refactor variable snippets * "v" is for shorthand variable declaration * "vr" is for variable initialization * "var" is for longhand variable declaration * "vars" is for multiple variable declarations commit deffc63 Author: Simeon F. Willbanks <sfw@simeonfosterwillbanks.com> Date: Sun Oct 27 13:31:19 2013 -0700 Remove duplicate "v" snippet commit f621635 Merge: f4f1b19 6fd0406 Author: Honza Pokorny <me@honza.ca> Date: Tue Oct 22 22:13:09 2013 -0700 Merge pull request honza#290 from aerowolf01/master I propose some assertion snippets, 1 included commit 6fd0406 Author: Cooper LeBrun <aerowolf01@gmail.com> Date: Tue Oct 22 18:56:21 2013 -0700 added a section for assertions, and a simple assertEqual snippet commit f4f1b19 Merge: e837c9b f35d8f2 Author: Honza Pokorny <me@honza.ca> Date: Sun Oct 20 06:09:48 2013 -0700 Merge pull request honza#287 from lavrin/master Add Erlang include_lib directive commit f35d8f2 Author: Radosław Szymczyszyn <lavrin@gmail.com> Date: Sun Oct 20 00:30:01 2013 +0200 Add Erlang include_lib directive commit e837c9b Merge: 6a38707 4526fcb Author: Iuri Fernandes <iurifq@gmail.com> Date: Sun Oct 13 16:41:18 2013 -0700 Merge pull request honza#286 from igrep/correct-ruby.snippets Fix typo in ruby.snippets: snippets => snippets commit 4526fcb Author: Yamamoto Yuji <whosekiteneverfly@gmail.com> Date: Sun Oct 13 18:49:26 2013 +0900 Fix typo in ruby.snippets: snippets => snippets commit 6a38707 Author: Marc Weber <marco-oweber@gmx.de> Date: Sat Oct 12 06:49:20 2013 +0200 fix css_block commit b4c26c4 Merge: 665d9d3 0fd6eef Author: Steven Oliver <oliver.steven@icloud.com> Date: Mon Sep 30 04:39:35 2013 -0700 Merge pull request honza#283 from bsutic/ruby-strftime Ruby strf snippet commit 0fd6eef Author: Bruno Sutic <bruno.sutic@gmail.com> Date: Mon Sep 30 01:12:36 2013 +0200 Ruby strf snippet strf snippet contains a template that should format time in the same way as `Time.now` default output. commit 665d9d3 Merge: 0f61100 fe4c59f Author: Honza Pokorny <me@honza.ca> Date: Wed Sep 25 10:16:12 2013 -0700 Merge pull request honza#282 from chrisyue/master [php] [symfony] some bugfix and improve commit fe4c59f Author: yuhuanbo <yuhuanbo@fabei.net> Date: Fri Sep 13 11:09:29 2013 +0800 [php] [symfony] some bugfix and improve symfony snippet `ent` now support abstract class
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Using latest UltiSnips on vim 7.4. When trying to expand the PHP getter and setter snippet (gs), UltiSnips throws the following error:
This snippet applied some complex transformations on $1, which the individual getter and setter snippets don't use, so I have copied both snippets onto this one to make it work as expected.