├── .elisp-autofmt ├── .gitignore ├── CHANGELOG.org ├── COPYING ├── Makefile ├── README.org ├── evil-numbers.el └── tests ├── evil-numbers-tests-watch.sh ├── evil-numbers-tests.el └── evil-numbers-tests.sh /.elisp-autofmt: -------------------------------------------------------------------------------- https://raw.githubusercontent.com/juliapath/evil-numbers/f4bbb729eebeef26966fae17bd414a7b49f82275/.elisp-autofmt -------------------------------------------------------------------------------- /.gitignore: -------------------------------------------------------------------------------- 1 | *.elc 2 | -------------------------------------------------------------------------------- /CHANGELOG.org: -------------------------------------------------------------------------------- 1 | #+TITLE: Evil Numbers CHANGELOG 2 | 3 | * 0.7 4 | 5 | ** Additions 6 | + =evil-numbers-use-cursor-at-end-of-number= option to match numbers directly before the cursor 7 | (diverging from VIM's default behavior). 8 | 9 | ** Changes 10 | + Use =message= instead of =error= when no number is found 11 | (don't error since VIM doesn't use an error in this case). 12 | 13 | ** Fixes 14 | + Fix #27 Number directly before the cursor manipulated when the cursor can't move forward. 15 | 16 | * 0.6 17 | 18 | ** Additions 19 | + Add =evil-numbers-separator-chars= option to support separator characters, 20 | such as =16_777_216= or =4,294,967,296=. 21 | + Add =evil-numbers-case= option for the case to use for hexadecimal values (defaults to the current case). 22 | 23 | ** Fixes 24 | + Fix #25 increment steps to the next line. 25 | + Fix #24 hexadecimal values case changes when incrementing/decrementing. 26 | + Fix padding being ignored with block selection. 27 | + Fix #21 increment w/ selection ignores items before the cursor. 28 | + Fix padded argument is ignored on non-decimal types. 29 | + Fix #20 The cursor moves when increment/decrement fails. 30 | + Fix #18 operating on bin/hex/octal failed w/ the cursor at the start. 31 | + Fix #17 bin/octal/hex numbers don't support becoming negative. 32 | + Fix hyphen-separated numbers handling. 33 | + Fix auto-loading evil macros. 34 | 35 | * 0.5 36 | 37 | ** Additions 38 | + Make padding optional. 39 | + Add support for block selections. 40 | + Add support for subscript and superscript numbers. 41 | + Add g C-a like functionality 42 | (i.e. increment first number in selection by 1, second one by 2 and so on). 43 | + Pad negative numbers and add a plus sign if a negative number is turned into 44 | a positive number (if padding is enabled). 45 | 46 | ** Fixes 47 | + Fix numbers being pushed out of selections. 48 | 49 | (e.g. calling inc-at-pt on =^9 9$= where =^$= denote the start and end of the selection would result in =10 9=). 50 | -------------------------------------------------------------------------------- /COPYING: -------------------------------------------------------------------------------- 1 | GNU GENERAL PUBLIC LICENSE 2 | Version 3, 29 June 2007 3 | 4 | Copyright (C) 2007 Free Software Foundation, Inc. 5 | Everyone is permitted to copy and distribute verbatim copies 6 | of this license document, but changing it is not allowed. 7 | 8 | Preamble 9 | 10 | The GNU General Public License is a free, copyleft license for 11 | software and other kinds of works. 12 | 13 | The licenses for most software and other practical works are designed 14 | to take away your freedom to share and change the works. By contrast, 15 | the GNU General Public License is intended to guarantee your freedom to 16 | share and change all versions of a program--to make sure it remains free 17 | software for all its users. We, the Free Software Foundation, use the 18 | GNU General Public License for most of our software; it applies also to 19 | any other work released this way by its authors. You can apply it to 20 | your programs, too. 21 | 22 | When we speak of free software, we are referring to freedom, not 23 | price. Our General Public Licenses are designed to make sure that you 24 | have the freedom to distribute copies of free software (and charge for 25 | them if you wish), that you receive source code or can get it if you 26 | want it, that you can change the software or use pieces of it in new 27 | free programs, and that you know you can do these things. 28 | 29 | To protect your rights, we need to prevent others from denying you 30 | these rights or asking you to surrender the rights. Therefore, you have 31 | certain responsibilities if you distribute copies of the software, or if 32 | you modify it: responsibilities to respect the freedom of others. 33 | 34 | For example, if you distribute copies of such a program, whether 35 | gratis or for a fee, you must pass on to the recipients the same 36 | freedoms that you received. You must make sure that they, too, receive 37 | or can get the source code. And you must show them these terms so they 38 | know their rights. 39 | 40 | Developers that use the GNU GPL protect your rights with two steps: 41 | (1) assert copyright on the software, and (2) offer you this License 42 | giving you legal permission to copy, distribute and/or modify it. 43 | 44 | For the developers' and authors' protection, the GPL clearly explains 45 | that there is no warranty for this free software. For both users' and 46 | authors' sake, the GPL requires that modified versions be marked as 47 | changed, so that their problems will not be attributed erroneously to 48 | authors of previous versions. 49 | 50 | Some devices are designed to deny users access to install or run 51 | modified versions of the software inside them, although the manufacturer 52 | can do so. This is fundamentally incompatible with the aim of 53 | protecting users' freedom to change the software. The systematic 54 | pattern of such abuse occurs in the area of products for individuals to 55 | use, which is precisely where it is most unacceptable. Therefore, we 56 | have designed this version of the GPL to prohibit the practice for those 57 | products. If such problems arise substantially in other domains, we 58 | stand ready to extend this provision to those domains in future versions 59 | of the GPL, as needed to protect the freedom of users. 60 | 61 | Finally, every program is threatened constantly by software patents. 62 | States should not allow patents to restrict development and use of 63 | software on general-purpose computers, but in those that do, we wish to 64 | avoid the special danger that patents applied to a free program could 65 | make it effectively proprietary. To prevent this, the GPL assures that 66 | patents cannot be used to render the program non-free. 67 | 68 | The precise terms and conditions for copying, distribution and 69 | modification follow. 70 | 71 | TERMS AND CONDITIONS 72 | 73 | 0. Definitions. 74 | 75 | "This License" refers to version 3 of the GNU General Public License. 76 | 77 | "Copyright" also means copyright-like laws that apply to other kinds of 78 | works, such as semiconductor masks. 79 | 80 | "The Program" refers to any copyrightable work licensed under this 81 | License. Each licensee is addressed as "you". "Licensees" and 82 | "recipients" may be individuals or organizations. 83 | 84 | To "modify" a work means to copy from or adapt all or part of the work 85 | in a fashion requiring copyright permission, other than the making of an 86 | exact copy. The resulting work is called a "modified version" of the 87 | earlier work or a work "based on" the earlier work. 88 | 89 | A "covered work" means either the unmodified Program or a work based 90 | on the Program. 91 | 92 | To "propagate" a work means to do anything with it that, without 93 | permission, would make you directly or secondarily liable for 94 | infringement under applicable copyright law, except executing it on a 95 | computer or modifying a private copy. Propagation includes copying, 96 | distribution (with or without modification), making available to the 97 | public, and in some countries other activities as well. 98 | 99 | To "convey" a work means any kind of propagation that enables other 100 | parties to make or receive copies. Mere interaction with a user through 101 | a computer network, with no transfer of a copy, is not conveying. 102 | 103 | An interactive user interface displays "Appropriate Legal Notices" 104 | to the extent that it includes a convenient and prominently visible 105 | feature that (1) displays an appropriate copyright notice, and (2) 106 | tells the user that there is no warranty for the work (except to the 107 | extent that warranties are provided), that licensees may convey the 108 | work under this License, and how to view a copy of this License. If 109 | the interface presents a list of user commands or options, such as a 110 | menu, a prominent item in the list meets this criterion. 111 | 112 | 1. Source Code. 113 | 114 | The "source code" for a work means the preferred form of the work 115 | for making modifications to it. "Object code" means any non-source 116 | form of a work. 117 | 118 | A "Standard Interface" means an interface that either is an official 119 | standard defined by a recognized standards body, or, in the case of 120 | interfaces specified for a particular programming language, one that 121 | is widely used among developers working in that language. 122 | 123 | The "System Libraries" of an executable work include anything, other 124 | than the work as a whole, that (a) is included in the normal form of 125 | packaging a Major Component, but which is not part of that Major 126 | Component, and (b) serves only to enable use of the work with that 127 | Major Component, or to implement a Standard Interface for which an 128 | implementation is available to the public in source code form. A 129 | "Major Component", in this context, means a major essential component 130 | (kernel, window system, and so on) of the specific operating system 131 | (if any) on which the executable work runs, or a compiler used to 132 | produce the work, or an object code interpreter used to run it. 133 | 134 | The "Corresponding Source" for a work in object code form means all 135 | the source code needed to generate, install, and (for an executable 136 | work) run the object code and to modify the work, including scripts to 137 | control those activities. However, it does not include the work's 138 | System Libraries, or general-purpose tools or generally available free 139 | programs which are used unmodified in performing those activities but 140 | which are not part of the work. For example, Corresponding Source 141 | includes interface definition files associated with source files for 142 | the work, and the source code for shared libraries and dynamically 143 | linked subprograms that the work is specifically designed to require, 144 | such as by intimate data communication or control flow between those 145 | subprograms and other parts of the work. 146 | 147 | The Corresponding Source need not include anything that users 148 | can regenerate automatically from other parts of the Corresponding 149 | Source. 150 | 151 | The Corresponding Source for a work in source code form is that 152 | same work. 153 | 154 | 2. Basic Permissions. 155 | 156 | All rights granted under this License are granted for the term of 157 | copyright on the Program, and are irrevocable provided the stated 158 | conditions are met. This License explicitly affirms your unlimited 159 | permission to run the unmodified Program. The output from running a 160 | covered work is covered by this License only if the output, given its 161 | content, constitutes a covered work. This License acknowledges your 162 | rights of fair use or other equivalent, as provided by copyright law. 163 | 164 | You may make, run and propagate covered works that you do not 165 | convey, without conditions so long as your license otherwise remains 166 | in force. You may convey covered works to others for the sole purpose 167 | of having them make modifications exclusively for you, or provide you 168 | with facilities for running those works, provided that you comply with 169 | the terms of this License in conveying all material for which you do 170 | not control copyright. Those thus making or running the covered works 171 | for you must do so exclusively on your behalf, under your direction 172 | and control, on terms that prohibit them from making any copies of 173 | your copyrighted material outside their relationship with you. 174 | 175 | Conveying under any other circumstances is permitted solely under 176 | the conditions stated below. Sublicensing is not allowed; section 10 177 | makes it unnecessary. 178 | 179 | 3. Protecting Users' Legal Rights From Anti-Circumvention Law. 180 | 181 | No covered work shall be deemed part of an effective technological 182 | measure under any applicable law fulfilling obligations under article 183 | 11 of the WIPO copyright treaty adopted on 20 December 1996, or 184 | similar laws prohibiting or restricting circumvention of such 185 | measures. 186 | 187 | When you convey a covered work, you waive any legal power to forbid 188 | circumvention of technological measures to the extent such circumvention 189 | is effected by exercising rights under this License with respect to 190 | the covered work, and you disclaim any intention to limit operation or 191 | modification of the work as a means of enforcing, against the work's 192 | users, your or third parties' legal rights to forbid circumvention of 193 | technological measures. 194 | 195 | 4. Conveying Verbatim Copies. 196 | 197 | You may convey verbatim copies of the Program's source code as you 198 | receive it, in any medium, provided that you conspicuously and 199 | appropriately publish on each copy an appropriate copyright notice; 200 | keep intact all notices stating that this License and any 201 | non-permissive terms added in accord with section 7 apply to the code; 202 | keep intact all notices of the absence of any warranty; and give all 203 | recipients a copy of this License along with the Program. 204 | 205 | You may charge any price or no price for each copy that you convey, 206 | and you may offer support or warranty protection for a fee. 207 | 208 | 5. Conveying Modified Source Versions. 209 | 210 | You may convey a work based on the Program, or the modifications to 211 | produce it from the Program, in the form of source code under the 212 | terms of section 4, provided that you also meet all of these conditions: 213 | 214 | a) The work must carry prominent notices stating that you modified 215 | it, and giving a relevant date. 216 | 217 | b) The work must carry prominent notices stating that it is 218 | released under this License and any conditions added under section 219 | 7. This requirement modifies the requirement in section 4 to 220 | "keep intact all notices". 221 | 222 | c) You must license the entire work, as a whole, under this 223 | License to anyone who comes into possession of a copy. This 224 | License will therefore apply, along with any applicable section 7 225 | additional terms, to the whole of the work, and all its parts, 226 | regardless of how they are packaged. This License gives no 227 | permission to license the work in any other way, but it does not 228 | invalidate such permission if you have separately received it. 229 | 230 | d) If the work has interactive user interfaces, each must display 231 | Appropriate Legal Notices; however, if the Program has interactive 232 | interfaces that do not display Appropriate Legal Notices, your 233 | work need not make them do so. 234 | 235 | A compilation of a covered work with other separate and independent 236 | works, which are not by their nature extensions of the covered work, 237 | and which are not combined with it such as to form a larger program, 238 | in or on a volume of a storage or distribution medium, is called an 239 | "aggregate" if the compilation and its resulting copyright are not 240 | used to limit the access or legal rights of the compilation's users 241 | beyond what the individual works permit. Inclusion of a covered work 242 | in an aggregate does not cause this License to apply to the other 243 | parts of the aggregate. 244 | 245 | 6. Conveying Non-Source Forms. 246 | 247 | You may convey a covered work in object code form under the terms 248 | of sections 4 and 5, provided that you also convey the 249 | machine-readable Corresponding Source under the terms of this License, 250 | in one of these ways: 251 | 252 | a) Convey the object code in, or embodied in, a physical product 253 | (including a physical distribution medium), accompanied by the 254 | Corresponding Source fixed on a durable physical medium 255 | customarily used for software interchange. 256 | 257 | b) Convey the object code in, or embodied in, a physical product 258 | (including a physical distribution medium), accompanied by a 259 | written offer, valid for at least three years and valid for as 260 | long as you offer spare parts or customer support for that product 261 | model, to give anyone who possesses the object code either (1) a 262 | copy of the Corresponding Source for all the software in the 263 | product that is covered by this License, on a durable physical 264 | medium customarily used for software interchange, for a price no 265 | more than your reasonable cost of physically performing this 266 | conveying of source, or (2) access to copy the 267 | Corresponding Source from a network server at no charge. 268 | 269 | c) Convey individual copies of the object code with a copy of the 270 | written offer to provide the Corresponding Source. This 271 | alternative is allowed only occasionally and noncommercially, and 272 | only if you received the object code with such an offer, in accord 273 | with subsection 6b. 274 | 275 | d) Convey the object code by offering access from a designated 276 | place (gratis or for a charge), and offer equivalent access to the 277 | Corresponding Source in the same way through the same place at no 278 | further charge. You need not require recipients to copy the 279 | Corresponding Source along with the object code. If the place to 280 | copy the object code is a network server, the Corresponding Source 281 | may be on a different server (operated by you or a third party) 282 | that supports equivalent copying facilities, provided you maintain 283 | clear directions next to the object code saying where to find the 284 | Corresponding Source. Regardless of what server hosts the 285 | Corresponding Source, you remain obligated to ensure that it is 286 | available for as long as needed to satisfy these requirements. 287 | 288 | e) Convey the object code using peer-to-peer transmission, provided 289 | you inform other peers where the object code and Corresponding 290 | Source of the work are being offered to the general public at no 291 | charge under subsection 6d. 292 | 293 | A separable portion of the object code, whose source code is excluded 294 | from the Corresponding Source as a System Library, need not be 295 | included in conveying the object code work. 296 | 297 | A "User Product" is either (1) a "consumer product", which means any 298 | tangible personal property which is normally used for personal, family, 299 | or household purposes, or (2) anything designed or sold for incorporation 300 | into a dwelling. In determining whether a product is a consumer product, 301 | doubtful cases shall be resolved in favor of coverage. For a particular 302 | product received by a particular user, "normally used" refers to a 303 | typical or common use of that class of product, regardless of the status 304 | of the particular user or of the way in which the particular user 305 | actually uses, or expects or is expected to use, the product. A product 306 | is a consumer product regardless of whether the product has substantial 307 | commercial, industrial or non-consumer uses, unless such uses represent 308 | the only significant mode of use of the product. 309 | 310 | "Installation Information" for a User Product means any methods, 311 | procedures, authorization keys, or other information required to install 312 | and execute modified versions of a covered work in that User Product from 313 | a modified version of its Corresponding Source. The information must 314 | suffice to ensure that the continued functioning of the modified object 315 | code is in no case prevented or interfered with solely because 316 | modification has been made. 317 | 318 | If you convey an object code work under this section in, or with, or 319 | specifically for use in, a User Product, and the conveying occurs as 320 | part of a transaction in which the right of possession and use of the 321 | User Product is transferred to the recipient in perpetuity or for a 322 | fixed term (regardless of how the transaction is characterized), the 323 | Corresponding Source conveyed under this section must be accompanied 324 | by the Installation Information. But this requirement does not apply 325 | if neither you nor any third party retains the ability to install 326 | modified object code on the User Product (for example, the work has 327 | been installed in ROM). 328 | 329 | The requirement to provide Installation Information does not include a 330 | requirement to continue to provide support service, warranty, or updates 331 | for a work that has been modified or installed by the recipient, or for 332 | the User Product in which it has been modified or installed. Access to a 333 | network may be denied when the modification itself materially and 334 | adversely affects the operation of the network or violates the rules and 335 | protocols for communication across the network. 336 | 337 | Corresponding Source conveyed, and Installation Information provided, 338 | in accord with this section must be in a format that is publicly 339 | documented (and with an implementation available to the public in 340 | source code form), and must require no special password or key for 341 | unpacking, reading or copying. 342 | 343 | 7. Additional Terms. 344 | 345 | "Additional permissions" are terms that supplement the terms of this 346 | License by making exceptions from one or more of its conditions. 347 | Additional permissions that are applicable to the entire Program shall 348 | be treated as though they were included in this License, to the extent 349 | that they are valid under applicable law. If additional permissions 350 | apply only to part of the Program, that part may be used separately 351 | under those permissions, but the entire Program remains governed by 352 | this License without regard to the additional permissions. 353 | 354 | When you convey a copy of a covered work, you may at your option 355 | remove any additional permissions from that copy, or from any part of 356 | it. (Additional permissions may be written to require their own 357 | removal in certain cases when you modify the work.) You may place 358 | additional permissions on material, added by you to a covered work, 359 | for which you have or can give appropriate copyright permission. 360 | 361 | Notwithstanding any other provision of this License, for material you 362 | add to a covered work, you may (if authorized by the copyright holders of 363 | that material) supplement the terms of this License with terms: 364 | 365 | a) Disclaiming warranty or limiting liability differently from the 366 | terms of sections 15 and 16 of this License; or 367 | 368 | b) Requiring preservation of specified reasonable legal notices or 369 | author attributions in that material or in the Appropriate Legal 370 | Notices displayed by works containing it; or 371 | 372 | c) Prohibiting misrepresentation of the origin of that material, or 373 | requiring that modified versions of such material be marked in 374 | reasonable ways as different from the original version; or 375 | 376 | d) Limiting the use for publicity purposes of names of licensors or 377 | authors of the material; or 378 | 379 | e) Declining to grant rights under trademark law for use of some 380 | trade names, trademarks, or service marks; or 381 | 382 | f) Requiring indemnification of licensors and authors of that 383 | material by anyone who conveys the material (or modified versions of 384 | it) with contractual assumptions of liability to the recipient, for 385 | any liability that these contractual assumptions directly impose on 386 | those licensors and authors. 387 | 388 | All other non-permissive additional terms are considered "further 389 | restrictions" within the meaning of section 10. If the Program as you 390 | received it, or any part of it, contains a notice stating that it is 391 | governed by this License along with a term that is a further 392 | restriction, you may remove that term. If a license document contains 393 | a further restriction but permits relicensing or conveying under this 394 | License, you may add to a covered work material governed by the terms 395 | of that license document, provided that the further restriction does 396 | not survive such relicensing or conveying. 397 | 398 | If you add terms to a covered work in accord with this section, you 399 | must place, in the relevant source files, a statement of the 400 | additional terms that apply to those files, or a notice indicating 401 | where to find the applicable terms. 402 | 403 | Additional terms, permissive or non-permissive, may be stated in the 404 | form of a separately written license, or stated as exceptions; 405 | the above requirements apply either way. 406 | 407 | 8. Termination. 408 | 409 | You may not propagate or modify a covered work except as expressly 410 | provided under this License. Any attempt otherwise to propagate or 411 | modify it is void, and will automatically terminate your rights under 412 | this License (including any patent licenses granted under the third 413 | paragraph of section 11). 414 | 415 | However, if you cease all violation of this License, then your 416 | license from a particular copyright holder is reinstated (a) 417 | provisionally, unless and until the copyright holder explicitly and 418 | finally terminates your license, and (b) permanently, if the copyright 419 | holder fails to notify you of the violation by some reasonable means 420 | prior to 60 days after the cessation. 421 | 422 | Moreover, your license from a particular copyright holder is 423 | reinstated permanently if the copyright holder notifies you of the 424 | violation by some reasonable means, this is the first time you have 425 | received notice of violation of this License (for any work) from that 426 | copyright holder, and you cure the violation prior to 30 days after 427 | your receipt of the notice. 428 | 429 | Termination of your rights under this section does not terminate the 430 | licenses of parties who have received copies or rights from you under 431 | this License. If your rights have been terminated and not permanently 432 | reinstated, you do not qualify to receive new licenses for the same 433 | material under section 10. 434 | 435 | 9. Acceptance Not Required for Having Copies. 436 | 437 | You are not required to accept this License in order to receive or 438 | run a copy of the Program. Ancillary propagation of a covered work 439 | occurring solely as a consequence of using peer-to-peer transmission 440 | to receive a copy likewise does not require acceptance. However, 441 | nothing other than this License grants you permission to propagate or 442 | modify any covered work. These actions infringe copyright if you do 443 | not accept this License. Therefore, by modifying or propagating a 444 | covered work, you indicate your acceptance of this License to do so. 445 | 446 | 10. Automatic Licensing of Downstream Recipients. 447 | 448 | Each time you convey a covered work, the recipient automatically 449 | receives a license from the original licensors, to run, modify and 450 | propagate that work, subject to this License. You are not responsible 451 | for enforcing compliance by third parties with this License. 452 | 453 | An "entity transaction" is a transaction transferring control of an 454 | organization, or substantially all assets of one, or subdividing an 455 | organization, or merging organizations. If propagation of a covered 456 | work results from an entity transaction, each party to that 457 | transaction who receives a copy of the work also receives whatever 458 | licenses to the work the party's predecessor in interest had or could 459 | give under the previous paragraph, plus a right to possession of the 460 | Corresponding Source of the work from the predecessor in interest, if 461 | the predecessor has it or can get it with reasonable efforts. 462 | 463 | You may not impose any further restrictions on the exercise of the 464 | rights granted or affirmed under this License. For example, you may 465 | not impose a license fee, royalty, or other charge for exercise of 466 | rights granted under this License, and you may not initiate litigation 467 | (including a cross-claim or counterclaim in a lawsuit) alleging that 468 | any patent claim is infringed by making, using, selling, offering for 469 | sale, or importing the Program or any portion of it. 470 | 471 | 11. Patents. 472 | 473 | A "contributor" is a copyright holder who authorizes use under this 474 | License of the Program or a work on which the Program is based. The 475 | work thus licensed is called the contributor's "contributor version". 476 | 477 | A contributor's "essential patent claims" are all patent claims 478 | owned or controlled by the contributor, whether already acquired or 479 | hereafter acquired, that would be infringed by some manner, permitted 480 | by this License, of making, using, or selling its contributor version, 481 | but do not include claims that would be infringed only as a 482 | consequence of further modification of the contributor version. For 483 | purposes of this definition, "control" includes the right to grant 484 | patent sublicenses in a manner consistent with the requirements of 485 | this License. 486 | 487 | Each contributor grants you a non-exclusive, worldwide, royalty-free 488 | patent license under the contributor's essential patent claims, to 489 | make, use, sell, offer for sale, import and otherwise run, modify and 490 | propagate the contents of its contributor version. 491 | 492 | In the following three paragraphs, a "patent license" is any express 493 | agreement or commitment, however denominated, not to enforce a patent 494 | (such as an express permission to practice a patent or covenant not to 495 | sue for patent infringement). To "grant" such a patent license to a 496 | party means to make such an agreement or commitment not to enforce a 497 | patent against the party. 498 | 499 | If you convey a covered work, knowingly relying on a patent license, 500 | and the Corresponding Source of the work is not available for anyone 501 | to copy, free of charge and under the terms of this License, through a 502 | publicly available network server or other readily accessible means, 503 | then you must either (1) cause the Corresponding Source to be so 504 | available, or (2) arrange to deprive yourself of the benefit of the 505 | patent license for this particular work, or (3) arrange, in a manner 506 | consistent with the requirements of this License, to extend the patent 507 | license to downstream recipients. "Knowingly relying" means you have 508 | actual knowledge that, but for the patent license, your conveying the 509 | covered work in a country, or your recipient's use of the covered work 510 | in a country, would infringe one or more identifiable patents in that 511 | country that you have reason to believe are valid. 512 | 513 | If, pursuant to or in connection with a single transaction or 514 | arrangement, you convey, or propagate by procuring conveyance of, a 515 | covered work, and grant a patent license to some of the parties 516 | receiving the covered work authorizing them to use, propagate, modify 517 | or convey a specific copy of the covered work, then the patent license 518 | you grant is automatically extended to all recipients of the covered 519 | work and works based on it. 520 | 521 | A patent license is "discriminatory" if it does not include within 522 | the scope of its coverage, prohibits the exercise of, or is 523 | conditioned on the non-exercise of one or more of the rights that are 524 | specifically granted under this License. You may not convey a covered 525 | work if you are a party to an arrangement with a third party that is 526 | in the business of distributing software, under which you make payment 527 | to the third party based on the extent of your activity of conveying 528 | the work, and under which the third party grants, to any of the 529 | parties who would receive the covered work from you, a discriminatory 530 | patent license (a) in connection with copies of the covered work 531 | conveyed by you (or copies made from those copies), or (b) primarily 532 | for and in connection with specific products or compilations that 533 | contain the covered work, unless you entered into that arrangement, 534 | or that patent license was granted, prior to 28 March 2007. 535 | 536 | Nothing in this License shall be construed as excluding or limiting 537 | any implied license or other defenses to infringement that may 538 | otherwise be available to you under applicable patent law. 539 | 540 | 12. No Surrender of Others' Freedom. 541 | 542 | If conditions are imposed on you (whether by court order, agreement or 543 | otherwise) that contradict the conditions of this License, they do not 544 | excuse you from the conditions of this License. If you cannot convey a 545 | covered work so as to satisfy simultaneously your obligations under this 546 | License and any other pertinent obligations, then as a consequence you may 547 | not convey it at all. For example, if you agree to terms that obligate you 548 | to collect a royalty for further conveying from those to whom you convey 549 | the Program, the only way you could satisfy both those terms and this 550 | License would be to refrain entirely from conveying the Program. 551 | 552 | 13. Use with the GNU Affero General Public License. 553 | 554 | Notwithstanding any other provision of this License, you have 555 | permission to link or combine any covered work with a work licensed 556 | under version 3 of the GNU Affero General Public License into a single 557 | combined work, and to convey the resulting work. The terms of this 558 | License will continue to apply to the part which is the covered work, 559 | but the special requirements of the GNU Affero General Public License, 560 | section 13, concerning interaction through a network will apply to the 561 | combination as such. 562 | 563 | 14. Revised Versions of this License. 564 | 565 | The Free Software Foundation may publish revised and/or new versions of 566 | the GNU General Public License from time to time. Such new versions will 567 | be similar in spirit to the present version, but may differ in detail to 568 | address new problems or concerns. 569 | 570 | Each version is given a distinguishing version number. If the 571 | Program specifies that a certain numbered version of the GNU General 572 | Public License "or any later version" applies to it, you have the 573 | option of following the terms and conditions either of that numbered 574 | version or of any later version published by the Free Software 575 | Foundation. If the Program does not specify a version number of the 576 | GNU General Public License, you may choose any version ever published 577 | by the Free Software Foundation. 578 | 579 | If the Program specifies that a proxy can decide which future 580 | versions of the GNU General Public License can be used, that proxy's 581 | public statement of acceptance of a version permanently authorizes you 582 | to choose that version for the Program. 583 | 584 | Later license versions may give you additional or different 585 | permissions. However, no additional obligations are imposed on any 586 | author or copyright holder as a result of your choosing to follow a 587 | later version. 588 | 589 | 15. Disclaimer of Warranty. 590 | 591 | THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY 592 | APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT 593 | HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY 594 | OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, 595 | THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 596 | PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM 597 | IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF 598 | ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 599 | 600 | 16. Limitation of Liability. 601 | 602 | IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING 603 | WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS 604 | THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY 605 | GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE 606 | USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF 607 | DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD 608 | PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), 609 | EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF 610 | SUCH DAMAGES. 611 | 612 | 17. Interpretation of Sections 15 and 16. 613 | 614 | If the disclaimer of warranty and limitation of liability provided 615 | above cannot be given local legal effect according to their terms, 616 | reviewing courts shall apply local law that most closely approximates 617 | an absolute waiver of all civil liability in connection with the 618 | Program, unless a warranty or assumption of liability accompanies a 619 | copy of the Program in return for a fee. 620 | 621 | END OF TERMS AND CONDITIONS 622 | 623 | How to Apply These Terms to Your New Programs 624 | 625 | If you develop a new program, and you want it to be of the greatest 626 | possible use to the public, the best way to achieve this is to make it 627 | free software which everyone can redistribute and change under these terms. 628 | 629 | To do so, attach the following notices to the program. It is safest 630 | to attach them to the start of each source file to most effectively 631 | state the exclusion of warranty; and each file should have at least 632 | the "copyright" line and a pointer to where the full notice is found. 633 | 634 | 635 | Copyright (C) 636 | 637 | This program is free software: you can redistribute it and/or modify 638 | it under the terms of the GNU General Public License as published by 639 | the Free Software Foundation, either version 3 of the License, or 640 | (at your option) any later version. 641 | 642 | This program is distributed in the hope that it will be useful, 643 | but WITHOUT ANY WARRANTY; without even the implied warranty of 644 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 645 | GNU General Public License for more details. 646 | 647 | You should have received a copy of the GNU General Public License 648 | along with this program. If not, see . 649 | 650 | Also add information on how to contact you by electronic and paper mail. 651 | 652 | If the program does terminal interaction, make it output a short 653 | notice like this when it starts in an interactive mode: 654 | 655 | Copyright (C) 656 | This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. 657 | This is free software, and you are welcome to redistribute it 658 | under certain conditions; type `show c' for details. 659 | 660 | The hypothetical commands `show w' and `show c' should show the appropriate 661 | parts of the General Public License. Of course, your program's commands 662 | might be different; for a GUI interface, you would use an "about box". 663 | 664 | You should also get your employer (if you work as a programmer) or school, 665 | if any, to sign a "copyright disclaimer" for the program, if necessary. 666 | For more information on this, and how to apply and follow the GNU GPL, see 667 | . 668 | 669 | The GNU General Public License does not permit incorporating your program 670 | into proprietary programs. If your program is a subroutine library, you 671 | may consider it more useful to permit linking proprietary applications with 672 | the library. If this is what you want to do, use the GNU Lesser General 673 | Public License instead of this License. But first, please read 674 | . 675 | -------------------------------------------------------------------------------- /Makefile: -------------------------------------------------------------------------------- 1 | # SPDX-License-Identifier: GPL-2.0-or-later 2 | 3 | test: 4 | ./tests/evil-numbers-tests.sh 5 | -------------------------------------------------------------------------------- /README.org: -------------------------------------------------------------------------------- 1 | #+TITLE: Evil Numbers 2 | 3 | * Features 4 | - Increment / Decrement binary, octal, decimal and hex literals. 5 | 6 | - Works like =C-a= / =C-x= in VIM, i.e. searches for number up to =eol= and then 7 | increments or decrements. 8 | 9 | - When a region is active, as in evil's visual mode, all the 10 | numbers within that region will be incremented/decremented (unlike in VIM). 11 | 12 | - Increment/decrement numbers incrementally like =g C-a= / =g C-x= in VIM. 13 | 14 | - Optionally keep zero padding (off by default). 15 | 16 | 17 | ** Detected Literals 18 | - Binary, e.g. =0b0101=, =0B0101=. 19 | - Octal, e.g. =0o755=, =0O700=. 20 | - Hexadecimal, e.g. =0xDEADBEEF=, =0XCAFE=. 21 | - Unicode superscript and subscript, e.g. =²= and =₁=. 22 | 23 | * Usage 24 | Once this package is installed, all you need to do is bind keys to 25 | =evil-numbers/inc-at-pt= and =evil-numbers/dec-at-pt=. 26 | 27 | Position cursor over or before the literal and play with your numbers! 28 | 29 | You may also want to bind keys to the incremental versions of these functions. 30 | 31 | ** Customization 32 | 33 | - =evil-numbers-pad-default= :: 34 | Set to =t= if you want numbers to be padded with zeros (numbers with a leading zero are always padded). 35 | If you want both behaviors, all commands take an optional argument =padded=. 36 | 37 | - =evil-numbers-separator-chars= :: 38 | This option to support separator characters, set to "_" or "," to support numeric literals such as: 39 | =16_777_216= or =4,294,967,296=. 40 | 41 | You may wish to set this as a buffer local variable to enable this only for languages that support separators. 42 | 43 | - =evil-numbers-case= :: 44 | The case to use for hexadecimal numbers. 45 | 46 | - =nil= Current case (default). 47 | - '=upcase= Always upper case. 48 | - '=downcase= Always lower case. 49 | 50 | - =evil-numbers-use-cursor-at-end-of-number= :: 51 | Support matching numbers directly before the cursor. 52 | 53 | This is off by default as it doesn't follow VIM's behavior. 54 | 55 | ** Key Bindings 56 | Example key bindings: 57 | 58 | #+BEGIN_SRC emacs-lisp 59 | (global-set-key (kbd "C-c +") 'evil-numbers/inc-at-pt) 60 | (global-set-key (kbd "C-c -") 'evil-numbers/dec-at-pt) 61 | (global-set-key (kbd "C-c C-+") 'evil-numbers/inc-at-pt-incremental) 62 | (global-set-key (kbd "C-c C--") 'evil-numbers/dec-at-pt-incremental) 63 | #+END_SRC 64 | 65 | or only in evil's =normal= & =visual= states: 66 | 67 | #+BEGIN_SRC emacs-lisp 68 | (evil-define-key '(normal visual) 'global (kbd "C-c +") 'evil-numbers/inc-at-pt) 69 | (evil-define-key '(normal visual) 'global (kbd "C-c -") 'evil-numbers/dec-at-pt) 70 | (evil-define-key '(normal visual) 'global (kbd "C-c C-+") 'evil-numbers/inc-at-pt-incremental) 71 | (evil-define-key '(normal visual) 'global (kbd "C-c C--") 'evil-numbers/dec-at-pt-incremental) 72 | #+END_SRC 73 | 74 | Keypad =+= and =-= present an alternative that can be directly bound without shadowing the regular =+= and =-=: 75 | 76 | #+BEGIN_SRC emacs-lisp 77 | (evil-define-key '(normal visual) 'global (kbd "") 'evil-numbers/inc-at-pt) 78 | (evil-define-key '(normal visual) 'global (kbd "") 'evil-numbers/dec-at-pt) 79 | (evil-define-key '(normal visual) 'global (kbd "C-") 'evil-numbers/inc-at-pt-incremental) 80 | (evil-define-key '(normal visual) 'global (kbd "C-") 'evil-numbers/dec-at-pt-incremental) 81 | #+END_SRC 82 | 83 | * Install 84 | 85 | ** Basic Installation 86 | Put in =load-path=, =(require 'evil-numbers)= and set key bindings. 87 | 88 | ** Use Package 89 | Assuming you have the =melpa= repository enabled, =use-package= can be used as follows. 90 | 91 | #+BEGIN_SRC emacs-lisp 92 | (use-package evil-numbers) 93 | #+END_SRC 94 | 95 | * Known Bugs 96 | See http://github.com/juliapath/evil-numbers/issues 97 | 98 | * Similar Packages 99 | - [[https://melpa.org/#/mouse-slider-mode][Mouse Slider Package]] 100 | - [[https://melpa.org/#/number][Number Package]] 101 | - [[https://melpa.org/#/shift-number][Shift Number Package]] 102 | - [[https://www.emacswiki.org/emacs/IncrementNumber][Emacs Wiki (Increment Number)]] 103 | 104 | * Contributors 105 | - Matthew Fidler 106 | - Michael Markert 107 | - Julia Path 108 | - Campbell Barton 109 | -------------------------------------------------------------------------------- /evil-numbers.el: -------------------------------------------------------------------------------- 1 | ;;; evil-numbers.el --- Increment/decrement numbers like in VIM -*- lexical-binding: t -*- 2 | 3 | ;; SPDX-License-Identifier: GPL-3.0-or-later 4 | ;; Copyright (C) 2011 by Michael Markert 5 | ;; 2020 by Julia Path 6 | ;; Author: Michael Markert 7 | ;; Maintainer: Julia Path 8 | ;; Contributors: Matthew Fidler 9 | ;; Michael Markert 10 | ;; Julia Path 11 | ;; Campbell Barton 12 | ;; URL: http://github.com/juliapath/evil-numbers 13 | ;; Git-Repository: git://github.com/juliapath/evil-numbers.git 14 | ;; Created: 2011-09-02 15 | ;; Version: 0.7 16 | ;; Package-Requires: ((emacs "24.1") (evil "1.2.0")) 17 | ;; Keywords: convenience tools 18 | 19 | ;;; Commentary: 20 | 21 | ;; Increment / Decrement binary, octal, decimal and hex literals. 22 | ;; 23 | ;; Works like C-a/C-x in VIM, i.e. searches for number up to EOL and 24 | ;; then increments or decrements and keep zero padding up. 25 | ;; 26 | ;; Known Bugs: 27 | ;; See http://github.com/juliapath/evil-numbers/issues 28 | ;; 29 | ;; Install: 30 | ;; 31 | ;; (require 'evil-numbers) 32 | ;; 33 | ;; and bind, for example: 34 | ;; 35 | ;; (global-set-key (kbd "C-c +") 'evil-numbers/inc-at-pt) 36 | ;; (global-set-key (kbd "C-c -") 'evil-numbers/dec-at-pt) 37 | ;; (global-set-key (kbd "C-c C-+") 'evil-numbers/inc-at-pt-incremental) 38 | ;; (global-set-key (kbd "C-c C--") 'evil-numbers/dec-at-pt-incremental) 39 | ;; 40 | ;; or only in evil's normal and visual state: 41 | ;; 42 | ;; (evil-define-key '(normal visual) 'global (kbd "C-c +") 43 | ;; 'evil-numbers/inc-at-pt) 44 | ;; (evil-define-key '(normal visual) 'global (kbd "C-c -") 45 | ;; 'evil-numbers/dec-at-pt) 46 | ;; (evil-define-key '(normal visual) 'global (kbd "C-c C-+") 47 | ;; 'evil-numbers/inc-at-pt-incremental) 48 | ;; (evil-define-key '(normal visual) 'global (kbd "C-c C--") 49 | ;; 'evil-numbers/dec-at-pt-incremental) 50 | ;; 51 | ;; Usage: 52 | ;; Go and play with your numbers! 53 | 54 | ;;; Code: 55 | 56 | (require 'evil) 57 | 58 | (eval-when-compile 59 | ;; For `pcase-dolist'. 60 | (require 'pcase)) 61 | 62 | 63 | ;; --------------------------------------------------------------------------- 64 | ;; ;; Compatibility 65 | 66 | (when (version< emacs-version "29.1") 67 | (defsubst pos-bol (&optional n) 68 | "Return the position at the line beginning." 69 | (line-beginning-position n)) 70 | (defsubst pos-eol (&optional n) 71 | "Return the position at the line end." 72 | (line-end-position n))) 73 | 74 | 75 | ;; --------------------------------------------------------------------------- 76 | ;; Custom Variables 77 | 78 | (defgroup evil-numbers nil 79 | "Support number increment/decrement." 80 | :group 'convenience) 81 | 82 | (define-obsolete-variable-alias 83 | 'evil-numbers/padDefault 'evil-numbers-pad-default "evil-numbers v0.6") 84 | 85 | (defcustom evil-numbers-pad-default nil 86 | "Whether numbers are padded by default." 87 | :type 'boolean) 88 | 89 | (defcustom evil-numbers-separator-chars nil 90 | "Support separator characters in numeric literals for visual grouping. 91 | 92 | This value is a string containing separator characters, 93 | typically \"_\" or \",\" which are allowed in numeric literals in some systems. 94 | 95 | Otherwise nil will disable this functionality." 96 | :type '(choice (const nil) string)) 97 | 98 | (defcustom evil-numbers-case nil 99 | "Case to use for hexadecimal numbers." 100 | :type 101 | '(choice 102 | (const :tag "Current Case" nil) 103 | (const :tag "Upper Case" upcase) 104 | (const :tag "Lower Case" downcase))) 105 | 106 | (defcustom evil-numbers-use-cursor-at-end-of-number nil 107 | "When non-nil, recognize numbers directly before the cursor. 108 | 109 | This doesn't match VIM's behavior." 110 | :type 'boolean) 111 | 112 | ;; --------------------------------------------------------------------------- 113 | ;; Internal Variables 114 | 115 | (defconst evil-numbers--chars-superscript "⁰¹²³⁴⁵⁶⁷⁸⁹") 116 | (defconst evil-numbers--chars-subscript "₀₁₂₃₄₅₆₇₈₉") 117 | 118 | (defconst evil-numbers--superscript-alist 119 | (cons 120 | (cons ?- ?⁻) 121 | (cons 122 | (cons ?+ ?⁺) 123 | (mapcar 124 | (lambda (i) 125 | (cons 126 | (string-to-char (number-to-string i)) 127 | (aref evil-numbers--chars-superscript i))) 128 | (number-sequence 0 9))))) 129 | 130 | (defconst evil-numbers--subscript-alist 131 | (cons 132 | (cons ?- ?₋) 133 | (cons 134 | (cons ?+ ?₊) 135 | (mapcar 136 | (lambda (i) 137 | (cons 138 | (string-to-char (number-to-string i)) 139 | (aref evil-numbers--chars-subscript i))) 140 | (number-sequence 0 9))))) 141 | 142 | 143 | ;; --------------------------------------------------------------------------- 144 | ;; Internal String Separator Utilities 145 | ;; 146 | ;; To remove, and restore separators. 147 | 148 | (defun evil-numbers--strip-chars (str sep-chars) 149 | "Remove SEP-CHARS from STR." 150 | (dotimes (i (length sep-chars)) 151 | (let ((ch (char-to-string (aref sep-chars i)))) 152 | (setq str (replace-regexp-in-string (regexp-quote ch) "" str t t)))) 153 | str) 154 | 155 | (defun evil-numbers--strip-chars-apply (str-src str-dst sep-chars) 156 | "Add SEP-CHARS into STR-DST from STR-SRC." 157 | (let ((sep-chars-list (append sep-chars nil)) 158 | ;; Strings to list. 159 | (str-src-rev (nreverse (append str-src nil))) 160 | (str-dst-rev (nreverse (append str-dst nil))) 161 | (result (list))) 162 | (while str-dst-rev 163 | (let ((ch-src (pop str-src-rev))) 164 | (cond 165 | ((and ch-src (memq ch-src sep-chars-list)) 166 | (push ch-src result)) 167 | (t 168 | (push (pop str-dst-rev) result))))) 169 | (apply #'string result))) 170 | 171 | ;; --------------------------------------------------------------------------- 172 | ;; Internal Utilities 173 | ;; 174 | ;; Not directly related to incrementing numbers. 175 | 176 | (defun evil-numbers--case-category (str default) 177 | "Categorize the case of STR or return DEFAULT when there is no case. 178 | 179 | - default: No case. 180 | - 1: Upper case. 181 | - -1: Lower case. 182 | - nil: Mixed case." 183 | (let ((str-dn (downcase str)) 184 | (str-up (upcase str))) 185 | (cond 186 | ((string-equal str str-dn) 187 | (cond 188 | ((string-equal str str-up) 189 | default) 190 | (t 191 | -1))) 192 | (t 193 | (cond 194 | ((string-equal str str-up) 195 | 1) 196 | (t 197 | nil)))))) 198 | 199 | (defun evil-numbers--format-binary (number &optional width fillchar) 200 | "Format NUMBER as binary. 201 | Fill up to WIDTH with FILLCHAR (defaults to ?0) if binary 202 | representation of NUMBER is smaller." 203 | (let ((nums (list)) 204 | (fillchar (or fillchar ?0))) 205 | (while (> number 0) 206 | (push (number-to-string (% number 2)) nums) 207 | (setq number (truncate number 2))) 208 | (let ((len (length nums))) 209 | (apply #'concat 210 | (cond 211 | ((and width (< len width)) 212 | (make-string (- width len) fillchar)) 213 | (t 214 | "")) 215 | nums)))) 216 | 217 | (defun evil-numbers--format (num width base) 218 | "Format NUM with at least WIDTH space in BASE." 219 | (cond 220 | ((= base 2) 221 | (evil-numbers--format-binary num width)) 222 | ((= base 8) 223 | (format (format "%%0%do" width) num)) 224 | ((= base 16) 225 | (format (format "%%0%dX" width) num)) 226 | ((= base 10) 227 | (format (format "%%0%dd" width) num)) 228 | (t 229 | ""))) 230 | 231 | (defun evil-numbers--skip-chars-impl (ch-skip ch-sep-optional dir ch-num limit) 232 | "Wrapper for `skip-chars-forward' and `skip-chars-backward'. 233 | 234 | CH-SKIP: Characters to skip. 235 | CH-SEP-OPTIONAL: Separator characters (single instances are stepped over). 236 | DIR: Direction to step in (1 -1). 237 | CH-NUM: Number of characters to step. 238 | LIMIT: Point which will not be stepped past." 239 | (let* ((is-forward (< 0 dir)) 240 | (skip-chars-fn 241 | (cond 242 | (is-forward 243 | #'skip-chars-forward) 244 | (t 245 | #'skip-chars-backward))) 246 | (clamp-fn 247 | (cond 248 | (is-forward 249 | #'min) 250 | (t 251 | #'max))) 252 | (skipped 253 | (abs 254 | (funcall skip-chars-fn 255 | ch-skip 256 | ;; Limit. 257 | (funcall clamp-fn (+ (point) (* ch-num dir)) limit))))) 258 | 259 | ;; Step over single separators, as long as there is a number after them. 260 | ;; Allow '100,123' and '16_777_216' to be handled as single numbers. 261 | (when ch-sep-optional 262 | (let ((point-next nil) 263 | (skipped-next 0)) 264 | (setq ch-num (- ch-num skipped)) 265 | (while (and (not (zerop ch-num)) 266 | (save-excursion 267 | (and (eq 268 | 1 269 | (evil-numbers--skip-chars-impl 270 | ch-sep-optional nil dir 1 limit)) 271 | (progn 272 | ;; Note counted towards 'skipped' 273 | ;; as this character is to be ignored entirely. 274 | (setq skipped-next 275 | (evil-numbers--skip-chars-impl 276 | ch-skip nil dir ch-num limit)) 277 | (unless (zerop skipped-next) 278 | (setq point-next (point)) 279 | ;; Found (apply `point-new'). 280 | t))))) 281 | ;; Step over the separator and contents found afterwards. 282 | (when point-next 283 | (goto-char point-next) 284 | (setq skipped (+ skipped skipped-next)) 285 | (setq ch-num (- ch-num skipped-next)) 286 | t)))) 287 | 288 | skipped)) 289 | 290 | (defun evil-numbers--match-from-skip-chars 291 | (match-chars dir limit do-check do-match) 292 | "Match MATCH-CHARS in DIR (-1 or 1), until LIMIT. 293 | 294 | When DO-CHECK is non-nil, any failure to match returns nil. 295 | When DO-MATCH is non-nil, match data is set. 296 | 297 | Each item in MATCH-CHARS is a cons pair. 298 | - The first item is the argument to pass to 299 | `skip-chars-forward' or `skip-chars-backward'. 300 | - The second item specifies how many characters to match, 301 | Valid values: 302 | - Symbol `+' one or more. 303 | - Symbol `*' zero or more. 304 | - `integerp' this number exactly." 305 | (catch 'result 306 | (let* ((is-forward (< 0 dir)) 307 | (point-init (point)) 308 | ;; Fill when `do-match' is set. 309 | (match-list (list))) 310 | 311 | ;; Sanity check. 312 | (when (cond 313 | (is-forward 314 | (> (point) limit)) 315 | (t 316 | (< (point) limit))) 317 | (error "Limit is on wrong side of point (internal error)")) 318 | 319 | (unless is-forward 320 | (setq match-chars (reverse match-chars))) 321 | 322 | (pcase-dolist (`(,ch-skip ,ch-num ,ch-sep-optional) match-chars) 323 | ;; Beginning of the match. 324 | (when do-match 325 | (push (point) match-list)) 326 | 327 | (cond 328 | ((integerp ch-num) 329 | (let ((skipped 330 | (evil-numbers--skip-chars-impl 331 | ch-skip ch-sep-optional dir ch-num limit))) 332 | (when do-check 333 | (unless (eq skipped ch-num) 334 | (throw 'result nil))))) 335 | ((eq ch-num '+) 336 | (let ((skipped 337 | (evil-numbers--skip-chars-impl 338 | ch-skip ch-sep-optional dir most-positive-fixnum limit))) 339 | (when do-check 340 | (unless (>= skipped 1) 341 | (throw 'result nil))))) 342 | 343 | ;; No length checking needed as zero is acceptable. 344 | ;; Skip these characters if they exist. 345 | ((eq ch-num '*) 346 | (evil-numbers--skip-chars-impl 347 | ch-skip ch-sep-optional dir most-positive-fixnum limit)) 348 | ((eq ch-num '\?) 349 | (evil-numbers--skip-chars-impl ch-skip ch-sep-optional dir 1 limit)) 350 | (t 351 | (error "Unknown type %S (internal error)" ch-skip))) 352 | 353 | ;; End of the match. 354 | (when do-match 355 | (push (point) match-list))) 356 | 357 | ;; Match 0 for the full range (expected at the beginning). 358 | (when do-match 359 | (setq match-list 360 | (cond ; `point-init' `point' `match-list'. 361 | (is-forward 362 | (cons point-init (cons (point) (nreverse match-list)))) 363 | (t ; `point' `point-init' `match-list'. 364 | (cons (point) (cons point-init match-list))))) 365 | 366 | (set-match-data match-list))) 367 | t)) 368 | 369 | (defun evil-numbers--swap-alist (alist) 370 | "Swap association list ALIST." 371 | (mapcar (lambda (x) (cons (cdr x) (car x))) alist)) 372 | 373 | (defun evil-numbers--translate-with-alist (alist string) 374 | "Translate every symbol in STRING using ALIST." 375 | (funcall (cond 376 | ((stringp string) 377 | #'concat) 378 | (t 379 | #'identity)) 380 | (mapcar (lambda (c) (cdr (assoc c alist))) string))) 381 | 382 | (defun evil-numbers--encode-super (x) 383 | "Convert X string into super-script." 384 | (evil-numbers--translate-with-alist evil-numbers--superscript-alist x)) 385 | (defun evil-numbers--decode-super (x) 386 | "Convert X string from super-script into regular characters." 387 | (evil-numbers--translate-with-alist 388 | (evil-numbers--swap-alist evil-numbers--superscript-alist) x)) 389 | 390 | (defun evil-numbers--encode-sub (x) 391 | "Convert X string into sub-script." 392 | (evil-numbers--translate-with-alist evil-numbers--subscript-alist x)) 393 | (defun evil-numbers--decode-sub (x) 394 | "Convert X string from sub-script into regular characters." 395 | (evil-numbers--translate-with-alist 396 | (evil-numbers--swap-alist evil-numbers--subscript-alist) x)) 397 | 398 | 399 | ;; --------------------------------------------------------------------------- 400 | ;; Internal Implementation 401 | 402 | (defun evil-numbers--inc-at-pt-impl-with-match-chars 403 | (match-chars 404 | ;; Numeric & other options. 405 | sign-group num-group base beg end padded do-case 406 | ;; Callbacks. 407 | range-check-fn number-xform-fn decode-fn encode-fn) 408 | "Perform the increment/decrement on the current line. 409 | 410 | For MATCH-CHARS docs see `evil-numbers--match-from-skip-chars'. 411 | NUM-GROUP is the match group used to evaluate the number. 412 | SIGN-GROUP is the match group used for the sign ('-' or '+'). 413 | 414 | When PADDED is non-nil, 415 | the number keeps it's current width (with leading zeroes). 416 | 417 | When RANGE-CHECK-FN is non-nil, it's called with the match beginning & end. 418 | A non nil result causes this function to return nil. 419 | 420 | When all characters are found in sequence, evaluate the number in BASE, 421 | replacing it by the result of NUMBER-XFORM-FN and return non-nil." 422 | (save-match-data 423 | (when (and (save-excursion 424 | ;; Skip backwards (as needed), there may be no 425 | ;; characters to skip back, so don't check the result. 426 | (evil-numbers--match-from-skip-chars 427 | match-chars -1 beg nil nil) 428 | ;; Skip forwards from the beginning, setting match data. 429 | (evil-numbers--match-from-skip-chars match-chars 1 end t t)) 430 | 431 | ;; Either there is no range checking or the range must 432 | ;; be accepted by the caller. 433 | (or (null range-check-fn) 434 | (funcall range-check-fn (match-beginning 0) (match-end 0)))) 435 | 436 | (let* ((sep-char (nth 2 (nth (1- num-group) match-chars))) 437 | (str-prev 438 | (funcall decode-fn 439 | (concat 440 | (match-string sign-group) (match-string num-group)))) 441 | 442 | (str-prev-strip 443 | (cond 444 | (sep-char 445 | (evil-numbers--strip-chars str-prev sep-char)) 446 | (t 447 | str-prev))) 448 | 449 | (num-prev (string-to-number str-prev-strip base)) 450 | (num-next (funcall number-xform-fn num-prev)) 451 | (str-next 452 | (evil-numbers--format 453 | (abs num-next) 454 | (cond 455 | (padded 456 | (- (match-end num-group) (match-beginning num-group))) 457 | (t 458 | 1)) 459 | base))) 460 | 461 | ;; Maintain case. 462 | (when do-case 463 | ;; Upper case (already set), no need to handle here. 464 | (cond 465 | ;; Keep current case. 466 | ((null evil-numbers-case) 467 | (when (eq -1 (or (evil-numbers--case-category str-prev -1) -1)) 468 | (setq str-next (downcase str-next)))) 469 | ((eq evil-numbers-case 'downcase) 470 | (setq str-next (downcase str-next))))) 471 | 472 | (when sep-char 473 | ;; This is a relatively expensive operation, 474 | ;; only apply separators back if any were found to begin with. 475 | (unless (string-equal str-prev str-prev-strip) 476 | (setq str-next 477 | (evil-numbers--strip-chars-apply 478 | str-prev str-next sep-char)))) 479 | 480 | ;; Replace number then sign, workaround emacs bug #74666. 481 | ;; The order replace runs isn't really important anyway, 482 | ;; the order may be restored once the bug is resolved in emacs. 483 | 484 | ;; Replace the number. 485 | (replace-match (funcall encode-fn str-next) t t nil num-group) 486 | 487 | ;; Replace the sign (as needed). 488 | (cond 489 | ;; From negative to positive. 490 | ((and (< num-prev 0) (not (< num-next 0))) 491 | (replace-match "" t t nil sign-group)) 492 | ;; From positive to negative. 493 | ((and (not (< num-prev 0)) (< num-next 0)) 494 | (replace-match (funcall encode-fn "-") t t nil sign-group))) 495 | 496 | (goto-char (match-end num-group))) 497 | 498 | t))) 499 | 500 | (defun evil-numbers--inc-at-pt-impl 501 | (beg end padded range-check-fn number-xform-fn) 502 | "Increment the number at the current POINT by AMOUNT limited by BEG and END. 503 | 504 | Keep padding when PADDED is non-nil. 505 | 506 | See `evil-numbers--inc-at-pt-impl-with-match-chars' for details on 507 | RANGE-CHECK-FN and NUMBER-XFORM-FN. 508 | 509 | Return non-nil on success, leaving the point at the end of the number." 510 | (or 511 | ;; Find binary literals: 512 | ;; 0[bB][01]+, e.g. 0b101 or 0B0 513 | (evil-numbers--inc-at-pt-impl-with-match-chars 514 | `(("+-" \?) ("0" 1) ("bB" 1) ("01" + ,evil-numbers-separator-chars)) 515 | ;; Sign, number groups & base. 516 | 1 4 2 517 | ;; Other arguments. 518 | beg end padded nil range-check-fn number-xform-fn 519 | ;; Decode & encode callbacks. 520 | #'identity #'identity) 521 | 522 | ;; Find octal literals: 523 | ;; 0[oO][0-7]+, e.g. 0o42 or 0O5 524 | (evil-numbers--inc-at-pt-impl-with-match-chars 525 | 526 | `(("+-" \?) ("0" 1) ("oO" 1) ("0-7" + ,evil-numbers-separator-chars)) 527 | ;; Sign & number groups. 528 | 1 4 8 529 | ;; Other arguments. 530 | beg end padded nil range-check-fn number-xform-fn 531 | ;; Decode & encode callbacks. 532 | #'identity #'identity) 533 | 534 | ;; Find hex literals: 535 | ;; 0[xX][0-9a-fA-F]+, e.g. 0xBEEF or 0Xcafe 536 | (evil-numbers--inc-at-pt-impl-with-match-chars 537 | `(("+-" \?) ("0" 1) ("xX" 1) ("[:xdigit:]" + ,evil-numbers-separator-chars)) 538 | ;; Sign, number groups & base. 539 | 1 4 16 540 | ;; Other arguments. 541 | beg end padded t range-check-fn number-xform-fn 542 | ;; Decode & encode callbacks. 543 | #'identity #'identity) 544 | 545 | ;; Find decimal literals: 546 | ;; [0-9]+, e.g. 42 or 23. 547 | (evil-numbers--inc-at-pt-impl-with-match-chars 548 | `(("+-" \?) ("0123456789" + ,evil-numbers-separator-chars)) 549 | ;; Sign, number groups & base. 550 | 1 2 10 551 | ;; Other arguments. 552 | beg end padded nil range-check-fn number-xform-fn 553 | ;; Decode & encode callbacks. 554 | #'identity #'identity) 555 | 556 | ;; Find decimal literals (super-script). 557 | (evil-numbers--inc-at-pt-impl-with-match-chars 558 | `(("⁺⁻" \?) (,evil-numbers--chars-superscript + nil)) 559 | ;; Sign, number groups & base. 560 | 1 2 10 561 | ;; Other arguments. 562 | beg end padded nil range-check-fn number-xform-fn 563 | ;; Decode & encode callbacks. 564 | #'evil-numbers--decode-super #'evil-numbers--encode-super) 565 | 566 | ;; Find decimal literals (sub-script). 567 | (evil-numbers--inc-at-pt-impl-with-match-chars 568 | `(("₊₋" \?) (,evil-numbers--chars-subscript + nil)) 569 | ;; Sign, number groups & base. 570 | 1 2 10 571 | ;; Other arguments. 572 | beg end padded nil range-check-fn number-xform-fn 573 | ;; Decode & encode callbacks. 574 | #'evil-numbers--decode-sub #'evil-numbers--encode-sub))) 575 | 576 | (defun evil-numbers--inc-at-pt-impl-with-search 577 | (amount beg end padded range-check-fn) 578 | "Increment the number at the current POINT by AMOUNT limited by BEG and END. 579 | 580 | Keep padding when PADDED is non-nil. 581 | 582 | See `evil-numbers--inc-at-pt-impl-with-match-chars' for details on 583 | RANGE-CHECK-FN. 584 | 585 | Return non-nil on success, leaving the point at the end of the number." 586 | (let ((found nil)) 587 | (save-match-data 588 | ;; Search for any text that might be part of a number, 589 | ;; if `evil-numbers--search-and-replace' cannot parse it - that's fine, 590 | ;; keep searching until `end' 591 | ;; This avoids doubling up on number parsing logic. 592 | ;; 593 | ;; Note that the while body is empty. 594 | (while (and 595 | ;; Found item, exit the loop. 596 | (null 597 | (when (evil-numbers--inc-at-pt-impl 598 | ;; Clamp limits to line bounds. 599 | ;; The caller may use a range that spans lines to 600 | ;; allow searching and finding items across 601 | ;; multiple lines (currently used for selection). 602 | (max beg (pos-bol)) 603 | (min end (pos-eol)) 604 | padded 605 | range-check-fn 606 | (lambda (n) (+ n amount))) 607 | (setq found t))) 608 | 609 | ;; Search failed, exit the loop. 610 | (re-search-forward (concat 611 | "[" 612 | "[:xdigit:]" 613 | evil-numbers--chars-superscript 614 | evil-numbers--chars-subscript 615 | "]") 616 | end t)))) 617 | found)) 618 | 619 | 620 | ;; --------------------------------------------------------------------------- 621 | ;; Public Functions 622 | 623 | ;;;###autoload (autoload 'evil-numbers/inc-at-pt "evil-numbers" nil t) 624 | (evil-define-operator evil-numbers/inc-at-pt 625 | (amount beg end type &optional incremental padded) 626 | 627 | "Increment the number at point or after point before `end-of-line' by AMOUNT. 628 | When region is selected, increment all numbers in the region by AMOUNT. 629 | 630 | NO-REGION is internal flag that allows 631 | `evil-numbers/inc-at-point' to be called recursively when 632 | applying the regional features of `evil-numbers/inc-at-point'. 633 | 634 | INCREMENTAL causes the first number to be increased by 1*AMOUNT, 635 | the second by 2*AMOUNT and so on. 636 | 637 | PADDED is whether numbers should be padded (e.g. 10 -> 09). 638 | - nil: is default behavior set by `evil-numbers-pad-default', 639 | - t: is the opposite of `evil-numbers-pad-default', 640 | - `'(t)': enables padding and `'(nil)' disables padding. 641 | 642 | Numbers with a leading zero are always padded. 643 | Signs are preserved when padding is enabled, for example: increasing a 644 | negative number to a positive will result in a number with a + sign." 645 | :motion 646 | nil 647 | (interactive "*") 648 | 649 | (setq amount (or amount 1)) 650 | (setq padded 651 | (cond 652 | ((consp padded) 653 | (car padded)) 654 | (t 655 | (funcall (cond 656 | (padded 657 | #'not) 658 | (t 659 | #'identity)) 660 | evil-numbers-pad-default)))) 661 | (cond 662 | ;; Handle selection (block or line). 663 | ;; Run this function in a loop (falling through to the `t' case). 664 | ((and beg end type) 665 | (let ((count 1)) 666 | (save-excursion 667 | (funcall (cond 668 | ((eq type 'block) 669 | (lambda (f) (evil-apply-on-block f beg end nil))) 670 | (t 671 | (lambda (f) (funcall f beg end)))) 672 | (lambda (beg end) 673 | (evil-with-restriction 674 | beg end (goto-char beg) 675 | (while (evil-numbers--inc-at-pt-impl-with-search 676 | (* amount count) (point) (point-max) padded nil) 677 | (when incremental 678 | (setq count (+ count 1)))))))))) 679 | 680 | ;; Handle the simple case, either the cursor is over a number, 681 | ;; or a number exists between the cursor and `end-of-line'. 682 | (t 683 | (let ((point-next 684 | (save-excursion 685 | (when (evil-numbers--inc-at-pt-impl-with-search 686 | amount (pos-bol) (pos-eol) padded 687 | ;; Optional range checking function, only needed when 688 | ;; `evil-numbers-use-cursor-at-end-of-number' is not nil. 689 | (cond 690 | (evil-numbers-use-cursor-at-end-of-number 691 | nil) 692 | (t 693 | ;; VIM doesn't allow the number directly before 694 | ;; the cursor to be manipulated. 695 | ;; This function checks the range to disallow that case. 696 | ;; 697 | ;; Note that this turns out to be simpler than enforcing 698 | ;; the limit in the searching logic. 699 | (let ((point-init (point))) 700 | (lambda (_beg end) (< point-init end)))))) 701 | (point))))) 702 | 703 | (cond 704 | ((null point-next) 705 | ;; Point not found, note that VIM doesn't report anything in this case. 706 | (message "No number at point or until end of line") 707 | nil) 708 | (t 709 | ;; Moves point one position back to conform with VIM, 710 | ;; see `evil-adjust-cursor' for details. 711 | (goto-char (1- point-next)) 712 | t)))))) 713 | 714 | ;;;###autoload (autoload 'evil-numbers/dec-at-pt "evil-numbers" nil t) 715 | (evil-define-operator evil-numbers/dec-at-pt 716 | (amount beg end type &optional incremental padded) 717 | "Decrement the number at point or after point before `end-of-line' by AMOUNT. 718 | 719 | If a region is active, decrement all the numbers at a point by AMOUNT." 720 | :motion nil 721 | 722 | (interactive "*") 723 | (evil-numbers/inc-at-pt (- (or amount 1)) beg end type incremental padded)) 724 | 725 | ;;;###autoload (autoload 'evil-numbers/inc-at-pt-incremental "evil-numbers" nil t) 726 | (evil-define-operator evil-numbers/inc-at-pt-incremental 727 | (amount beg end type padded) 728 | "Increment the number at point or after point before `end-of-line' by AMOUNT. 729 | 730 | When a region is active, increment all the numbers at a point by AMOUNT*n, where 731 | n is the index of the number among the numbers in the region, starting at 1. 732 | That is increment the first number by AMOUNT, the second by 2*AMOUNT, 733 | and so on." 734 | :motion nil 735 | 736 | (interactive "*") 737 | (evil-numbers/inc-at-pt amount beg end type 'incremental padded)) 738 | 739 | ;;;###autoload (autoload 'evil-numbers/dec-at-pt-incremental "evil-numbers" nil t) 740 | (evil-define-operator evil-numbers/dec-at-pt-incremental 741 | (amount beg end type padded) 742 | "Like `evil-numbers/inc-at-pt-incremental' but with negated argument AMOUNT." 743 | :motion nil 744 | 745 | (interactive "*") 746 | (evil-numbers/inc-at-pt (- (or amount 1)) beg end type 'incremental padded)) 747 | 748 | (provide 'evil-numbers) 749 | 750 | ;; Local Variables: 751 | ;; fill-column: 80 752 | ;; elisp-autofmt-load-packages-local: ("evil-macros") 753 | ;; End: 754 | 755 | ;;; evil-numbers.el ends here 756 | -------------------------------------------------------------------------------- /tests/evil-numbers-tests-watch.sh: -------------------------------------------------------------------------------- 1 | #!/bin/bash 2 | 3 | # This script re-runs the tests whenever files change. 4 | 5 | SCRIPT_PATH="$(dirname "${BASH_SOURCE[0]}")" 6 | echo $SCRIPT_PATH 7 | while true; do 8 | inotifywait -e close_write "$SCRIPT_PATH/evil-numbers-tests.el" "$SCRIPT_PATH/../evil-numbers.el" 9 | tput clear 10 | "$SCRIPT_PATH/evil-numbers-tests.sh" 11 | done 12 | -------------------------------------------------------------------------------- /tests/evil-numbers-tests.el: -------------------------------------------------------------------------------- 1 | ;;; evil-numbers-tests.el --- Testing -*- lexical-binding: t -*- 2 | 3 | ;; This file is not part of GNU Emacs. 4 | 5 | ;; This program is free software: you can redistribute it and/or modify 6 | ;; it under the terms of the GNU General Public License as published by 7 | ;; the Free Software Foundation, either version 3 of the License, or 8 | ;; (at your option) any later version. 9 | 10 | ;; This program is distributed in the hope that it will be useful, 11 | ;; but WITHOUT ANY WARRANTY; without even the implied warranty of 12 | ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 | ;; GNU General Public License for more details. 14 | 15 | ;; You should have received a copy of the GNU General Public License 16 | ;; along with this program. If not, see . 17 | 18 | ;;; Commentary: 19 | 20 | ;; See: `evil-numbers-tests.sh' for launching this script. 21 | 22 | ;; TODO: tests that handle bugs: #20, #21, #24, #26, #27. 23 | ;; Bugs fixed in: 24 | ;; c37a4cf92a9cf8aa9f8bd752ea856a9d1bc6c84c 25 | 26 | (require 'ert) 27 | 28 | (setq evil-numbers-tests-basedir 29 | (concat (file-name-directory load-file-name) "..")) 30 | (add-to-list 'load-path evil-numbers-tests-basedir) 31 | (require 'evil-numbers) 32 | 33 | ;;; Code: 34 | 35 | ;; --------------------------------------------------------------------------- 36 | ;; Global State 37 | 38 | ;; VIM keys. 39 | (global-set-key (kbd "C-a") 'evil-numbers/inc-at-pt) 40 | (global-set-key (kbd "C-x") 'evil-numbers/dec-at-pt) 41 | 42 | ;; Not VIM keys. 43 | (global-set-key (kbd "C-M-a") 'evil-numbers/inc-at-pt-incremental) 44 | (global-set-key (kbd "C-M-x") 'evil-numbers/dec-at-pt-incremental) 45 | 46 | 47 | ;; --------------------------------------------------------------------------- 48 | ;; Internal Functions/Macros 49 | 50 | (defmacro simulate-input (&rest keys) 51 | "Helper macro to simulate input using KEYS." 52 | (declare (indent 0)) 53 | `(let ((keys-list (list ,@keys))) 54 | (dolist (keys keys-list) 55 | (execute-kbd-macro keys)))) 56 | 57 | (defun buffer-reset-text (initial-buffer-text) 58 | "Use INITIAL-BUFFER-TEXT to initialize the buffer with text." 59 | (buffer-disable-undo) 60 | (simulate-input 61 | (kbd "i")) 62 | (erase-buffer) 63 | ;; Don't move the cursor. 64 | (save-excursion (insert initial-buffer-text)) 65 | (simulate-input 66 | (kbd "")) 67 | (buffer-enable-undo)) 68 | 69 | (defmacro with-evil-numbers-test (initial-buffer-text &rest body) 70 | "Run BODY adding any message call to the MESSAGE-LIST list. 71 | Setting the buffers text to INITIAL-BUFFER-TEXT." 72 | (declare (indent 1)) 73 | ;; Messages make test output noisy (mainly evil mode switching messages). 74 | ;; Disable when debugging tests. 75 | `(let ((inhibit-message t)) 76 | (evil-mode 1) 77 | (buffer-reset-text ,initial-buffer-text) 78 | (prog1 (progn 79 | ,@body) 80 | (evil-mode 0)))) 81 | 82 | 83 | ;; --------------------------------------------------------------------------- 84 | ;; Tests 85 | 86 | (ert-deftest simple () 87 | "Check a single number increments." 88 | (let ((text-expected "2|") 89 | (text-initial "1")) 90 | (with-evil-numbers-test text-initial 91 | ;; Select the line & increment. 92 | (simulate-input 93 | (kbd "C-a") 94 | "a|") 95 | (should (equal text-expected (buffer-string)))))) 96 | 97 | (ert-deftest simple-negative () 98 | "Check a single number increments." 99 | (let ((text-expected "-1|") 100 | (text-initial "0")) 101 | (with-evil-numbers-test text-initial 102 | ;; Select the line & increment. 103 | (simulate-input 104 | (kbd "C-x") 105 | "a|") 106 | (should (equal text-expected (buffer-string)))))) 107 | 108 | ;; See bug #18. 109 | (ert-deftest simple-hex () 110 | "Check hexadecimal is detected at all parts." 111 | (let ((text-initial " 0xFFF ")) 112 | ;; Test incrementing at different offsets, 113 | ;; this ensures scanning the hexadecimal is handled properly. 114 | (dotimes (i 6) 115 | (with-evil-numbers-test text-initial 116 | (dotimes (_ i) 117 | (simulate-input 118 | "l")) 119 | (simulate-input 120 | (kbd "C-a") 121 | "a|") 122 | (should (equal " 0x1000| " (buffer-string))))) 123 | (with-evil-numbers-test text-initial 124 | (simulate-input 125 | (kbd "llllll") 126 | (kbd "C-a") 127 | "a|" 128 | (kbd "")) 129 | (should (equal " 0xFFF |" (buffer-string)))))) 130 | 131 | ;; See bug #17. 132 | (ert-deftest simple-hex-positive-to-negative () 133 | "Change negative hex to negative." 134 | (let ((text-expected " -0x1| ") 135 | (text-initial " 0x1 ")) 136 | (dotimes (i 4) 137 | (with-evil-numbers-test text-initial 138 | (dotimes (_ i) 139 | (simulate-input 140 | "l")) 141 | (simulate-input 142 | (kbd "C-x") 143 | (kbd "C-x")) 144 | (simulate-input 145 | "a|" 146 | (kbd "")) 147 | (should (equal text-expected (buffer-string))))))) 148 | 149 | (ert-deftest simple-hex-negative-to-positive () 150 | "Change negative hex to positive." 151 | (let ((text-expected " 0x1| ") 152 | (text-initial " -0x1 ")) 153 | (dotimes (i 5) 154 | (with-evil-numbers-test text-initial 155 | (dotimes (_ i) 156 | (simulate-input 157 | "l")) 158 | (simulate-input 159 | (kbd "C-a") 160 | (kbd "C-a")) 161 | (simulate-input 162 | "a|" 163 | (kbd "")) 164 | (should (equal text-expected (buffer-string))))))) 165 | 166 | (ert-deftest simple-nop-non-number () 167 | "Do nothing, the value under the cursor is not a number." 168 | (let ((text-expected "X|") 169 | (text-initial "X")) 170 | (with-evil-numbers-test text-initial 171 | (simulate-input 172 | (kbd "C-a") 173 | "a|") 174 | (should (equal text-expected (buffer-string)))))) 175 | 176 | (ert-deftest simple-nop-non-number-signed () 177 | "Do nothing, the value under the cursor is not a number, but it has a sign." 178 | (let ((text-expected "-|X") 179 | (text-initial "-X")) 180 | (with-evil-numbers-test text-initial 181 | (simulate-input 182 | (kbd "C-a") 183 | "a|") 184 | (should (equal text-expected (buffer-string)))))) 185 | 186 | ;; See bug #25. 187 | (ert-deftest simple-nop-non-number-with-newline-before () 188 | "Do nothing, ensure the newline isn't stepped over." 189 | (let ((text-expected "|\n0") 190 | (text-initial "\n0")) 191 | (with-evil-numbers-test text-initial 192 | (simulate-input 193 | (kbd "") 194 | (kbd "C-a") 195 | "a|") 196 | (should (equal text-expected (buffer-string)))))) 197 | 198 | (ert-deftest simple-nop-non-number-with-newline-after () 199 | "Do nothing, ensure the newline isn't stepped over." 200 | (let ((text-expected "0\n|") 201 | (text-initial "0\n")) 202 | (with-evil-numbers-test text-initial 203 | (simulate-input 204 | "j" 205 | (kbd "C-a") 206 | "a|") 207 | (should (equal text-expected (buffer-string)))))) 208 | 209 | (ert-deftest simple-nop-cursor-after-decimal () 210 | "Do nothing, the cursor is after the number so it shouldn't be modified." 211 | (let ((text-expected "1 |\n") 212 | (text-initial "1 \n")) 213 | (with-evil-numbers-test text-initial 214 | (simulate-input 215 | (kbd "") 216 | (kbd "C-a") 217 | "a|") 218 | (should (equal text-expected (buffer-string)))))) 219 | 220 | (ert-deftest simple-nop-cursor-after-hex () 221 | "Do nothing, the cursor is after the number so it shouldn't be modified." 222 | (let ((text-expected "0xBEEF |\n") 223 | (text-initial "0xBEEF \n")) 224 | (with-evil-numbers-test text-initial 225 | (simulate-input 226 | (kbd "") 227 | (kbd "C-a") 228 | "a|") 229 | (should (equal text-expected (buffer-string)))))) 230 | 231 | (ert-deftest simple-separator-chars () 232 | "Check a single number increments." 233 | (let ((text-expected "1_11_111|") 234 | (text-initial "1_11_110")) 235 | ;; Test at different offsets to ensure 236 | ;; there are no bugs similar to #18 occurring. 237 | (dotimes (i 8) 238 | (with-evil-numbers-test text-initial 239 | (setq-local evil-numbers-separator-chars "_") 240 | (dotimes (_ i) 241 | (simulate-input 242 | "l")) 243 | (simulate-input 244 | (kbd "C-a") 245 | "a|") 246 | (should (equal text-expected (buffer-string))))))) 247 | 248 | (ert-deftest simple-separator-chars-disabled () 249 | "Check a single number increments." 250 | (let ((text-expected "2|_11_111") 251 | (text-initial "1_11_111")) 252 | (with-evil-numbers-test text-initial 253 | (setq-local evil-numbers-separator-chars nil) 254 | (simulate-input 255 | (kbd "C-a") 256 | "a|") 257 | (should (equal text-expected (buffer-string)))))) 258 | 259 | (ert-deftest selected-block-column-first () 260 | "Block selection test." 261 | (let ((text-expected 262 | ;; format-next-line: off 263 | (concat "1| 0 0\n" 264 | "1 0 0\n" 265 | "1 0 0\n")) 266 | (text-initial 267 | ;; format-next-line: off 268 | (concat "0 0 0\n" 269 | "0 0 0\n" 270 | "0 0 0\n"))) 271 | (with-evil-numbers-test text-initial 272 | (simulate-input 273 | ;; Block select the column 274 | (kbd "C-v") 275 | "jj" 276 | ;; Increment. 277 | (kbd "C-a") 278 | ;; Show cursor location. 279 | "a|") 280 | (should (equal text-expected (buffer-string)))))) 281 | 282 | (ert-deftest selected-block-column-second () 283 | "Block selection test." 284 | (let ((text-expected 285 | ;; format-next-line: off 286 | (concat "0 1| 0\n" 287 | "0 1 0\n" 288 | "0 1 0\n")) 289 | (text-initial 290 | ;; format-next-line: off 291 | (concat "0 0 0\n" 292 | "0 0 0\n" 293 | "0 0 0\n"))) 294 | (with-evil-numbers-test text-initial 295 | (simulate-input 296 | (kbd "w") 297 | ;; Block select the column 298 | (kbd "C-v") 299 | "jj" 300 | ;; Increment. 301 | (kbd "C-a") 302 | ;; Show cursor location. 303 | "a|") 304 | (should (equal text-expected (buffer-string)))))) 305 | 306 | (ert-deftest selected-block-column-third () 307 | "Block selection test." 308 | (let ((text-expected 309 | ;; format-next-line: off 310 | (concat "0 0 1|\n" 311 | "0 0 1\n" 312 | "0 0 1\n")) 313 | (text-initial 314 | ;; format-next-line: off 315 | (concat "0 0 0\n" 316 | "0 0 0\n" 317 | "0 0 0\n"))) 318 | (with-evil-numbers-test text-initial 319 | (simulate-input 320 | (kbd "ww") 321 | ;; Block select the column. 322 | (kbd "C-v") 323 | "jj" 324 | ;; Increment. 325 | (kbd "C-a") 326 | ;; Show cursor location. 327 | "a|") 328 | (should (equal text-expected (buffer-string)))))) 329 | 330 | (ert-deftest selected-block-column-first-incremental () 331 | "Incremental block selection test." 332 | (let ((text-expected 333 | ;; format-next-line: off 334 | (concat "1| 0 0\n" 335 | "2 0 0\n" 336 | "3 0 0\n")) 337 | (text-initial 338 | ;; format-next-line: off 339 | (concat "0 0 0\n" 340 | "0 0 0\n" 341 | "0 0 0\n"))) 342 | (with-evil-numbers-test text-initial 343 | (simulate-input 344 | ;; Block select the column 345 | (kbd "C-v") 346 | "jj" 347 | ;; Increment. 348 | (kbd "C-M-a") 349 | "a|") ;; Show cursor location. 350 | (should (equal text-expected (buffer-string)))))) 351 | 352 | (ert-deftest selected-lines-incremental () 353 | "Incremental line selection test." 354 | (let ((text-expected 355 | ;; format-next-line: off 356 | (concat "1| 2 3\n" 357 | "4 5 6\n" 358 | "7 8 9\n")) 359 | (text-initial 360 | ;; format-next-line: off 361 | (concat "0 0 0\n" 362 | "0 0 0\n" 363 | "0 0 0\n"))) 364 | (with-evil-numbers-test text-initial 365 | (simulate-input 366 | ;; Block select the column 367 | (kbd "V") 368 | "jj" 369 | ;; Increment. 370 | (kbd "C-M-a") 371 | ;; Show cursor location. 372 | "a|") 373 | (should (equal text-expected (buffer-string)))))) 374 | 375 | (provide 'evil-numbers-tests) 376 | ;;; evil-numbers-tests.el ends here 377 | -------------------------------------------------------------------------------- /tests/evil-numbers-tests.sh: -------------------------------------------------------------------------------- 1 | #!/bin/bash 2 | SCRIPT_PATH="$(dirname "${BASH_SOURCE[0]}")" 3 | 4 | # `package-initialize` is needed so the 'evil' package can be found. 5 | emacs \ 6 | -batch \ 7 | --eval "(package-initialize)" \ 8 | -l $SCRIPT_PATH/evil-numbers-tests.el \ 9 | -f ert-run-tests-batch-and-exit 10 | --------------------------------------------------------------------------------