Wrong current form in the REPL window when cursor is to the right of a form

[PEZ]

In the REPL window the ”current form” should be determined first by any form immediately preceding the cursor and second any form immediately succeeding the cursor. This is not the case today. As is evident by this screenshot:

Here the brackets in [1 2 3 4] should be highlighted, but instead the it is the ) to the right of the cursor that gets highlighted together with it's matching bracket. This also makes the Expand selection command do the wrong thing.