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
@@ -0,0 +1,14 @@
1
+ module VER
2
+ class Text
3
+ class End < Mark
4
+ def initialize(buffer)
5
+ super(buffer, :end)
6
+ end
7
+
8
+ # ignore
9
+ def set(index)
10
+ end
11
+ alias index= set
12
+ end
13
+ end
14
+ end
@@ -1,119 +1,34 @@
1
1
  module VER
2
2
  class Text
3
- Index = Struct.new(:widget, :idx, :y, :x)
4
- class Index
5
- include Comparable
3
+ class Index < Struct.new(:buffer, :index)
4
+ include Position
6
5
 
7
- def initialize(widget, idx)
8
- self.widget, self.idx = widget, idx.to_str
9
- end
10
-
11
- def to_index
12
- self
13
- end
14
-
15
- def <=>(other)
16
- self_idx, other_idx = idx, other.to_index.idx
17
- return 1 if widget.compare(self_idx, '>', other_idx)
18
- return -1 if widget.compare(self_idx, '<', other_idx)
19
- return 0 if widget.compare(self_idx, '==', other_idx)
20
- end
21
-
22
- def ==(other)
23
- self_idx, other_idx = idx, other.to_index.idx
24
- widget.compare(self_idx, '==', other_idx)
25
- end
26
-
27
- def delta(other)
28
- y_diff = other.y - y
29
-
30
- if y_diff == 0
31
- (other.x - x).abs
32
- else
33
- y_diff.abs
34
- end
35
- end
36
-
37
- def y
38
- self[:y] ||= idx.split('.', 2)[0].to_i
39
- end
40
-
41
- def x
42
- self[:x] ||= idx.split('.', 2)[1].to_i
43
- end
44
-
45
- def linestart
46
- widget.index "#{idx} linestart"
47
- end
48
-
49
- def lineend
50
- widget.index "#{idx} lineend"
51
- end
52
-
53
- def wordstart
54
- widget.index "#{idx} wordstart"
55
- end
56
-
57
- def wordend
58
- widget.index "#{idx} wordend"
59
- end
60
-
61
- def next
62
- widget.index "#{y + 1}.#{x}"
63
- end
6
+ LINE = /^\d+/
7
+ CHAR = /\d+$/
64
8
 
65
- def prev
66
- widget.index "#{y - 1}.#{x}"
9
+ def line
10
+ index.to_s[LINE].to_i
67
11
  end
68
12
 
69
- def +(chars)
70
- widget.index "#{idx} + #{chars} chars"
13
+ def char
14
+ index.to_s[CHAR].to_i
71
15
  end
72
16
 
73
- def -(other)
74
- if other.is_a?(self.class)
75
- widget.count(other, self, :displaychars)
76
- else
77
- widget.index "#{idx} - #{other.to_int} chars"
78
- end
79
- end
80
-
81
- def split
82
- return y, x
83
- end
84
-
85
- def inspect
86
- to_s # "#<Text::Index #{self}>"
87
- end
88
-
89
- def to_str
90
- idx
17
+ def to_tcl
18
+ index
91
19
  end
92
20
 
93
21
  def to_s
94
- "#{y}.#{x}"
22
+ index.to_s
95
23
  end
96
24
 
97
- def to_i
98
- y
25
+ def to_a
26
+ line, char = index.split('.')
27
+ return line.to_i, char.to_i
99
28
  end
100
29
 
101
- def to_tcl
102
- Tk::TclString.new(to_s)
103
- end
104
-
105
- def upto(other)
106
- if block_given?
107
- y.upto(other.y) do |line|
108
- yield self.class.new(widget, "#{line}.0")
109
- end
110
- else
111
- Enumerator.new(self, :upto, other)
112
- end
113
- end
114
-
115
- def is_a?(obj)
116
- obj == String || super
30
+ def inspect
31
+ "#<VER::Text::Index %p on %p>" % [index, buffer]
117
32
  end
118
33
  end
119
34
  end
@@ -0,0 +1,138 @@
1
+ module VER
2
+ class Text
3
+ # Mostly a Mark, but has to generate Movement event and sometimes change
4
+ # modes.
5
+ class Insert < Mark
6
+ def initialize(buffer)
7
+ super(buffer, :insert)
8
+ end
9
+
10
+ def set(index)
11
+ buffer.mark_set(self, index)
12
+ Tk::Event.generate(buffer, '<<Movement>>')
13
+ end
14
+ alias index= set
15
+
16
+ # Kill contents of the line at position, switch from control to
17
+ # insert mode.
18
+ # Always leaves an empty line and sets the insert mark inside that.
19
+ def change_line(count = buffer.prefix_count)
20
+ from, to = "insert linestart", "insert + #{count - 1} lines lineend"
21
+ range = buffer.range(buffer.index(from), buffer.index(to))
22
+ range.kill
23
+ buffer.minor_mode(:control, :insert)
24
+ end
25
+
26
+ def change(count = buffer.prefix_count)
27
+ from, to = "insert", "insert + #{count} displaychars"
28
+ range = buffer.range(buffer.index(from), buffer.index(to))
29
+ range.kill
30
+ buffer.minor_mode(:control, :insert)
31
+ end
32
+
33
+ # Same as {Mark.forward_jump}, but generate <<Movement>> event.
34
+ def forward_jump(count)
35
+ super
36
+ Tk::Event.generate(buffer, '<<Movement>>')
37
+ end
38
+
39
+ # Same as {Mark.backward_jump}, but generate <<Movement>> event.
40
+ def backward_jump(count)
41
+ super
42
+ Tk::Event.generate(buffer, '<<Movement>>')
43
+ end
44
+
45
+ # Go to previous line, maintaining the display char position.
46
+ # Only on Insert, as {Buffer.up_down_line} tracks the position.
47
+ def prev_line(count = buffer.prefix_count)
48
+ up_down_line(-count.abs)
49
+ end
50
+
51
+ # Go to next line, maintaining the display char position.
52
+ # Only on Insert, as {Buffer.up_down_line} tracks the position.
53
+ def next_line(count = buffer.prefix_count)
54
+ up_down_line(count.abs)
55
+ end
56
+
57
+ # Only on Insert, as {Buffer.up_down_line} tracks the position.
58
+ def up_down_line(count)
59
+ set(buffer.up_down_line(count))
60
+ end
61
+
62
+ def insert_char_above
63
+ index = buffer.index("#{self} - 1 lines")
64
+
65
+ if index.line < line && index.char == char
66
+ char = index.get
67
+ buffer.insert(self, char) unless char == "\n"
68
+ end
69
+ end
70
+
71
+ def insert_char_below
72
+ index = buffer.index("#{self} + 1 lines")
73
+
74
+ if index.line > line && index.char == char
75
+ char = index.get
76
+ buffer.insert(self, char) unless char == "\n"
77
+ end
78
+ end
79
+
80
+ def insert_newline_below
81
+ return insert_indented_newline_below if buffer.options.autoindent
82
+ super
83
+ buffer.minor_mode(:control, :insert)
84
+ end
85
+
86
+ def insert_indented_newline_below
87
+ super
88
+ buffer.minor_mode(:control, :insert)
89
+ end
90
+
91
+ def insert_indented_newline_below
92
+ super
93
+ buffer.minor_mode(:control, :insert)
94
+ end
95
+
96
+ def insert_newline_above
97
+ super
98
+ buffer.minor_mode(:control, :insert)
99
+ end
100
+
101
+ def insert_digraph
102
+ buffer.major_mode.read 2 do |*events|
103
+ require 'ver/digraphs'
104
+ first, last = events.first.unicode, events.last.unicode
105
+ if found = DIGRAPHS["#{first}#{last}"]
106
+ elsif found = DIGRAPHS["#{last}#{first}"]
107
+ else
108
+ # some kinda error?
109
+ end
110
+
111
+ buffer.insert(self, found) if found
112
+ end
113
+ end
114
+
115
+ # Set insert mark to a position in the previous page in buffer.
116
+ # Also sets the insert mark to the position it used to be on the old view.
117
+ #
118
+ # @params [Integer] count
119
+ # Number of pages to scroll
120
+ def prev_page(count = buffer.prefix_count)
121
+ set(buffer.tk_prev_page_pos(count))
122
+ end
123
+
124
+ # Scroll down the view of buffer by +count+ number of pages.
125
+ # Also sets the insert mark to the position it used to be on the old view.
126
+ #
127
+ # @params [Integer] count
128
+ # Number of pages to scroll
129
+ def next_page(count = buffer.prefix_count)
130
+ set(buffer.tk_next_page_pos(count))
131
+ end
132
+
133
+ def toggle_case!
134
+ super
135
+ end
136
+ end
137
+ end
138
+ end
@@ -0,0 +1,559 @@
1
+ module VER
2
+ class Text
3
+ class Mark < Struct.new(:buffer, :name)
4
+ include Position
5
+
6
+ MATCHING_BRACE_RIGHT = {
7
+ '(' => ')',
8
+ '{' => '}',
9
+ '[' => ']',
10
+ '<' => '>',
11
+ }
12
+ MATCHING_BRACE_LEFT = MATCHING_BRACE_RIGHT.invert
13
+
14
+ def initialize(buffer, name, index = nil)
15
+ self.buffer, self.name = buffer, name
16
+ self.index = index unless index.nil?
17
+ end
18
+
19
+ # @return [Tk::TclString] tcl representation of {name}
20
+ def to_tcl
21
+ name.to_tcl
22
+ end
23
+
24
+ # @return [String] representation of {name}
25
+ def to_s
26
+ name.to_s
27
+ end
28
+
29
+ # @return [String] representation of {name} and {buffer}
30
+ def inspect
31
+ "#<VER::Text::Mark %p on %p>" % [name, buffer]
32
+ end
33
+
34
+ # Number of characters from the start of the line.
35
+ # Counting characters starts at zero.
36
+ #
37
+ # @return [Integer] Number of characters from the line-start.
38
+ def char
39
+ index.char
40
+ end
41
+
42
+ # The number of lines from the top of {buffer}.
43
+ # Counting lines starts at one.
44
+ #
45
+ # @return [Integer] Number of lines from top of buffer.
46
+ def line
47
+ index.line
48
+ end
49
+
50
+ def line=(line)
51
+ set("#{line}.#{char}")
52
+ end
53
+
54
+ def char=(char)
55
+ set("#{line}.#{char}")
56
+ end
57
+
58
+ def gravity=(direction)
59
+ buffer.mark_gravity(self, direction)
60
+ end
61
+
62
+ def gravity
63
+ buffer.mark_gravity(self)
64
+ end
65
+
66
+ def set(index)
67
+ buffer.mark_set(self, index)
68
+ end
69
+ alias index= set
70
+
71
+ def unset
72
+ buffer.mark_unset(self)
73
+ end
74
+
75
+ def next
76
+ buffer.mark_next(self)
77
+ end
78
+
79
+ def previous
80
+ buffer.mark_previous(self)
81
+ end
82
+
83
+ def index
84
+ buffer.index(self)
85
+ end
86
+
87
+ # Create a Range from a "virtual" movement.
88
+ # This means that you pass a block that changes the position of the insert
89
+ # mark, and this method will return a Range consists of the old and new
90
+ # position.
91
+ # The method yields self, so you can use the Symbol#to_proc shortcut as
92
+ # well as predefined blocks or other methods that take the Insert as
93
+ # argument.
94
+ #
95
+ # @example usage
96
+ # insert = buffer.at_insert
97
+ # insert.virtual(&:next_char).delete # delete to next character
98
+ # insert.virtual{|ins| ins.last_char }.copy # copy until end of line
99
+ def virtual(*args)
100
+ pos = index
101
+ yield(self, *args)
102
+ mark = index
103
+ set(pos)
104
+ return Range.new(buffer, *[pos, mark].sort)
105
+ end
106
+
107
+ def virtual_motion(motion, *args)
108
+ virtual do |mark|
109
+ if motion.respond_to?(:call)
110
+ motion.call(buffer, *args)
111
+ else
112
+ mark.send(motion, *args)
113
+ end
114
+ end
115
+ end
116
+
117
+ def copying(motion, *args)
118
+ virtual_motion(motion, *args).copy
119
+ end
120
+
121
+ def changing(motion, *args)
122
+ virtual_motion(motion, *args).change
123
+ end
124
+
125
+ # if the motion is up-down, we might want to kill whole lines?
126
+ # that's what vim does, but i don't find it very intuitive or easy to
127
+ # implement.
128
+ def killing(motion, *args)
129
+ virtual_motion(motion, *args).kill
130
+ end
131
+
132
+ def deleting(motion, *args)
133
+ virtual_motion(motion, *args).delete
134
+ end
135
+
136
+ def toggle_casing(motion, *args)
137
+ virtual_motion(motion, *args).toggle_case!
138
+ end
139
+
140
+ def lower_casing(motion, *args)
141
+ virtual_motion(motion, *args).lower_case!
142
+ end
143
+
144
+ def upper_casing(motion, *args)
145
+ virtual_motion(motion, *args).upper_case!
146
+ end
147
+
148
+ def encoding_rot13(motion, *args)
149
+ virtual_motion(motion, *args).encode_rot13!
150
+ end
151
+
152
+ # {word_right_end} goes to the last character, that is, the insert mark is
153
+ # between the second to last and last character.
154
+ # This means that the range to delete is off by one, account for it here.
155
+ def change_next_word_end
156
+ range = buffer.at_insert.virtual(&:next_word_end)
157
+ range.last += '1 chars'
158
+ range.kill
159
+ buffer.minor_mode(:control, :insert)
160
+ end
161
+
162
+ def change_at(motion, *args)
163
+ if motion.respond_to?(:call)
164
+ motion.call(buffer, *args)
165
+ else
166
+ send(motion, *args)
167
+ end
168
+
169
+ buffer.minor_mode(:control, :insert)
170
+ end
171
+
172
+ def insert(string, *rest)
173
+ buffer.insert(self, string, *rest)
174
+ end
175
+
176
+ def <<(string)
177
+ buffer.insert(self, string)
178
+ self
179
+ end
180
+
181
+ def delete(amount)
182
+ case amount
183
+ when Integer
184
+ buffer.delete(self, self + "#{amount} chars")
185
+ when Float, String, Symbol
186
+ buffer.delete(self, amount)
187
+ else
188
+ raise ArgumentError
189
+ end
190
+ end
191
+
192
+ def insert_selection
193
+ self << Tk::Selection.get(type: 'UTF8_STRING')
194
+ end
195
+
196
+ def insert_tab
197
+ self << "\t"
198
+ end
199
+
200
+ def insert_newline
201
+ if buffer.options.autoindent
202
+ insert_indented_newline
203
+ else
204
+ self << "\n"
205
+ end
206
+ end
207
+
208
+ def insert_indented_newline
209
+ buffer.undo_record do |record|
210
+ indent1 = get('linestart', 'lineend')[/^\s*/]
211
+ record.insert(self, "\n")
212
+
213
+ indent2 = get('linestart', 'lineend')[/^\s*/]
214
+ record.replace(
215
+ "#{self} linestart",
216
+ "#{self} linestart + #{indent2.size} chars",
217
+ indent1
218
+ )
219
+
220
+ Methods::Control.clean_line(buffer, "#{self} - 1 line", record)
221
+ end
222
+ end
223
+
224
+ def insert_newline_below
225
+ return insert_indented_newline_below if buffer.options.autoindent
226
+ set "#{self} lineend"
227
+ self << "\n"
228
+ end
229
+
230
+ def insert_indented_newline_below
231
+ line = get('linestart', 'lineend')
232
+ indent = line[/^\s*/]
233
+ set "#{self} lineend"
234
+ self << "\n#{indent}"
235
+ end
236
+
237
+ def insert_newline_above
238
+ if char > 1
239
+ set(self - '1 line')
240
+ insert_newline_below
241
+ else
242
+ buffer.undo_record do |record|
243
+ record.insert("#{self} linestart", "\n")
244
+ set "#{self} - 1 line"
245
+ Methods::Control.clean_line(buffer, "#{self} - 1 line", record)
246
+ end
247
+ end
248
+ end
249
+
250
+ # Set mark to be +count+ display-chars to the right.
251
+ # Stays on the same line.
252
+ def next_char(count = buffer.prefix_count)
253
+ return if self == lineend
254
+ set(self + "#{count} displaychars")
255
+ end
256
+
257
+ def next_word(count = buffer.prefix_count)
258
+ forward_jump(count, &method(:word_char_type))
259
+ end
260
+
261
+ def next_chunk(count = buffer.prefix_count)
262
+ forward_jump(count, &method(:chunk_char_type))
263
+ end
264
+
265
+ # Jump to the last character of the word the insert cursor is over
266
+ # currently.
267
+ def next_word_end(count = buffer.prefix_count)
268
+ forward_jump_end(count, &method(:word_char_type))
269
+ end
270
+
271
+ # Jump to the last character of the chunk the insert cursor is over
272
+ # currently.
273
+ def next_chunk_end(count = buffer.prefix_count)
274
+ forward_jump_end(count, &method(:chunk_char_type))
275
+ end
276
+
277
+ # Set mark to be +count+ display-chars to the left.
278
+ # Jumps to previous line when on first character of a line.
279
+ def prev_char(count = buffer.prefix_count)
280
+ return if self == linestart
281
+ set(self - "#{count} displaychars")
282
+ end
283
+
284
+ def prev_word(count = buffer.prefix_count)
285
+ backward_jump(count, &method(:word_char_type))
286
+ end
287
+
288
+ def prev_chunk(count = buffer.prefix_count)
289
+ backward_jump(count, &method(:chunk_char_type))
290
+ end
291
+
292
+ def prev_word_end(count = buffer.prefix_count)
293
+ set(index_at_word_left_end(count))
294
+ end
295
+
296
+ def first_line(line = buffer.prefix_count)
297
+ go_first_nonblank(buffer.index("#{line}.0"))
298
+ end
299
+
300
+ def last_line(line = buffer.prefix_count(:end))
301
+ if line == :end
302
+ go_first_nonblank(buffer.index("end - 1 chars"))
303
+ else
304
+ go_first_nonblank(buffer.index("#{line}.0"))
305
+ end
306
+ end
307
+
308
+ def go_first_nonblank(index)
309
+ line = index.get('linestart', 'lineend')
310
+
311
+ if first_nonblank = (line =~ /\S/)
312
+ set("#{index.line}.#{first_nonblank}")
313
+ else
314
+ set("#{index.line}.0")
315
+ end
316
+ end
317
+
318
+ def go_char(char = buffer.prefix_count(0))
319
+ set("#{self} linestart + #{char} display chars")
320
+ end
321
+
322
+ def go_line_char(line = nil, char = nil)
323
+ set("#{line || self.line}.#{char || self.char}")
324
+ end
325
+
326
+
327
+ # Go to {count} percentage in the file, on the first non-blank in the line
328
+ # linewise. To compute the new line number this formula is used:
329
+ # ({count} * number-of-lines + 99) / 100
330
+ def go_percent(count = buffer.prefix_count(nil))
331
+ raise ArgumentError unless count
332
+ number_of_lines = buffer.count('1.0', 'end', :lines)
333
+ line = (count * number_of_lines + 99) / 100
334
+ go_first_nonblank(buffer.index("#{line}.0"))
335
+ end
336
+
337
+ def down_nonblank(count = buffer.prefix_count)
338
+ offset = (count - 1).abs
339
+ go_first_nonblank(buffer.index("insert + #{offset} lines"))
340
+ end
341
+
342
+ def prev_line_nonblank(count = buffer.prefix_count)
343
+ go_first_nonblank(buffer.index("insert - #{count} lines"))
344
+ end
345
+
346
+ def next_line_nonblank(count = buffer.prefix_count)
347
+ go_first_nonblank(buffer.index("insert + #{count} lines"))
348
+ end
349
+
350
+ def start_of_buffer
351
+ set('1.0')
352
+ end
353
+
354
+ def end_of_buffer(count = nil)
355
+ if count
356
+ set("#{count}.0")
357
+ else
358
+ set(:end)
359
+ end
360
+ end
361
+
362
+ # Move to the end of the line where mark is located.
363
+ #
364
+ # With +count+ it moves to the end of line +count+ lines below.
365
+ def last_char(count = buffer.prefix_count)
366
+ set("#{self} + #{count - 1} lines lineend")
367
+ end
368
+
369
+ # Move to the middle of the display line.
370
+ # Vim moves to the middle of the screen width...
371
+ # not so useful, but in order to be compatible, do that instead.
372
+ def middle_of_line
373
+ x, y, width, height, baseline = *buffer.dlineinfo(self)
374
+ middle = width / 2
375
+ set("@#{middle},#{y}")
376
+ end
377
+
378
+ # Move to the beginning of the line in which insert mark is located.
379
+ #
380
+ # With +count+ it will move to the beginning of the display line, which
381
+ # takes line wraps into account.
382
+ def start_of_line(alternative = buffer.prefix_arg)
383
+ if alternative
384
+ set("#{self} display linestart")
385
+ else
386
+ set("#{self} linestart")
387
+ end
388
+ end
389
+
390
+ # Move to the non-blank character of the line in which insert mark is located.
391
+ def home_of_line
392
+ char = get('linestart', 'lineend').index(/\S/) || 0
393
+ self.char = char
394
+ end
395
+
396
+ def end_of_sentence(count = buffer.prefix_count)
397
+ buffer.search_all(/\.\s/, self) do |match, from, to|
398
+ set("#{to} - 1 chars")
399
+ count -= 1
400
+ return if count <= 0
401
+ end
402
+ end
403
+
404
+ def matching_brace(count = buffer.prefix_count)
405
+ from, to = matching_brace_indices(count)
406
+ index = self.index
407
+
408
+ if index < from
409
+ set(from)
410
+ elsif index == from
411
+ set(to)
412
+ elsif index > to
413
+ set(to)
414
+ elsif index == to
415
+ set(from)
416
+ else
417
+ if from.delta(index) < to.delta(index)
418
+ set(from)
419
+ else
420
+ set(to)
421
+ end
422
+ end
423
+ end
424
+
425
+ def matching_brace_indices(count = 1)
426
+ needle = Regexp.union(MATCHING_BRACE_RIGHT.to_a.flatten.sort.uniq)
427
+ from = buffer.search_all(needle, self){|match, range| break range }
428
+ return unless from
429
+
430
+ opening = from.get
431
+
432
+ if closing = MATCHING_BRACE_RIGHT[opening]
433
+ start = from + '1 chars'
434
+ search = buffer.method(:search_all)
435
+ elsif closing = MATCHING_BRACE_LEFT[opening]
436
+ start = from.index
437
+ search = buffer.method(:rsearch_all)
438
+ else
439
+ return
440
+ end
441
+
442
+ balance = count
443
+ needle = Regexp.union(opening, closing)
444
+ search.call(needle, start){|match, range|
445
+ case match
446
+ when opening
447
+ balance += 1
448
+ when closing
449
+ balance -= 1
450
+ end
451
+
452
+ if balance == 0
453
+ return [from, range].sort
454
+ end
455
+ }
456
+ end
457
+
458
+ def word_char_type(char)
459
+ case char
460
+ when /\w/; :word
461
+ when /\S/; :special
462
+ when /\s/; :space
463
+ else
464
+ Kernel.raise "No matching char type for: %p" % [char]
465
+ end
466
+ end
467
+
468
+ def chunk_char_type(char)
469
+ case char
470
+ when /\S/; :nonspace
471
+ when /\s/; :space
472
+ else
473
+ Kernel.raise "No matching chunk type for: %p " % [char]
474
+ end
475
+ end
476
+
477
+ def forward_jump(count)
478
+ count.times do
479
+ original_type = type = yield(get)
480
+ changed = 0
481
+
482
+ begin
483
+ original_pos = index
484
+ buffer.execute_only(:mark, :set, self, "#{self} + 1 chars")
485
+ break if original_pos == index
486
+
487
+ type = yield(get)
488
+ changed += 1 if type != original_type
489
+ original_type = type
490
+ end until changed > 0 && type != :space
491
+ end
492
+ rescue => ex
493
+ VER.error(ex)
494
+ end
495
+
496
+ def forward_jump_end(count)
497
+ offset = 1
498
+ last = buffer.index('end')
499
+
500
+ count.times do
501
+ pos = buffer.index("#{self} + #{offset} chars")
502
+
503
+ return if pos == last
504
+
505
+ type = yield(pos.get)
506
+
507
+ while type == :space
508
+ offset += 1
509
+ pos = buffer.index("#{self} + #{offset} chars")
510
+ break if pos == last
511
+ type = yield(pos.get)
512
+ end
513
+
514
+ lock = type
515
+
516
+ while type == lock && type != :space
517
+ offset += 1
518
+ pos = buffer.index("#{self} + #{offset} chars")
519
+ break if pos == last
520
+ type = yield(pos.get)
521
+ end
522
+ end
523
+
524
+ set("#{self} + #{offset - 1} chars")
525
+ rescue => ex
526
+ VER.error(ex)
527
+ end
528
+
529
+ def backward_jump(count)
530
+ count.times do
531
+ original_type = type = yield(get)
532
+ changed = 0
533
+
534
+ begin
535
+ original_pos = index
536
+ buffer.execute_only(:mark, :set, self, "#{self} - 1 chars")
537
+ break if original_pos == index
538
+
539
+ type = yield(get)
540
+ changed += 1 if type != original_type
541
+ original_type = type
542
+ end until changed > 0 && type != :space
543
+
544
+ type = yield(get('- 1 chars'))
545
+
546
+ while type == original_type
547
+ original_pos = index
548
+ buffer.execute_only(:mark, :set, self, "#{self} - 1 chars")
549
+ break if original_pos == index
550
+
551
+ type = yield(get('- 1 chars'))
552
+ end
553
+ end
554
+ rescue => ex
555
+ VER.error(ex)
556
+ end
557
+ end
558
+ end
559
+ end