Fixed behavior of h, l and I, gg commands added #15
Conversation
commands I and gg added command G simplified issue 8 fixed
| @@ -52,10 +52,18 @@ def _move_cursor(self, movement, repeat=1): | |||
| editor.setTextCursor(cursor) | |||
| self._widget.update_vim_cursor() | |||
|
|
|||
| def _editor_cursor(self): | |||
There was a problem hiding this comment.
Useful helper, thanks. Could you use it in _move_cursor() above too ?
| cursor = self._editor_cursor() | ||
| if not cursor.atBlockStart(): | ||
| self._move_cursor(QTextCursor.Left) | ||
| if repeat > 1: self.h(repeat-1) |
There was a problem hiding this comment.
Please put the code block in a new line, even if it's small it will be more clear. (same below)
| self._widget.update_vim_cursor() | ||
|
|
||
| def G(self, repeat=1): | ||
| self._move_cursor(QTextCursor.Start) |
There was a problem hiding this comment.
number+G is supposed to send the cursor to a specific line number, your version doesn't do that anymore ?
G puts the cursor to the top inly if no number was entered, i.e. repeat == 1
There was a problem hiding this comment.
I actually wasn't aware that you could jump lines that way! I thought G and gg were different because I only used their default uses: G goes to last line, gg goes to first line. And actually I mixed their default uses too! Whoops, I'll get on it
| self._move_cursor(QTextCursor.Start) | ||
|
|
||
| def gg(self, repeat=1): | ||
| self._move_cursor(QTextCursor.End) |
There was a problem hiding this comment.
Is is the same as G, where entering a number before gg does something different ?
used _editor_cursor() in _move_cursor() fixed indentation for h() and l() fixed behavior of gg restored behavior of G
Allows G to have 0 as a default repeat value. This way 1G will go to the first line and G will go to the last line.
|
In commit ca748fe I added some lines to allow G to have a different default behavior than if G was preceded by a number (1 or greater). I'm not sure if this was the best way to do it, but it seemed to be the most simple. Without the change, the default value for repeat would always be 1, regardless of the default value provided at the definition of the function. I also tried changing |
| @@ -294,6 +315,8 @@ def on_text_changed(self, text): | |||
| if text.startswith("0"): | |||
| # Special case to simplify regexp | |||
| repeat, key, leftover = 1, "0", text[1:] | |||
| elif text.startswith("G"): | |||
| repeat, key, leftover = 0, "G", text[1:] | |||
There was a problem hiding this comment.
Use -1 rather than 0, it will be clearer (-1 as an index in python means the last one).
There was a problem hiding this comment.
All done! Thanks for the help :)
repeat should be -1 to represent last line, rather than 0
|
Thanks ! |
ccordoba12
changed the title
ccordoba12
changed the title
commands I and gg added
command G simplified
issue #8 fixed