Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2686 delete forward from comment #2690

Merged

Conversation

pbwolf
Copy link

@pbwolf pbwolf commented Jan 1, 2025

What has changed?

whenContexts.setCursorContextIfChanged is called not upon only changeTextEditorSelection and changeActiveTextEditor (as before), but also changeTextDocument - to account for the case where a document change affected the meaning of the active point without moving it.

Since most edits also move the active point, a check is added to avoid redundant calls to setCursorContextIfChanged. The check compares the event's editor, document version, and active point with those of the previous event.

Tests: I have not figured out how to automate keypresses. The test would start with the document |;•(foo) where | signifies the active point and is a newline; press Del (removing the semicolon), Del again (removing the newline), and Del again (passing harmlessly over the open-paren? or erroneously deleting it?).

Alternative: There is also a changeTextDocument handler in mirror-doc. It might be a more robust place to adjust cursor context, although it would complicate coordination of edit- vs selection-occasioned adjustment. The thing is that the mirror-doc handler updates the model, which is used in whenContexts.setCursorContextIfChanged. Luckily, the problematic case involves TWO presses of Del and therefore in practice the present, un-tangled, change will address it.

Fixes #2686

My Calva PR Checklist

I have:

  • Read How to Contribute.
  • Directed this pull request at the dev branch. (Or have specific reasons to target some other branch.)
  • Made sure I have changed the PR base branch, so that it is not published. (Sorry for the nagging.)
  • Made sure there is an issue registered with a clear problem statement that this PR addresses, (created the issue if it was not present).
    • Updated the [Unreleased] entry in CHANGELOG.md, linking the issue(s) that the PR is addressing.
  • Figured if anything about the fix warrants tests on Mac/Linux/Windows/Remote/Whatever, and either tested it there if so, or mentioned it in the PR.
  • (No docs changes) Added to or updated docs in this branch, if appropriate
  • Tests (see above)
    • Tested the particular change
    • Figured if the change might have some side effects and tested those as well.
  • Formatted all JavaScript and TypeScript code that was changed. (use the prettier extension or run npm run prettier-format)
  • Confirmed that there are no linter warnings or errors (use the eslint extension, run npm run eslint before creating your PR, or run npm run eslint-watch to eslint as you go).

Ping @PEZ, @bpringe, @corasaurus-hex, @Cyrik

Copy link

netlify bot commented Jan 1, 2025

Deploy Preview for calva-docs ready!

Name Link
🔨 Latest commit aa0713f
🔍 Latest deploy log https://app.netlify.com/sites/calva-docs/deploys/677583b1dd9f3b00089af059
😎 Deploy Preview https://deploy-preview-2690--calva-docs.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@bpringe bpringe requested a review from PEZ January 3, 2025 19:17
@bpringe
Copy link
Member

bpringe commented Jan 3, 2025

Thanks for this contribution and for your other work on Calva! Is this still a WIP as the title suggests?

@pbwolf
Copy link
Author

pbwolf commented Jan 4, 2025

@bpringe it is ready for your review. Thank you.

@pbwolf pbwolf changed the title Wip/2686 delete forward from comment 2686 delete forward from comment Jan 4, 2025
@bpringe bpringe merged commit b8bcccd into BetterThanTomorrow:dev Jan 6, 2025
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants