ver 2010.02 → 2010.08
Sign up to get free protection for your applications and to get access to all the features.
- data/.gitignore +1 -0
- data/.yardopts +1 -1
- data/AUTHORS +2 -2
- data/CHANGELOG +1160 -0
- data/MANIFEST +212 -62
- data/README.textile +68 -9
- data/Rakefile +2 -2
- data/bin/ver +33 -8
- data/config/commands/ANTLR.rb +11 -0
- data/config/commands/ActionScript.rb +102 -0
- data/config/commands/Active4D.rb +30 -0
- data/config/commands/Ada.rb +11 -0
- data/config/commands/Ant.rb +90 -0
- data/config/commands/Apache.rb +98 -0
- data/config/commands/AppleScript.rb +169 -0
- data/config/commands/Blogging.rb +72 -0
- data/config/commands/Bulletin Board.rb +10 -0
- data/config/commands/Bundle Development.rb +83 -0
- data/config/commands/C++ Qt.rb +158 -0
- data/config/commands/C.rb +82 -0
- data/config/commands/CMake.rb +32 -0
- data/config/commands/CSS.rb +76 -0
- data/config/commands/CTags.rb +29 -0
- data/config/commands/CVS.rb +114 -0
- data/config/commands/CoffeeScript.rb +58 -0
- data/config/commands/Context Free.rb +20 -0
- data/config/commands/Cucumber.rb +94 -0
- data/config/commands/D.rb +47 -0
- data/config/commands/Darcs.rb +72 -0
- data/config/commands/Diff.rb +76 -0
- data/config/commands/Doxygen.rb +9 -0
- data/config/commands/Experimental Wiki.rb +9 -0
- data/config/commands/Experimental.rb +172 -0
- data/config/commands/F-Script.rb +13 -0
- data/config/commands/FXScript.rb +11 -0
- data/config/commands/FileMerge.rb +42 -0
- data/config/commands/Fortran.rb +58 -0
- data/config/commands/GTD2.rb +134 -0
- data/config/commands/GTDAlt.rb +225 -0
- data/config/commands/GetBundle.rb +41 -0
- data/config/commands/Go.rb +29 -0
- data/config/commands/Graphviz.rb +11 -0
- data/config/commands/Greasemonkey.rb +158 -0
- data/config/commands/Gri.rb +11 -0
- data/config/commands/Groovy Grails.rb +174 -0
- data/config/commands/Groovy.rb +66 -0
- data/config/commands/HTML.rb +206 -0
- data/config/commands/Haskell.rb +48 -0
- data/config/commands/Hotkey.rb +50 -0
- data/config/commands/Hyperlink Helper.rb +81 -0
- data/config/commands/ImageBrowser.rb +10 -0
- data/config/commands/Io.rb +11 -0
- data/config/commands/JSFL.rb +29 -0
- data/config/commands/JSON.rb +11 -0
- data/config/commands/Java.rb +45 -0
- data/config/commands/JavaDoc.rb +12 -0
- data/config/commands/JavaScript Prototype & Script.aculo.us.rb +51 -0
- data/config/commands/JavaScript YUI.rb +12 -0
- data/config/commands/JavaScript jQuery.rb +12 -0
- data/config/commands/JavaScript.rb +50 -0
- data/config/commands/LaTeX.rb +423 -0
- data/config/commands/Lisp.rb +20 -0
- data/config/commands/Logo.rb +10 -0
- data/config/commands/Logtalk.rb +34 -0
- data/config/commands/Lua.rb +29 -0
- data/config/commands/MEL.rb +20 -0
- data/config/commands/Mail.rb +73 -0
- data/config/commands/Make.rb +20 -0
- data/config/commands/Man Pages.rb +20 -0
- data/config/commands/Markdown.rb +194 -0
- data/config/commands/Math.rb +79 -0
- data/config/commands/Matlab.rb +188 -0
- data/config/commands/Maven.rb +162 -0
- data/config/commands/Mediawiki.rb +12 -0
- data/config/commands/Mercurial.rb +185 -0
- data/config/commands/MoinMoin.rb +74 -0
- data/config/commands/Movable Type.rb +68 -0
- data/config/commands/Nemerle.rb +29 -0
- data/config/commands/OCaml Experimental Completions.rb +22 -0
- data/config/commands/OCaml.rb +99 -0
- data/config/commands/Objective-C.rb +181 -0
- data/config/commands/Outlines.rb +54 -0
- data/config/commands/PHP Smarty.rb +10 -0
- data/config/commands/Pascal.rb +11 -0
- data/config/commands/Perforce.rb +102 -0
- data/config/commands/Perl.rb +78 -0
- data/config/commands/Processing.rb +11 -0
- data/config/commands/Prolog.rb +11 -0
- data/config/commands/Property List.rb +38 -0
- data/config/commands/Python Django.rb +11 -0
- data/config/commands/Python.rb +131 -0
- data/config/commands/R Console (R.app).rb +80 -0
- data/config/commands/R Console (Rdaemon).rb +414 -0
- data/config/commands/R.rb +337 -0
- data/config/commands/Ragel.rb +10 -0
- data/config/commands/Regular Expressions.rb +18 -0
- data/config/commands/Remind.rb +44 -0
- data/config/commands/Ruby RSpec.rb +40 -0
- data/config/commands/Ruby on Rails.rb +331 -0
- data/config/commands/Ruby.rb +220 -0
- data/config/commands/S5 Slide Show.rb +37 -0
- data/config/commands/SCons.rb +24 -0
- data/config/commands/SQL.rb +60 -0
- data/config/commands/SVK.rb +83 -0
- data/config/commands/SWeave.rb +63 -0
- data/config/commands/Scheme.rb +30 -0
- data/config/commands/Scilab.rb +28 -0
- data/config/commands/Setext.rb +20 -0
- data/config/commands/Shell Script.rb +59 -0
- data/config/commands/Slate.rb +9 -0
- data/config/commands/Source.rb +84 -0
- data/config/commands/Standard ML.rb +38 -0
- data/config/commands/Subversion.rb +181 -0
- data/config/commands/TODO.rb +32 -0
- data/config/commands/Tcl.rb +21 -0
- data/config/commands/TerminalMate.rb +30 -0
- data/config/commands/Text.rb +137 -0
- data/config/commands/TextMate.rb +100 -0
- data/config/commands/Textile.rb +58 -0
- data/config/commands/Thrift.rb +20 -0
- data/config/commands/Transmit.rb +34 -0
- data/config/commands/Txt2tags.rb +213 -0
- data/config/commands/Vectorscript.rb +19 -0
- data/config/commands/Widget Creator.rb +23 -0
- data/config/commands/XML.rb +29 -0
- data/config/commands/Xcode.rb +106 -0
- data/config/commands/YAML.rb +39 -0
- data/config/commands/YARD.rb +12 -0
- data/config/commands/iTerm.rb +26 -0
- data/config/commands/reStructuredText.rb +126 -0
- data/config/detect.rb +13 -1
- data/config/keymap/diakonos.rb +113 -115
- data/config/keymap/emacs.rb +6 -2
- data/config/keymap/nano.rb +104 -112
- data/config/keymap/vim.rb +329 -258
- data/config/plugin/autosave.rb +3 -6
- data/config/plugin/git.rb +18 -12
- data/config/plugin/soma.rb +1 -1
- data/config/preferences/Apache.rb +17 -17
- data/config/preferences/AppleScript.rb +5 -5
- data/config/preferences/Bundle Development.rb +10 -10
- data/config/preferences/C.rb +38 -30
- data/config/preferences/CoffeeScript.rb +28 -0
- data/config/preferences/ColdFusion.rb +6 -6
- data/config/preferences/Cucumber.rb +40 -0
- data/config/preferences/Diff.rb +4 -4
- data/config/preferences/Eiffel.rb +6 -6
- data/config/preferences/Erlang.rb +16 -16
- data/config/preferences/F-Script.rb +12 -12
- data/config/preferences/FXScript.rb +5 -5
- data/config/preferences/Fortran.rb +17 -17
- data/config/preferences/Go.rb +23 -0
- data/config/preferences/Groovy.rb +29 -0
- data/config/preferences/HTML.rb +44 -44
- data/config/preferences/Haskell.rb +14 -14
- data/config/preferences/Io.rb +11 -11
- data/config/preferences/Java.rb +8 -8
- data/config/preferences/LaTeX.rb +24 -24
- data/config/preferences/Logo.rb +6 -6
- data/config/preferences/Logtalk.rb +5 -5
- data/config/preferences/Markdown.rb +43 -0
- data/config/preferences/Maven.rb +42 -42
- data/config/preferences/Mediawiki.rb +8 -8
- data/config/preferences/Movable Type.rb +14 -14
- data/config/preferences/OCaml.rb +15 -15
- data/config/preferences/Objective-C.rb +5 -5
- data/config/preferences/PHP.rb +2564 -0
- data/config/preferences/Property List.rb +8 -8
- data/config/preferences/R.rb +5 -5
- data/config/preferences/Ruby.rb +24 -24
- data/config/preferences/Source.rb +13 -13
- data/config/preferences/Standard ML.rb +9 -9
- data/config/preferences/Tcl.rb +5 -5
- data/config/preferences/Text.rb +14 -14
- data/config/preferences/TextMate.rb +5 -5
- data/config/preferences/Textile.rb +8 -8
- data/config/preferences/YARD.rb +9 -0
- data/config/preferences/iTerm.rb +9 -9
- data/config/rc.rb +5 -2
- data/config/snippets/ASP vb.NET.rb +203 -54
- data/config/snippets/ASP.rb +51 -36
- data/config/snippets/ActionScript.rb +332 -205
- data/config/snippets/Active4D.rb +325 -256
- data/config/snippets/Ada.rb +106 -60
- data/config/snippets/Ant.rb +7 -5
- data/config/snippets/Apache.rb +24 -20
- data/config/snippets/AppleScript.rb +213 -82
- data/config/snippets/Blogging.rb +41 -18
- data/config/snippets/Bulletin Board.rb +56 -21
- data/config/snippets/Bundle Development.rb +108 -63
- data/config/snippets/C++ Qt.rb +72 -57
- data/config/snippets/C.rb +128 -100
- data/config/snippets/CMake.rb +42 -32
- data/config/snippets/CSS.rb +515 -115
- data/config/snippets/CoffeeScript.rb +85 -0
- data/config/snippets/ColdFusion.rb +2228 -1547
- data/config/snippets/Context Free.rb +35 -28
- data/config/snippets/Cucumber.rb +55 -0
- data/config/snippets/D.rb +164 -111
- data/config/snippets/DokuWiki.rb +103 -54
- data/config/snippets/Doxygen.rb +87 -40
- data/config/snippets/Eiffel.rb +121 -18
- data/config/snippets/Erlang.rb +109 -68
- data/config/snippets/F-Script.rb +30 -24
- data/config/snippets/FXScript.rb +364 -210
- data/config/snippets/Fortran.rb +462 -280
- data/config/snippets/GTDAlt.rb +10 -4
- data/config/snippets/Gettext.rb +10 -8
- data/config/snippets/Go.rb +52 -0
- data/config/snippets/Greasemonkey.rb +52 -42
- data/config/snippets/Gri.rb +12 -10
- data/config/snippets/Groovy Grails.rb +313 -0
- data/config/snippets/Groovy.rb +685 -0
- data/config/snippets/HTML.rb +325 -126
- data/config/snippets/Haskell.rb +32 -24
- data/config/snippets/Io.rb +53 -42
- data/config/snippets/Java.rb +204 -92
- data/config/snippets/JavaDoc.rb +105 -56
- data/config/snippets/JavaScript MooTools.rb +208 -13
- data/config/snippets/JavaScript Objective-J.rb +18 -15
- data/config/snippets/JavaScript Prototype & Script.aculo.us.rb +362 -107
- data/config/snippets/JavaScript YUI.rb +1245 -186
- data/config/snippets/JavaScript jQuery.rb +693 -375
- data/config/snippets/JavaScript.rb +71 -53
- data/config/snippets/LaTeX.rb +188 -0
- data/config/snippets/Lisp.rb +59 -40
- data/config/snippets/Logo.rb +12 -6
- data/config/snippets/Logtalk.rb +131 -60
- data/config/snippets/Lua.rb +43 -33
- data/config/snippets/MIPS Assembler.rb +7 -5
- data/config/snippets/Mail.rb +10 -1
- data/config/snippets/Markdown.rb +7 -0
- data/config/snippets/Matlab.rb +232 -178
- data/config/snippets/Maven.rb +6 -5
- data/config/snippets/Mediawiki.rb +43 -12
- data/config/snippets/MoinMoin.rb +50 -10
- data/config/snippets/Movable Type.rb +368 -53
- data/config/snippets/Nemerle.rb +127 -79
- data/config/snippets/OCaml Code Completion Misc.rb +1716 -72
- data/config/snippets/OCaml Code Completion Unix.rb +2128 -203
- data/config/snippets/OCaml.rb +107 -73
- data/config/snippets/ODCompletion.rb +169 -118
- data/config/snippets/Objective-C.rb +281 -193
- data/config/snippets/PHP Smarty.rb +149 -79
- data/config/snippets/PHP.rb +186 -0
- data/config/snippets/Pascal.rb +47 -33
- data/config/snippets/Perl HTML-Template.rb +33 -0
- data/config/snippets/Perl Mason.rb +50 -30
- data/config/snippets/Perl Template Toolkit.rb +25 -20
- data/config/snippets/Perl.rb +91 -72
- data/config/snippets/Processing.rb +55 -33
- data/config/snippets/Propel.rb +36 -30
- data/config/snippets/Property List.rb +57 -24
- data/config/snippets/Python Django Templates.rb +381 -95
- data/config/snippets/Python Django.rb +159 -132
- data/config/snippets/Python.rb +88 -0
- data/config/snippets/R Console (Rdaemon).rb +11 -9
- data/config/snippets/R.rb +96 -77
- data/config/snippets/Remind.rb +18 -15
- data/config/snippets/Ruby RSpec.rb +343 -238
- data/config/snippets/Ruby on Rails.rb +1116 -765
- data/config/snippets/Ruby.rb +770 -545
- data/config/snippets/S5 Slide Show.rb +32 -24
- data/config/snippets/SSH Config.rb +21 -17
- data/config/snippets/SWIG.rb +30 -18
- data/config/snippets/Scilab.rb +98 -79
- data/config/snippets/Setext.rb +10 -8
- data/config/snippets/Shell Script.rb +52 -42
- data/config/snippets/Slate.rb +62 -48
- data/config/snippets/Source.rb +24 -1
- data/config/snippets/Standard ML.rb +37 -27
- data/config/snippets/Tcl.rb +32 -26
- data/config/snippets/Text.rb +28 -15
- data/config/snippets/Textile.rb +130 -45
- data/config/snippets/Thrift.rb +22 -18
- data/config/snippets/Twiki.rb +158 -105
- data/config/snippets/Txt2tags.rb +166 -79
- data/config/snippets/Vectorscript.rb +47 -38
- data/config/snippets/Widget Creator.rb +5 -5
- data/config/snippets/XML.rb +30 -18
- data/config/snippets/YAML.rb +5 -4
- data/config/snippets/YARD.rb +93 -0
- data/config/snippets/reStructuredText.rb +25 -20
- data/config/syntax/ANTLR.rb +17 -15
- data/config/syntax/ASP vb.NET.rb +27 -24
- data/config/syntax/ASP.rb +21 -19
- data/config/syntax/ActionScript.rb +16 -16
- data/config/syntax/Active4D Config.rb +5 -5
- data/config/syntax/Active4D Library.rb +2 -2
- data/config/syntax/Active4D.rb +32 -30
- data/config/syntax/Ada.rb +13 -10
- data/config/syntax/Ant.rb +9 -7
- data/config/syntax/Apache.rb +22 -18
- data/config/syntax/AppleScript.rb +486 -192
- data/config/syntax/AsciiDoc.rb +21 -0
- data/config/syntax/BibTeX.rb +7 -7
- data/config/syntax/Blog - HTML.rb +7 -7
- data/config/syntax/Blog - Markdown.rb +6 -6
- data/config/syntax/Blog - Text.rb +2 -2
- data/config/syntax/Blog - Textile.rb +2 -2
- data/config/syntax/Bulletin Board.rb +33 -32
- data/config/syntax/C++ Qt.rb +7 -6
- data/config/syntax/C++.rb +31 -28
- data/config/syntax/C.rb +55 -51
- data/config/syntax/CMake Listfile.rb +12 -11
- data/config/syntax/CSS.rb +24 -23
- data/config/syntax/CSV.rb +3 -3
- data/config/syntax/CoffeeScript.rb +161 -0
- data/config/syntax/ColdFusion.rb +8 -8
- data/config/syntax/Context Free.rb +18 -16
- data/config/syntax/Cucumber Steps.rb +108 -0
- data/config/syntax/D.rb +70 -69
- data/config/syntax/Diff.rb +13 -10
- data/config/syntax/DokuWiki.rb +22 -18
- data/config/syntax/Doxygen.rb +1 -1
- data/config/syntax/Dylan.rb +8 -8
- data/config/syntax/Eiffel.rb +12 -12
- data/config/syntax/Erlang.rb +96 -89
- data/config/syntax/F-Script.rb +11 -9
- data/config/syntax/FXScript.rb +16 -14
- data/config/syntax/Fortran - Modern.rb +25 -24
- data/config/syntax/Fortran - Punchcard.rb +43 -40
- data/config/syntax/GTD.rb +1 -1
- data/config/syntax/GTDalt.rb +14 -11
- data/config/syntax/Gettext.rb +10 -9
- data/config/syntax/Gherkin.rb +65 -0
- data/config/syntax/Go.rb +256 -0
- data/config/syntax/Grails Server Page.rb +108 -0
- data/config/syntax/Graphviz (DOT).rb +6 -6
- data/config/syntax/Greasemonkey.rb +3 -3
- data/config/syntax/Gri.rb +12 -12
- data/config/syntax/Groovy.rb +502 -0
- data/config/syntax/HTML (ASP).rb +3 -3
- data/config/syntax/HTML (ASP.net).rb +31 -31
- data/config/syntax/HTML (Active4D).rb +19 -19
- data/config/syntax/HTML (Django).rb +6 -6
- data/config/syntax/HTML (Erlang).rb +4 -4
- data/config/syntax/HTML (Mason).rb +13 -13
- data/config/syntax/HTML (Rails).rb +5 -5
- data/config/syntax/HTML (Tcl).rb +3 -3
- data/config/syntax/HTML (Template Toolkit).rb +9 -9
- data/config/syntax/HTML.rb +27 -27
- data/config/syntax/Haskell.rb +31 -28
- data/config/syntax/Inform.rb +5 -5
- data/config/syntax/Ini.rb +4 -4
- data/config/syntax/Installer Distribution Script.rb +19 -18
- data/config/syntax/Io.rb +17 -15
- data/config/syntax/JSFL.rb +7 -6
- data/config/syntax/Java Properties.rb +3 -3
- data/config/syntax/Java Server Page (JSP).rb +5 -4
- data/config/syntax/Java.rb +40 -33
- data/config/syntax/JavaDoc.rb +24 -22
- data/config/syntax/JavaScript (Rails).rb +1 -1
- data/config/syntax/JavaScript.rb +41 -34
- data/config/syntax/Javascript YUI.rb +109 -101
- data/config/syntax/LaTeX Beamer.rb +3 -3
- data/config/syntax/LaTeX Log.rb +3 -3
- data/config/syntax/LaTeX Memoir.rb +7 -5
- data/config/syntax/LaTeX Rdaemon.rb +1 -1
- data/config/syntax/LaTeX.rb +52 -47
- data/config/syntax/Language Grammar.rb +58 -55
- data/config/syntax/Lex-Flex.rb +13 -13
- data/config/syntax/Lighttpd.rb +7 -7
- data/config/syntax/Lisp.rb +6 -5
- data/config/syntax/Literate Haskell.rb +2 -2
- data/config/syntax/Logo.rb +4 -4
- data/config/syntax/Logtalk.rb +64 -49
- data/config/syntax/Lua.rb +12 -12
- data/config/syntax/MATLAB.rb +71 -70
- data/config/syntax/MEL.rb +16 -15
- data/config/syntax/MIPS Assembler.rb +11 -11
- data/config/syntax/MacPorts Portfile.rb +16 -15
- data/config/syntax/Mail.rb +5 -4
- data/config/syntax/Makefile.rb +3 -3
- data/config/syntax/Man.rb +2 -2
- data/config/syntax/Markdown.rb +440 -0
- data/config/syntax/Maven POM.rb +17 -16
- data/config/syntax/Mediawiki.rb +46 -46
- data/config/syntax/Modula-3.rb +7 -6
- data/config/syntax/MoinMoin.rb +16 -16
- data/config/syntax/MooTools.rb +75 -65
- data/config/syntax/Movable Type (MT only).rb +18 -18
- data/config/syntax/Movable Type.rb +20 -20
- data/config/syntax/MultiMarkdown.rb +35 -0
- data/config/syntax/Nemerle.rb +12 -12
- data/config/syntax/OCaml.rb +79 -71
- data/config/syntax/OCamllex.rb +14 -14
- data/config/syntax/OCamlyacc.rb +14 -12
- data/config/syntax/Objective-C++.rb +2 -2
- data/config/syntax/Objective-C.rb +76 -70
- data/config/syntax/Objective-J.rb +30 -29
- data/config/syntax/Octave.rb +27 -27
- data/config/syntax/OpenGL.rb +4 -4
- data/config/syntax/PHP.rb +1154 -0
- data/config/syntax/Pascal.rb +8 -8
- data/config/syntax/Perl HTML-Template.rb +5 -5
- data/config/syntax/Perl.rb +80 -76
- data/config/syntax/Plain Text.rb +5 -5
- data/config/syntax/Postscript.rb +6 -6
- data/config/syntax/Processing.rb +20 -20
- data/config/syntax/Prolog.rb +2 -2
- data/config/syntax/Property List.rb +50 -47
- data/config/syntax/Prototype & Script.aculo.us (JavaScript) Bracketed.rb +15 -13
- data/config/syntax/Prototype & Script.aculo.us (JavaScript).rb +9 -8
- data/config/syntax/Python Django.rb +6 -6
- data/config/syntax/Python.rb +94 -87
- data/config/syntax/Quake Style .cfg.rb +4 -4
- data/config/syntax/R Console (Rdaemon) Plain.rb +2 -2
- data/config/syntax/R Console (Rdaemon).rb +2 -2
- data/config/syntax/R.rb +21 -20
- data/config/syntax/RSpec.rb +15 -15
- data/config/syntax/Ragel.rb +14 -13
- data/config/syntax/Rd (R Documentation).rb +4 -4
- data/config/syntax/Regular Expressions (Oniguruma).rb +11 -10
- data/config/syntax/Regular Expressions (Python).rb +9 -9
- data/config/syntax/Release Notes.rb +7 -6
- data/config/syntax/Remind.rb +19 -17
- data/config/syntax/Rez.rb +10 -9
- data/config/syntax/Ruby Haml.rb +11 -11
- data/config/syntax/Ruby on Rails.rb +26 -24
- data/config/syntax/Ruby.rb +73 -71
- data/config/syntax/S5 Slide Show.rb +9 -9
- data/config/syntax/SQL.rb +29 -27
- data/config/syntax/SSH Config.rb +4 -4
- data/config/syntax/SWIG.rb +12 -11
- data/config/syntax/SWeave.rb +8 -7
- data/config/syntax/Scheme.rb +56 -54
- data/config/syntax/Scilab.rb +7 -6
- data/config/syntax/Setext.rb +14 -13
- data/config/syntax/Shell Script (Bash).rb +42 -42
- data/config/syntax/Slate.rb +24 -19
- data/config/syntax/Smarty.rb +11 -10
- data/config/syntax/Standard ML - CM.rb +2 -2
- data/config/syntax/Standard ML.rb +26 -23
- data/config/syntax/Strings File.rb +6 -6
- data/config/syntax/TSV.rb +2 -2
- data/config/syntax/Tcl.rb +10 -9
- data/config/syntax/TeX Math.rb +7 -6
- data/config/syntax/TeX.rb +7 -7
- data/config/syntax/Textile.rb +33 -27
- data/config/syntax/Thrift.rb +37 -29
- data/config/syntax/Twiki.rb +19 -18
- data/config/syntax/Txt2tags.rb +26 -23
- data/config/syntax/Vectorscript.rb +9 -7
- data/config/syntax/XML strict.rb +6 -4
- data/config/syntax/XML.rb +55 -30
- data/config/syntax/XSL.rb +5 -5
- data/config/syntax/YAML.rb +14 -12
- data/config/syntax/camlp4.rb +5 -5
- data/config/syntax/iCalendar.rb +3 -3
- data/config/syntax/jQuery (JavaScript).rb +9 -9
- data/config/syntax/mod_perl.rb +6 -6
- data/config/syntax/qmake Project file.rb +16 -15
- data/config/syntax/reStructuredText.rb +23 -21
- data/config/syntax/svn-commit.tmp.rb +5 -5
- data/lib/ver.rb +169 -85
- data/lib/ver/action.rb +39 -30
- data/lib/ver/buffer.rb +962 -144
- data/lib/ver/buffer/frame.rb +23 -0
- data/lib/ver/buffer/invalid_trailing_whitespace.rb +17 -0
- data/lib/ver/buffer/markup_underline_link.rb +30 -0
- data/lib/ver/buffer/matching_brace.rb +22 -0
- data/lib/ver/buffer/term.rb +1 -1
- data/lib/ver/clipboard.rb +107 -0
- data/lib/ver/digraphs.rb +1373 -0
- data/lib/ver/entry.rb +54 -43
- data/lib/ver/event.rb +335 -0
- data/lib/ver/exception_view.rb +3 -1
- data/lib/ver/executor.rb +7 -7
- data/lib/ver/executor/buffer.rb +4 -4
- data/lib/ver/executor/encoding.rb +19 -0
- data/lib/ver/executor/entry.rb +9 -9
- data/lib/ver/executor/fuzzy_file_finder.rb +1 -1
- data/lib/ver/executor/label.rb +2 -0
- data/lib/ver/executor/method.rb +2 -3
- data/lib/ver/help/describe_key.rb +44 -44
- data/lib/ver/hover_completion.rb +11 -6
- data/lib/ver/keymap.rb +68 -39
- data/lib/ver/layout/paned.rb +56 -44
- data/lib/ver/layout/toplevel.rb +68 -0
- data/lib/ver/layout/vim.rb +919 -0
- data/lib/ver/major_mode.rb +49 -49
- data/lib/ver/methods.rb +22 -25
- data/lib/ver/methods/basic.rb +49 -20
- data/lib/ver/methods/bookmark.rb +33 -33
- data/lib/ver/methods/clipboard.rb +186 -49
- data/lib/ver/methods/completion.rb +5 -5
- data/lib/ver/methods/control.rb +47 -66
- data/lib/ver/methods/delete.rb +5 -122
- data/lib/ver/methods/help.rb +2 -2
- data/lib/ver/methods/insert.rb +101 -29
- data/lib/ver/methods/layout.rb +62 -64
- data/lib/ver/methods/macro.rb +45 -0
- data/lib/ver/methods/move.rb +63 -349
- data/lib/ver/methods/nano.rb +99 -71
- data/lib/ver/methods/open.rb +8 -7
- data/lib/ver/methods/preview.rb +34 -14
- data/lib/ver/methods/save.rb +194 -163
- data/lib/ver/methods/search.rb +169 -81
- data/lib/ver/methods/search_and_replace.rb +62 -49
- data/lib/ver/methods/selection.rb +26 -54
- data/lib/ver/methods/snippet.rb +79 -54
- data/lib/ver/methods/undo.rb +12 -16
- data/lib/ver/minibuffer.rb +283 -134
- data/lib/ver/minor_mode.rb +36 -47
- data/lib/ver/mode_resolving.rb +71 -0
- data/lib/ver/platform.rb +41 -0
- data/lib/ver/plist.rb +16 -4
- data/lib/ver/register.rb +86 -0
- data/lib/ver/status.rb +44 -6
- data/lib/ver/status/battery.rb +1 -1
- data/lib/ver/status/buffer_position.rb +2 -2
- data/lib/ver/status/diakonos_position.rb +3 -3
- data/lib/ver/status/encoding.rb +1 -1
- data/lib/ver/status/filename.rb +1 -1
- data/lib/ver/status/label.rb +20 -20
- data/lib/ver/status/mode.rb +1 -1
- data/lib/ver/status/nano_help.rb +3 -14
- data/lib/ver/status/nano_position.rb +6 -6
- data/lib/ver/status/percent.rb +2 -2
- data/lib/ver/status/position.rb +2 -2
- data/lib/ver/status/short_filename.rb +1 -1
- data/lib/ver/status/syntax.rb +1 -1
- data/lib/ver/struct.rb +28 -0
- data/lib/ver/syntax/processor.rb +2 -1
- data/lib/ver/text.rb +48 -520
- data/lib/ver/text/end.rb +14 -0
- data/lib/ver/text/index.rb +16 -101
- data/lib/ver/text/insert.rb +138 -0
- data/lib/ver/text/mark.rb +559 -0
- data/lib/ver/text/position.rb +240 -0
- data/lib/ver/text/range.rb +74 -0
- data/lib/ver/text/selection.rb +402 -0
- data/lib/ver/text/selection/block.rb +69 -0
- data/lib/ver/text/selection/char.rb +93 -0
- data/lib/ver/text/selection/line.rb +64 -0
- data/lib/ver/text/tag.rb +322 -0
- data/lib/ver/undo.rb +109 -34
- data/lib/ver/vendor/eval_completer.rb +184 -0
- data/lib/ver/vendor/json_store.rb +23 -0
- data/lib/ver/vendor/open3.rb +729 -0
- data/lib/ver/vendor/pathname.rb +73 -0
- data/lib/ver/vendor/textpow.rb +1 -1
- data/lib/ver/version.rb +1 -1
- data/lib/ver/widget_event.rb +9 -5
- data/lib/ver/widget_major_mode.rb +69 -23
- data/spec/helper.rb +124 -8
- data/spec/ver/action.rb +160 -46
- data/spec/ver/buffer.rb +23 -0
- data/spec/ver/clipboard.rb +92 -0
- data/spec/ver/keymap.rb +63 -61
- data/spec/ver/keymap/diakonos.rb +88 -0
- data/spec/ver/keymap/emacs.rb +65 -0
- data/spec/ver/keymap/general.rb +98 -0
- data/spec/ver/keymap/nano.rb +84 -0
- data/spec/ver/keymap/vim.rb +205 -0
- data/spec/ver/keymap/vim/changing_text.rb +489 -0
- data/spec/ver/keymap/vim/complex_changes.rb +53 -0
- data/spec/ver/keymap/vim/copying_and_moving_text.rb +258 -0
- data/spec/ver/keymap/vim/deleting_text.rb +188 -0
- data/spec/ver/keymap/vim/digraphs.rb +52 -0
- data/spec/ver/keymap/vim/external_commands.rb +21 -0
- data/spec/ver/keymap/vim/inserting_mode_keys.rb +115 -0
- data/spec/ver/keymap/vim/inserting_mode_special.rb +168 -0
- data/spec/ver/keymap/vim/inserting_text.rb +108 -0
- data/spec/ver/keymap/vim/left_right_motion.rb +120 -0
- data/spec/ver/keymap/vim/mark_motion.rb +73 -0
- data/spec/ver/keymap/vim/repeating_commands.rb +64 -0
- data/spec/ver/keymap/vim/text_object_motion.rb +137 -0
- data/spec/ver/keymap/vim/text_objects.rb +101 -0
- data/spec/ver/keymap/vim/undo_redo.rb +21 -0
- data/spec/ver/keymap/vim/up_down_motion.rb +94 -0
- data/spec/ver/keymap/vim/various_motion.rb +33 -0
- data/spec/ver/keysyms.rb +13 -0
- data/spec/ver/major_mode.rb +37 -37
- data/spec/ver/minor_mode.rb +21 -20
- data/spec/ver/plugin/smart_autoindent.rb +2 -2
- data/spec/ver/text/index.rb +122 -0
- data/spec/ver/text/insert.rb +299 -0
- data/spec/ver/text/mark.rb +94 -0
- data/spec/ver/text/range.rb +71 -0
- data/spec/ver/text/selection.rb +315 -0
- data/spec/ver/text/tag.rb +93 -0
- data/spec/ver/undo.rb +133 -0
- data/spec/ver/undo/record_sanitize.rb +85 -0
- data/spec/ver/vendor/eval_completer.rb +91 -0
- data/spec/ver/widget_major_mode.rb +4 -3
- data/ver.gemspec +8 -8
- metadata +234 -72
- data/.todo +0 -102
- data/ROADMAP.textile +0 -187
- data/config/snippets/ANTLR.rb +0 -3
- data/config/snippets/Bison.rb +0 -3
- data/config/snippets/CTags.rb +0 -3
- data/config/snippets/CVS.rb +0 -3
- data/config/snippets/Darcs.rb +0 -3
- data/config/snippets/Diff.rb +0 -3
- data/config/snippets/Dylan.rb +0 -3
- data/config/snippets/Experimental Wiki.rb +0 -3
- data/config/snippets/Experimental.rb +0 -3
- data/config/snippets/FileMerge.rb +0 -3
- data/config/snippets/GTD2.rb +0 -3
- data/config/snippets/GetBundle.rb +0 -3
- data/config/snippets/Graphviz.rb +0 -3
- data/config/snippets/Hotkey.rb +0 -3
- data/config/snippets/Hyperlink Helper.rb +0 -3
- data/config/snippets/ImageBrowser.rb +0 -3
- data/config/snippets/Inform.rb +0 -3
- data/config/snippets/Ini.rb +0 -3
- data/config/snippets/Installer.rb +0 -3
- data/config/snippets/JSFL.rb +0 -3
- data/config/snippets/JSON.rb +0 -3
- data/config/snippets/Lex-Flex.rb +0 -3
- data/config/snippets/Lighttpd.rb +0 -3
- data/config/snippets/MEL.rb +0 -3
- data/config/snippets/MacPorts.rb +0 -3
- data/config/snippets/Make.rb +0 -3
- data/config/snippets/Man Pages.rb +0 -3
- data/config/snippets/Math.rb +0 -3
- data/config/snippets/Mercurial.rb +0 -3
- data/config/snippets/Modula.rb +0 -3
- data/config/snippets/Navigation.rb +0 -3
- data/config/snippets/OCaml Experimental Completions.rb +0 -3
- data/config/snippets/OpenGL.rb +0 -3
- data/config/snippets/Outlines.rb +0 -3
- data/config/snippets/Perforce.rb +0 -3
- data/config/snippets/Perl HTML::Template.rb +0 -27
- data/config/snippets/Postscript.rb +0 -3
- data/config/snippets/Prolog.rb +0 -3
- data/config/snippets/Quake.rb +0 -3
- data/config/snippets/R Console (R.app).rb +0 -3
- data/config/snippets/Ragel.rb +0 -3
- data/config/snippets/Regular Expressions.rb +0 -3
- data/config/snippets/Rez.rb +0 -3
- data/config/snippets/Ruby Haml.rb +0 -3
- data/config/snippets/SCons.rb +0 -3
- data/config/snippets/SQL.rb +0 -3
- data/config/snippets/SVK.rb +0 -3
- data/config/snippets/SWeave.rb +0 -3
- data/config/snippets/Scheme.rb +0 -3
- data/config/snippets/Subversion.rb +0 -3
- data/config/snippets/TODO.rb +0 -3
- data/config/snippets/Tabular.rb +0 -3
- data/config/snippets/TerminalMate.rb +0 -3
- data/config/snippets/TextMate.rb +0 -3
- data/config/snippets/Transmit.rb +0 -3
- data/config/snippets/Xcode.rb +0 -3
- data/config/snippets/iCalendar.rb +0 -3
- data/config/snippets/iTerm.rb +0 -3
- data/lib/ver/keysyms.rb +0 -104
- data/spec/ver/methods/move.rb +0 -150
data/lib/ver/exception_view.rb
CHANGED
@@ -30,6 +30,8 @@ module VER
|
|
30
30
|
|
31
31
|
tag_configure('error', background: '#f88')
|
32
32
|
tag_configure('backtrace', background: '#8f8')
|
33
|
+
|
34
|
+
column('line', width: 50, stretch: false, anchor: :e)
|
33
35
|
end
|
34
36
|
|
35
37
|
def setup_binds
|
@@ -37,7 +39,7 @@ module VER
|
|
37
39
|
|
38
40
|
bind('<Escape>'){
|
39
41
|
pack_forget
|
40
|
-
VER.
|
42
|
+
VER.layout.visible.first.show
|
41
43
|
}
|
42
44
|
end
|
43
45
|
|
data/lib/ver/executor.rb
CHANGED
@@ -4,16 +4,16 @@ module VER
|
|
4
4
|
autoload :ExLabel, 'ver/executor/label'
|
5
5
|
|
6
6
|
class Frame < Tk::Tile::Frame
|
7
|
-
|
8
|
-
|
9
|
-
end
|
7
|
+
attr_accessor :shown
|
8
|
+
alias shown? shown
|
10
9
|
|
11
|
-
def
|
12
|
-
|
10
|
+
def initialize(parent, options = {})
|
11
|
+
super
|
12
|
+
@shown = true
|
13
13
|
end
|
14
14
|
end
|
15
15
|
|
16
|
-
attr_reader :caller, :tree, :label, :entry, :ybar
|
16
|
+
attr_reader :caller, :tree, :label, :entry, :ybar, :frame
|
17
17
|
attr_accessor :update_on_change
|
18
18
|
|
19
19
|
def initialize(caller, options = {})
|
@@ -75,7 +75,7 @@ module VER
|
|
75
75
|
def destroy(caller_focus = true)
|
76
76
|
[@entry, @label, @tree, @ybar, @top, @bottom].compact.each(&:destroy)
|
77
77
|
|
78
|
-
caller.layout.close_buffer(
|
78
|
+
# caller.layout.close_buffer(self)
|
79
79
|
@frame.destroy
|
80
80
|
@caller.focus if caller_focus
|
81
81
|
end
|
data/lib/ver/executor/buffer.rb
CHANGED
@@ -3,8 +3,8 @@ module VER
|
|
3
3
|
class ExBuffer < Entry
|
4
4
|
def setup
|
5
5
|
callback.update_on_change = true
|
6
|
-
@buffers = VER.buffers.map{|
|
7
|
-
[Marshal.dump(
|
6
|
+
@buffers = VER.buffers.map{|buffer|
|
7
|
+
[Marshal.dump(buffer.uri), buffer.uri.to_s]
|
8
8
|
}
|
9
9
|
|
10
10
|
tree.configure(
|
@@ -22,8 +22,8 @@ module VER
|
|
22
22
|
item = tree.focus_item
|
23
23
|
key, name, = item.options(:values)
|
24
24
|
return unless key
|
25
|
-
|
26
|
-
Buffer[
|
25
|
+
uri = Marshal.load(key)
|
26
|
+
Buffer[uri].show
|
27
27
|
callback.destroy(false)
|
28
28
|
end
|
29
29
|
end
|
@@ -0,0 +1,19 @@
|
|
1
|
+
module VER
|
2
|
+
class Executor
|
3
|
+
class ExEncoding < Entry
|
4
|
+
def setup
|
5
|
+
callback.update_on_change = true
|
6
|
+
@encodings = Encoding.list.map(&:name)
|
7
|
+
end
|
8
|
+
|
9
|
+
def choices(name)
|
10
|
+
subset(name, @encodings)
|
11
|
+
end
|
12
|
+
|
13
|
+
def action(name)
|
14
|
+
caller.encoding = Encoding.find(name)
|
15
|
+
callback.destroy
|
16
|
+
end
|
17
|
+
end
|
18
|
+
end
|
19
|
+
end
|
data/lib/ver/executor/entry.rb
CHANGED
@@ -24,8 +24,8 @@ module VER
|
|
24
24
|
self.tabcount = 0
|
25
25
|
self.update_on_change = true
|
26
26
|
|
27
|
-
bind('<<Inserted>>'
|
28
|
-
bind('<<Deleted>>'
|
27
|
+
bind('<<Inserted>>', &method(:on_insert))
|
28
|
+
bind('<<Deleted>>', &method(:on_delete))
|
29
29
|
end
|
30
30
|
|
31
31
|
# Called on <<Inserted>> events.
|
@@ -128,32 +128,32 @@ module VER
|
|
128
128
|
end
|
129
129
|
|
130
130
|
def action(value)
|
131
|
-
|
131
|
+
l action: value
|
132
132
|
raise NotImplementedError, "Implement in subclass"
|
133
133
|
end
|
134
134
|
|
135
|
-
def cancel
|
135
|
+
def cancel
|
136
136
|
callback.destroy
|
137
137
|
end
|
138
138
|
|
139
|
-
def next_line
|
139
|
+
def next_line
|
140
140
|
tree.line_down
|
141
141
|
end
|
142
142
|
|
143
|
-
def prev_line
|
143
|
+
def prev_line
|
144
144
|
tree.line_up
|
145
145
|
end
|
146
146
|
|
147
|
-
def accept_line
|
147
|
+
def accept_line
|
148
148
|
self.tabcount = 0
|
149
149
|
catch(:invalid){ action(tree_selection_value) }
|
150
150
|
end
|
151
151
|
|
152
|
-
def speed_selection
|
152
|
+
def speed_selection
|
153
153
|
accept_line(event)
|
154
154
|
end
|
155
155
|
|
156
|
-
def completion
|
156
|
+
def completion
|
157
157
|
self.tabcount += 1
|
158
158
|
|
159
159
|
if tabcount == 1
|
@@ -50,7 +50,7 @@ module VER
|
|
50
50
|
rescue FFF::TooManyEntries
|
51
51
|
setup_fff_with(@pwd)
|
52
52
|
rescue FFF::TooManyEntries
|
53
|
-
|
53
|
+
caller.message "The FuzzyFileFinder is overwhelmed by the amount of files"
|
54
54
|
callback.destroy
|
55
55
|
Tk.callback_break
|
56
56
|
end
|
data/lib/ver/executor/label.rb
CHANGED
@@ -1,6 +1,7 @@
|
|
1
1
|
module VER
|
2
2
|
class Executor
|
3
3
|
autoload :ExFuzzyFileFinder, 'ver/executor/fuzzy_file_finder'
|
4
|
+
autoload :ExEncoding, 'ver/executor/encoding'
|
4
5
|
autoload :ExGrep, 'ver/executor/grep'
|
5
6
|
autoload :ExGrepBuffers, 'ver/executor/grep'
|
6
7
|
autoload :ExLocate, 'ver/executor/locate'
|
@@ -14,6 +15,7 @@ module VER
|
|
14
15
|
class ExLabel < Entry
|
15
16
|
COMPLETERS = {
|
16
17
|
'edit' => :ExPath,
|
18
|
+
'encoding' => :ExEncoding,
|
17
19
|
'fuzzy' => :ExFuzzyFileFinder,
|
18
20
|
'grep' => :ExGrep,
|
19
21
|
'grep_buffers' => :ExGrepBuffers,
|
data/lib/ver/executor/method.rb
CHANGED
@@ -1,6 +1,8 @@
|
|
1
1
|
module VER
|
2
2
|
module Help
|
3
3
|
class DescribeKey
|
4
|
+
include Keymap::Results
|
5
|
+
|
4
6
|
def initialize(parent)
|
5
7
|
@parent = parent
|
6
8
|
@full = []
|
@@ -11,72 +13,70 @@ module VER
|
|
11
13
|
@label_frame = Tk::Tile::LabelFrame.new(@parent, text: 'Describe Key')
|
12
14
|
desc = <<-DESC
|
13
15
|
Enter any key combination.
|
14
|
-
Escape closes
|
15
|
-
Click on result opens the location of the associated
|
16
|
+
<Escape> closes this dialog.
|
17
|
+
Click on result opens the location of the associated action.
|
16
18
|
DESC
|
17
19
|
@desc = Tk::Tile::Label.new(@label_frame, text: desc).pack
|
18
|
-
@label_frame.place
|
20
|
+
@label_frame.place(
|
21
|
+
relx: 0.5,
|
22
|
+
rely: 0.5,
|
23
|
+
relwidth: 0.9,
|
24
|
+
anchor: :center
|
25
|
+
)
|
19
26
|
@label = Tk::Tile::Label.new(@label_frame, text: 'So far:').pack
|
20
27
|
@label.focus
|
21
28
|
|
22
|
-
@parent.
|
23
|
-
@label.bind(
|
24
|
-
if event.sequence == '<Key>'
|
25
|
-
sequence = event.unicode
|
26
|
-
sequence = VER::KEYSYMS.fetch(sequence, sequence)
|
27
|
-
sequence = "<#{sequence}>" unless sequence =~ /^([a-zA-Z]|)$/
|
28
|
-
else
|
29
|
-
sequence = event.sequence
|
30
|
-
end
|
31
|
-
|
32
|
-
lookup(sequence) if sequence && !sequence.empty?
|
33
|
-
Tk.callback_break
|
34
|
-
}
|
29
|
+
@parent.major_mode.bound_keys.each do |key|
|
30
|
+
@label.bind(key){|event| lookup(key) }
|
35
31
|
end
|
36
32
|
|
37
|
-
@label.bind('<
|
38
|
-
@label.bind('<
|
33
|
+
@label.bind('<Escape>'){ @label_frame.destroy }
|
34
|
+
@label.bind('<FocusOut>'){ @label_frame.destroy }
|
35
|
+
@label.bind('<Destroy>'){ @parent.focus }
|
39
36
|
end
|
40
37
|
|
41
|
-
def lookup(
|
42
|
-
@full <<
|
43
|
-
|
38
|
+
def lookup(pattern)
|
39
|
+
@full << pattern
|
40
|
+
|
41
|
+
case found = @parent.major_mode.resolve(@full)
|
42
|
+
when Incomplete
|
43
|
+
info = found.to_s
|
44
|
+
when Impossible
|
45
|
+
@full.clear
|
46
|
+
info = found.to_s
|
47
|
+
else
|
48
|
+
@full.clear
|
49
|
+
mode, action = found
|
50
|
+
handler = action.handler || @parent.inspect
|
51
|
+
invocation = action.invocation
|
52
|
+
|
53
|
+
info = <<-INFO
|
54
|
+
Mode: #{mode.name}
|
55
|
+
Handler: #{handler}
|
56
|
+
Invocation: #{invocation.inspect}
|
57
|
+
INFO
|
58
|
+
|
59
|
+
message(info){
|
60
|
+
open_method(action.to_method(@parent))
|
61
|
+
}
|
62
|
+
end
|
44
63
|
rescue => ex
|
45
64
|
VER.error(ex)
|
46
65
|
end
|
47
66
|
|
48
|
-
def
|
49
|
-
@
|
50
|
-
|
51
|
-
|
52
|
-
def send(executable, *args)
|
53
|
-
method = @parent.method(executable)
|
54
|
-
info = <<-INFO
|
55
|
-
Sequence: #{@full.inspect}
|
56
|
-
Mapping: #{method}
|
57
|
-
Arguments: #{args.inspect}
|
58
|
-
INFO
|
59
|
-
|
60
|
-
@current = method
|
61
|
-
@label.configure text: info
|
62
|
-
@label.bind('<1>'){ open_method(method) }
|
63
|
-
@full.clear
|
67
|
+
def message(string, &action)
|
68
|
+
@label.configure(text: string)
|
69
|
+
@label.bind('<1>', &action)
|
64
70
|
end
|
65
71
|
|
66
72
|
def inspect
|
67
73
|
"#<VER::Help::DescribeKey>"
|
68
74
|
end
|
69
75
|
|
70
|
-
def destroy
|
71
|
-
@label.destroy
|
72
|
-
@label_frame.destroy
|
73
|
-
@parent.focus
|
74
|
-
end
|
75
|
-
|
76
76
|
def open_method(method)
|
77
77
|
file, line = method.source_location
|
78
78
|
VER.find_or_create_buffer(file, line)
|
79
|
-
Tk::After.idle{ destroy }
|
79
|
+
Tk::After.idle{ @label_frame.destroy }
|
80
80
|
end
|
81
81
|
end
|
82
82
|
end
|
data/lib/ver/hover_completion.rb
CHANGED
@@ -7,25 +7,25 @@ module VER
|
|
7
7
|
include Keymapped
|
8
8
|
attr_accessor :hover_completion
|
9
9
|
|
10
|
-
def cancel
|
10
|
+
def cancel
|
11
11
|
hover_completion.cancel
|
12
12
|
end
|
13
13
|
|
14
|
-
def continue_completion
|
14
|
+
def continue_completion
|
15
15
|
hover_completion.continue_completion
|
16
16
|
end
|
17
17
|
|
18
|
-
def go_down
|
18
|
+
def go_down
|
19
19
|
index = curselection.first + 1
|
20
20
|
select(index) if index < size
|
21
21
|
end
|
22
22
|
|
23
|
-
def go_up
|
23
|
+
def go_up
|
24
24
|
index = curselection.first - 1
|
25
25
|
select(index) if index >= 0
|
26
26
|
end
|
27
27
|
|
28
|
-
def submit
|
28
|
+
def submit
|
29
29
|
hover_completion.submit
|
30
30
|
end
|
31
31
|
|
@@ -49,7 +49,12 @@ module VER
|
|
49
49
|
end
|
50
50
|
|
51
51
|
def setup_widgets
|
52
|
-
@list = Listbox.new(
|
52
|
+
@list = Listbox.new(
|
53
|
+
parent,
|
54
|
+
borderwidth: 0,
|
55
|
+
selectmode: :single,
|
56
|
+
font: parent.options.font
|
57
|
+
)
|
53
58
|
@list.hover_completion = self
|
54
59
|
@list.major_mode = :HoverCompletion
|
55
60
|
@list.focus
|
data/lib/ver/keymap.rb
CHANGED
@@ -4,29 +4,48 @@ module VER
|
|
4
4
|
class Keymap < Struct.new(:keymap, :keys)
|
5
5
|
module Results
|
6
6
|
# Indicate that no result can and will be found in the keymap
|
7
|
-
class Impossible < Struct.new(:
|
7
|
+
class Impossible < Struct.new(:pattern)
|
8
8
|
def to_s
|
9
|
-
stack =
|
9
|
+
stack = pattern.map{|seq| Event[seq].keysym }.join(' - ')
|
10
10
|
"#{stack} is undefined"
|
11
11
|
end
|
12
12
|
end
|
13
13
|
|
14
14
|
# Indicate that no result could be found yet.
|
15
|
-
class Incomplete < Struct.new(:
|
15
|
+
class Incomplete < Struct.new(:pattern, :choices)
|
16
16
|
def merge!(incomplete)
|
17
|
-
return unless
|
17
|
+
return unless pattern == incomplete.pattern
|
18
18
|
choices.deep_merge!(incomplete.choices)
|
19
19
|
end
|
20
20
|
|
21
|
-
def to_s
|
22
|
-
stack =
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
21
|
+
def to_s(handler)
|
22
|
+
stack = pattern.map{|seq| Event[seq].keysym }.join
|
23
|
+
|
24
|
+
follow = choices.map{|key, action|
|
25
|
+
case action
|
26
|
+
when Action
|
27
|
+
method = action.to_method(handler)
|
28
|
+
args = [*action.invocation][1..-1]
|
29
|
+
|
30
|
+
case receiver = method.receiver
|
31
|
+
when Class, Module
|
32
|
+
signature = "#{receiver}.#{method.name}"
|
33
|
+
else
|
34
|
+
signature = "#{method.receiver.class}.#{method.name}"
|
35
|
+
end
|
36
|
+
|
37
|
+
unless args.empty?
|
38
|
+
signature << '(' << args.map(&:inspect).join(', ') << ')'
|
39
|
+
end
|
40
|
+
|
41
|
+
"#{key} => #{signature}"
|
42
|
+
when MapHash
|
43
|
+
key
|
44
|
+
else
|
45
|
+
'%s => %p' % [key, action]
|
46
|
+
end
|
47
|
+
}.join(', ')
|
48
|
+
"#{stack} -- (#{follow})"
|
30
49
|
end
|
31
50
|
end
|
32
51
|
end
|
@@ -71,31 +90,35 @@ module VER
|
|
71
90
|
self.keys = keys
|
72
91
|
end
|
73
92
|
|
74
|
-
def []=(*
|
75
|
-
|
93
|
+
def []=(*pattern, action)
|
94
|
+
pattern = pattern_to_patterns(*pattern)
|
95
|
+
|
96
|
+
case existing = self[pattern]
|
97
|
+
when Action
|
98
|
+
VER.warn "Redefining %p bound to %p with %p" % [existing, pattern, action]
|
99
|
+
when Incomplete
|
100
|
+
VER.warn "%p shadows other actions bound to %p: %p" % [action, pattern, existing.choices]
|
101
|
+
when Impossible
|
102
|
+
end
|
103
|
+
|
76
104
|
top = sub = MapHash.new
|
77
105
|
|
78
|
-
while key =
|
79
|
-
if key.respond_to?(:
|
80
|
-
canonical = key_to_canonical(key.to_str)
|
81
|
-
self.keys << canonical
|
82
|
-
else
|
83
|
-
canonical = key
|
84
|
-
end
|
106
|
+
while key = pattern.shift
|
107
|
+
self.keys << key if key.respond_to?(:keysym)
|
85
108
|
|
86
|
-
if
|
87
|
-
sub[
|
109
|
+
if pattern.empty?
|
110
|
+
sub[key] = action
|
88
111
|
else
|
89
|
-
sub = sub[
|
112
|
+
sub = sub[key] = MapHash.new
|
90
113
|
end
|
91
114
|
end
|
92
115
|
|
93
116
|
keymap.replace(keymap.merge(top, &MERGER))
|
94
117
|
end
|
95
118
|
|
96
|
-
def [](*
|
97
|
-
|
98
|
-
remaining =
|
119
|
+
def [](*pattern)
|
120
|
+
pattern = [*pattern].flatten
|
121
|
+
remaining = pattern.dup
|
99
122
|
|
100
123
|
current = keymap
|
101
124
|
while key = remaining.shift
|
@@ -114,17 +137,18 @@ module VER
|
|
114
137
|
when Impossible
|
115
138
|
false
|
116
139
|
else
|
117
|
-
|
140
|
+
mode, action = *resolved
|
141
|
+
return cvalue.combine(action)
|
118
142
|
end
|
119
143
|
end
|
120
144
|
|
121
|
-
return Impossible.new(
|
145
|
+
return Impossible.new(pattern)
|
122
146
|
end
|
123
147
|
end
|
124
148
|
|
125
149
|
case current
|
126
150
|
when MapHash # incomplete
|
127
|
-
Incomplete.new(
|
151
|
+
Incomplete.new(pattern, current)
|
128
152
|
else
|
129
153
|
current
|
130
154
|
end
|
@@ -145,15 +169,20 @@ module VER
|
|
145
169
|
keymap.deep_each.map{|key, value| value }
|
146
170
|
end
|
147
171
|
|
148
|
-
def
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
|
153
|
-
|
154
|
-
|
155
|
-
|
172
|
+
def pattern_to_patterns(*patterns)
|
173
|
+
result = []
|
174
|
+
|
175
|
+
patterns.flatten.each do |pattern|
|
176
|
+
if pattern.respond_to?(:scan)
|
177
|
+
pattern.scan(/<<[^>]+>>|<[^>]+>|(?!\s<)[[:print:]]/) do
|
178
|
+
result << Event[$&].pattern
|
179
|
+
end
|
180
|
+
else
|
181
|
+
result << pattern
|
182
|
+
end
|
156
183
|
end
|
184
|
+
|
185
|
+
result
|
157
186
|
end
|
158
187
|
end
|
159
188
|
end
|