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
@@ -4,30 +4,30 @@
|
|
4
4
|
firstLineMatch: "<\\$?[Mm][Tt]",
|
5
5
|
foldingStartMarker:
|
6
6
|
/(?x)
|
7
|
-
(
|
8
|
-
|<(?i:MT:?(?!Else))(
|
7
|
+
(?<_1><(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|li|form|dl)\b.*?>
|
8
|
+
|<(?i:MT:?(?!Else))(?<_2>\w+:)?\w+\b.*?>
|
9
9
|
|<!--(?!.*--\s*>)
|
10
10
|
|^<!--\ \#tminclude\ (?>.*?-->)$
|
11
|
-
|<\?(?:php)?.*\b(if|for(each)?|while)\b.+:
|
12
|
-
|\{\{?(if|foreach|capture|literal|foreach|php|section|strip)
|
13
|
-
|\{\s*(
|
11
|
+
|<\?(?:php)?.*\b(?<_3>if|for(?<_4>each)?|while)\b.+:
|
12
|
+
|\{\{?(?<_5>if|foreach|capture|literal|foreach|php|section|strip)
|
13
|
+
|\{\s*(?<_6>$|\?>\s*$|\/\/|\/\*(?<_7>.*\*\/\s*$|(?!.*?\*\/)))
|
14
14
|
)/,
|
15
15
|
foldingStopMarker:
|
16
16
|
/(?x)
|
17
|
-
(
|
18
|
-
|<\/(?i:MT:?(?!Else))(
|
17
|
+
(?<_1><\/(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|li|form|dl)>
|
18
|
+
|<\/(?i:MT:?(?!Else))(?<_2>\w+:)?\w+\b.*?>
|
19
19
|
|^(?!.*?<!--).*?--\s*>
|
20
20
|
|^<!--\ end\ tminclude\ -->$
|
21
|
-
|<\?(?:php)?.*\bend(if|for(each)?|while)\b
|
22
|
-
|\{\{?\/(if|foreach|capture|literal|foreach|php|section|strip)
|
21
|
+
|<\?(?:php)?.*\bend(?<_3>if|for(?<_4>each)?|while)\b
|
22
|
+
|\{\{?\/(?<_5>if|foreach|capture|literal|foreach|php|section|strip)
|
23
23
|
|^[^{]*\}
|
24
24
|
)/,
|
25
|
-
keyEquivalent:
|
25
|
+
keyEquivalent: "^~M",
|
26
26
|
name: "Movable Type (MT only)",
|
27
27
|
patterns: [{include: "#mt"}],
|
28
28
|
repository:
|
29
29
|
{:"basic-html" =>
|
30
|
-
{begin: /(
|
30
|
+
{begin: /(?<_1><)(?<_2>[a-zA-Z0-9:]+)(?=[^>]*><\/\k<_2>>)/,
|
31
31
|
beginCaptures:
|
32
32
|
{1 => {name: "punctuation.definition.tag.html"},
|
33
33
|
2 => {name: "entity.name.tag.html"}},
|
@@ -46,7 +46,7 @@
|
|
46
46
|
[{captures:
|
47
47
|
{1 => {name: "punctuation.definition.constant.html"},
|
48
48
|
3 => {name: "punctuation.definition.constant.html"}},
|
49
|
-
match: /(
|
49
|
+
match: /(?<_1>&)(?<_2>[a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(?<_3>;)/,
|
50
50
|
name: "constant.character.entity.html"},
|
51
51
|
{match: /&/, name: "invalid.illegal.bad-ampersand.html"}]},
|
52
52
|
mt:
|
@@ -58,7 +58,7 @@
|
|
58
58
|
{comment: "text.html.basic"}]},
|
59
59
|
:"mt-container-tag" =>
|
60
60
|
{patterns:
|
61
|
-
[{begin: /(
|
61
|
+
[{begin: /(?<_1><\/?)(?<_2>[mM][tT]:?(?:\w+)?:?\w+)/,
|
62
62
|
beginCaptures:
|
63
63
|
{1 => {name: "punctuation.definition.tag.mt"},
|
64
64
|
2 => {name: "entity.name.tag.mt"}},
|
@@ -68,7 +68,7 @@
|
|
68
68
|
patterns: [{include: "#tag-stuff"}]}]},
|
69
69
|
:"mt-variable-tag" =>
|
70
70
|
{patterns:
|
71
|
-
[{begin: /(
|
71
|
+
[{begin: /(?<_1><)(?<_2>\$[mM][tT]:?(?:\w+)?:?\w+)/,
|
72
72
|
beginCaptures:
|
73
73
|
{1 => {name: "punctuation.definition.tag.mt"},
|
74
74
|
2 => {name: "variable.other.mt"}},
|
@@ -80,7 +80,7 @@
|
|
80
80
|
patterns: [{include: "#tag-stuff"}]}]},
|
81
81
|
php:
|
82
82
|
{patterns:
|
83
|
-
[{begin: /<\?(php|=)?/,
|
83
|
+
[{begin: /<\?(?<_1>php|=)?/,
|
84
84
|
captures: {0 => {name: "punctuation.section.embedded.php"}},
|
85
85
|
end: "\\?>",
|
86
86
|
name: "source.php.embedded.html",
|
@@ -101,9 +101,9 @@
|
|
101
101
|
name: "string.quoted.single.html",
|
102
102
|
patterns: [{include: "#embedded-code"}, {include: "#entities"}]},
|
103
103
|
:"tag-generic-attribute" =>
|
104
|
-
{match: /\b([a-zA-Z_:-]+)/, name: "entity.other.attribute-name.html"},
|
104
|
+
{match: /\b(?<_1>[a-zA-Z_:-]+)/, name: "entity.other.attribute-name.html"},
|
105
105
|
:"tag-id-attribute" =>
|
106
|
-
{begin: /\b(id)\b\s*(
|
106
|
+
{begin: /\b(?<_1>id)\b\s*(?<_2>=)/,
|
107
107
|
captures:
|
108
108
|
{1 => {name: "entity.other.attribute-name.id.html"},
|
109
109
|
2 => {name: "punctuation.separator.key-value.html"}},
|
@@ -129,7 +129,7 @@
|
|
129
129
|
:"tag-stuff" => {patterns: [{include: "#embedded-code"}]},
|
130
130
|
:"trans-tag" =>
|
131
131
|
{patterns:
|
132
|
-
[{begin: /(
|
132
|
+
[{begin: /(?<_1><)(?<_2>__trans)/,
|
133
133
|
beginCaptures:
|
134
134
|
{1 => {name: "punctuation.definition.tag.mt"},
|
135
135
|
2 => {name: "variable.other.mt"}},
|
@@ -4,25 +4,25 @@
|
|
4
4
|
firstLineMatch: "<\\$?[Mm][Tt]",
|
5
5
|
foldingStartMarker:
|
6
6
|
/(?x)
|
7
|
-
(
|
8
|
-
|<(?i:MT:?(?!Else))(
|
7
|
+
(?<_1><(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|li|form|dl)\b.*?>
|
8
|
+
|<(?i:MT:?(?!Else))(?<_2>\w+:)?\w+\b.*?>
|
9
9
|
|<!--(?!.*--\s*>)
|
10
10
|
|^<!--\ \#tminclude\ (?>.*?-->)$
|
11
|
-
|<\?(?:php)?.*\b(if|for(each)?|while)\b.+:
|
12
|
-
|\{\{?(if|foreach|capture|literal|foreach|php|section|strip)
|
13
|
-
|\{\s*(
|
11
|
+
|<\?(?:php)?.*\b(?<_3>if|for(?<_4>each)?|while)\b.+:
|
12
|
+
|\{\{?(?<_5>if|foreach|capture|literal|foreach|php|section|strip)
|
13
|
+
|\{\s*(?<_6>$|\?>\s*$|\/\/|\/\*(?<_7>.*\*\/\s*$|(?!.*?\*\/)))
|
14
14
|
)/,
|
15
15
|
foldingStopMarker:
|
16
16
|
/(?x)
|
17
|
-
(
|
18
|
-
|<\/(?i:MT:?(?!Else))(
|
17
|
+
(?<_1><\/(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|li|form|dl)>
|
18
|
+
|<\/(?i:MT:?(?!Else))(?<_2>\w+:)?\w+\b.*?>
|
19
19
|
|^(?!.*?<!--).*?--\s*>
|
20
20
|
|^<!--\ end\ tminclude\ -->$
|
21
|
-
|<\?(?:php)?.*\bend(if|for(each)?|while)\b
|
22
|
-
|\{\{?\/(if|foreach|capture|literal|foreach|php|section|strip)
|
21
|
+
|<\?(?:php)?.*\bend(?<_3>if|for(?<_4>each)?|while)\b
|
22
|
+
|\{\{?\/(?<_5>if|foreach|capture|literal|foreach|php|section|strip)
|
23
23
|
|^[^{]*\}
|
24
24
|
)/,
|
25
|
-
keyEquivalent:
|
25
|
+
keyEquivalent: "^~M",
|
26
26
|
name: "Movable Type",
|
27
27
|
patterns:
|
28
28
|
[{include: "#trans-tag"},
|
@@ -44,12 +44,12 @@
|
|
44
44
|
[{captures:
|
45
45
|
{1 => {name: "punctuation.definition.constant.html"},
|
46
46
|
3 => {name: "punctuation.definition.constant.html"}},
|
47
|
-
match: /(
|
47
|
+
match: /(?<_1>&)(?<_2>[a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(?<_3>;)/,
|
48
48
|
name: "constant.character.entity.html"},
|
49
49
|
{match: /&/, name: "invalid.illegal.bad-ampersand.html"}]},
|
50
50
|
:"mt-container-tag" =>
|
51
51
|
{patterns:
|
52
|
-
[{begin: /(
|
52
|
+
[{begin: /(?<_1><\/?)(?<_2>[Mm][Tt]:?(?<_3>\w+:)?\w+)/,
|
53
53
|
beginCaptures:
|
54
54
|
{1 => {name: "punctuation.definition.tag.mt"},
|
55
55
|
2 => {name: "entity.name.tag.mt"}},
|
@@ -59,7 +59,7 @@
|
|
59
59
|
patterns: [{include: "#tag-stuff"}]}]},
|
60
60
|
:"mt-variable-tag" =>
|
61
61
|
{patterns:
|
62
|
-
[{begin: /(
|
62
|
+
[{begin: /(?<_1><)(?<_2>\$[Mm][Tt]:?(?<_3>\w+:)?\w+)/,
|
63
63
|
beginCaptures:
|
64
64
|
{1 => {name: "punctuation.definition.tag.mt"},
|
65
65
|
2 => {name: "variable.other.mt"}},
|
@@ -71,13 +71,13 @@
|
|
71
71
|
patterns: [{include: "#tag-stuff"}]}]},
|
72
72
|
php:
|
73
73
|
{patterns:
|
74
|
-
[{begin: /(?:^\s*)(
|
74
|
+
[{begin: /(?:^\s*)(?<_1><\?(?<_2>php|=)?)(?!.*\?>)/,
|
75
75
|
captures: {1 => {name: "punctuation.section.embedded.php"}},
|
76
76
|
comment: "match only multi-line PHP with leading whitespace",
|
77
77
|
end: "(\\?>)(?:\\s*$\\n)?",
|
78
78
|
name: "source.php.embedded.html",
|
79
79
|
patterns: [{include: "#php-source"}]},
|
80
|
-
{begin: /<\?(php|=)?/,
|
80
|
+
{begin: /<\?(?<_1>php|=)?/,
|
81
81
|
captures: {0 => {name: "punctuation.section.embedded.php"}},
|
82
82
|
end: "\\?>",
|
83
83
|
name: "source.php.embedded.html",
|
@@ -85,10 +85,10 @@
|
|
85
85
|
:"php-source" =>
|
86
86
|
{patterns:
|
87
87
|
[{captures: {1 => {name: "punctuation.definition.comment.php"}},
|
88
|
-
match: /(
|
88
|
+
match: /(?<_1>#).*?(?=\?>)/,
|
89
89
|
name: "comment.line.number-sign.ruby"},
|
90
90
|
{captures: {1 => {name: "punctuation.definition.comment.php"}},
|
91
|
-
match: /(
|
91
|
+
match: /(?<_1>\/\/).*?(?=\?>)/,
|
92
92
|
name: "comment.line.double-slash.ruby"},
|
93
93
|
{include: "source.php"}]},
|
94
94
|
ruby:
|
@@ -98,7 +98,7 @@
|
|
98
98
|
name: "source.ruby.embedded.html",
|
99
99
|
patterns:
|
100
100
|
[{captures: {1 => {name: "punctuation.definition.comment.ruby"}},
|
101
|
-
match: /(
|
101
|
+
match: /(?<_1>#).*?(?=-?%>)/,
|
102
102
|
name: "comment.line.number-sign.ruby"},
|
103
103
|
{include: "source.ruby"}]},
|
104
104
|
smarty:
|
@@ -133,7 +133,7 @@
|
|
133
133
|
{include: "#embedded-code"},
|
134
134
|
{include: "#entities"}]},
|
135
135
|
:"tag-generic-attribute" =>
|
136
|
-
{match: /\b([a-zA-Z_:-]+)/, name: "entity.other.attribute-name.html"},
|
136
|
+
{match: /\b(?<_1>[a-zA-Z_:-]+)/, name: "entity.other.attribute-name.html"},
|
137
137
|
:"tag-stuff" =>
|
138
138
|
{patterns:
|
139
139
|
[{include: "#trans-tag"},
|
@@ -142,7 +142,7 @@
|
|
142
142
|
{include: "#string-single-quoted"}]},
|
143
143
|
:"trans-tag" =>
|
144
144
|
{patterns:
|
145
|
-
[{begin: /(
|
145
|
+
[{begin: /(?<_1><)(?<_2>__trans)/,
|
146
146
|
beginCaptures:
|
147
147
|
{1 => {name: "punctuation.definition.tag.mt"},
|
148
148
|
2 => {name: "variable.other.mt"}},
|
@@ -0,0 +1,35 @@
|
|
1
|
+
# Encoding: UTF-8
|
2
|
+
|
3
|
+
{firstLineMatch: "^Format:\\s*(?i:complete)\\s*$",
|
4
|
+
foldingStartMarker:
|
5
|
+
/(?x)
|
6
|
+
(?<_1><(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|form|dl)\b.*?>
|
7
|
+
|<!--(?!.*-->)
|
8
|
+
|\{\s*(?<_2>$|\?>\s*$|\/\/|\/\*(?<_3>.*\*\/\s*$|(?!.*?\*\/)))
|
9
|
+
)/,
|
10
|
+
foldingStopMarker:
|
11
|
+
/(?x)
|
12
|
+
(?<_1><\/(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|form|dl)>
|
13
|
+
|^\s*-->
|
14
|
+
|(?<_2>^|\s)\}
|
15
|
+
)/,
|
16
|
+
keyEquivalent: "^~M",
|
17
|
+
name: "MultiMarkdown",
|
18
|
+
patterns:
|
19
|
+
[{begin: /^(?<_1>[A-Za-z0-9]+)(?<_2>:)\s*/,
|
20
|
+
beginCaptures:
|
21
|
+
{1 => {name: "keyword.other.multimarkdown"},
|
22
|
+
2 => {name: "punctuation.separator.key-value.multimarkdown"}},
|
23
|
+
end: "^$|^(?=[A-Za-z0-9]+:)",
|
24
|
+
name: "meta.header.multimarkdown",
|
25
|
+
patterns:
|
26
|
+
[{comment:
|
27
|
+
"The reason for not setting scopeName = \"string.unquoted\" \n\t\t\t\t\t\t(for the parent rule) is that we do not want\n\t\t\t\t\t\tnewlines to be marked as string.unquoted",
|
28
|
+
match: /.+/,
|
29
|
+
name: "string.unquoted.multimarkdown"}]},
|
30
|
+
{begin: /^(?!=[A-Za-z0-9]+:)/,
|
31
|
+
end: "^(?=not)possible$",
|
32
|
+
name: "meta.content.multimarkdown",
|
33
|
+
patterns: [{include: "text.html.markdown"}]}],
|
34
|
+
scopeName: "text.html.markdown.multimarkdown",
|
35
|
+
uuid: "F5E04BF4-69A9-45AE-9205-B3F3C2B00130"}
|
data/config/syntax/Nemerle.rb
CHANGED
@@ -1,8 +1,8 @@
|
|
1
1
|
# Encoding: UTF-8
|
2
2
|
|
3
3
|
{fileTypes: ["n"],
|
4
|
-
foldingStartMarker: /(
|
5
|
-
foldingStopMarker: /(
|
4
|
+
foldingStartMarker: /(?<_1>\{|\(|<\[)/,
|
5
|
+
foldingStopMarker: /(?<_1>\}|\)|\]>)/,
|
6
6
|
keyEquivalent: "^~N",
|
7
7
|
name: "Nemerle",
|
8
8
|
patterns:
|
@@ -14,22 +14,22 @@
|
|
14
14
|
captures: {0 => {name: "punctuation.definition.comment.nemerle"}},
|
15
15
|
end: "\\*/",
|
16
16
|
name: "comment.block.nemerle"},
|
17
|
-
{match: /\b(
|
17
|
+
{match: /\b(?<_1>|false|null|true)\b/, name: "constant.language.nemerle"},
|
18
18
|
{match:
|
19
|
-
/\b(([0-9]+(
|
19
|
+
/\b(?<_1>(?<_2>[0-9]+(?<_3>\.|\_)?[0-9]*(?<_4>b|bu|d|f|L|LU|m|u|ub|UL)?)|(?<_5>0(?<_6>b|o|x)[0-9]+))\b/,
|
20
20
|
name: "constant.numeric.nemerle"},
|
21
21
|
{match:
|
22
|
-
/\b(catch|else|finally|for|foreach|if|match|repeat|try|unless|when|while)\b/,
|
22
|
+
/\b(?<_1>catch|else|finally|for|foreach|if|match|repeat|try|unless|when|while)\b/,
|
23
23
|
name: "keyword.control.nemerle"},
|
24
|
-
{match: /(
|
24
|
+
{match: /(?<_1>\+|\-|\*|\/|\%)\=?/, name: "keyword.operator.nemerle"},
|
25
25
|
{match:
|
26
|
-
/\b(
|
26
|
+
/\b(?<_1>\_|as|assert|base|checked|do|fun|get|ignore|implements|in|is|lock|namespace|out|params|ref|set|syntax|throw|typeof|unchecked|using|with)\b/,
|
27
27
|
name: "keyword.other.nemerle"},
|
28
28
|
{match:
|
29
|
-
/\b(array|bool|byte|char|class|decimal|double|enum|float|int|interface|list|long|macro|module|object|sbyte|short|string|struct|type|uint|ulong|ushort|variant|void)\b/,
|
29
|
+
/\b(?<_1>array|bool|byte|char|class|decimal|double|enum|float|int|interface|list|long|macro|module|object|sbyte|short|string|struct|type|uint|ulong|ushort|variant|void)\b/,
|
30
30
|
name: "storage.type.nemerle"},
|
31
31
|
{match:
|
32
|
-
/\b(abstract|def|delegate|event|extern|internal|mutable|override|public|private|protected|sealed|static|volatile|virtual|new)\b/,
|
32
|
+
/\b(?<_1>abstract|def|delegate|event|extern|internal|mutable|override|public|private|protected|sealed|static|volatile|virtual|new)\b/,
|
33
33
|
name: "storage.modifier.nemerle"},
|
34
34
|
{match: /this/, name: "variable.language.nemerle"},
|
35
35
|
{begin: /"/,
|
@@ -39,7 +39,7 @@
|
|
39
39
|
endCaptures: {0 => {name: "punctuation.definition.string.end.nemerle"}},
|
40
40
|
name: "string.quoted.double.nemerle",
|
41
41
|
patterns:
|
42
|
-
[{match: /\\(
|
42
|
+
[{match: /\\(?<_1>\\|'|\"|a|b|c[A-Z]+|e|f|n|r|u0+[0-9,A-Z]+|v)/,
|
43
43
|
name: "constant.character.escape.nemerle"}]},
|
44
44
|
{begin: /\$"/,
|
45
45
|
beginCaptures:
|
@@ -48,7 +48,7 @@
|
|
48
48
|
endCaptures: {0 => {name: "punctuation.definition.string.end.nemerle"}},
|
49
49
|
name: "string.interpolated.nemerle",
|
50
50
|
patterns:
|
51
|
-
[{match: /\$[a-z,A-Z]+[a-z,A-Z,0-9]*( |\+|\-|\*|\/|\%)/,
|
51
|
+
[{match: /\$[a-z,A-Z]+[a-z,A-Z,0-9]*(?<_1> |\+|\-|\*|\/|\%)/,
|
52
52
|
name: "constant.character.escape"}]},
|
53
53
|
{begin: /'/,
|
54
54
|
beginCaptures:
|
@@ -57,7 +57,7 @@
|
|
57
57
|
endCaptures: {0 => {name: "punctuation.definition.string.end.nemerle"}},
|
58
58
|
name: "string.quoted.single.nemerle",
|
59
59
|
patterns:
|
60
|
-
[{match: /\\(
|
60
|
+
[{match: /\\(?<_1>\\|'|\"|a|b|c[A-Z]+|e|f|n|r|u0+[0-9,A-Z]+|v)/,
|
61
61
|
name: "constant.character.escape"}]}],
|
62
62
|
scopeName: "source.nemerle",
|
63
63
|
uuid: "F563968D-4CB3-11DB-9F95-00112474B8F0"}
|
data/config/syntax/OCaml.rb
CHANGED
@@ -2,9 +2,9 @@
|
|
2
2
|
|
3
3
|
{fileTypes: ["ml", "mli"],
|
4
4
|
foldingStartMarker:
|
5
|
-
/(
|
5
|
+
/(?<_1>\b(?<_2>module|class|)\s.*?=\s*$|\bbegin|sig|struct|(?<_3>object(?<_4>\s*\(_?[a-z]+\))?)\s*$|\bwhile\s.*?\bdo\s*$|^let(?:\s+rec)?\s+[a-z_][a-zA-Z0-9_]*\s+(?!=)\S)/,
|
6
6
|
foldingStopMarker:
|
7
|
-
/(
|
7
|
+
/(?<_1>\bend(?<_2>\s+in)?[ \t]*(?<_3>;{1,2}|=)?|\bdone;?|^\s*;;|^\s*in)[ \t]*$/,
|
8
8
|
keyEquivalent: "^~O",
|
9
9
|
name: "OCaml",
|
10
10
|
patterns:
|
@@ -13,10 +13,11 @@
|
|
13
13
|
2 => {name: "keyword.other.module-definition.ocaml"},
|
14
14
|
3 => {name: "support.other.module.ocaml"},
|
15
15
|
4 => {name: "punctuation.separator.module-binding.ocmal"}},
|
16
|
-
match:
|
16
|
+
match:
|
17
|
+
/\b(?<_1>let)\s+(?<_2>module)\s+(?<_3>[A-Z][a-zA-Z0-9'_]*)\s*(?<_4>=)/,
|
17
18
|
name: "meta.module.binding"},
|
18
19
|
{begin:
|
19
|
-
/\b(let|and)\s+(?!\(\*)((rec\s+)([a-z_][a-zA-Z0-9_']*)\b|([a-z_][a-zA-Z0-9_']*|\([^)]+\))(?=\s)((?=\s*=\s*(?=fun(?:ction)\b))|(?!\s*=)))/,
|
20
|
+
/\b(?<_1>let|and)\s+(?!\(\*)(?<_2>(?<_3>rec\s+)(?<_4>[a-z_][a-zA-Z0-9_']*)\b|(?<_5>[a-z_][a-zA-Z0-9_']*|\([^)]+\))(?=\s)(?<_6>(?=\s*=\s*(?=fun(?:ction)\b))|(?!\s*=)))/,
|
20
21
|
beginCaptures:
|
21
22
|
{1 => {name: "keyword.other.function-definition.ocaml"},
|
22
23
|
3 => {name: "keyword.other.funtion-definition.ocaml"},
|
@@ -30,7 +31,7 @@
|
|
30
31
|
4 => {name: "keyword.operator.ocaml"}},
|
31
32
|
name: "meta.function.ocaml",
|
32
33
|
patterns: [{include: "#variables"}]},
|
33
|
-
{begin: /(
|
34
|
+
{begin: /(?<_1>\(|\s)(?=fun\s)/,
|
34
35
|
beginCaptures:
|
35
36
|
{1 => {name: "punctuation.definition.function.anonymous.ocaml"}},
|
36
37
|
end: "(\\))",
|
@@ -38,7 +39,7 @@
|
|
38
39
|
{1 => {name: "punctuation.definition.function.anonymous.ocaml"}},
|
39
40
|
name: "meta.function.anonymous.ocaml",
|
40
41
|
patterns:
|
41
|
-
[{begin: /(?<=(
|
42
|
+
[{begin: /(?<=(?<_1>\(|\s))(?<_2>fun)\s/,
|
42
43
|
beginCaptures: {2 => {name: "keyword.other.function-definition.ocaml"}},
|
43
44
|
end: "(->)",
|
44
45
|
endCaptures:
|
@@ -50,7 +51,7 @@
|
|
50
51
|
end: "\\b(?=let|end|val)|^\\s*$",
|
51
52
|
name: "meta.type-definition-group.ocaml",
|
52
53
|
patterns:
|
53
|
-
[{begin: /\b(type|and)\s+([^=]*)(
|
54
|
+
[{begin: /\b(?<_1>type|and)\s+(?<_2>[^=]*)(?<_3>=)?/,
|
54
55
|
beginCaptures:
|
55
56
|
{1 => {name: "keyword.other.type-definition.ocaml"},
|
56
57
|
2 => {name: "storage.type.ocaml"},
|
@@ -58,7 +59,8 @@
|
|
58
59
|
end: "(?=\\b(type|and|let|end|val)\\b)|(?=^\\s*$)",
|
59
60
|
name: "meta.type-definition.ocaml",
|
60
61
|
patterns: [{include: "#typedefs"}]}]},
|
61
|
-
{begin:
|
62
|
+
{begin:
|
63
|
+
/\b(?<_1>with|function)(?=(?<_2>\s*$|.*->))\b|(?<_3>(?<!\S)(?<_4>\|)(?=(?<_5>\w|\s).*->))/,
|
62
64
|
beginCaptures:
|
63
65
|
{1 => {name: "keyword.control.match-definition.ocaml"},
|
64
66
|
2 => {name: "keyword.other.function-definition.ocaml"},
|
@@ -74,10 +76,10 @@
|
|
74
76
|
2 => {name: "entity.name.type.class-type.ocaml"},
|
75
77
|
4 => {name: "storage.type.ocaml"}},
|
76
78
|
match:
|
77
|
-
/^[ \t]*(class\s+type\s+)((
|
79
|
+
/^[ \t]*(?<_1>class\s+type\s+)(?<_2>(?<_3>\[\s*(?<_4>'[A-Za-z][a-zA-Z0-9_']*(?:\s*,\s*'[A-Za-z][a-zA-Z0-9_']*)*)\s*\]\s+)?[a-z_][a-zA-Z0-9'_]*)/,
|
78
80
|
name: "meta.class.type-definition.ocaml"},
|
79
81
|
{begin:
|
80
|
-
/^[ \t]*(class)(?:\s+(?!(?:virtual)\s+))((
|
82
|
+
/^[ \t]*(?<_1>class)(?:\s+(?!(?:virtual)\s+))(?<_2>(?<_3>\[\s*(?<_4>'[A-Za-z][a-zA-Z0-9_']*(?:\s*,\s*'[A-Za-z][a-zA-Z0-9_']*)*)\s*\]\s+)?[a-z_][a-zA-Z0-9'_]*)/,
|
81
83
|
beginCaptures:
|
82
84
|
{1 => {name: "keyword.other.class-definition.ocaml"},
|
83
85
|
2 => {name: "entity.name.type.class.ocaml"},
|
@@ -87,7 +89,7 @@
|
|
87
89
|
name: "meta.class.ocaml",
|
88
90
|
patterns: [{include: "#variables"}]},
|
89
91
|
{begin:
|
90
|
-
/^[ \t]*(class\s+virtual\s+)((
|
92
|
+
/^[ \t]*(?<_1>class\s+virtual\s+)(?<_2>(?<_3>\[\s*(?<_4>'[A-Za-z][a-zA-Z0-9_']*(?:\s*,\s*'[A-Za-z][a-zA-Z0-9_']*)*)\s*\]\s+)?[a-z_][a-zA-Z0-9'_]*)/,
|
91
93
|
beginCaptures:
|
92
94
|
{1 => {name: "keyword.other.class-definition.ocaml"},
|
93
95
|
2 => {name: "entity.name.type.class.ocaml"},
|
@@ -101,16 +103,16 @@
|
|
101
103
|
2 => {name: "entity.name.type.class-type.ocaml"},
|
102
104
|
4 => {name: "storage.type.ocaml"}},
|
103
105
|
match:
|
104
|
-
/^[ \t]*(class\s+type\s+virtual)((
|
106
|
+
/^[ \t]*(?<_1>class\s+type\s+virtual)(?<_2>(?<_3>\[\s*(?<_4>'[A-Za-z][a-zA-Z0-9_']*(?:\s*,\s*'[A-Za-z][a-zA-Z0-9_']*)*)\s*\]\s+)?[a-z_][a-zA-Z0-9'_]*)/,
|
105
107
|
name: "meta.class.virtual.type-definition.ocaml"},
|
106
|
-
{begin: /(
|
108
|
+
{begin: /(?<_1>\{)/,
|
107
109
|
beginCaptures: {1 => {name: "punctuation.definition.record.ocaml"}},
|
108
110
|
end: "(\\})",
|
109
111
|
endCaptures: {1 => {name: "punctuation.definition.record.ocaml"}},
|
110
112
|
name: "meta.record.ocaml",
|
111
113
|
patterns:
|
112
114
|
[{match: /\bwith\b/, name: "keyword.other.language.ocaml"},
|
113
|
-
{begin: /(
|
115
|
+
{begin: /(?<_1>\bmutable\s+)?\b(?<_2>[a-z_][a-zA-Z0-9_']*)\s*(?<_3>:)/,
|
114
116
|
beginCaptures:
|
115
117
|
{1 => {name: "keyword.other.storage.modifier.ocaml"},
|
116
118
|
2 => {name: "source.ocaml"},
|
@@ -120,7 +122,7 @@
|
|
120
122
|
name: "meta.record.definition.ocaml",
|
121
123
|
patterns: [{include: "#typedefs"}]},
|
122
124
|
{include: "$self"}]},
|
123
|
-
{begin: /\b(object)\s*(?:(
|
125
|
+
{begin: /\b(?<_1>object)\s*(?:(?<_2>\()(?<_3>_?[a-z]+)(?<_4>\)))?\s*$/,
|
124
126
|
beginCaptures:
|
125
127
|
{1 => {name: "keyword.other.object-definition.ocaml"},
|
126
128
|
2 => {name: "punctuation.definition.self-binding.ocaml"},
|
@@ -132,7 +134,8 @@
|
|
132
134
|
2 => {name: "punctuation.terminator.expression.ocaml"}},
|
133
135
|
name: "meta.object.ocaml",
|
134
136
|
patterns:
|
135
|
-
[{begin:
|
137
|
+
[{begin:
|
138
|
+
/\b(?<_1>method)\s+(?<_2>virtual\s+)?(?<_3>private\s+)?(?<_4>[a-z_][a-zA-Z0-9'_]*)/,
|
136
139
|
beginCaptures:
|
137
140
|
{1 => {name: "keyword.other.method-definition.ocaml"},
|
138
141
|
2 => {name: "keyword.other.method-definition.ocaml"},
|
@@ -142,7 +145,7 @@
|
|
142
145
|
endCaptures: {1 => {name: "keyword.operator.ocaml"}},
|
143
146
|
name: "meta.method.ocaml",
|
144
147
|
patterns: [{include: "#variables"}]},
|
145
|
-
{begin: /(constraint)\s+([a-z_'][a-zA-Z0-9'_]*)\s+(
|
148
|
+
{begin: /(?<_1>constraint)\s+(?<_2>[a-z_'][a-zA-Z0-9'_]*)\s+(?<_3>=)/,
|
146
149
|
beginCaptures:
|
147
150
|
{1 => {name: "keyword.other.language.ocaml"},
|
148
151
|
2 => {name: "storage.type.ocaml"},
|
@@ -156,7 +159,7 @@
|
|
156
159
|
name: "meta.object.type-constraint.ocaml"},
|
157
160
|
{include: "$self"}]},
|
158
161
|
{captures: {1 => {name: "punctuation.separator.method-call.ocaml"}},
|
159
|
-
match: /(?<=\w|\)|')(
|
162
|
+
match: /(?<=\w|\)|')(?<_1>#)[a-z_][a-zA-Z0-9'_]*/,
|
160
163
|
name: "meta.method-call.ocaml"},
|
161
164
|
{captures:
|
162
165
|
{1 => {name: "keyword.other.module-definition.ocaml"},
|
@@ -164,14 +167,14 @@
|
|
164
167
|
3 => {name: "punctuation.separator.module-definition.ocaml"},
|
165
168
|
4 => {name: "entity.name.type.module-type.ocaml"}},
|
166
169
|
match:
|
167
|
-
/^[ \t]*(module)\s+([A-Z_][a-zA-Z0-9'_]*)(?:\s*(
|
170
|
+
/^[ \t]*(?<_1>module)\s+(?<_2>[A-Z_][a-zA-Z0-9'_]*)(?:\s*(?<_3>:)\s*(?<_4>[A-Z][a-zA-Z0-9'_]*)?)?/,
|
168
171
|
name: "meta.module.ocaml"},
|
169
172
|
{captures:
|
170
173
|
{1 => {name: "keyword.other.module-type-definition.ocaml"},
|
171
174
|
2 => {name: "entity.name.type.module-type.ocaml"}},
|
172
|
-
match: /^[ \t]*(module\s+type\s+)([A-Z][a-zA-Z0-9'_]*)/,
|
175
|
+
match: /^[ \t]*(?<_1>module\s+type\s+)(?<_2>[A-Z][a-zA-Z0-9'_]*)/,
|
173
176
|
name: "meta.module.type.ocaml"},
|
174
|
-
{begin: /\b(sig)\b/,
|
177
|
+
{begin: /\b(?<_1>sig)\b/,
|
175
178
|
beginCaptures: {1 => {name: "keyword.other.module.signature.ocaml"}},
|
176
179
|
end: "\\b(end)\\b",
|
177
180
|
endCaptures:
|
@@ -180,14 +183,15 @@
|
|
180
183
|
3 => {name: "keyword.operator.ocaml"}},
|
181
184
|
name: "meta.module.signature.ocaml",
|
182
185
|
patterns: [{include: "#module-signature"}, {include: "$self"}]},
|
183
|
-
{begin: /\b(struct)\b/,
|
186
|
+
{begin: /\b(?<_1>struct)\b/,
|
184
187
|
beginCaptures: {1 => {name: "keyword.other.module.structure.ocaml"}},
|
185
188
|
end: "\\b(end)\\b",
|
186
189
|
endCaptures: {1 => {name: "keyword.other.module.structure.ocaml"}},
|
187
190
|
name: "meta.module.structure.ocaml",
|
188
191
|
patterns: [{include: "$self"}]},
|
189
192
|
{include: "#moduleref"},
|
190
|
-
{begin:
|
193
|
+
{begin:
|
194
|
+
/\b(?<_1>open)\s+(?<_2>[A-Z][a-zA-Z0-9'_]*)(?=(?<_3>\.[A-Z][a-zA-Z0-9_]*)*)/,
|
191
195
|
beginCaptures:
|
192
196
|
{1 => {name: "keyword.other.ocaml"},
|
193
197
|
2 => {name: "support.other.module.ocaml"}},
|
@@ -195,14 +199,14 @@
|
|
195
199
|
name: "meta.module.open.ocaml",
|
196
200
|
patterns:
|
197
201
|
[{captures: {1 => {name: "punctuation.separator.module-reference.ocaml"}},
|
198
|
-
match: /(
|
202
|
+
match: /(?<_1>\.)(?<_2>[A-Z][a-zA-Z0-9'_]*)/,
|
199
203
|
name: "support.other.module.ocaml"}]},
|
200
204
|
{captures:
|
201
205
|
{1 => {name: "keyword.other.ocaml"},
|
202
206
|
2 => {name: "entity.name.type.exception.ocaml"}},
|
203
|
-
match: /\b(exception)\s+([A-Z][a-zA-Z0-9'_]*)\b/,
|
207
|
+
match: /\b(?<_1>exception)\s+(?<_2>[A-Z][a-zA-Z0-9'_]*)\b/,
|
204
208
|
name: "meta.exception.ocaml"},
|
205
|
-
{begin: /(?=(
|
209
|
+
{begin: /(?=(?<_1>\[<)(?![^\[]+?[^>]]))/,
|
206
210
|
end: "(>])",
|
207
211
|
endCaptures: {1 => {name: "punctuation.definition.camlp4-stream.ocaml"}},
|
208
212
|
name: "source.camlp4.embedded.ocaml",
|
@@ -213,7 +217,7 @@
|
|
213
217
|
{include: "#lists"},
|
214
218
|
{include: "#arrays"},
|
215
219
|
{begin:
|
216
|
-
/(
|
220
|
+
/(?<_1>\()(?=(?<_2>~[a-z][a-zA-Z0-9_]*:|(?<_3>"(?<_4>\\"|[^"])*")|[^\(\)~"])+(?<!:)(?<_5>:>|:(?![:=])))/,
|
217
221
|
beginCaptures: {1 => {name: "punctuation.section.type-constraint.ocaml"}},
|
218
222
|
end: "(?<!:)(:>|:(?![:=]))(.*?)(\\))",
|
219
223
|
endCaptures:
|
@@ -226,7 +230,8 @@
|
|
226
230
|
{match: /^[ \t]*#[0-9]*/,
|
227
231
|
name: "keyword.other.directive.line-number.ocaml"},
|
228
232
|
{include: "#storagetypes"},
|
229
|
-
{match: /\b(mutable|ref)\b/,
|
233
|
+
{match: /\b(?<_1>mutable|ref)\b/,
|
234
|
+
name: "keyword.other.storage.modifier.ocaml"},
|
230
235
|
{match: /`[A-Za-z][a-zA-Z0-9'_]*\b/,
|
231
236
|
name: "entity.name.type.variant.polymorphic.ocaml"},
|
232
237
|
{match: /\b[A-Z][a-zA-Z0-9'_]*\b/, name: "entity.name.type.variant.ocaml"},
|
@@ -242,15 +247,15 @@
|
|
242
247
|
{match: /\bnot\b|!|[!\?~][!$%&*+.\/:<=>?@^~-]+/,
|
243
248
|
name: "keyword.operator.prefix.ocaml"},
|
244
249
|
{captures: {1 => {name: "punctuation.separator.argument-label.ocaml"}},
|
245
|
-
match: /~[a-z][a-z0-9'_]*(
|
250
|
+
match: /~[a-z][a-z0-9'_]*(?<_1>:)?/,
|
246
251
|
name: "entity.name.tag.label.ocaml"},
|
247
|
-
{begin: /\b(begin)\b/,
|
252
|
+
{begin: /\b(?<_1>begin)\b/,
|
248
253
|
beginCaptures: {1 => {name: "keyword.control.begin-end.ocaml"}},
|
249
254
|
end: "\\b(end)\\b",
|
250
255
|
endCaptures: {1 => {name: "keyword.control.begin-end.ocaml"}},
|
251
256
|
name: "meta.begin-end-group.ocaml",
|
252
257
|
patterns: [{include: "$self"}]},
|
253
|
-
{begin: /\b(for)\b/,
|
258
|
+
{begin: /\b(?<_1>for)\b/,
|
254
259
|
beginCaptures: {1 => {name: "keyword.control.for-loop.ocaml"}},
|
255
260
|
end: "\\b(done)\\b",
|
256
261
|
endCaptures: {1 => {name: "keyword.control.for-loop.ocaml"}},
|
@@ -258,7 +263,7 @@
|
|
258
263
|
patterns:
|
259
264
|
[{match: /\bdo\b/, name: "keyword.control.loop.ocaml"},
|
260
265
|
{include: "$self"}]},
|
261
|
-
{begin: /\b(while)\b/,
|
266
|
+
{begin: /\b(?<_1>while)\b/,
|
262
267
|
beginCaptures: {1 => {name: "keyword.control.while-loop.ocaml"}},
|
263
268
|
end: "\\b(done)\\b",
|
264
269
|
endCaptures: {1 => {name: "keyword.control.while-loop.ocaml"}},
|
@@ -270,19 +275,20 @@
|
|
270
275
|
end: "\\)",
|
271
276
|
name: "meta.paren-group.ocaml",
|
272
277
|
patterns: [{include: "$self"}]},
|
273
|
-
{match: /\b(and|land|lor|lsl|lsr|lxor|mod|or)\b/,
|
278
|
+
{match: /\b(?<_1>and|land|lor|lsl|lsr|lxor|mod|or)\b/,
|
274
279
|
name: "keyword.operator.ocaml"},
|
275
|
-
{match: /\b(downto|if|else|match|then|to|when|with|try)\b/,
|
280
|
+
{match: /\b(?<_1>downto|if|else|match|then|to|when|with|try)\b/,
|
276
281
|
name: "keyword.control.ocaml"},
|
277
282
|
{match:
|
278
|
-
/\b(as|assert|class|constraint|exception|functor|in|include|inherit|initializer|lazy|let|mod|module|mutable|new|object|open|private|rec|sig|struct|type|virtual)\b/,
|
283
|
+
/\b(?<_1>as|assert|class|constraint|exception|functor|in|include|inherit|initializer|lazy|let|mod|module|mutable|new|object|open|private|rec|sig|struct|type|virtual)\b/,
|
279
284
|
name: "keyword.other.ocaml"},
|
280
285
|
{include: "#module-signature"},
|
281
|
-
{match: /(
|
286
|
+
{match: /(?<_1>’|‘|“|”)/,
|
287
|
+
name: "invalid.illegal.unrecognized-character.ocaml"}],
|
282
288
|
repository:
|
283
289
|
{arrays:
|
284
290
|
{patterns:
|
285
|
-
[{begin: /(
|
291
|
+
[{begin: /(?<_1>\[\|)/,
|
286
292
|
beginCaptures:
|
287
293
|
{1 => {name: "punctuation.definition.array.begin.ocaml"}},
|
288
294
|
end: "(\\|])",
|
@@ -292,17 +298,17 @@
|
|
292
298
|
comments:
|
293
299
|
{patterns:
|
294
300
|
[{captures: {1 => {name: "comment.block.empty.ocaml"}},
|
295
|
-
match: /\(\*+(
|
301
|
+
match: /\(\*+(?<_1>\*)\)/,
|
296
302
|
name: "comment.block.ocaml"},
|
297
303
|
{begin: /\(\*/,
|
298
304
|
end: "\\*\\)",
|
299
305
|
name: "comment.block.ocaml",
|
300
306
|
patterns: [{include: "#comments"}]},
|
301
|
-
{begin: /(?=[^\\])(")/,
|
307
|
+
{begin: /(?=[^\\])(?<_1>")/,
|
302
308
|
end: "\"",
|
303
309
|
name: "comment.block.string.quoted.double.ocaml",
|
304
310
|
patterns:
|
305
|
-
[{match: /\\(x[a-fA-F0-9][a-fA-F0-9]|[0-2]\d\d|[bnrt'"\\])/,
|
311
|
+
[{match: /\\(?<_1>x[a-fA-F0-9][a-fA-F0-9]|[0-2]\d\d|[bnrt'"\\])/,
|
306
312
|
name: "comment.block.string.constant.character.escape.ocaml"}]}]},
|
307
313
|
constants:
|
308
314
|
{patterns:
|
@@ -310,25 +316,27 @@
|
|
310
316
|
{1 => {name: "meta.empty-typing-pair.ocaml"},
|
311
317
|
2 => {name: "meta.empty-typing-pair.parens.ocaml"},
|
312
318
|
3 => {name: "meta.empty-typing-pair.ocaml"}},
|
313
|
-
match: /(?:\[\s*(
|
319
|
+
match: /(?:\[\s*(?<_1>\])|\((?<_2>\))|\(\s*(?<_3>\)))/,
|
314
320
|
name: "constant.language.pseudo-variable.ocaml"},
|
315
|
-
{match: /\b(true|false)\b/,
|
321
|
+
{match: /\b(?<_1>true|false)\b/,
|
322
|
+
name: "constant.language.boolean.ocaml"},
|
316
323
|
{match:
|
317
|
-
/\b-?[0-9][0-9_]*((
|
324
|
+
/\b-?[0-9][0-9_]*(?<_1>(?<_2>\.(?<_3>[0-9][0-9_]*(?<_4>[eE][+-]??[0-9][0-9_]*)?)?)|(?<_5>[eE][+-]??[0-9][0-9_]*))/,
|
318
325
|
name: "constant.numeric.floating-point.ocaml"},
|
319
326
|
{match:
|
320
|
-
/\b(
|
327
|
+
/\b(?<_1>-?(?<_2>(?<_3>0(?<_4>x|X)[0-9a-fA-F][0-9a-fA-F_]*)|(?<_5>0(?<_6>o|O)[0-7][0-7_]*)|(?<_7>0(?<_8>b|B)[01][01_]*)|(?<_9>[0-9][0-9_]*)))n/,
|
321
328
|
name: "constant.numeric.integer.nativeint.ocaml"},
|
322
329
|
{match:
|
323
|
-
/\b(
|
330
|
+
/\b(?<_1>-?(?<_2>(?<_3>0(?<_4>x|X)[0-9a-fA-F][0-9a-fA-F_]*)|(?<_5>0(?<_6>o|O)[0-7][0-7_]*)|(?<_7>0(?<_8>b|B)[01][01_]*)|(?<_9>[0-9][0-9_]*)))L/,
|
324
331
|
name: "constant.numeric.integer.int64.ocaml"},
|
325
332
|
{match:
|
326
|
-
/\b(
|
333
|
+
/\b(?<_1>-?(?<_2>(?<_3>0(?<_4>x|X)[0-9a-fA-F][0-9a-fA-F_]*)|(?<_5>0(?<_6>o|O)[0-7][0-7_]*)|(?<_7>0(?<_8>b|B)[01][01_]*)|(?<_9>[0-9][0-9_]*)))l/,
|
327
334
|
name: "constant.numeric.integer.int32.ocaml"},
|
328
335
|
{match:
|
329
|
-
/\b(
|
336
|
+
/\b(?<_1>-?(?<_2>(?<_3>0(?<_4>x|X)[0-9a-fA-F][0-9a-fA-F_]*)|(?<_5>0(?<_6>o|O)[0-7][0-7_]*)|(?<_7>0(?<_8>b|B)[01][01_]*)|(?<_9>[0-9][0-9_]*)))/,
|
330
337
|
name: "constant.numeric.integer.ocaml"},
|
331
|
-
{match:
|
338
|
+
{match:
|
339
|
+
/'(?<_1>.|\\(?<_2>x[a-fA-F0-9][a-fA-F0-9]|[0-2]\d\d|[bnrt'"\\]))'/,
|
332
340
|
name: "constant.character.ocaml"}]},
|
333
341
|
definite_storagetypes:
|
334
342
|
{patterns:
|
@@ -336,7 +344,7 @@
|
|
336
344
|
{match: /\b[a-zA-Z0-9'_]+\b/, name: "storage.type.ocaml"}]},
|
337
345
|
lists:
|
338
346
|
{patterns:
|
339
|
-
[{begin: /(
|
347
|
+
[{begin: /(?<_1>\[)(?!\||<|>)/,
|
340
348
|
beginCaptures:
|
341
349
|
{1 => {name: "punctuation.definition.list.begin.ocaml"}},
|
342
350
|
end: "(?<!\\||>)(])",
|
@@ -348,7 +356,7 @@
|
|
348
356
|
[{match: /\b_\b/, name: "constant.language.universal-match.ocaml"},
|
349
357
|
{match: /\|(?=\s*\S)/,
|
350
358
|
name: "punctuation.separator.match-pattern.ocaml"},
|
351
|
-
{begin: /(
|
359
|
+
{begin: /(?<_1>\()(?=(?!=.*?->).*?\|)/,
|
352
360
|
beginCaptures:
|
353
361
|
{1 => {name: "punctuation.definition.match-option.ocaml"}},
|
354
362
|
end: "(\\))",
|
@@ -364,7 +372,7 @@
|
|
364
372
|
{include: "$self"}]},
|
365
373
|
:"module-signature" =>
|
366
374
|
{patterns:
|
367
|
-
[{begin: /(val)\s+([a-z_][a-zA-Z0-9_']*)\s*(
|
375
|
+
[{begin: /(?<_1>val)\s+(?<_2>[a-z_][a-zA-Z0-9_']*)\s*(?<_3>:)/,
|
368
376
|
beginCaptures:
|
369
377
|
{1 => {name: "keyword.other.ocaml"},
|
370
378
|
2 => {name: "entity.name.type.value-signature.ocaml"},
|
@@ -376,9 +384,9 @@
|
|
376
384
|
{1 => {name: "punctuation.definition.optional-parameter.ocaml"},
|
377
385
|
2 => {name: "entity.name.tag.label.optional.ocaml"},
|
378
386
|
3 => {name: "punctuation.separator.optional-parameter.ocaml"}},
|
379
|
-
match: /(
|
387
|
+
match: /(?<_1>\?)(?<_2>[a-z][a-zA-Z0-9_]*)\s*(?<_3>:)/,
|
380
388
|
name: "variable.parameter.ameter.optional.ocaml"},
|
381
|
-
{begin: /([a-z][a-zA-Z0-9'_]*)\s*(
|
389
|
+
{begin: /(?<_1>[a-z][a-zA-Z0-9'_]*)\s*(?<_2>:)\s*/,
|
382
390
|
beginCaptures:
|
383
391
|
{1 => {name: "entity.name.tag.label.ocaml"},
|
384
392
|
2 => {name: "punctuation.separator.label.ocaml"},
|
@@ -387,7 +395,7 @@
|
|
387
395
|
name: "variable.parameter.labeled.ocaml",
|
388
396
|
patterns: [{include: "#definite_storagetypes"}]},
|
389
397
|
{include: "#typedefs"}]},
|
390
|
-
{begin: /(external)\s+([a-z_][a-zA-Z0-9_']*)\s*(
|
398
|
+
{begin: /(?<_1>external)\s+(?<_2>[a-z_][a-zA-Z0-9_']*)\s*(?<_3>:)/,
|
391
399
|
beginCaptures:
|
392
400
|
{1 => {name: "keyword.other.ocaml"},
|
393
401
|
2 => {name: "entity.name.type.external-signature.ocaml"},
|
@@ -399,9 +407,9 @@
|
|
399
407
|
{1 => {name: "punctuation.definition.optional-parameter.ocaml"},
|
400
408
|
2 => {name: "entity.name.tag.label.optional.ocaml"},
|
401
409
|
3 => {name: "punctuation.separator.optional-parameter.ocaml"}},
|
402
|
-
match: /(
|
410
|
+
match: /(?<_1>\?)(?<_2>[a-z][a-zA-Z0-9_]*)\s*(?<_3>:)/,
|
403
411
|
name: "variable.parameter.optional.ocaml"},
|
404
|
-
{begin: /(
|
412
|
+
{begin: /(?<_1>~)(?<_2>[a-z][a-zA-Z0-9'_]*)\s*(?<_3>:)\s*/,
|
405
413
|
beginCaptures:
|
406
414
|
{1 => {name: "punctuation.definition.labeled-parameter.ocaml"},
|
407
415
|
2 => {name: "entity.name.tag.label.ocaml"},
|
@@ -416,18 +424,18 @@
|
|
416
424
|
[{beginCaptures:
|
417
425
|
{1 => {name: "support.other.module.ocaml"},
|
418
426
|
2 => {name: "punctuation.separator.module-reference.ocaml"}},
|
419
|
-
match: /\b([A-Z][a-zA-Z0-9'_]*)(
|
427
|
+
match: /\b(?<_1>[A-Z][a-zA-Z0-9'_]*)(?<_2>\.)/,
|
420
428
|
name: "meta.module-reference.ocaml"}]},
|
421
429
|
storagetypes:
|
422
430
|
{patterns:
|
423
431
|
[{match:
|
424
|
-
/\b(int|char|float|string|list|array|bool|unit|exn|option|int32|int64|nativeint|format4|lazy_t)\b/,
|
432
|
+
/\b(?<_1>int|char|float|string|list|array|bool|unit|exn|option|int32|int64|nativeint|format4|lazy_t)\b/,
|
425
433
|
name: "storage.type.ocaml"},
|
426
434
|
{match: /#[a-z_][a-zA-Z0-9_]*/,
|
427
435
|
name: "storage.type.variant.polymorphic.ocaml"}]},
|
428
436
|
strings:
|
429
437
|
{patterns:
|
430
|
-
[{begin: /(?=[^\\])(")/,
|
438
|
+
[{begin: /(?=[^\\])(?<_1>")/,
|
431
439
|
beginCaptures:
|
432
440
|
{1 => {name: "punctuation.definition.string.begin.ocaml"}},
|
433
441
|
end: "(\")",
|
@@ -436,12 +444,12 @@
|
|
436
444
|
patterns:
|
437
445
|
[{match: /\\$[ \t]*/,
|
438
446
|
name: "punctuation.separator.string.ignore-eol.ocaml"},
|
439
|
-
{match: /\\(x[a-fA-F0-9][a-fA-F0-9]|[0-2]\d\d|[bnrt'"\\])/,
|
447
|
+
{match: /\\(?<_1>x[a-fA-F0-9][a-fA-F0-9]|[0-2]\d\d|[bnrt'"\\])/,
|
440
448
|
name: "constant.character.string.escape.ocaml"},
|
441
449
|
{match: /\\[\|\(\)1-9$^.*+?\[\]]/,
|
442
450
|
name: "constant.character.regexp.escape.ocaml"},
|
443
451
|
{match:
|
444
|
-
/\\(?!(x[a-fA-F0-9][a-fA-F0-9]|[0-2]\d\d|[bnrt'"\\]|[\|\(\)1-9$^.*+?\[\]]|$[ \t]*))(?:.)/,
|
452
|
+
/\\(?!(?<_1>x[a-fA-F0-9][a-fA-F0-9]|[0-2]\d\d|[bnrt'"\\]|[\|\(\)1-9$^.*+?\[\]]|$[ \t]*))(?:.)/,
|
445
453
|
name: "invalid.illegal.character.string.escape"}]}]},
|
446
454
|
typedefs:
|
447
455
|
{patterns:
|
@@ -458,9 +466,9 @@
|
|
458
466
|
{1 => {name: "support.other.module.ocaml"},
|
459
467
|
2 => {name: "storage.type.module.ocaml"}},
|
460
468
|
match:
|
461
|
-
/\b((?:[A-Z][a-zA-Z0-9'_]*)(?:\.[A-Z][a-zA-Z0-9'_]+)*)(
|
469
|
+
/\b(?<_1>(?:[A-Z][a-zA-Z0-9'_]*)(?:\.[A-Z][a-zA-Z0-9'_]+)*)(?<_2>\.[a-zA-Z0-9'_]+)/,
|
462
470
|
name: "meta.module.type.ocaml"},
|
463
|
-
{begin: /(
|
471
|
+
{begin: /(?<_1>\[(?<_2>>|<)?)/,
|
464
472
|
beginCaptures:
|
465
473
|
{1 => {name: "punctuation.definition.polymorphic-variant.ocaml"}},
|
466
474
|
end: "(\\])",
|
@@ -475,7 +483,7 @@
|
|
475
483
|
[{match: /\(\)/, name: "variable.parameter.unit.ocaml"},
|
476
484
|
{include: "#constants"},
|
477
485
|
{include: "#moduleref"},
|
478
|
-
{begin: /(
|
486
|
+
{begin: /(?<_1>~)(?<_2>[a-z][a-zA-Z0-9'_]*)(?<_3>\s*:\s*)?/,
|
479
487
|
beginCaptures:
|
480
488
|
{1 => {name: "punctuation.definition.labeled-parameter.ocaml"},
|
481
489
|
2 => {name: "entity.name.tag.label.ocaml"},
|
@@ -486,9 +494,9 @@
|
|
486
494
|
{captures:
|
487
495
|
{1 => {name: "punctuation.definition.optional-parameter.ocaml"},
|
488
496
|
2 => {name: "entity.name.tag.label.optional.ocaml"}},
|
489
|
-
match: /(
|
497
|
+
match: /(?<_1>\?)(?<_2>[a-z][a-zA-Z0-9_]*)/,
|
490
498
|
name: "variable.parameter.optional.ocaml"},
|
491
|
-
{begin: /(
|
499
|
+
{begin: /(?<_1>\?)(?<_2>\()(?<_3>[a-z_][a-zA-Z0-9'_]*)\s*(?<_4>=)/,
|
492
500
|
beginCaptures:
|
493
501
|
{1 => {name: "punctuation.definition.optional-parameter.ocaml"},
|
494
502
|
2 => {name: "punctuation.definition.optional-parameter.ocaml"},
|
@@ -502,7 +510,7 @@
|
|
502
510
|
name: "variable.parameter.optional.ocaml",
|
503
511
|
patterns: [{include: "$self"}]},
|
504
512
|
{begin:
|
505
|
-
/(
|
513
|
+
/(?<_1>\()(?=(?<_2>~[a-z][a-zA-Z0-9_]*:|(?<_3>"(?<_4>\\"|[^"])*")|[^\(\)~"])+(?<!:)(?<_5>:>|:(?![:=])))/,
|
506
514
|
beginCaptures:
|
507
515
|
{1 => {name: "punctuation.section.type-constraint.ocaml"}},
|
508
516
|
end: "(\\))",
|
@@ -510,7 +518,7 @@
|
|
510
518
|
{1 => {name: "punctuation.section.type-constraint.ocaml"}},
|
511
519
|
name: "meta.parameter.type-constrained.ocaml",
|
512
520
|
patterns:
|
513
|
-
[{begin: /(?<!:)(
|
521
|
+
[{begin: /(?<!:)(?<_1>:>|:(?![:=]))/,
|
514
522
|
beginCaptures:
|
515
523
|
{1 => {name: "punctuation.separator.type-constraint.ocaml"}},
|
516
524
|
end: "(?=\\))",
|
@@ -522,7 +530,7 @@
|
|
522
530
|
end: "\\)",
|
523
531
|
name: "meta.paren-group.ocaml",
|
524
532
|
patterns: [{include: "#variables"}]},
|
525
|
-
{begin: /(
|
533
|
+
{begin: /(?<_1>\()/,
|
526
534
|
beginCaptures: {1 => {name: "punctuation.definition.tuple.ocaml"}},
|
527
535
|
end: "(\\))",
|
528
536
|
endCaptures: {1 => {name: "punctuation.definition.tuple.ocaml"}},
|
@@ -531,14 +539,14 @@
|
|
531
539
|
[{include: "#matchpatterns"},
|
532
540
|
{include: "#variables"},
|
533
541
|
{match: /,/, name: "punctuation.separator.tuple.ocaml"}]},
|
534
|
-
{begin: /(
|
542
|
+
{begin: /(?<_1>\{)/,
|
535
543
|
beginCaptures: {1 => {name: "punctuation.definition.record.ocaml"}},
|
536
544
|
end: "(\\})",
|
537
545
|
endCaptures: {1 => {name: "punctuation.definition.record.ocaml"}},
|
538
546
|
name: "variable.parameter.record.ocaml",
|
539
547
|
patterns:
|
540
548
|
[{include: "#moduleref"},
|
541
|
-
{begin: /\b([a-z][a-zA-Z0-9'_]*)\s*(
|
549
|
+
{begin: /\b(?<_1>[a-z][a-zA-Z0-9'_]*)\s*(?<_2>=)/,
|
542
550
|
beginCaptures:
|
543
551
|
{1 => {name: "entity.name.tag.record.ocaml"},
|
544
552
|
2 =>
|