Paredit and highlight fixes and improvements. #456

cfehse · 2019-11-07T16:24:56Z

What has Changed?

Changed the paredit.open() method to wrap around the current selection ([2.0] Paredit inconsistencies #170 ).
Keep the selection after wrap on open() and wrapSexpr().
Changed insertString() to use changeRange() directly.
Added a dblclick handler to the webview to execute growSelection() on mouse double click starting at the current position of the mouse pointer. This allows the selection of words with a double click like in the editor.

Fixed the growSelection() method to allow cursor positions outside an sexpr (Expand selection fails at the start and end of the input of the REPL window #417).
Fixed the regex for the calva highlighter to allow correct rendering of comment forms (Calva Highlight sometimes incorrectly recognises form as a comment form #403).
Disables the call to util.select() for the paredit.deleteBackward command to avoid misplaced cursor position after a line was deleted ([Paredit/Editor] paredit.deleteBackward sets cursor position wrong when deleting a line. #458).

Fixes #170 #417 #403 #458

My Calva PR Checklist

I have:

The Calva Team PR Checklist:

Before merging we (at least one of us) have:

Made sure the PR is directed at the dev branch (unless reasons).
Read the source changes.
Given feedback and guidance on source changes, if needed. (Please consider noting extra nice stuff as well.)
Tested the VSIX built from the PR (well, if this is a PR that changes the source code.)
- Tested the particular change
- Figured if the change might have some side effects and tested those as well.
- Smoke tested the extension as such.
If need be, had a chat within the team about particular changes.

Ping @PEZ, @kstehn, @bpringe

… into dev

Closes: #170

positions outside an sexpr. Closes: #417.

Closes: #403

Closes #458

fix typo

PEZ · 2019-11-09T15:38:16Z

That double-click is great! We should add it to the editor as well. (Not in this PR, though. 😄 )

PEZ · 2019-11-09T16:07:35Z

Double-clicking inside a string should probably not use grow-selection. It makes it hard to select words in the string.

PEZ · 2019-11-09T16:10:28Z

Undoing wrap selection deletes the selection. I think this might be an old bug.

PEZ · 2019-11-09T16:14:45Z

Those are the only things I find when testing. The rest works wonderfully as advertised.

cfehse · 2019-11-09T16:46:33Z

Double-clicking inside a string should probably not use grow-selection. It makes it hard to select words in the string.

You mean clicking in something like this "This is a documentation string"?

cfehse · 2019-11-09T16:46:59Z

Undoing wrap selection deletes the selection. I think this might be an old bug.

I take a look at this as well.

PEZ · 2019-11-10T00:18:25Z

You mean clicking in something like this "This is a documentation string"?

Yes. It is both good and bad that the whole string is selected, I guess. But it ”feels” weird.

cfehse · 2019-11-10T11:34:09Z

Undoing wrap selection deletes the selection. I think this might be an old bug.

I can not reproduce this for the wrap around commands. The behavior with ctrl+z does not delete the selection but removes the inserted backets/parens/curlies. What I noticed that the shortcuts for paredit.wrapAroundSquare and paredit.wrapAroundCurly can not be applied on a german keyboard.

from the current offset in the model.

cfehse · 2019-11-10T11:39:34Z

@PEZ, @kstehn, @bpringe

I changed the double click behavior in the webview to select the current word in a string.

PEZ · 2019-11-10T12:43:18Z

src/webview/token-cursor.ts

+    /**
+     * Indicates if the current token is inside a string (e.g. a documentation string)
+     */
+    isInString() {


I thought we already had a method for checking if we're inside a string? Or maybe that is only while parsing... But even if it is, maybe add that fact to the token?

If so I didn't found it and the decision if in a string may depend on the next and previous token so I think this method is correctly placed in the token cursor because only the cursor has the whole picture of the model.

I was remembering correctly 😄

calva/src/webview/token-cursor.ts

Line 414 in 786d6dd

withinString() {

Hey cool! But I think the code is not sufficient. I will test it.

What seems a bit odd to me is that double-clicking words work everywhere on in the REPL window, except the prompt. Is there a reason for that, you think? (I'm talking about the released Calva.)

That's because outside the line model the default behavior of the double click is in place. We override the default for mouse events to set the blinking cursor on the right place. My new code takes care that this default behavior is preserved outside the line model.

My new code takes care that this default behavior is preserved outside the line model.

Yes. I saw that.

… into dev

PEZ · 2019-11-11T08:25:40Z

I can not reproduce this for the wrap around commands.

I now tried this a bit more and realise we have quite a few different behaviours. If I use the Wrap around ()` command on a left->right selection, the right thing is selected and I can undo the wrap around w/o undoing something else as well. However:

If the selection is right->left (either by dragging the mouse in that direction, or by holding down the shift-key and expanding the selection with key-left) then the wrap around command does really funny things, and undoing it doesn't bring the cursor back where it was before the wrap.
If I wrap around parens around a left->right selection by typing an opening bracket, like (, the selection is wrapped and keep being correctly selected, but undoing also deletes the selection. (This is probably what I had done when reporting on the behaviour).
The really crazy things start to happen if I have a right-left selection and wrap using an opening bracket. Then:
1. the selection is trippled!
2. the middle clone is wrapped
3. the leftmost clone is selected, offset by one character
4. undoing here:
  1. removes the parens around the middle clone of the original selection
  2. keeps all three clones
  3. undoing here:
    1. creates yet another clone of the selection 😂
    2. selects the leftmost clone
      1. you might think this is the end of the madness, but you'd be wrong!
      2. undoing now:
        
        does a bit of different things everytime I try, including creating new content that is a mix of the current content and some other entry in the repl history. I haven't found a pattern to it.
        
        keeps the selection range where the original selection was.

OK. So complicated to follow, here's a gif:

Crazy, huh? 🤔

PEZ · 2019-11-11T11:46:43Z

Much less crazy now! 😄

I think a new issue arrived. I can't move the cursor right with key-right. It instead selects the character to the right w/o moving the cursor, and then the cursor won't move either left or right.

Also:

Having the cursor adjacent to the left of a form and then using the Wrap around commands places the brackets adjacent to the right of the form.
Having the cursor adjacent to the left of a form and then typing an opening bracket, places the brackets adjacent to the left of the form.
Typing a bracket when there is a selection, wraps it correctly, but undo will delete the selection and misplace the cursor
- undoing again gives you the selection back and the cursor position correct.
- (yes, I've already reported this, but including for completeness).

no selection to restore previous behavior.

cfehse · 2019-11-11T12:52:12Z

I think a new issue arrived. I can't move the cursor right with key-right. It instead selects the character to the right w/o moving the cursor, and then the cursor won't move either left or right.

Yes the cursor movement depends on the "direction" of the selection. I fixed that.

Having the cursor adjacent to the left of a form and then using the Wrap around commands places the brackets adjacent to the right of the form.

Yes that was wrong.

Having the cursor adjacent to the left of a form and then typing an opening bracket, places the brackets adjacent to the left of the form.

I am really not sure, what you doing. I do this:

Typing a bracket when there is a selection, wraps it correctly, but undo will delete the selection and misplace the cursor

And the same for this one: I am doing this - selecting both directions and execute open and wrapSexpr for each type of selection followed by undo (Ctrl+Z):

PEZ · 2019-11-11T13:45:51Z

I am really not sure, what you doing

I type the character (. So, on my Swedish keyboard that is shift+8.

cfehse · 2019-11-11T14:52:50Z

type the character (. So, on my Swedish keyboard that is shift+8.

Okay then we are doing the same - it is Shift+8 on the german keyboard as well.

Having the cursor adjacent to the left of a form and then typing an opening bracket, places the brackets adjacent to the left of the form.

Typing a bracket when there is a selection, wraps it correctly, but undo will delete the selection and misplace the cursor

Is this still present for you with the latest commits?

… into dev

PEZ · 2019-11-11T15:29:00Z

Yes. With some few variations on what happens. Here's a session where select something, then type (, then undo several times. And (this I now noticed) redo many times:

cfehse · 2019-11-11T16:20:55Z

Did you typed that repeat just before selecting and wrap it with paredit.open().? Do you edit in strict mode or not.

On my system the changes in the model are played correctly back in order (Windows and Linux).

PEZ · 2019-11-11T18:06:33Z

It doesn't matter if I am in strict mode or not. Or if I am doing this on something in the repl history or something I have just typed.

The redo bug is not new, btw. I just tried it in the released Calva. I'll file an issue about it.

PEZ · 2019-11-11T19:16:39Z

Here's that issue. #462

In this PR I still have this issue:

Typing a bracket when there is a selection, wraps it correctly, but undo will delete the selection and misplace the cursor

Too bad you can't reproduce it! How about @kstehn and @bpringe ?

cfehse · 2019-11-11T19:48:10Z

On my systems the undo/redo works like a charm in both directions. Looking further into this tomorrow.

cfehse · 2019-11-11T19:50:49Z

@PEZ By the way is there a specific reason that the redo command in the REPL is Ctrl+Shift+Z and not Ctrl+Y like in the editor?

PEZ · 2019-11-11T20:06:43Z

Maybe because it is ctrl+shift+z in the editor in any sane setup? 😄 No, we should probably try to figure out what the setting is in the editor and use the same in at the repl prompt.

On my machine redo is cmd+shitft+z, everywhere, and I think it might be quite common with that shift ”reverses” the meaning of ctrl/cmd+z.

cfehse · 2019-11-11T20:22:58Z

Mayby. gg On my stock vscode installation on Windows redo is Ctrl+Y. Was just a question.

…o dev

cfehse · 2019-11-14T15:16:00Z

@PEZ @bpringe

I think this PR is ready for merging now.

PEZ · 2019-11-14T18:46:01Z

Yes. And I have reached the limit to my testing of this since things are crazy on macOS anyway. Let's merge and we will find out. Especically together with my lexing fix things will work pretty much better than they do today with this PR.

After that, we're almost ready to take on Paredit in the editor. Haha.

PEZ and others added 10 commits November 7, 2019 14:26

Add sponsor, Terje [skip ci]

93dc6d5

Merge HEAD, branch 'dev' of https://github.com/BetterThanTomorrow/calva…

257c299

… into dev

Implemented paredt.open to wrap around selection.

c156e95

Closes: #170

Keep the selection after inserting.

759d299

Made wrapSexpr() behave like open.

3478405

Added dblclick handler to grow selection.

5e52bb8

fix typo

bf1e3c0

Fixed the growSelection() method to allow cursor

f64d8eb

positions outside an sexpr. Closes: #417.

Changed regex to find comment forms correctly.

30cac4a

Closes: #403

Skip the uti.select() call for paredit.deleteBackward(()

5074718

Closes #458

cfehse changed the title ~~Implemented paredit open to wrap around selection.~~ paredit and highlight fixes and improvements. Nov 9, 2019

cfehse changed the title ~~paredit and highlight fixes and improvements.~~ Paredit and highlight fixes and improvements. Nov 9, 2019

Merge pull request #457 from rogererens/patch-3

248007d

fix typo

cf added 3 commits November 10, 2019 12:35

Added method to see if the current token is in a string.

46c8c00

Added method to get the selection for a word

3408155

from the current offset in the model.

Improved double click selection.

786d6dd

PEZ reviewed Nov 10, 2019

View reviewed changes

PEZ and others added 3 commits November 10, 2019 21:14

Merge branch 'dev'

6b6a1b1

Merge HEAD, branch 'dev' of https://github.com/BetterThanTomorrow/calva…

afc37a8

… into dev

Merge branch 'dev' into fix/issue-170

bb51108

Made a real difference between selection and

40faf49

no selection to restore previous behavior.

Merge branch 'dev'

997cf21

cf added 2 commits November 11, 2019 16:15

Merge HEAD, branch 'dev' of https://github.com/BetterThanTomorrow/calva…

806e2a7

… into dev

Merge branch 'dev' into fix/issue-170

ef8e020

cf added 7 commits November 12, 2019 12:25

Fixed corner case in wrapSexpr().

7292f8b

Restored cursor position with no selection.

c28ca1e

Added the undo/redo commands to list.

b002ad0

Merge branch 'dev' of https://github.com/BetterThanTomorrow/calva int…

e28ce47

…o dev

Merge branch 'dev' into fix/issue-170

6c26e18

Merge branch 'dev' of https://github.com/BetterThanTomorrow/calva int…

8c28458

…o dev

Merge branch 'dev' into fix/issue-170

60d0c60

PEZ merged commit f719a60 into dev Nov 14, 2019

PEZ deleted the fix/issue-170 branch November 14, 2019 18:46

This was referenced Nov 5, 2022

[Snyk] Fix for 1 vulnerabilities meonBot/calva#14

Open

[Snyk] Fix for 1 vulnerabilities devcode1981/calva#22

Open

[Snyk] Fix for 1 vulnerabilities MarcelRaschke/calva#20

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Paredit and highlight fixes and improvements. #456

Paredit and highlight fixes and improvements. #456

cfehse commented Nov 7, 2019 •

edited

Loading

PEZ commented Nov 9, 2019

PEZ commented Nov 9, 2019

PEZ commented Nov 9, 2019

PEZ commented Nov 9, 2019

cfehse commented Nov 9, 2019

cfehse commented Nov 9, 2019

PEZ commented Nov 10, 2019

cfehse commented Nov 10, 2019

cfehse commented Nov 10, 2019

PEZ Nov 10, 2019

cfehse Nov 10, 2019 •

edited

Loading

PEZ Nov 10, 2019

cfehse Nov 10, 2019

PEZ Nov 10, 2019

cfehse Nov 10, 2019

PEZ Nov 10, 2019

PEZ commented Nov 11, 2019

PEZ commented Nov 11, 2019

cfehse commented Nov 11, 2019

PEZ commented Nov 11, 2019

cfehse commented Nov 11, 2019

PEZ commented Nov 11, 2019

cfehse commented Nov 11, 2019

PEZ commented Nov 11, 2019

PEZ commented Nov 11, 2019

cfehse commented Nov 11, 2019

cfehse commented Nov 11, 2019

PEZ commented Nov 11, 2019

cfehse commented Nov 11, 2019

cfehse commented Nov 14, 2019

PEZ commented Nov 14, 2019

Paredit and highlight fixes and improvements. #456

Paredit and highlight fixes and improvements. #456

Conversation

cfehse commented Nov 7, 2019 • edited Loading

What has Changed?

My Calva PR Checklist

The Calva Team PR Checklist:

PEZ commented Nov 9, 2019

PEZ commented Nov 9, 2019

PEZ commented Nov 9, 2019

PEZ commented Nov 9, 2019

cfehse commented Nov 9, 2019

cfehse commented Nov 9, 2019

PEZ commented Nov 10, 2019

cfehse commented Nov 10, 2019

cfehse commented Nov 10, 2019

PEZ Nov 10, 2019

Choose a reason for hiding this comment

cfehse Nov 10, 2019 • edited Loading

Choose a reason for hiding this comment

PEZ Nov 10, 2019

Choose a reason for hiding this comment

cfehse Nov 10, 2019

Choose a reason for hiding this comment

PEZ Nov 10, 2019

Choose a reason for hiding this comment

cfehse Nov 10, 2019

Choose a reason for hiding this comment

PEZ Nov 10, 2019

Choose a reason for hiding this comment

PEZ commented Nov 11, 2019

PEZ commented Nov 11, 2019

cfehse commented Nov 11, 2019

PEZ commented Nov 11, 2019

cfehse commented Nov 11, 2019

PEZ commented Nov 11, 2019

cfehse commented Nov 11, 2019

PEZ commented Nov 11, 2019

PEZ commented Nov 11, 2019

cfehse commented Nov 11, 2019

cfehse commented Nov 11, 2019

PEZ commented Nov 11, 2019

cfehse commented Nov 11, 2019

cfehse commented Nov 14, 2019

PEZ commented Nov 14, 2019

cfehse commented Nov 7, 2019 •

edited

Loading

cfehse Nov 10, 2019 •

edited

Loading