Commit Graph

120 Commits

Author SHA1 Message Date
58a9c2ec69 add functionality for commands: 'dgg' (delete from cursor to start of buffer), 'dge' (delete from cursor to the end of the previous word) and 'dgE' (delete from cursor to the end of the previous WORD) 2024-11-10 07:34:30 +00:00
bc27925e75 similar loop optimisations described in previous commit to app-update.sml's 'helpDeleteToChr' function 2024-11-09 10:49:54 +00:00
fed827a6c9 same loop optimisation mentioned in previous commit to app-update.sml's 'helpDelete' function 2024-11-09 10:41:37 +00:00
dece4d4d83 break out of loop early in 'helpMove' and 'helpMoveToChr' functions, in case where calling 'fMove' returned the same value as before 2024-11-09 10:11:51 +00:00
cde4dbc67f reduce unnecessary intermediary allocations in app-update.sml's 'helpDeleteToChr' function, similarly to previous commit 2024-11-09 09:59:12 +00:00
5804620846 small optimisation in app-update.sml's 'helpDelete' function, reducing number of allocations by accumulating otherIdx, and deleting from buffer only once loop is over 2024-11-09 09:39:03 +00:00
19aaae72f3 add functionality to delete to chr (equivalent of Vi commands starting with 'df' like 'dfe' to delete to the next 'e', and also add equivalent of 'dFe' to delete backwards) 2024-11-09 09:24:14 +00:00
faff848cb4 in cursor.sml's 'helpTillPrevChr' function, properly handle edge case where graphical chr is followed by multiple line breaks 2024-11-09 06:33:32 +00:00
d4d0236dab amend cursor.sml's 'helpTillNextChr' function to work with new line break scheme, and use it to implement 'delete till' functionality starting with 'dt' (for example, 'dta' deletes till 'a', 'dts'detetes till 's', etc.) 2024-11-09 05:35:32 +00:00
e4f46295d4 improvement to app-update.sml's 'deleteEndOfLine' function, where we rely on 'helpRemoveChr' function to handle conditional 'go backwards' logic, and we also make sure not to do anything in 'deleteEndOfLine' if we are at a \n 2024-11-09 03:51:39 +00:00
267efae4cc add another custom delete function ('deleteToFirstNonSpaceChr', which can be triggered with command d^ and it works fine on testing 2024-11-08 22:19:57 +00:00
ae80ef5f21 code function to delete to end of line with command 'd$' (custom function needed because it did not work as expected to pass 'Cursor.viDlr' as a higher order function as with other motions) 2024-11-08 21:52:04 +00:00
74822d1541 rename cursor.sml's 'clipIdxAfterDelete' function to 'clipIdx', simplify it, and use it in other functions too 2024-11-08 20:43:36 +00:00
f02a20c6ea clip idx after delete if necessary 2024-11-08 18:47:26 +00:00
88f4ff6057 progress with delete 2024-11-08 15:19:16 +00:00
6e66d4c968 done with imperative shell/ffi aspect of sending KEY_ESC to update thread when that action has occurred 2024-11-08 09:46:01 +00:00
a4dea7626f add KEY_ESC message type, and refactor app-update.sml to use it (always calls 'clearMode' function which always sets the app to normal mode, and sets the command strnig to empty) 2024-11-08 09:30:57 +00:00
ff38e39deb do not use 'clearMode' in helpDeleteChr function, because we have 'buffer' and 'cursorIdx' parameters we would like to add to the app state before exiting the loop. Instead, go to end of loop by passing 'count' of 0 2024-11-08 04:25:33 +00:00
36763fce94 add count to 'x' command, allowing [count] chars to be deleted 2024-11-08 04:21:05 +00:00
81c516e907 fix very minor issue in cursor.sml's 'helpViL' function (previously returned cursorIdx when non-line breaks is followed by non-line break, but now return cursorIdx + 1 instead which is the correct behaviour, because we want to move the cursor rightwards one position in that case 2024-11-07 21:07:11 +00:00
fdb6e0292a fully done amending 'getCursorColumn' in cursor.sml it seems, because all the inputs I throw at it give the expected results 2024-11-07 21:00:56 +00:00
63f2945334 restore triple-line checking to 'startViK' in cursor.sml, as it seems safer 2024-11-07 20:51:02 +00:00
a77003e348 seem to have viK and viJ fixed for the moment, except when I delete from the first or second line with 'x' (deleting from other lines does not seem to make a difference) 2024-11-07 12:59:03 +00:00
a35c0803fb fix 'getStartLineBefore' in text-window.sml, where we always decrement 'lineNum' variable when encountering \n, and use 'Int.max (lineNum - 1, 0)' to clip lineNum to 0 if it happens to go below 0 2024-11-07 11:57:32 +00:00
c07afee77f simplify one part of cursor.sml's 'startViK' function, by calling 'helpVi0' rather than 'helpViK' when we know previous char is \n 2024-11-07 11:46:30 +00:00
9f0982ad91 simplify viK and especially startViK in cursor.sml, by only checking (strIdx - 1) and (strIdx - 2) 2024-11-06 19:47:14 +00:00
6b9cf8dbc2 amend problem with TextWindow.getStartLineBefore, where we were not following rule mentioned in previous commits to not count (graphical-chr -> \n) as line break 2024-11-06 12:46:53 +00:00
50d10c1a89 delete-chr (equivalent of vi's 'x' cmd) works fine now, except when deleting from the very first line, where first line may become invisible temporarily. I am not sure why that is happening but will find out. 2024-11-06 12:17:26 +00:00
2e13030efb handle more edge cases of viK (and it is now complete) 2024-11-06 11:52:40 +00:00
62d62a8429 rewrite viK in accordance with previous commits 2024-11-05 21:42:56 +00:00
7f1e5249f0 rewrite Cursor.viJ and Cursor.helpViJ for new line break scheme 2024-11-05 20:25:08 +00:00
0315bd6550 rewrite Cursor.viH for new line-break-skip scheme, as mentioned in previous commit 2024-11-05 19:44:49 +00:00
9df6f92a33 progress with equivalent of vi's 'x' command 2024-11-05 12:38:01 +00:00
a0a8fcc17b change line indexing in AppUpdate.moveToLine from 0-based to 1-based (so first line can be access with 1G, second with 2G, as is normal with Vim) 2024-11-04 02:56:57 +00:00
66d4346c74 improvement in Cursor.getLineStartIdx when going to last line in buffer 2024-11-04 02:46:02 +00:00
b368619df3 add functionality to go to specific line in buffer 2024-11-02 13:59:55 +00:00
2df8f88452 improvements to TextWindow.isCursorVisible (no need to do binary search; in fact, that leads to an exception, because we are meant to use Vector.sub to access the relative line instead) 2024-11-02 12:54:34 +00:00
2a8e02ff3a when pressing fcore/text-window.sml to match pair, only recentre text window if matching pair is not currently visible on screen 2024-11-02 12:34:23 +00:00
f7b755d6a6 fix minor bug in cursor.sml (we checked if strPos is equal to 'String.size str - 1' but then accessed strPos + 1, which makes our bound check useless and may cause an exception. Instead, check 'strPos < String.size str - 1' 2024-11-01 03:35:12 +00:00
25f06b1f9a fix minor bug in Cursor.matchPair fuunction; depending on chr at strIdx, we might want to iterate on the leftStrings or on the rightStrings. Before, we iterated on the rightStrings only, but now we iterate on whichever is appropriate 2024-10-31 11:50:18 +00:00
fe317ca220 add missing implementation of Cursor.matchPair when strIdx is in tl 2024-10-31 11:19:10 +00:00
553d4605e7 add implementation of matching cursor pairs 2024-10-31 11:07:52 +00:00
1316cdfe13 fill in todo where strIdx is in tl, in text-window.sml function 'getStartLineWithCursorCentered 2024-10-30 11:12:12 +00:00
601a341992 add functionality to move to end of line 2024-10-30 10:54:55 +00:00
308d042deb add functionality to centre text window to cursor 2024-10-30 10:05:16 +00:00
f2f305c35d add command to go to start of lineGap 2024-10-30 07:51:24 +00:00
c7570707ab 100fcore/app-update.sml done with functionality of getting screen to move (if needed) when cursor moves, including getting screen to move when moving to a new chr (in this commit) 2024-10-28 23:06:32 +00:00
5e1e39ca69 fixed two issues. First is that an exception occurred when sometimes moving cursor forwards. Cause of this issue was that callee functions depended on LineGap being moved to start of line, but this did not always happen (and now it does always happen). Second issue was that moving cursor down did not scroll as expected when line wrapped. The reason for this second issue was that the 'getStartLineAfter' function did not increment 'startLine' value in loop when line wrap occurred. Both issues are now fixed. 2024-10-28 22:54:28 +00:00
bff4c006ed have functionality for cursor to scroll down a line when cursor moves down one line working, but it only seems to work perfectly when there are no visual line breaks 2024-10-28 21:56:07 +00:00
0ed5a23ade some progress moving textWindow, but it is not perfect yet 2024-10-28 10:59:18 +00:00