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.

Sign up for GitHub

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

Jump to bottom

[WIP] PR: Add multi-cursor editing to codeeditor #22996

Draft
wants to merge 52 commits into
base: master
Choose a base branch
from
Draft

[WIP] PR: Add multi-cursor editing to codeeditor #22996

wants to merge 52 commits into from

Commits on Nov 3, 2024

  1. manually draw all text cursors and mouse shortcut to add cursors

    @athompson673
    athompson673 committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    8a24981 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master'

    @athompson673
    athompson673 committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    d64e95e View commit details
    Browse the repository at this point in the history

  3. non-shortcut mouse press clears extra cursors

    @athompson673
    athompson673 committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    d03be3e View commit details
    Browse the repository at this point in the history

  4. draw extra cursor selections using text decorations

    @athompson673
    athompson673 committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    d3e3e65 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2024

  1. refactoring

    @athompson673
    athompson673 committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    13414fd View commit details
    Browse the repository at this point in the history

  2. formatting and comments

    @athompson673
    athompson673 committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    c457bb0 View commit details
    Browse the repository at this point in the history

  3. first attempt at handling keyEvent for all cursors

    @athompson673
    athompson673 committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    2c8d669 View commit details
    Browse the repository at this point in the history

  4. implement various cursor movement

    @athompson673
    athompson673 authored Nov 4, 2024
    Configuration menu
    Copy the full SHA
    df16552 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2024

  1. Merge branch 'spyder-ide:master' into master

    @athompson673
    athompson673 authored Nov 5, 2024
    Configuration menu
    Copy the full SHA
    244a4ba View commit details
    Browse the repository at this point in the history

  2. Merge branch 'spyder-ide:master' into master

    @athompson673
    athompson673 authored Nov 5, 2024
    Configuration menu
    Copy the full SHA
    a9ec7b8 View commit details
    Browse the repository at this point in the history

  3. Fix missing line for delete key handling

    @athompson673
    athompson673 authored Nov 5, 2024
    Configuration menu
    Copy the full SHA
    7895b99 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2024

  1. Add cursor EditBlock to key event for undo history and other changes

    @athompson673
    athompson673 authored Nov 6, 2024
    Configuration menu
    Copy the full SHA
    c121ec3 View commit details
    Browse the repository at this point in the history

  2. write multi-cursor cut, copy, paste

    @athompson673
    athompson673 authored Nov 6, 2024
    Configuration menu
    Copy the full SHA
    daf592f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'spyder-ide:master' into master

    @athompson673
    athompson673 authored Nov 6, 2024
    Configuration menu
    Copy the full SHA
    7284757 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2024

  1. rework delete handling for better undo/redo cursor positioning

    @athompson673
    athompson673 authored Nov 7, 2024
    Configuration menu
    Copy the full SHA
    1a955e9 View commit details
    Browse the repository at this point in the history

  2. rework cursor painting

    @athompson673
    athompson673 authored Nov 7, 2024
    Configuration menu
    Copy the full SHA
    63fe5ed View commit details
    Browse the repository at this point in the history

  3. overtype cursor rendering 

    Required manually tracking overwriteMode and leaving it disabled except for during keyEvent. This might be a fragile solution...
    @athompson673
    athompson673 authored Nov 7, 2024
    Configuration menu
    Copy the full SHA
    af348c5 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2024

  1. implement overlapping cursor merge

    @athompson673
    athompson673 authored Nov 8, 2024
    Configuration menu
    Copy the full SHA
    8b2c27c View commit details
    Browse the repository at this point in the history

  2. impl select-all, and template methods for wrapping other shortcuts

    @athompson673
    athompson673 authored Nov 8, 2024
    Configuration menu
    Copy the full SHA
    4c803fa View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2024

  1. refactor prev/next word, and prevent auto completions when multi-cursor

    @athompson673
    athompson673 committed Nov 9, 2024
    Configuration menu
    Copy the full SHA
    a612b78 View commit details
    Browse the repository at this point in the history

  2. impl wrappers for shortcut functions and delete_line function for mul… 

    …ti-cursor
    @athompson673
    athompson673 committed Nov 9, 2024
    Configuration menu
    Copy the full SHA
    88d6fd2 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2024

  1. better cursor edit handling in for_each_cursor wrapper. Implements go… 

    …to new line, and clears extra_cursors on goto_definition
    @athompson673
    athompson673 committed Nov 10, 2024
    Configuration menu
    Copy the full SHA
    1c5685d View commit details
    Browse the repository at this point in the history

  2. revert cursor_move_event in favor of wrapper function: for_each_curso… 

    …r. many TODO comments
    @athompson673
    athompson673 committed Nov 10, 2024
    Configuration menu
    Copy the full SHA
    df71b7b View commit details
    Browse the repository at this point in the history

  3. re-work callback wrappers to prevent QAction from sending extraneous … 

    …bool, and added #TODO notes
    @athompson673
    athompson673 committed Nov 10, 2024
    Configuration menu
    Copy the full SHA
    bee76c3 View commit details
    Browse the repository at this point in the history

  4. style changes and #TODO comments

    @athompson673
    athompson673 committed Nov 10, 2024
    Configuration menu
    Copy the full SHA
    6b34797 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'spyder-ide:master' into master

    @athompson673
    athompson673 authored Nov 10, 2024
    Configuration menu
    Copy the full SHA
    15a20d9 View commit details
    Browse the repository at this point in the history

  6. docstrings, and unneeded func call cleanup

    @athompson673
    athompson673 committed Nov 10, 2024
    Configuration menu
    Copy the full SHA
    6bb721f View commit details
    Browse the repository at this point in the history

  7. small refactoring

    @athompson673
    athompson673 committed Nov 10, 2024
    Configuration menu
    Copy the full SHA
    cef9337 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2024

  1. fix deletion of folded lines (delete and delete_line)

    @athompson673
    athompson673 committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    3f35f0a View commit details
    Browse the repository at this point in the history

  2. qt6 enum naming, and attempt to get cursor to not enter hidden blocks

    @athompson673
    athompson673 committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    528672b View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2024

  1. Merge branch 'spyder-ide:master' into master

    @athompson673
    athompson673 authored Nov 13, 2024
    Configuration menu
    Copy the full SHA
    82f5597 View commit details
    Browse the repository at this point in the history

  2. edit docstrings and todo notes

    @athompson673
    athompson673 authored Nov 13, 2024
    Configuration menu
    Copy the full SHA
    d76d32a View commit details
    Browse the repository at this point in the history

  3. re-implement methods for next/prev cell

    @athompson673
    athompson673 authored Nov 13, 2024
    Configuration menu
    Copy the full SHA
    6e94976 View commit details
    Browse the repository at this point in the history

  4. move cursor clearing for several functions to go_to_line

    @athompson673
    athompson673 authored Nov 13, 2024
    Configuration menu
    Copy the full SHA
    128f306 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2024

  1. simplify multi-cursor keypress handling and add merge direction to fo… 

    …r_all_cursors wrapper
    @athompson673
    athompson673 authored Nov 14, 2024
    Configuration menu
    Copy the full SHA
    7b7c1a4 View commit details
    Browse the repository at this point in the history

  2. multi-cursor docstring shortcuts

    @athompson673
    athompson673 authored Nov 14, 2024
    Configuration menu
    Copy the full SHA
    4bb130f View commit details
    Browse the repository at this point in the history

  3. fix cursor blink typo so cursor is not hidden during rapid keypress e… 

    …vents
    @athompson673
    athompson673 authored Nov 14, 2024
    Configuration menu
    Copy the full SHA
    a0979d0 View commit details
    Browse the repository at this point in the history

  4. Colum cursor creation and multi-cursor remove cursor click interactions

    @athompson673
    athompson673 authored Nov 14, 2024
    Configuration menu
    Copy the full SHA
    525f8fd View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2024

  1. Fix column cursor shortcut: clamp cursor position to text length not … 

    …line length.

Also revert to builtin cursor rendering for text dragging with single cursor.
    @athompson673
    athompson673 committed Nov 16, 2024
    Configuration menu
    Copy the full SHA
    64b8523 View commit details
    Browse the repository at this point in the history

  2. edit multi cursor paste: if single line on clipboard; repeat for all … 

    …cursors
    @athompson673
    athompson673 committed Nov 16, 2024
    Configuration menu
    Copy the full SHA
    0596845 View commit details
    Browse the repository at this point in the history

  3. rewrite cursor rendering again for overwrite mode

    @athompson673
    athompson673 committed Nov 16, 2024
    Configuration menu
    Copy the full SHA
    a66d4e8 View commit details
    Browse the repository at this point in the history

  4. pep 8 changes (some, not all)

    @athompson673
    athompson673 committed Nov 16, 2024
    Configuration menu
    Copy the full SHA
    2c1c9bf View commit details
    Browse the repository at this point in the history

  5. revert badly merged line from cut()

    @athompson673
    athompson673 committed Nov 16, 2024
    Configuration menu
    Copy the full SHA
    7d35e3f View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2024

  1. Merge branch 'spyder-ide:master' into master

    @athompson673
    athompson673 authored Nov 18, 2024
    Configuration menu
    Copy the full SHA
    f65df51 View commit details
    Browse the repository at this point in the history

  2. pep8 line length edits and attempt to fix delete behavior regression

    @athompson673
    athompson673 authored Nov 18, 2024
    Configuration menu
    Copy the full SHA
    2aeb191 View commit details
    Browse the repository at this point in the history

  3. reorganize multi-cursor keyPressEvent, and bugfix merge_cursors 

    handle_multi_cursor_keypress no longer an event reciever, instead directly called from keyPressEvent. This way we can cleanly emit sig_key_pressed for each cursor and respond to event.isAccepted. This implements ignoring keystrokes on folded lines.
    @athompson673
    athompson673 authored Nov 18, 2024
    Configuration menu
    Copy the full SHA
    de42e08 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2024

  1. rewrite delete and delete_line to fix behavior with folded code

    @athompson673
    athompson673 authored Nov 19, 2024
    Configuration menu
    Copy the full SHA
    5ffd2df View commit details
    Browse the repository at this point in the history

  2. update multi_cursor_keypress handling to emit signals before changing… 

    … text

similar to edits for delete function, emit a signal for each cursor prior to changing text as this prevents an out of order edit problem with code folding.
    @athompson673
    athompson673 authored Nov 19, 2024
    Configuration menu
    Copy the full SHA
    2f300d2 View commit details
    Browse the repository at this point in the history

  3. make autoformatting clear extra cursors 

    The delayed update model with the LSP makes it difficult to encapsulate the changes with a simple call to for_each_cursor. Future implementation might edit lsp_mixin?
    @athompson673
    athompson673 authored Nov 19, 2024
    Configuration menu
    Copy the full SHA
    8fb4df7 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2024

  1. begin implementing multi-cursor toggle for settings option, and add d… 

    …ecorator to two shortcuts
    @athompson673
    athompson673 authored Nov 20, 2024
    Configuration menu
    Copy the full SHA
    8b19db9 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2024

  1. Merge branch 'spyder-ide:master' into master

    @athompson673
    athompson673 authored Nov 21, 2024
    Configuration menu
    Copy the full SHA
    0dd876e View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2024

  1. Merge branch 'spyder-ide:master' into master

    @athompson673
    athompson673 authored Nov 22, 2024
    Configuration menu
    Copy the full SHA
    c0f58b1 View commit details
    Browse the repository at this point in the history