|
|
c29afbdb7c
|
fix minor bug regarding 'NormalMove.moveCursorDown': after a <count-j> that moved the cursor to the last line in the buffer, the cursor would be at the last column too, even if that wasn't the previous column. To address this issue, we take out code that calculates the lineIdx from the 'NormalMove.finishMoveCursorUpDown' function, and have both 'NormalMove.moveCursorUp' and 'NormalMove.moveCursorDown' calculate their own lineIdx in different ways and pass it to the 'NormalMove.finishMoveCursorUpAndDown' function.
|
2025-09-20 02:58:51 +01:00 |
|
|
|
090e7ccea2
|
pass 'maxLength' value to TextScroll function so that we can prevent scrolling past the bottom of the file (unless we want to od so by centtering the screen)
|
2025-09-19 23:17:28 +01:00 |
|
|
|
d3fa4d08bf
|
extract reusable function containing common code previously used in both 'NormalMove.moveCursorUp' and 'NormalMove.moveCursorDown' functions, and make them call the reusable function instead
|
2025-09-19 22:40:29 +01:00 |
|
|
|
859860b19f
|
reimplement vi's 'j' motion, and remove the original function for this motion which was in cursor.sml
|
2025-09-19 22:33:37 +01:00 |
|
|
|
2c88341c37
|
remove code which became dead after reimplementing vi's 'k' motion
|
2025-09-19 05:27:10 +01:00 |
|
|
|
9ec8891ce5
|
fix bugs in new function for moving cursor upwards, taking care to calculate column different if on first line (where there is no preceding newline) vs any line other than the first
|
2025-09-19 05:23:20 +01:00 |
|
|
|
4c1a76ae67
|
begin reimplementing motion to move cursor up (vi's 'k' command), although it is in progress and buggy
|
2025-09-19 04:59:40 +01:00 |
|
|
|
e4e3961d41
|
in NormalMove.moveToLine function, use new LineGap function, 'LineGap.lineNumberToIdx', to get the index a line is at, and delete the Cursor.getLineStartIdx' function which we no longer need, as that functionality is in brolib-sml itself.
|
2025-09-19 04:45:29 +01:00 |
|
|
|
38c1766b14
|
pull in new version of brolib-sml, which adds a function to convert a line number to an index
|
2025-09-19 04:38:52 +01:00 |
|
|
|
b6244d4962
|
amend motion to move to a line: if the requested line has a linebreak as the next character after it, stay at the current position, or else add 1 to the linebreak's idx so that we go to the first character of the line
|
2025-09-19 04:03:54 +01:00 |
|
|
|
d871ac451f
|
restore temp.txt to previous state, as it was temporarily being edited for testing
|
2025-09-19 03:04:10 +01:00 |
|
|
|
ab2f2cc752
|
simplify 'vi-hl-dfa's DFA, removing one state
|
2025-09-19 02:40:14 +01:00 |
|
|
|
ad7d103f61
|
rename 'ViLDfa' structure to 'ViHlDfa' since this DFA implements both vi's 'h' motion and vi's 'l' motion
|
2025-09-17 11:02:11 +01:00 |
|
|
|
dbf05ec8dc
|
refactor Cursor.viH to use DFA
|
2025-09-17 10:45:37 +01:00 |
|
|
|
9ddb5f68d7
|
fix bugs in vi-l-dfa (we want to stop looping when the counter is ~1, because the starting character will likely be final/a not-newline, and we want to loop at least once; also, we want to special case 'twoNewlineState' as a final case which causes us to go backwards by 1 instead of treating 'oneNewlineState' as a final/special case). We also modify other code to use the new vi-l implementation in the program.
|
2025-09-17 03:52:31 +01:00 |
|
|
|
5174a5b0a4
|
adjustments to vi-l-dfa: we should accept a single-newline as a final state, but not a double-newline
|
2025-09-17 02:35:32 +01:00 |
|
|
|
161caee62a
|
create DFA for Vi's 'l' motion
|
2025-09-17 02:31:38 +01:00 |
|
|
|
c94aa72015
|
create 'MakeIfCharFolderNext' functor, which mirrors the 'MakeIfCharFolderPrev' functor that we already have
|
2025-09-17 02:20:36 +01:00 |
|
|
|
97936b83a0
|
in TextBuilder functions, when we encounter a newline, we want any cursor here to be drawn after a linebreak (after the posX and posY values go to the next line) and not before
|
2025-09-16 22:29:19 +01:00 |
|
|
|
1adb74df2c
|
pull in new brolib-sml changes (which just changes one particular function's name to be clearer), and modify code to use the correct name
|
2025-09-16 22:20:55 +01:00 |
|
|
|
c4fedc6434
|
fix 'Cursor.getLineStartIdx' function, which should look at the left nodes if there is no relevant line in this node
|
2025-09-16 22:09:15 +01:00 |
|
|
|
96521f358f
|
when looping through a DFA in a functor, make sure we return the absolute index to the calling function and not a modified version of the absolute index which has already been clipped
|
2025-09-16 21:35:48 +01:00 |
|
|
|
12478f8ac2
|
remove references to 'Cursor.clipIdx' and delete that function once it is no longer used
|
2025-09-16 16:08:01 +01:00 |
|
|
|
578d3af5ec
|
remove changes to temp.txt which were only for testing
|
2025-09-16 15:55:16 +01:00 |
|
|
|
19d2235686
|
refactor 'MakeNormalDelete.removeLineBreaks' function to remove function call to 'Cursor.clipIdx', instead relying on textLength field in buffer
|
2025-09-16 15:53:41 +01:00 |
|
|
|
2c5449dc0a
|
rewrite 'MakeMove' functor in fcore/move.sml to use textLength field instead of Cursor.clipIdx function
|
2025-09-16 07:59:26 +01:00 |
|
|
|
148b108062
|
when using 'G' command to move to end fo file, use the 'textLength' field to calculate the new bufferIdx, which is more sensible than using the LineGap's idx for the same purpose
|
2025-09-16 07:52:47 +01:00 |
|
|
|
3d9bf962e7
|
handle additional deleteLine edge case
|
2025-09-16 07:40:58 +01:00 |
|
|
|
70ffea21b3
|
fix the last MakeNormalDelete.deleteLine bug: if we delete such that the startIdx (prior to deletion) becomes longer than the text in the buffer, we move the cursor to the start of the last line
|
2025-09-16 07:01:55 +01:00 |
|
|
|
6507b9d49c
|
adjust MakeNormalDelete.deleteLine implementation slightly, because the previous implementation did not delete the last character when we are at the end of the file
|
2025-09-16 06:29:35 +01:00 |
|
|
|
169f96f459
|
fix exception when the buffer is empty
|
2025-09-16 04:35:49 +01:00 |
|
|
|
0793744e24
|
minor bug fix: when we start looping backwards in a DFA and the rightStrings is empty, start iterating from leftStrings if possible
|
2025-09-16 03:05:33 +01:00 |
|
|
|
820a6c2462
|
copy new file order from shf.mlb to shf-tests.mlb, and remove split-string tests because we have tried to refactor string-search logic to be separate from the data structure
|
2025-09-16 01:25:27 +01:00 |
|
|
|
873fa1b1ac
|
pull in update to brolib-sml, which gives us a LineGap that has textLength and lineLength fields
|
2025-09-14 15:54:59 +01:00 |
|
|
|
ae1772605b
|
in TextBuilderWithHighlight.build, check when we encounter a \n if we would be past the last line, and return the acc if so, or else continue looping
|
2025-09-14 10:39:51 +01:00 |
|
|
|
9b34014af1
|
a few bug fixes to NORMAL_SEARCH_MODE: the main one is that we were passing the general searchString to the resize function before, and we were drawing the wrong string because of that; another bug fix is that, on resizing, we have to update the mode to contain the recalculated searchScrollColumn
|
2025-09-14 10:28:42 +01:00 |
|
|
|
0632f7a969
|
add horizontal scrolling functionality to SearchBar
|
2025-09-14 10:07:43 +01:00 |
|
|
|
f1a06f946d
|
add searchScrollColumn to NORMAL_SEARCH_MODE variant, and update and recalculate it where needed
|
2025-09-14 09:50:07 +01:00 |
|
|
|
b556fc7d63
|
extract a reusable function to calculate the scroll column in different contexts (can be used for a plain string or a LineGap.t; doesn't matter)
|
2025-09-14 09:22:37 +01:00 |
|
|
|
428208f9bf
|
when text is wide enough to be centered, also centre the search bar
|
2025-09-14 09:14:22 +01:00 |
|
|
|
4bc6c54951
|
in TextBuilder.build functions, when we encounter a space, check if we are before the scroll column's start, and set the x position to startX if so. This is done in preparation for the character which is actually at the scroll column's start, which will be added at the wrong offset unless we do this.
|
2025-09-14 08:42:46 +01:00 |
|
|
|
120568a18d
|
modify 'TextBuilder.initEnv' function to take 'startX' and 'startY' parameters, instead of hardcoding the startX/Y inside the function, and change width/height calculations to take these parameters into account
|
2025-09-14 08:24:37 +01:00 |
|
|
|
2ab48626cd
|
remove 'skipToFirstVisibleColumn' function in TextBuilder, as control flow is simpler if we have fewer mutually recursive functions and we can implement its functionality in the 'build' function instead. Also change the 'z' values for cursor and highlight; the cursor should appear above the highlight and now it does, but it previously didn't
|
2025-09-13 23:22:40 +01:00 |
|
|
|
7a388f2983
|
add TextScroll function for centering line to cursor, and use it in 'NormalFinish.centreToCursor' function
|
2025-09-13 18:23:55 +01:00 |
|
|
|
18d2579605
|
remove todo-exception from 'G' (NormalMove.goToEnd) command. The todo was a reminder to implement a way to get the scroll line when moving to the end. We have that implemented now.
|
2025-09-13 18:15:30 +01:00 |
|
|
|
bfb653e059
|
pull in new changes to brolib-sml, which fixes the LineGap.goToLine function to properly go to the start of the line
|
2025-09-13 18:04:23 +01:00 |
|
|
|
bbe39f90d4
|
move cursor to low/cursorIdx in helper function
|
2025-09-13 08:48:00 +01:00 |
|
|
|
9208c47622
|
fix exception caused by resizing in normal mode: we were passing 'buffer' to the TextScroll function previously, but we were meant to be passing 'newBuffer'. We are passing 'newBuffer' in this new commit as we are meant to.
|
2025-09-13 05:31:11 +01:00 |
|
|
|
2a332f543a
|
minor adjustment to vertical TextScroll: we shouldn't need to move the cursor to the very line in the visible area, or the ver first line in the visible area, to scroll. We scroll if the cursorLine is some distance close to either edge instead.
|
2025-09-13 05:24:51 +01:00 |
|
|
|
668dd07699
|
pull in new version of brolib-sml so that we can get bug fixes for LineGap.getLineNumberOfIdx, delete the TextWindow structure (which was previously used to get the start line to draw from), and replace previous usages of TextWindow with TextScroll.getStartLine. This enables us to scroll in a way tailored to the reimplemented TextBuilder (which do not wrap lines or characters)
|
2025-09-13 05:12:17 +01:00 |
|
