ver 2010.02 → 2010.08

Sign up to get free protection for your applications and to get access to all the features.
Files changed (651) hide show
  1. data/.gitignore +1 -0
  2. data/.yardopts +1 -1
  3. data/AUTHORS +2 -2
  4. data/CHANGELOG +1160 -0
  5. data/MANIFEST +212 -62
  6. data/README.textile +68 -9
  7. data/Rakefile +2 -2
  8. data/bin/ver +33 -8
  9. data/config/commands/ANTLR.rb +11 -0
  10. data/config/commands/ActionScript.rb +102 -0
  11. data/config/commands/Active4D.rb +30 -0
  12. data/config/commands/Ada.rb +11 -0
  13. data/config/commands/Ant.rb +90 -0
  14. data/config/commands/Apache.rb +98 -0
  15. data/config/commands/AppleScript.rb +169 -0
  16. data/config/commands/Blogging.rb +72 -0
  17. data/config/commands/Bulletin Board.rb +10 -0
  18. data/config/commands/Bundle Development.rb +83 -0
  19. data/config/commands/C++ Qt.rb +158 -0
  20. data/config/commands/C.rb +82 -0
  21. data/config/commands/CMake.rb +32 -0
  22. data/config/commands/CSS.rb +76 -0
  23. data/config/commands/CTags.rb +29 -0
  24. data/config/commands/CVS.rb +114 -0
  25. data/config/commands/CoffeeScript.rb +58 -0
  26. data/config/commands/Context Free.rb +20 -0
  27. data/config/commands/Cucumber.rb +94 -0
  28. data/config/commands/D.rb +47 -0
  29. data/config/commands/Darcs.rb +72 -0
  30. data/config/commands/Diff.rb +76 -0
  31. data/config/commands/Doxygen.rb +9 -0
  32. data/config/commands/Experimental Wiki.rb +9 -0
  33. data/config/commands/Experimental.rb +172 -0
  34. data/config/commands/F-Script.rb +13 -0
  35. data/config/commands/FXScript.rb +11 -0
  36. data/config/commands/FileMerge.rb +42 -0
  37. data/config/commands/Fortran.rb +58 -0
  38. data/config/commands/GTD2.rb +134 -0
  39. data/config/commands/GTDAlt.rb +225 -0
  40. data/config/commands/GetBundle.rb +41 -0
  41. data/config/commands/Go.rb +29 -0
  42. data/config/commands/Graphviz.rb +11 -0
  43. data/config/commands/Greasemonkey.rb +158 -0
  44. data/config/commands/Gri.rb +11 -0
  45. data/config/commands/Groovy Grails.rb +174 -0
  46. data/config/commands/Groovy.rb +66 -0
  47. data/config/commands/HTML.rb +206 -0
  48. data/config/commands/Haskell.rb +48 -0
  49. data/config/commands/Hotkey.rb +50 -0
  50. data/config/commands/Hyperlink Helper.rb +81 -0
  51. data/config/commands/ImageBrowser.rb +10 -0
  52. data/config/commands/Io.rb +11 -0
  53. data/config/commands/JSFL.rb +29 -0
  54. data/config/commands/JSON.rb +11 -0
  55. data/config/commands/Java.rb +45 -0
  56. data/config/commands/JavaDoc.rb +12 -0
  57. data/config/commands/JavaScript Prototype & Script.aculo.us.rb +51 -0
  58. data/config/commands/JavaScript YUI.rb +12 -0
  59. data/config/commands/JavaScript jQuery.rb +12 -0
  60. data/config/commands/JavaScript.rb +50 -0
  61. data/config/commands/LaTeX.rb +423 -0
  62. data/config/commands/Lisp.rb +20 -0
  63. data/config/commands/Logo.rb +10 -0
  64. data/config/commands/Logtalk.rb +34 -0
  65. data/config/commands/Lua.rb +29 -0
  66. data/config/commands/MEL.rb +20 -0
  67. data/config/commands/Mail.rb +73 -0
  68. data/config/commands/Make.rb +20 -0
  69. data/config/commands/Man Pages.rb +20 -0
  70. data/config/commands/Markdown.rb +194 -0
  71. data/config/commands/Math.rb +79 -0
  72. data/config/commands/Matlab.rb +188 -0
  73. data/config/commands/Maven.rb +162 -0
  74. data/config/commands/Mediawiki.rb +12 -0
  75. data/config/commands/Mercurial.rb +185 -0
  76. data/config/commands/MoinMoin.rb +74 -0
  77. data/config/commands/Movable Type.rb +68 -0
  78. data/config/commands/Nemerle.rb +29 -0
  79. data/config/commands/OCaml Experimental Completions.rb +22 -0
  80. data/config/commands/OCaml.rb +99 -0
  81. data/config/commands/Objective-C.rb +181 -0
  82. data/config/commands/Outlines.rb +54 -0
  83. data/config/commands/PHP Smarty.rb +10 -0
  84. data/config/commands/Pascal.rb +11 -0
  85. data/config/commands/Perforce.rb +102 -0
  86. data/config/commands/Perl.rb +78 -0
  87. data/config/commands/Processing.rb +11 -0
  88. data/config/commands/Prolog.rb +11 -0
  89. data/config/commands/Property List.rb +38 -0
  90. data/config/commands/Python Django.rb +11 -0
  91. data/config/commands/Python.rb +131 -0
  92. data/config/commands/R Console (R.app).rb +80 -0
  93. data/config/commands/R Console (Rdaemon).rb +414 -0
  94. data/config/commands/R.rb +337 -0
  95. data/config/commands/Ragel.rb +10 -0
  96. data/config/commands/Regular Expressions.rb +18 -0
  97. data/config/commands/Remind.rb +44 -0
  98. data/config/commands/Ruby RSpec.rb +40 -0
  99. data/config/commands/Ruby on Rails.rb +331 -0
  100. data/config/commands/Ruby.rb +220 -0
  101. data/config/commands/S5 Slide Show.rb +37 -0
  102. data/config/commands/SCons.rb +24 -0
  103. data/config/commands/SQL.rb +60 -0
  104. data/config/commands/SVK.rb +83 -0
  105. data/config/commands/SWeave.rb +63 -0
  106. data/config/commands/Scheme.rb +30 -0
  107. data/config/commands/Scilab.rb +28 -0
  108. data/config/commands/Setext.rb +20 -0
  109. data/config/commands/Shell Script.rb +59 -0
  110. data/config/commands/Slate.rb +9 -0
  111. data/config/commands/Source.rb +84 -0
  112. data/config/commands/Standard ML.rb +38 -0
  113. data/config/commands/Subversion.rb +181 -0
  114. data/config/commands/TODO.rb +32 -0
  115. data/config/commands/Tcl.rb +21 -0
  116. data/config/commands/TerminalMate.rb +30 -0
  117. data/config/commands/Text.rb +137 -0
  118. data/config/commands/TextMate.rb +100 -0
  119. data/config/commands/Textile.rb +58 -0
  120. data/config/commands/Thrift.rb +20 -0
  121. data/config/commands/Transmit.rb +34 -0
  122. data/config/commands/Txt2tags.rb +213 -0
  123. data/config/commands/Vectorscript.rb +19 -0
  124. data/config/commands/Widget Creator.rb +23 -0
  125. data/config/commands/XML.rb +29 -0
  126. data/config/commands/Xcode.rb +106 -0
  127. data/config/commands/YAML.rb +39 -0
  128. data/config/commands/YARD.rb +12 -0
  129. data/config/commands/iTerm.rb +26 -0
  130. data/config/commands/reStructuredText.rb +126 -0
  131. data/config/detect.rb +13 -1
  132. data/config/keymap/diakonos.rb +113 -115
  133. data/config/keymap/emacs.rb +6 -2
  134. data/config/keymap/nano.rb +104 -112
  135. data/config/keymap/vim.rb +329 -258
  136. data/config/plugin/autosave.rb +3 -6
  137. data/config/plugin/git.rb +18 -12
  138. data/config/plugin/soma.rb +1 -1
  139. data/config/preferences/Apache.rb +17 -17
  140. data/config/preferences/AppleScript.rb +5 -5
  141. data/config/preferences/Bundle Development.rb +10 -10
  142. data/config/preferences/C.rb +38 -30
  143. data/config/preferences/CoffeeScript.rb +28 -0
  144. data/config/preferences/ColdFusion.rb +6 -6
  145. data/config/preferences/Cucumber.rb +40 -0
  146. data/config/preferences/Diff.rb +4 -4
  147. data/config/preferences/Eiffel.rb +6 -6
  148. data/config/preferences/Erlang.rb +16 -16
  149. data/config/preferences/F-Script.rb +12 -12
  150. data/config/preferences/FXScript.rb +5 -5
  151. data/config/preferences/Fortran.rb +17 -17
  152. data/config/preferences/Go.rb +23 -0
  153. data/config/preferences/Groovy.rb +29 -0
  154. data/config/preferences/HTML.rb +44 -44
  155. data/config/preferences/Haskell.rb +14 -14
  156. data/config/preferences/Io.rb +11 -11
  157. data/config/preferences/Java.rb +8 -8
  158. data/config/preferences/LaTeX.rb +24 -24
  159. data/config/preferences/Logo.rb +6 -6
  160. data/config/preferences/Logtalk.rb +5 -5
  161. data/config/preferences/Markdown.rb +43 -0
  162. data/config/preferences/Maven.rb +42 -42
  163. data/config/preferences/Mediawiki.rb +8 -8
  164. data/config/preferences/Movable Type.rb +14 -14
  165. data/config/preferences/OCaml.rb +15 -15
  166. data/config/preferences/Objective-C.rb +5 -5
  167. data/config/preferences/PHP.rb +2564 -0
  168. data/config/preferences/Property List.rb +8 -8
  169. data/config/preferences/R.rb +5 -5
  170. data/config/preferences/Ruby.rb +24 -24
  171. data/config/preferences/Source.rb +13 -13
  172. data/config/preferences/Standard ML.rb +9 -9
  173. data/config/preferences/Tcl.rb +5 -5
  174. data/config/preferences/Text.rb +14 -14
  175. data/config/preferences/TextMate.rb +5 -5
  176. data/config/preferences/Textile.rb +8 -8
  177. data/config/preferences/YARD.rb +9 -0
  178. data/config/preferences/iTerm.rb +9 -9
  179. data/config/rc.rb +5 -2
  180. data/config/snippets/ASP vb.NET.rb +203 -54
  181. data/config/snippets/ASP.rb +51 -36
  182. data/config/snippets/ActionScript.rb +332 -205
  183. data/config/snippets/Active4D.rb +325 -256
  184. data/config/snippets/Ada.rb +106 -60
  185. data/config/snippets/Ant.rb +7 -5
  186. data/config/snippets/Apache.rb +24 -20
  187. data/config/snippets/AppleScript.rb +213 -82
  188. data/config/snippets/Blogging.rb +41 -18
  189. data/config/snippets/Bulletin Board.rb +56 -21
  190. data/config/snippets/Bundle Development.rb +108 -63
  191. data/config/snippets/C++ Qt.rb +72 -57
  192. data/config/snippets/C.rb +128 -100
  193. data/config/snippets/CMake.rb +42 -32
  194. data/config/snippets/CSS.rb +515 -115
  195. data/config/snippets/CoffeeScript.rb +85 -0
  196. data/config/snippets/ColdFusion.rb +2228 -1547
  197. data/config/snippets/Context Free.rb +35 -28
  198. data/config/snippets/Cucumber.rb +55 -0
  199. data/config/snippets/D.rb +164 -111
  200. data/config/snippets/DokuWiki.rb +103 -54
  201. data/config/snippets/Doxygen.rb +87 -40
  202. data/config/snippets/Eiffel.rb +121 -18
  203. data/config/snippets/Erlang.rb +109 -68
  204. data/config/snippets/F-Script.rb +30 -24
  205. data/config/snippets/FXScript.rb +364 -210
  206. data/config/snippets/Fortran.rb +462 -280
  207. data/config/snippets/GTDAlt.rb +10 -4
  208. data/config/snippets/Gettext.rb +10 -8
  209. data/config/snippets/Go.rb +52 -0
  210. data/config/snippets/Greasemonkey.rb +52 -42
  211. data/config/snippets/Gri.rb +12 -10
  212. data/config/snippets/Groovy Grails.rb +313 -0
  213. data/config/snippets/Groovy.rb +685 -0
  214. data/config/snippets/HTML.rb +325 -126
  215. data/config/snippets/Haskell.rb +32 -24
  216. data/config/snippets/Io.rb +53 -42
  217. data/config/snippets/Java.rb +204 -92
  218. data/config/snippets/JavaDoc.rb +105 -56
  219. data/config/snippets/JavaScript MooTools.rb +208 -13
  220. data/config/snippets/JavaScript Objective-J.rb +18 -15
  221. data/config/snippets/JavaScript Prototype & Script.aculo.us.rb +362 -107
  222. data/config/snippets/JavaScript YUI.rb +1245 -186
  223. data/config/snippets/JavaScript jQuery.rb +693 -375
  224. data/config/snippets/JavaScript.rb +71 -53
  225. data/config/snippets/LaTeX.rb +188 -0
  226. data/config/snippets/Lisp.rb +59 -40
  227. data/config/snippets/Logo.rb +12 -6
  228. data/config/snippets/Logtalk.rb +131 -60
  229. data/config/snippets/Lua.rb +43 -33
  230. data/config/snippets/MIPS Assembler.rb +7 -5
  231. data/config/snippets/Mail.rb +10 -1
  232. data/config/snippets/Markdown.rb +7 -0
  233. data/config/snippets/Matlab.rb +232 -178
  234. data/config/snippets/Maven.rb +6 -5
  235. data/config/snippets/Mediawiki.rb +43 -12
  236. data/config/snippets/MoinMoin.rb +50 -10
  237. data/config/snippets/Movable Type.rb +368 -53
  238. data/config/snippets/Nemerle.rb +127 -79
  239. data/config/snippets/OCaml Code Completion Misc.rb +1716 -72
  240. data/config/snippets/OCaml Code Completion Unix.rb +2128 -203
  241. data/config/snippets/OCaml.rb +107 -73
  242. data/config/snippets/ODCompletion.rb +169 -118
  243. data/config/snippets/Objective-C.rb +281 -193
  244. data/config/snippets/PHP Smarty.rb +149 -79
  245. data/config/snippets/PHP.rb +186 -0
  246. data/config/snippets/Pascal.rb +47 -33
  247. data/config/snippets/Perl HTML-Template.rb +33 -0
  248. data/config/snippets/Perl Mason.rb +50 -30
  249. data/config/snippets/Perl Template Toolkit.rb +25 -20
  250. data/config/snippets/Perl.rb +91 -72
  251. data/config/snippets/Processing.rb +55 -33
  252. data/config/snippets/Propel.rb +36 -30
  253. data/config/snippets/Property List.rb +57 -24
  254. data/config/snippets/Python Django Templates.rb +381 -95
  255. data/config/snippets/Python Django.rb +159 -132
  256. data/config/snippets/Python.rb +88 -0
  257. data/config/snippets/R Console (Rdaemon).rb +11 -9
  258. data/config/snippets/R.rb +96 -77
  259. data/config/snippets/Remind.rb +18 -15
  260. data/config/snippets/Ruby RSpec.rb +343 -238
  261. data/config/snippets/Ruby on Rails.rb +1116 -765
  262. data/config/snippets/Ruby.rb +770 -545
  263. data/config/snippets/S5 Slide Show.rb +32 -24
  264. data/config/snippets/SSH Config.rb +21 -17
  265. data/config/snippets/SWIG.rb +30 -18
  266. data/config/snippets/Scilab.rb +98 -79
  267. data/config/snippets/Setext.rb +10 -8
  268. data/config/snippets/Shell Script.rb +52 -42
  269. data/config/snippets/Slate.rb +62 -48
  270. data/config/snippets/Source.rb +24 -1
  271. data/config/snippets/Standard ML.rb +37 -27
  272. data/config/snippets/Tcl.rb +32 -26
  273. data/config/snippets/Text.rb +28 -15
  274. data/config/snippets/Textile.rb +130 -45
  275. data/config/snippets/Thrift.rb +22 -18
  276. data/config/snippets/Twiki.rb +158 -105
  277. data/config/snippets/Txt2tags.rb +166 -79
  278. data/config/snippets/Vectorscript.rb +47 -38
  279. data/config/snippets/Widget Creator.rb +5 -5
  280. data/config/snippets/XML.rb +30 -18
  281. data/config/snippets/YAML.rb +5 -4
  282. data/config/snippets/YARD.rb +93 -0
  283. data/config/snippets/reStructuredText.rb +25 -20
  284. data/config/syntax/ANTLR.rb +17 -15
  285. data/config/syntax/ASP vb.NET.rb +27 -24
  286. data/config/syntax/ASP.rb +21 -19
  287. data/config/syntax/ActionScript.rb +16 -16
  288. data/config/syntax/Active4D Config.rb +5 -5
  289. data/config/syntax/Active4D Library.rb +2 -2
  290. data/config/syntax/Active4D.rb +32 -30
  291. data/config/syntax/Ada.rb +13 -10
  292. data/config/syntax/Ant.rb +9 -7
  293. data/config/syntax/Apache.rb +22 -18
  294. data/config/syntax/AppleScript.rb +486 -192
  295. data/config/syntax/AsciiDoc.rb +21 -0
  296. data/config/syntax/BibTeX.rb +7 -7
  297. data/config/syntax/Blog - HTML.rb +7 -7
  298. data/config/syntax/Blog - Markdown.rb +6 -6
  299. data/config/syntax/Blog - Text.rb +2 -2
  300. data/config/syntax/Blog - Textile.rb +2 -2
  301. data/config/syntax/Bulletin Board.rb +33 -32
  302. data/config/syntax/C++ Qt.rb +7 -6
  303. data/config/syntax/C++.rb +31 -28
  304. data/config/syntax/C.rb +55 -51
  305. data/config/syntax/CMake Listfile.rb +12 -11
  306. data/config/syntax/CSS.rb +24 -23
  307. data/config/syntax/CSV.rb +3 -3
  308. data/config/syntax/CoffeeScript.rb +161 -0
  309. data/config/syntax/ColdFusion.rb +8 -8
  310. data/config/syntax/Context Free.rb +18 -16
  311. data/config/syntax/Cucumber Steps.rb +108 -0
  312. data/config/syntax/D.rb +70 -69
  313. data/config/syntax/Diff.rb +13 -10
  314. data/config/syntax/DokuWiki.rb +22 -18
  315. data/config/syntax/Doxygen.rb +1 -1
  316. data/config/syntax/Dylan.rb +8 -8
  317. data/config/syntax/Eiffel.rb +12 -12
  318. data/config/syntax/Erlang.rb +96 -89
  319. data/config/syntax/F-Script.rb +11 -9
  320. data/config/syntax/FXScript.rb +16 -14
  321. data/config/syntax/Fortran - Modern.rb +25 -24
  322. data/config/syntax/Fortran - Punchcard.rb +43 -40
  323. data/config/syntax/GTD.rb +1 -1
  324. data/config/syntax/GTDalt.rb +14 -11
  325. data/config/syntax/Gettext.rb +10 -9
  326. data/config/syntax/Gherkin.rb +65 -0
  327. data/config/syntax/Go.rb +256 -0
  328. data/config/syntax/Grails Server Page.rb +108 -0
  329. data/config/syntax/Graphviz (DOT).rb +6 -6
  330. data/config/syntax/Greasemonkey.rb +3 -3
  331. data/config/syntax/Gri.rb +12 -12
  332. data/config/syntax/Groovy.rb +502 -0
  333. data/config/syntax/HTML (ASP).rb +3 -3
  334. data/config/syntax/HTML (ASP.net).rb +31 -31
  335. data/config/syntax/HTML (Active4D).rb +19 -19
  336. data/config/syntax/HTML (Django).rb +6 -6
  337. data/config/syntax/HTML (Erlang).rb +4 -4
  338. data/config/syntax/HTML (Mason).rb +13 -13
  339. data/config/syntax/HTML (Rails).rb +5 -5
  340. data/config/syntax/HTML (Tcl).rb +3 -3
  341. data/config/syntax/HTML (Template Toolkit).rb +9 -9
  342. data/config/syntax/HTML.rb +27 -27
  343. data/config/syntax/Haskell.rb +31 -28
  344. data/config/syntax/Inform.rb +5 -5
  345. data/config/syntax/Ini.rb +4 -4
  346. data/config/syntax/Installer Distribution Script.rb +19 -18
  347. data/config/syntax/Io.rb +17 -15
  348. data/config/syntax/JSFL.rb +7 -6
  349. data/config/syntax/Java Properties.rb +3 -3
  350. data/config/syntax/Java Server Page (JSP).rb +5 -4
  351. data/config/syntax/Java.rb +40 -33
  352. data/config/syntax/JavaDoc.rb +24 -22
  353. data/config/syntax/JavaScript (Rails).rb +1 -1
  354. data/config/syntax/JavaScript.rb +41 -34
  355. data/config/syntax/Javascript YUI.rb +109 -101
  356. data/config/syntax/LaTeX Beamer.rb +3 -3
  357. data/config/syntax/LaTeX Log.rb +3 -3
  358. data/config/syntax/LaTeX Memoir.rb +7 -5
  359. data/config/syntax/LaTeX Rdaemon.rb +1 -1
  360. data/config/syntax/LaTeX.rb +52 -47
  361. data/config/syntax/Language Grammar.rb +58 -55
  362. data/config/syntax/Lex-Flex.rb +13 -13
  363. data/config/syntax/Lighttpd.rb +7 -7
  364. data/config/syntax/Lisp.rb +6 -5
  365. data/config/syntax/Literate Haskell.rb +2 -2
  366. data/config/syntax/Logo.rb +4 -4
  367. data/config/syntax/Logtalk.rb +64 -49
  368. data/config/syntax/Lua.rb +12 -12
  369. data/config/syntax/MATLAB.rb +71 -70
  370. data/config/syntax/MEL.rb +16 -15
  371. data/config/syntax/MIPS Assembler.rb +11 -11
  372. data/config/syntax/MacPorts Portfile.rb +16 -15
  373. data/config/syntax/Mail.rb +5 -4
  374. data/config/syntax/Makefile.rb +3 -3
  375. data/config/syntax/Man.rb +2 -2
  376. data/config/syntax/Markdown.rb +440 -0
  377. data/config/syntax/Maven POM.rb +17 -16
  378. data/config/syntax/Mediawiki.rb +46 -46
  379. data/config/syntax/Modula-3.rb +7 -6
  380. data/config/syntax/MoinMoin.rb +16 -16
  381. data/config/syntax/MooTools.rb +75 -65
  382. data/config/syntax/Movable Type (MT only).rb +18 -18
  383. data/config/syntax/Movable Type.rb +20 -20
  384. data/config/syntax/MultiMarkdown.rb +35 -0
  385. data/config/syntax/Nemerle.rb +12 -12
  386. data/config/syntax/OCaml.rb +79 -71
  387. data/config/syntax/OCamllex.rb +14 -14
  388. data/config/syntax/OCamlyacc.rb +14 -12
  389. data/config/syntax/Objective-C++.rb +2 -2
  390. data/config/syntax/Objective-C.rb +76 -70
  391. data/config/syntax/Objective-J.rb +30 -29
  392. data/config/syntax/Octave.rb +27 -27
  393. data/config/syntax/OpenGL.rb +4 -4
  394. data/config/syntax/PHP.rb +1154 -0
  395. data/config/syntax/Pascal.rb +8 -8
  396. data/config/syntax/Perl HTML-Template.rb +5 -5
  397. data/config/syntax/Perl.rb +80 -76
  398. data/config/syntax/Plain Text.rb +5 -5
  399. data/config/syntax/Postscript.rb +6 -6
  400. data/config/syntax/Processing.rb +20 -20
  401. data/config/syntax/Prolog.rb +2 -2
  402. data/config/syntax/Property List.rb +50 -47
  403. data/config/syntax/Prototype & Script.aculo.us (JavaScript) Bracketed.rb +15 -13
  404. data/config/syntax/Prototype & Script.aculo.us (JavaScript).rb +9 -8
  405. data/config/syntax/Python Django.rb +6 -6
  406. data/config/syntax/Python.rb +94 -87
  407. data/config/syntax/Quake Style .cfg.rb +4 -4
  408. data/config/syntax/R Console (Rdaemon) Plain.rb +2 -2
  409. data/config/syntax/R Console (Rdaemon).rb +2 -2
  410. data/config/syntax/R.rb +21 -20
  411. data/config/syntax/RSpec.rb +15 -15
  412. data/config/syntax/Ragel.rb +14 -13
  413. data/config/syntax/Rd (R Documentation).rb +4 -4
  414. data/config/syntax/Regular Expressions (Oniguruma).rb +11 -10
  415. data/config/syntax/Regular Expressions (Python).rb +9 -9
  416. data/config/syntax/Release Notes.rb +7 -6
  417. data/config/syntax/Remind.rb +19 -17
  418. data/config/syntax/Rez.rb +10 -9
  419. data/config/syntax/Ruby Haml.rb +11 -11
  420. data/config/syntax/Ruby on Rails.rb +26 -24
  421. data/config/syntax/Ruby.rb +73 -71
  422. data/config/syntax/S5 Slide Show.rb +9 -9
  423. data/config/syntax/SQL.rb +29 -27
  424. data/config/syntax/SSH Config.rb +4 -4
  425. data/config/syntax/SWIG.rb +12 -11
  426. data/config/syntax/SWeave.rb +8 -7
  427. data/config/syntax/Scheme.rb +56 -54
  428. data/config/syntax/Scilab.rb +7 -6
  429. data/config/syntax/Setext.rb +14 -13
  430. data/config/syntax/Shell Script (Bash).rb +42 -42
  431. data/config/syntax/Slate.rb +24 -19
  432. data/config/syntax/Smarty.rb +11 -10
  433. data/config/syntax/Standard ML - CM.rb +2 -2
  434. data/config/syntax/Standard ML.rb +26 -23
  435. data/config/syntax/Strings File.rb +6 -6
  436. data/config/syntax/TSV.rb +2 -2
  437. data/config/syntax/Tcl.rb +10 -9
  438. data/config/syntax/TeX Math.rb +7 -6
  439. data/config/syntax/TeX.rb +7 -7
  440. data/config/syntax/Textile.rb +33 -27
  441. data/config/syntax/Thrift.rb +37 -29
  442. data/config/syntax/Twiki.rb +19 -18
  443. data/config/syntax/Txt2tags.rb +26 -23
  444. data/config/syntax/Vectorscript.rb +9 -7
  445. data/config/syntax/XML strict.rb +6 -4
  446. data/config/syntax/XML.rb +55 -30
  447. data/config/syntax/XSL.rb +5 -5
  448. data/config/syntax/YAML.rb +14 -12
  449. data/config/syntax/camlp4.rb +5 -5
  450. data/config/syntax/iCalendar.rb +3 -3
  451. data/config/syntax/jQuery (JavaScript).rb +9 -9
  452. data/config/syntax/mod_perl.rb +6 -6
  453. data/config/syntax/qmake Project file.rb +16 -15
  454. data/config/syntax/reStructuredText.rb +23 -21
  455. data/config/syntax/svn-commit.tmp.rb +5 -5
  456. data/lib/ver.rb +169 -85
  457. data/lib/ver/action.rb +39 -30
  458. data/lib/ver/buffer.rb +962 -144
  459. data/lib/ver/buffer/frame.rb +23 -0
  460. data/lib/ver/buffer/invalid_trailing_whitespace.rb +17 -0
  461. data/lib/ver/buffer/markup_underline_link.rb +30 -0
  462. data/lib/ver/buffer/matching_brace.rb +22 -0
  463. data/lib/ver/buffer/term.rb +1 -1
  464. data/lib/ver/clipboard.rb +107 -0
  465. data/lib/ver/digraphs.rb +1373 -0
  466. data/lib/ver/entry.rb +54 -43
  467. data/lib/ver/event.rb +335 -0
  468. data/lib/ver/exception_view.rb +3 -1
  469. data/lib/ver/executor.rb +7 -7
  470. data/lib/ver/executor/buffer.rb +4 -4
  471. data/lib/ver/executor/encoding.rb +19 -0
  472. data/lib/ver/executor/entry.rb +9 -9
  473. data/lib/ver/executor/fuzzy_file_finder.rb +1 -1
  474. data/lib/ver/executor/label.rb +2 -0
  475. data/lib/ver/executor/method.rb +2 -3
  476. data/lib/ver/help/describe_key.rb +44 -44
  477. data/lib/ver/hover_completion.rb +11 -6
  478. data/lib/ver/keymap.rb +68 -39
  479. data/lib/ver/layout/paned.rb +56 -44
  480. data/lib/ver/layout/toplevel.rb +68 -0
  481. data/lib/ver/layout/vim.rb +919 -0
  482. data/lib/ver/major_mode.rb +49 -49
  483. data/lib/ver/methods.rb +22 -25
  484. data/lib/ver/methods/basic.rb +49 -20
  485. data/lib/ver/methods/bookmark.rb +33 -33
  486. data/lib/ver/methods/clipboard.rb +186 -49
  487. data/lib/ver/methods/completion.rb +5 -5
  488. data/lib/ver/methods/control.rb +47 -66
  489. data/lib/ver/methods/delete.rb +5 -122
  490. data/lib/ver/methods/help.rb +2 -2
  491. data/lib/ver/methods/insert.rb +101 -29
  492. data/lib/ver/methods/layout.rb +62 -64
  493. data/lib/ver/methods/macro.rb +45 -0
  494. data/lib/ver/methods/move.rb +63 -349
  495. data/lib/ver/methods/nano.rb +99 -71
  496. data/lib/ver/methods/open.rb +8 -7
  497. data/lib/ver/methods/preview.rb +34 -14
  498. data/lib/ver/methods/save.rb +194 -163
  499. data/lib/ver/methods/search.rb +169 -81
  500. data/lib/ver/methods/search_and_replace.rb +62 -49
  501. data/lib/ver/methods/selection.rb +26 -54
  502. data/lib/ver/methods/snippet.rb +79 -54
  503. data/lib/ver/methods/undo.rb +12 -16
  504. data/lib/ver/minibuffer.rb +283 -134
  505. data/lib/ver/minor_mode.rb +36 -47
  506. data/lib/ver/mode_resolving.rb +71 -0
  507. data/lib/ver/platform.rb +41 -0
  508. data/lib/ver/plist.rb +16 -4
  509. data/lib/ver/register.rb +86 -0
  510. data/lib/ver/status.rb +44 -6
  511. data/lib/ver/status/battery.rb +1 -1
  512. data/lib/ver/status/buffer_position.rb +2 -2
  513. data/lib/ver/status/diakonos_position.rb +3 -3
  514. data/lib/ver/status/encoding.rb +1 -1
  515. data/lib/ver/status/filename.rb +1 -1
  516. data/lib/ver/status/label.rb +20 -20
  517. data/lib/ver/status/mode.rb +1 -1
  518. data/lib/ver/status/nano_help.rb +3 -14
  519. data/lib/ver/status/nano_position.rb +6 -6
  520. data/lib/ver/status/percent.rb +2 -2
  521. data/lib/ver/status/position.rb +2 -2
  522. data/lib/ver/status/short_filename.rb +1 -1
  523. data/lib/ver/status/syntax.rb +1 -1
  524. data/lib/ver/struct.rb +28 -0
  525. data/lib/ver/syntax/processor.rb +2 -1
  526. data/lib/ver/text.rb +48 -520
  527. data/lib/ver/text/end.rb +14 -0
  528. data/lib/ver/text/index.rb +16 -101
  529. data/lib/ver/text/insert.rb +138 -0
  530. data/lib/ver/text/mark.rb +559 -0
  531. data/lib/ver/text/position.rb +240 -0
  532. data/lib/ver/text/range.rb +74 -0
  533. data/lib/ver/text/selection.rb +402 -0
  534. data/lib/ver/text/selection/block.rb +69 -0
  535. data/lib/ver/text/selection/char.rb +93 -0
  536. data/lib/ver/text/selection/line.rb +64 -0
  537. data/lib/ver/text/tag.rb +322 -0
  538. data/lib/ver/undo.rb +109 -34
  539. data/lib/ver/vendor/eval_completer.rb +184 -0
  540. data/lib/ver/vendor/json_store.rb +23 -0
  541. data/lib/ver/vendor/open3.rb +729 -0
  542. data/lib/ver/vendor/pathname.rb +73 -0
  543. data/lib/ver/vendor/textpow.rb +1 -1
  544. data/lib/ver/version.rb +1 -1
  545. data/lib/ver/widget_event.rb +9 -5
  546. data/lib/ver/widget_major_mode.rb +69 -23
  547. data/spec/helper.rb +124 -8
  548. data/spec/ver/action.rb +160 -46
  549. data/spec/ver/buffer.rb +23 -0
  550. data/spec/ver/clipboard.rb +92 -0
  551. data/spec/ver/keymap.rb +63 -61
  552. data/spec/ver/keymap/diakonos.rb +88 -0
  553. data/spec/ver/keymap/emacs.rb +65 -0
  554. data/spec/ver/keymap/general.rb +98 -0
  555. data/spec/ver/keymap/nano.rb +84 -0
  556. data/spec/ver/keymap/vim.rb +205 -0
  557. data/spec/ver/keymap/vim/changing_text.rb +489 -0
  558. data/spec/ver/keymap/vim/complex_changes.rb +53 -0
  559. data/spec/ver/keymap/vim/copying_and_moving_text.rb +258 -0
  560. data/spec/ver/keymap/vim/deleting_text.rb +188 -0
  561. data/spec/ver/keymap/vim/digraphs.rb +52 -0
  562. data/spec/ver/keymap/vim/external_commands.rb +21 -0
  563. data/spec/ver/keymap/vim/inserting_mode_keys.rb +115 -0
  564. data/spec/ver/keymap/vim/inserting_mode_special.rb +168 -0
  565. data/spec/ver/keymap/vim/inserting_text.rb +108 -0
  566. data/spec/ver/keymap/vim/left_right_motion.rb +120 -0
  567. data/spec/ver/keymap/vim/mark_motion.rb +73 -0
  568. data/spec/ver/keymap/vim/repeating_commands.rb +64 -0
  569. data/spec/ver/keymap/vim/text_object_motion.rb +137 -0
  570. data/spec/ver/keymap/vim/text_objects.rb +101 -0
  571. data/spec/ver/keymap/vim/undo_redo.rb +21 -0
  572. data/spec/ver/keymap/vim/up_down_motion.rb +94 -0
  573. data/spec/ver/keymap/vim/various_motion.rb +33 -0
  574. data/spec/ver/keysyms.rb +13 -0
  575. data/spec/ver/major_mode.rb +37 -37
  576. data/spec/ver/minor_mode.rb +21 -20
  577. data/spec/ver/plugin/smart_autoindent.rb +2 -2
  578. data/spec/ver/text/index.rb +122 -0
  579. data/spec/ver/text/insert.rb +299 -0
  580. data/spec/ver/text/mark.rb +94 -0
  581. data/spec/ver/text/range.rb +71 -0
  582. data/spec/ver/text/selection.rb +315 -0
  583. data/spec/ver/text/tag.rb +93 -0
  584. data/spec/ver/undo.rb +133 -0
  585. data/spec/ver/undo/record_sanitize.rb +85 -0
  586. data/spec/ver/vendor/eval_completer.rb +91 -0
  587. data/spec/ver/widget_major_mode.rb +4 -3
  588. data/ver.gemspec +8 -8
  589. metadata +234 -72
  590. data/.todo +0 -102
  591. data/ROADMAP.textile +0 -187
  592. data/config/snippets/ANTLR.rb +0 -3
  593. data/config/snippets/Bison.rb +0 -3
  594. data/config/snippets/CTags.rb +0 -3
  595. data/config/snippets/CVS.rb +0 -3
  596. data/config/snippets/Darcs.rb +0 -3
  597. data/config/snippets/Diff.rb +0 -3
  598. data/config/snippets/Dylan.rb +0 -3
  599. data/config/snippets/Experimental Wiki.rb +0 -3
  600. data/config/snippets/Experimental.rb +0 -3
  601. data/config/snippets/FileMerge.rb +0 -3
  602. data/config/snippets/GTD2.rb +0 -3
  603. data/config/snippets/GetBundle.rb +0 -3
  604. data/config/snippets/Graphviz.rb +0 -3
  605. data/config/snippets/Hotkey.rb +0 -3
  606. data/config/snippets/Hyperlink Helper.rb +0 -3
  607. data/config/snippets/ImageBrowser.rb +0 -3
  608. data/config/snippets/Inform.rb +0 -3
  609. data/config/snippets/Ini.rb +0 -3
  610. data/config/snippets/Installer.rb +0 -3
  611. data/config/snippets/JSFL.rb +0 -3
  612. data/config/snippets/JSON.rb +0 -3
  613. data/config/snippets/Lex-Flex.rb +0 -3
  614. data/config/snippets/Lighttpd.rb +0 -3
  615. data/config/snippets/MEL.rb +0 -3
  616. data/config/snippets/MacPorts.rb +0 -3
  617. data/config/snippets/Make.rb +0 -3
  618. data/config/snippets/Man Pages.rb +0 -3
  619. data/config/snippets/Math.rb +0 -3
  620. data/config/snippets/Mercurial.rb +0 -3
  621. data/config/snippets/Modula.rb +0 -3
  622. data/config/snippets/Navigation.rb +0 -3
  623. data/config/snippets/OCaml Experimental Completions.rb +0 -3
  624. data/config/snippets/OpenGL.rb +0 -3
  625. data/config/snippets/Outlines.rb +0 -3
  626. data/config/snippets/Perforce.rb +0 -3
  627. data/config/snippets/Perl HTML::Template.rb +0 -27
  628. data/config/snippets/Postscript.rb +0 -3
  629. data/config/snippets/Prolog.rb +0 -3
  630. data/config/snippets/Quake.rb +0 -3
  631. data/config/snippets/R Console (R.app).rb +0 -3
  632. data/config/snippets/Ragel.rb +0 -3
  633. data/config/snippets/Regular Expressions.rb +0 -3
  634. data/config/snippets/Rez.rb +0 -3
  635. data/config/snippets/Ruby Haml.rb +0 -3
  636. data/config/snippets/SCons.rb +0 -3
  637. data/config/snippets/SQL.rb +0 -3
  638. data/config/snippets/SVK.rb +0 -3
  639. data/config/snippets/SWeave.rb +0 -3
  640. data/config/snippets/Scheme.rb +0 -3
  641. data/config/snippets/Subversion.rb +0 -3
  642. data/config/snippets/TODO.rb +0 -3
  643. data/config/snippets/Tabular.rb +0 -3
  644. data/config/snippets/TerminalMate.rb +0 -3
  645. data/config/snippets/TextMate.rb +0 -3
  646. data/config/snippets/Transmit.rb +0 -3
  647. data/config/snippets/Xcode.rb +0 -3
  648. data/config/snippets/iCalendar.rb +0 -3
  649. data/config/snippets/iTerm.rb +0 -3
  650. data/lib/ver/keysyms.rb +0 -104
  651. data/spec/ver/methods/move.rb +0 -150
@@ -6,14 +6,14 @@
6
6
  keyEquivalent: "^~R",
7
7
  name: "reStructuredText",
8
8
  patterns:
9
- [{begin: /^([ \t]*)(?=\S)/,
9
+ [{begin: /^(?<_1>[ \t]*)(?=\S)/,
10
10
  contentName: "meta.paragraph.restructuredtext",
11
11
  end: "^(?!\\1(?=\\S))",
12
12
  patterns: [{include: "#inline"}]}],
13
13
  repository:
14
14
  {inline:
15
15
  {patterns:
16
- [{begin: /^([ \t]*)((\.\.)\sraw(::)) html/,
16
+ [{begin: /^(?<_1>[ \t]*)(?<_2>(?<_3>\.\.)\sraw(?<_4>::)) html/,
17
17
  captures:
18
18
  {2 => {name: "meta.directive.restructuredtext"},
19
19
  3 => {name: "punctuation.definition.directive.restructuredtext"},
@@ -25,9 +25,9 @@
25
25
  {1 => {name: "punctuation.definition.directive.restructuredtext"},
26
26
  2 => {name: "punctuation.separator.key-value.restructuredtext"}},
27
27
  comment: "directives",
28
- match: /(\.\.)\s[A-z][A-z0-9_-]+(::)\s*$/,
28
+ match: /(?<_1>\.\.)\s[A-z][A-z0-9_-]+(?<_2>::)\s*$/,
29
29
  name: "meta.other.directive.restructuredtext"},
30
- {begin: /^([ \t]*).*?((::))/,
30
+ {begin: /^(?<_1>[ \t]*).*?(?<_2>(?<_3>::))/,
31
31
  captures:
32
32
  {2 => {name: "markup.raw.restructuredtext"},
33
33
  3 => {name: "punctuation.definition.raw.restructuredtext"}},
@@ -42,13 +42,13 @@
42
42
  {1 => {name: "punctuation.definition.italic.restructuredtext"},
43
43
  2 => {name: "punctuation.definition.italic.restructuredtext"}},
44
44
  comment: "strong emphasis",
45
- match: /(\*\*)[^*]+(\*\*)/,
45
+ match: /(?<_1>\*\*)[^*]+(?<_2>\*\*)/,
46
46
  name: "markup.bold.restructuredtext"},
47
47
  {captures:
48
48
  {1 => {name: "punctuation.definition.italic.restructuredtext"},
49
49
  2 => {name: "punctuation.definition.italic.restructuredtext"}},
50
50
  comment: "emphasis",
51
- match: /(\*)\w[^*]\w+(\*)/,
51
+ match: /(?<_1>\*)\w[^*]\w+(?<_2>\*)/,
52
52
  name: "markup.italic.restructuredtext"},
53
53
  {captures:
54
54
  {1 => {name: "punctuation.definition.link.restructuredtext"},
@@ -57,25 +57,25 @@
57
57
  4 => {name: "punctuation.separator.key-value.restructuredtext"},
58
58
  5 => {name: "markup.underline.link.restructuredtext"}},
59
59
  comment: "replacement",
60
- match: /(\.\.)\s+(_)([\w\s]+)(:)\s+(.*)/,
60
+ match: /(?<_1>\.\.)\s+(?<_2>_)(?<_3>[\w\s]+)(?<_4>:)\s+(?<_5>.*)/,
61
61
  name: "meta.link.reference.def.restructuredtext"},
62
62
  {captures:
63
63
  {1 => {name: "punctuation.definition.substitution.restructuredtext"}},
64
64
  comment: "substitution",
65
- match: /(\|)[^|]+(\|_{0,2})/,
65
+ match: /(?<_1>\|)[^|]+(?<_2>\|_{0,2})/,
66
66
  name: "markup.underline.substitution.restructuredtext"},
67
67
  {captures:
68
68
  {1 => {name: "string.other.link.title.restructuredtext"},
69
69
  2 => {name: "punctuation.definition.link.restructuredtext"}},
70
70
  comment: "links `...`_ or `...`__",
71
- match: /\b(\w+)(_)\b/,
71
+ match: /\b(?<_1>\w+)(?<_2>_)\b/,
72
72
  name: "meta.link.reference"},
73
73
  {captures:
74
74
  {1 => {name: "punctuation.definition.link.restructuredtext"},
75
75
  2 => {name: "string.other.link.title.restructuredtext"},
76
76
  3 => {name: "punctuation.definition.link.restructuredtext"}},
77
77
  comment: "links `...`_ or `...`__",
78
- match: /(`)([\w\s]+)(`_)/,
78
+ match: /(?<_1>`)(?<_2>[\w\s]+)(?<_3>`_)/,
79
79
  name: "meta.link.reference"},
80
80
  {captures:
81
81
  {1 => {name: "punctuation.definition.link.restructuredtext"},
@@ -85,7 +85,7 @@
85
85
  5 => {name: "punctuation.definition.location.restructuredtext"},
86
86
  6 => {name: "punctuation.definition.link.restructuredtext"}},
87
87
  comment: "links `...`_ ",
88
- match: /(`)([\w\s]+)\s+(<)(.*?)(>)(`_)/,
88
+ match: /(?<_1>`)(?<_2>[\w\s]+)\s+(?<_3><)(?<_4>.*?)(?<_5>>)(?<_6>`_)/,
89
89
  name: "meta.link.inline.restructuredtext"},
90
90
  {captures:
91
91
  {1 => {name: "punctuation.definition.link.restructuredtext"},
@@ -95,7 +95,8 @@
95
95
  7 => {name: "punctuation.definition.constant.restructuredtext"},
96
96
  8 => {name: "string.other.footnote.restructuredtext"}},
97
97
  comment: "replacement",
98
- match: /^(\.\.)\s+((\[)(((#?)[^\]]*?)|\*)(\]))\s+(.*)/,
98
+ match:
99
+ /^(?<_1>\.\.)\s+(?<_2>(?<_3>\[)(?<_4>(?<_5>(?<_6>#?)[^\]]*?)|\*)(?<_7>\]))\s+(?<_8>.*)/,
99
100
  name: "meta.link.footnote.def.restructuredtext"},
100
101
  {captures:
101
102
  {1 => {name: "constant.other.footnote.link"},
@@ -103,7 +104,7 @@
103
104
  3 => {name: "punctuation.definition.constant.restructuredtext"},
104
105
  4 => {name: "punctuation.definition.constant.restructuredtext"}},
105
106
  comment: "footnote reference: [0]_",
106
- match: /((\[)[0-9]+(\]))(_)/,
107
+ match: /(?<_1>(?<_2>\[)[0-9]+(?<_3>\]))(?<_4>_)/,
107
108
  name: "meta.link.footnote.numeric.restructuredtext"},
108
109
  {captures:
109
110
  {1 => {name: "constant.other.footnote.link"},
@@ -111,7 +112,7 @@
111
112
  3 => {name: "punctuation.definition.constant.restructuredtext"},
112
113
  4 => {name: "punctuation.definition.constant.restructuredtext"}},
113
114
  comment: "footnote reference [#]_ or [#foo]_",
114
- match: /((\[#)[A-z0-9_]*(\]))(_)/,
115
+ match: /(?<_1>(?<_2>\[#)[A-z0-9_]*(?<_3>\]))(?<_4>_)/,
115
116
  name: "meta.link.footnote.auto.restructuredtext"},
116
117
  {captures:
117
118
  {1 => {name: "constant.other.footnote.link.restructuredtext"},
@@ -119,7 +120,7 @@
119
120
  3 => {name: "punctuation.definition.constant.restructuredtext"},
120
121
  4 => {name: "punctuation.definition.constant.restructuredtext"}},
121
122
  comment: "footnote reference [*]_",
122
- match: /((\[)\*(\]))(_)/,
123
+ match: /(?<_1>(?<_2>\[)\*(?<_3>\]))(?<_4>_)/,
123
124
  name: "meta.link.footnote.symbol.auto.restructuredtext"},
124
125
  {captures:
125
126
  {1 => {name: "punctuation.definition.link.restructuredtext"},
@@ -129,7 +130,8 @@
129
130
  5 => {name: "punctuation.definition.constant.restructuredtext"},
130
131
  6 => {name: "string.other.citation.restructuredtext"}},
131
132
  comment: "replacement",
132
- match: /^(\.\.)\s+((\[)[A-z][A-z0-9]*(\]))(_)\s+(.*)/,
133
+ match:
134
+ /^(?<_1>\.\.)\s+(?<_2>(?<_3>\[)[A-z][A-z0-9]*(?<_4>\]))(?<_5>_)\s+(?<_6>.*)/,
133
135
  name: "meta.link.citation.def.restructuredtext"},
134
136
  {captures:
135
137
  {1 => {name: "constant.other.citation.link.restructuredtext"},
@@ -137,7 +139,7 @@
137
139
  3 => {name: "punctuation.definition.constant.restructuredtext"},
138
140
  4 => {name: "punctuation.definition.constant.restructuredtext"}},
139
141
  comment: "citation reference",
140
- match: /((\[)[A-z][A-z0-9_-]*(\]))(_)/,
142
+ match: /(?<_1>(?<_2>\[)[A-z][A-z0-9_-]*(?<_3>\]))(?<_4>_)/,
141
143
  name: "meta.link.citation.restructuredtext"},
142
144
  {begin: /``/,
143
145
  captures: {0 => {name: "punctuation.definition.raw.restructuredtext"}},
@@ -148,13 +150,13 @@
148
150
  {1 => {name: "punctuation.definition.intepreted.restructuredtext"},
149
151
  2 => {name: "punctuation.definition.intepreted.restructuredtext"}},
150
152
  comment: "intepreted text",
151
- match: /(`)[^`]+(`)(?!_)/,
153
+ match: /(?<_1>`)[^`]+(?<_2>`)(?!_)/,
152
154
  name: "markup.other.command.restructuredtext"},
153
155
  {captures:
154
156
  {1 => {name: "punctuation.definition.field.restructuredtext"},
155
157
  2 => {name: "punctuation.definition.field.restructuredtext"}},
156
158
  comment: "field list",
157
- match: /(:)[A-z][A-z0-9 =\s\t_]*(:)/,
159
+ match: /(?<_1>:)[A-z][A-z0-9 =\s\t_]*(?<_2>:)/,
158
160
  name: "entity.name.tag.restructuredtext"},
159
161
  {captures:
160
162
  {0 => {name: "punctuation.definition.table.restructuredtext"}},
@@ -168,9 +170,9 @@
168
170
  name: "markup.other.table.restructuredtext"},
169
171
  {captures:
170
172
  {1 => {name: "punctuation.definition.heading.restructuredtext"}},
171
- match: /(^(=|-|~|`|#|"|\^|\+|\*){3,}$){1,1}?/,
173
+ match: /(?<_1>^(?<_2>=|-|~|`|#|"|\^|\+|\*){3,}$){1,1}?/,
172
174
  name: "markup.heading.restructuredtext"},
173
- {begin: /^(\.\.)/,
175
+ {begin: /^(?<_1>\.\.)/,
174
176
  beginCaptures:
175
177
  {1 => {name: "punctuation.definition.comment.restructuredtext"}},
176
178
  comment: "comment",
@@ -4,22 +4,22 @@
4
4
  name: "svn-commit.tmp",
5
5
  patterns:
6
6
  [{captures: {1 => {name: "punctuation.definition.item.subversion-commit"}},
7
- match: /^\s*().*$\n?/,
7
+ match: /^\s*(?<_1>•).*$\n?/,
8
8
  name: "meta.bullet-point.strong"},
9
9
  {captures: {1 => {name: "punctuation.definition.item.subversion-commit"}},
10
- match: /^\s*(·).*$\n?/,
10
+ match: /^\s*(?<_1>·).*$\n?/,
11
11
  name: "meta.bullet-point.light"},
12
12
  {captures: {1 => {name: "punctuation.definition.item.subversion-commit"}},
13
- match: /^\s*(\*).*$\n?/,
13
+ match: /^\s*(?<_1>\*).*$\n?/,
14
14
  name: "meta.bullet-point.star"},
15
15
  {begin:
16
- /(^--(This line, and those below, will be ignored| Diese und die folgenden Zeilen werden ignoriert )--$\n?)/,
16
+ /(?<_1>^--(?<_2>This line, and those below, will be ignored| Diese und die folgenden Zeilen werden ignoriert )--$\n?)/,
17
17
  beginCaptures: {1 => {name: "meta.separator.svn"}},
18
18
  end: "^--not gonna happen--$",
19
19
  name: "meta.scope.changed-files.svn",
20
20
  patterns:
21
21
  [{match: /^A\s+.*$\n?/, name: "markup.inserted.svn"},
22
- {match: /^(M|.M)\s+.*$\n?/, name: "markup.changed.svn"},
22
+ {match: /^(?<_1>M|.M)\s+.*$\n?/, name: "markup.changed.svn"},
23
23
  {match: /^D\s+.*$\n?/, name: "markup.deleted.svn"}]}],
24
24
  scopeName: "text.subversion-commit",
25
25
  uuid: "5B201F55-90BC-4A69-9A44-1BABE5A9FE99"}
data/lib/ver.rb CHANGED
@@ -8,38 +8,71 @@ autoload :Tempfile, 'tempfile'
8
8
 
9
9
  # eager stdlib
10
10
  require 'digest/sha1'
11
+ require 'forwardable'
12
+ require 'logger'
11
13
  require 'securerandom'
12
14
  require 'set'
15
+ require 'tmpdir'
16
+
17
+ # vendor stuff, extensions and fixes.
13
18
  require 'ver/vendor/better_pp_hash'
14
19
  require 'ver/vendor/pathname'
15
20
  require 'ver/vendor/sized_array'
21
+ require 'ver/vendor/json_store'
22
+
23
+ # 3rd party dependencies
24
+ require 'ffi'
25
+
26
+ # Small helper method that equivalent to Kernel#p but writes to log.
27
+ # Please use this for debugging, log is at /tmp/ver/log/all.log.
28
+ #
29
+ # Returns the arguments given just like Kernel#p.
30
+ #
31
+ # Logger takes care of calling #inspect on everything that's not a String.
32
+ # We use debug level for this.
33
+ def l(arg = nil, *args)
34
+ if args.empty?
35
+ VER.log.debug(arg)
36
+ arg
37
+ else
38
+ VER.log.debug(arg, *args)
39
+ [arg, *args]
40
+ end
41
+ end
16
42
 
17
43
  # This is the doc for VER
18
44
  module VER
19
45
  autoload :Action, 'ver/action'
20
46
  autoload :Bookmarks, 'ver/methods/bookmark'
21
47
  autoload :Buffer, 'ver/buffer'
48
+ autoload :Clipboard, 'ver/clipboard'
22
49
  autoload :Entry, 'ver/entry'
50
+ autoload :EvalCompleter, 'ver/vendor/eval_completer'
51
+ autoload :Event, 'ver/event'
23
52
  autoload :ExceptionView, 'ver/exception_view'
24
53
  autoload :Executor, 'ver/executor'
25
54
  autoload :Font, 'ver/font'
26
55
  autoload :Help, 'ver/help'
27
56
  autoload :HoverCompletion, 'ver/hover_completion'
28
- autoload :KEYSYMS, 'ver/keysyms'
29
57
  autoload :Keymap, 'ver/keymap'
30
58
  autoload :Keymapped, 'ver/keymap/keymapped'
31
59
  autoload :Levenshtein, 'ver/vendor/levenshtein'
32
60
  autoload :Methods, 'ver/methods'
33
61
  autoload :MiniBuffer, 'ver/minibuffer'
62
+ autoload :ModeResolving, 'ver/mode_resolving'
34
63
  autoload :NotebookLayout, 'ver/layout/notebook'
35
64
  autoload :PanedLayout, 'ver/layout/paned'
36
- autoload :SYMKEYS, 'ver/keysyms'
65
+ autoload :Platform, 'ver/platform'
66
+ autoload :Register, 'ver/register'
67
+ autoload :RegisterList, 'ver/register'
37
68
  autoload :Status, 'ver/status'
69
+ autoload :Struct, 'ver/struct'
38
70
  autoload :Syntax, 'ver/syntax'
39
71
  autoload :Text, 'ver/text'
40
72
  autoload :Textpow, 'ver/vendor/textpow'
41
73
  autoload :Theme, 'ver/theme'
42
74
  autoload :TilingLayout, 'ver/layout/tiling'
75
+ autoload :ToplevelLayout, 'ver/layout/toplevel'
43
76
  autoload :Treeview, 'ver/treeview'
44
77
  autoload :Undo, 'ver/undo'
45
78
  autoload :WidgetEvent, 'ver/widget_event'
@@ -55,13 +88,16 @@ module VER
55
88
  attr_reader(:ctag_stack, :keymap, :style_name_pools, :style_name_register,
56
89
  :bookmarks, :buffers, :layout, :options, :paths, :root, :status,
57
90
  :minibuf)
58
- attr_accessor :layout_class
91
+ attr_accessor :layout_class, :log
59
92
  end
60
93
 
61
94
  # the rest of the options are in config/rc.rb
62
95
  options.dsl do
63
96
  o "Fork off on startup to avoid dying with the terminal",
64
- :fork, true
97
+ :fork, Platform.unix?
98
+
99
+ o "Start hidden, useful for specs",
100
+ :hidden, false
65
101
 
66
102
  o "Use EventMachine inside VER, at the moment only for the console",
67
103
  :eventmachine, false
@@ -72,6 +108,9 @@ module VER
72
108
  o "Keymap used",
73
109
  :keymap, 'vim'
74
110
 
111
+ o "Load personal rc.rb",
112
+ :load_rc, true
113
+
75
114
  o "Width of one tab in pixel",
76
115
  :tabs, 10
77
116
 
@@ -89,6 +128,9 @@ module VER
89
128
 
90
129
  o "Name under which the session is stored (nil means to keep no session)",
91
130
  :session, nil
131
+
132
+ o "Open welcome file on startup without parameters",
133
+ :welcome, true
92
134
  end
93
135
 
94
136
  module_function
@@ -98,15 +140,23 @@ module VER
98
140
  end
99
141
 
100
142
  def run(given_options = {}, &block)
143
+ # we fork, redirect all output to log files.
144
+ log_dir = Pathname.tmpdir/'ver/log'
145
+ log_dir.mkpath
146
+
147
+ self.log = Logger.new(log_dir/'all.log', 10, 1 << 20)
148
+
149
+ touch
101
150
  setup_tk
102
151
  run_startup(given_options)
103
152
  pp options if $DEBUG
104
153
 
105
154
  run_maybe_forking do
155
+ Event.load!
106
156
  options.eventmachine ? run_em(&block) : run_noem(&block)
107
157
  end
108
158
  rescue => exception
109
- VER.error(exception)
159
+ error(exception)
110
160
  exit
111
161
  end
112
162
 
@@ -114,7 +164,8 @@ module VER
114
164
  return yield unless options.fork
115
165
 
116
166
  fork do
117
- trap(:HUP){ 'terminal disconnected' }
167
+ [$stdout, $stderr].each{|io| io.reopen('/dev/null') }
168
+ trap(:HUP){ l('terminal lost') }
118
169
  yield
119
170
  end
120
171
  end
@@ -149,15 +200,20 @@ module VER
149
200
  @startup_hooks = []
150
201
  @paths = Set.new
151
202
  @cancel_blocks = {}
203
+ @repeat_blocks = {}
152
204
  @load_plugins = Set.new
153
205
  @exception_view = nil
154
206
  @bookmarks = Bookmarks.new
155
207
  @ctag_stack = []
156
208
  @style_name_register = []
157
209
  @style_name_pools = {}
158
- @buffers = {}
210
+ @buffers = Set.new
159
211
 
160
- load 'rc'
212
+ if given_options[:load_rc] != false
213
+ load 'rc'
214
+ else
215
+ require(options.core_conf_dir/'rc')
216
+ end
161
217
  @options.merge!(given_options)
162
218
  end
163
219
 
@@ -171,33 +227,46 @@ module VER
171
227
  run_startup_hooks
172
228
  end
173
229
 
174
- def when_inactive_for(ms)
230
+ def when_inactive_for(ms, repetitions = 1)
175
231
  block = lambda{
176
232
  if @cancel_blocks[block]
177
233
  @cancel_blocks.delete(block)
178
234
  else
179
-
180
- if Tk.root.tk_inactive > ms
181
- yield
182
- Tk.root.tk_inactive('reset')
183
- Tk::After.ms(ms, &block)
235
+ if inactive > ms
236
+ if @repeat_blocks[block] < repetitions
237
+ @repeat_blocks[block] += 1
238
+ yield
239
+ Tk::After.ms(ms, &block)
240
+ else
241
+ Tk::After.ms(ms, &block)
242
+ end
184
243
  else
244
+ @repeat_blocks[block] = 0
185
245
  Tk::After.ms(ms, &block)
186
246
  end
187
247
  end
188
248
  }
189
249
 
190
250
  @cancel_blocks[block] = false
251
+ @repeat_blocks[block] = 0
191
252
  Tk::After.idle(&block)
192
253
  block
193
254
  end
194
255
 
256
+ def touch
257
+ @mtime = Time.now
258
+ end
259
+
260
+ def inactive
261
+ (Time.now - @mtime) * 1000
262
+ end
263
+
195
264
  def defer
196
265
  Tk::After.idle do
197
266
  begin
198
267
  yield
199
268
  rescue Exception => ex
200
- VER.error(ex)
269
+ error(ex)
201
270
  end
202
271
  end
203
272
  end
@@ -252,30 +321,21 @@ module VER
252
321
 
253
322
  def setup_widgets
254
323
  Tk::Tile.set_theme options.tk_theme
255
-
256
- @root = Tk.root
257
- @root.wm_geometry = '160x80'
258
-
259
324
  Tk::Tile::Style.configure('Label', font: options.font, sticky: :sw)
260
- # Tk::Tile::Style.configure('TLabelframe', background: '#f00')
261
325
 
326
+ @root = Tk.root
262
327
  setup_layout
263
-
264
328
  load("keymap/#{options.keymap}.rb")
329
+ @minibuf = MiniBuffer.new(@root)
330
+ @minibuf.pack expand: true, fill: :both
265
331
 
266
- @minibuf = MiniBuffer.new(@layout)
267
- @layout.configure(
268
- labelwidget: minibuf,
269
- labelanchor: :sw
270
- )
271
-
272
- [:Messages, :Scratch].each do |name|
273
- defer{ Buffer[name].hide }
274
- end
332
+ # [:Messages, :Scratch, :Completions].each do |name|
333
+ # Buffer[name].hide
334
+ # end
275
335
  end
276
336
 
277
337
  def setup_layout
278
- @layout = (layout_class || PanedLayout).new(root)
338
+ @layout = (layout_class || ToplevelLayout).new(root)
279
339
  end
280
340
 
281
341
  def sanitize_options
@@ -326,7 +386,7 @@ module VER
326
386
  def exit
327
387
  store_session
328
388
  @cancel_blocks.keys.each{|key| @cancel_blocks[key] = true }
329
- Tk.exit rescue nil
389
+ Tk.exit
330
390
  EM.stop rescue nil
331
391
  Kernel.exit
332
392
  end
@@ -372,6 +432,7 @@ module VER
372
432
  end
373
433
 
374
434
  def open_welcome
435
+ return unless options.welcome
375
436
  if welcome = find_in_loadpath('welcome')
376
437
  find_or_create_buffer(welcome)
377
438
  true
@@ -380,58 +441,58 @@ module VER
380
441
 
381
442
  def open_session
382
443
  return unless session_base = options.session
383
- basename = "#{session_base}.session.rb"
444
+ basename = "sessions/#{session_base}.json"
384
445
  return unless file = find_in_loadpath(basename)
385
446
 
386
- begin
387
- session = eval(File.read(file))
388
- rescue SyntaxError => ex
389
- puts "#{ex.class}: #{ex}", *ex.backtrace
390
- return
391
- end
392
-
393
- session[:bookmarks].each do |raw_bm|
394
- bm = Bookmarks::Bookmark.new
395
- bm.name = raw_bm[:name]
396
- bm.file = Pathname(raw_bm[:file])
397
- bm.index = raw_bm[:index]
398
- bookmarks << bm
399
- end
447
+ JSON::Store.new(file, true).transaction do |session|
448
+ session['bookmarks'].each do |raw_bm|
449
+ bm = Bookmarks::Bookmark.new
450
+ bm.name = raw_bm['name']
451
+ bm.file = Pathname(raw_bm['file'])
452
+ bm.index = raw_bm['index']
453
+ l "Loaded %p" % [bm]
454
+ bookmarks << bm
455
+ end
400
456
 
401
- session[:buffers].each do |buffer|
402
- find_or_create_buffer(buffer[:filename], *buffer[:insert])
457
+ session['buffers'].each do |buffer|
458
+ l "Loading Buffer: %p" % [buffer]
459
+ find_or_create_buffer(buffer['filename'], *buffer['insert'])
460
+ end
403
461
  end
404
462
  end
405
463
 
464
+ # FIXME: there are no buffers anymore when this is called.
406
465
  def store_session
407
466
  return unless session_base = VER.options.session
408
- basename = "#{session_base}.session.rb"
467
+ basename = "sessions/#{session_base}.json"
409
468
  session_path = loadpath.first/basename
410
-
411
- session = {buffers: [], bookmarks: []}
412
- buffers.each do |name, buffer|
413
- session[:buffers] << {
414
- name: name.to_s,
415
- filename: buffer.filename.to_s,
416
- insert: buffer.text.index(:insert).split,
417
- }
418
- end
419
-
420
- bookmarks.each do |bm|
421
- session[:bookmarks] << {
422
- name: bm.name,
423
- file: bm.file.to_s,
424
- index: bm.index,
425
- }
426
- end
427
-
428
- session_path.open('w+:UTF-8') do |io|
429
- io.write(session.pretty_inspect)
469
+ session_path.parent.mkpath
470
+
471
+ JSON::Store.new(session_path.to_s, true).transaction do |session|
472
+ buffers = self.buffers.map do |buffer|
473
+ l buffer: buffer
474
+ { 'name' => buffer.name.to_s,
475
+ 'filename' => buffer.filename.to_s,
476
+ 'insert' => buffer.at_insert.to_a, }
477
+ end
478
+ l "Storing Buffers: %p" % [buffers]
479
+ session['buffers'] = buffers
480
+
481
+ bookmarks = self.bookmarks.map do |bm|
482
+ l bookmark: bm
483
+ { 'name' => bm.name,
484
+ 'file' => bm.file.to_s,
485
+ 'index' => bm.index, }
486
+ end
487
+ l "Storing Bookmarks: %p" % [bookmarks]
488
+ session['bookmarks'] = bookmarks
430
489
  end
431
490
  end
432
491
 
433
492
  def find_or_create_buffer(file, line = nil, column = nil, &block)
434
- Buffer.find_or_create(file, line, column, &block)
493
+ buffer = Buffer.find_or_create(file, line, column, &block)
494
+ buffer.show
495
+ buffer
435
496
  end
436
497
 
437
498
  def emergency_bindings
@@ -468,6 +529,7 @@ module VER
468
529
  end
469
530
 
470
531
  def return_style_name(style_name)
532
+ return unless style_name
471
533
  id, widget_name, widget_class = style_name.split('.')
472
534
  suffix = "#{widget_name}.#{widget_class}"
473
535
  style_name_pools[suffix] << style_name
@@ -494,21 +556,43 @@ module VER
494
556
  end
495
557
  end
496
558
 
497
- def error(exception)
498
- @status.value = exception.message if @status
499
- exception_view(exception) if @root
500
- $stderr.puts("#{exception.class}: #{exception}", *exception.backtrace)
501
- rescue Errno::EIO
502
- # The original terminal has disappeared, the $stderr pipe was closed on the
503
- # other side.
504
- [$stderr, $stdout, $stdin].each(&:close)
505
- rescue IOError
506
- # Our pipes are closed, maybe put some output to a file logger here, or display
507
- # in a nicer way, maybe let it bubble up to Tk handling.
559
+ # low-level information for developers
560
+ def debug(*args)
561
+ log.debug(*args)
562
+ p(*args)
563
+ end
564
+
565
+ # generic (useful) information about system operation
566
+ def info(*args)
567
+ log.info(*args)
568
+ p(:info, *args)
569
+ end
570
+
571
+ # a warning
572
+ def warn(*args)
573
+ log.warn(*args)
574
+ p(:warn, *args)
575
+ end
576
+
577
+ # a handleable error condition
578
+ def error(*args)
579
+ log.error(*args)
580
+ if args.size == 1
581
+ arg = args.first
582
+ case arg
583
+ when Exception
584
+ puts "#{arg.class}: #{arg}", *arg.backtrace
585
+ else
586
+ p(:error, *args)
587
+ end
588
+ else
589
+ p(:error, *args)
590
+ end
508
591
  end
509
592
 
510
- def exception_view(exception)
511
- @exception_view ||= ExceptionView.new(root)
512
- @exception_view.show(exception)
593
+ # an unhandleable error that results in a program crash
594
+ def fatal(*args)
595
+ log.fatal(*args)
596
+ p(:fatal, *args)
513
597
  end
514
598
  end